WIP

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

@@ -1,28 +1,25 @@
-using System.Diagnostics;
+using Phantom.Utils.Collections;
-using Phantom.Utils.Collections;
 using Phantom.Utils.Runtime;
 
 namespace Phantom.Agent.Minecraft.Instance; 
 
-public sealed class InstanceSession : IDisposable {
+public sealed class InstanceProcess : IDisposable {
 	public InstanceProperties InstanceProperties { get; }
 	public CancellableSemaphore BackupSemaphore { get; } = new (1, 1);
 	
 	private readonly RingBuffer<string> outputBuffer = new (10000);
 	private event EventHandler<string>? OutputEvent;
 
-	public event EventHandler? SessionEnded;
+	public event EventHandler? Ended;
 	public bool HasEnded { get; private set; }
 
 	private readonly Process process;
 
-	internal InstanceSession(InstanceProperties instanceProperties, Process process) {
+	internal InstanceProcess(InstanceProperties instanceProperties, Process process) {
 		this.InstanceProperties = instanceProperties;
 		this.process = process;
-		this.process.EnableRaisingEvents = true;
 		this.process.Exited += ProcessOnExited;
-		this.process.OutputDataReceived += HandleOutputLine;
+		this.process.OutputReceived += ProcessOutputReceived;
-		this.process.ErrorDataReceived += HandleOutputLine;
 	}
 
 	public async Task SendCommand(string command, CancellationToken cancellationToken) {
@@ -41,17 +38,15 @@ public sealed class InstanceSession : IDisposable {
 		OutputEvent -= listener;
 	}
 
-	private void HandleOutputLine(object sender, DataReceivedEventArgs args) {
+	private void ProcessOutputReceived(object? sender, Process.Output output) {
-		if (args.Data is {} line) {
+		outputBuffer.Add(output.Line);
-			outputBuffer.Add(line);
+		OutputEvent?.Invoke(this, output.Line);
-			OutputEvent?.Invoke(this, line);
-		}
 	}
 
 	private void ProcessOnExited(object? sender, EventArgs e) {
 		OutputEvent = null;
 		HasEnded = true;
-		SessionEnded?.Invoke(this, EventArgs.Empty);
+		Ended?.Invoke(this, EventArgs.Empty);
 	}
 
 	public void Kill() {
@@ -68,6 +63,6 @@ public sealed class InstanceSession : IDisposable {
 		process.Dispose();
 		BackupSemaphore.Dispose();
 		OutputEvent = null;
-		SessionEnded = null;
+		Ended = null;
 	}
 }

Agent/Phantom.Agent.Minecraft/Instance/InstanceProperties.cs

@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Minecraft.Properties;
+using Phantom.Common.Data.Instance;
 
 namespace Phantom.Agent.Minecraft.Instance;
 
@@ -11,5 +12,6 @@ public sealed record InstanceProperties(
 	ImmutableArray<string> JvmArguments,
 	string InstanceFolder,
 	string ServerVersion,
-	ServerProperties ServerProperties
+	ServerProperties ServerProperties,
+	InstanceLaunchProperties LaunchProperties
 );

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

@@ -1,17 +1,19 @@
-using System.Diagnostics;
+using System.Text;
-using System.Text;
 using Kajabity.Tools.Java;
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Minecraft.Server;
 using Phantom.Common.Minecraft;
+using Phantom.Utils.Runtime;
 using Serilog;
 
 namespace Phantom.Agent.Minecraft.Launcher;
 
-public abstract class BaseLauncher {
+public abstract class BaseLauncher : IServerLauncher {
 	private readonly InstanceProperties instanceProperties;
 
+	protected string MinecraftVersion => instanceProperties.ServerVersion;
+
 	private protected BaseLauncher(InstanceProperties instanceProperties) {
 		this.instanceProperties = instanceProperties;
 	}
@@ -25,33 +27,25 @@ public abstract class BaseLauncher {
 			return new LaunchResult.InvalidJvmArguments();
 		}
 
-		var vanillaServerJarPath = await services.ServerExecutables.DownloadAndGetPath(instanceProperties.ServerVersion, downloadProgressEventHandler, cancellationToken);
+		var vanillaServerJarPath = await services.ServerExecutables.DownloadAndGetPath(instanceProperties.LaunchProperties.ServerDownloadInfo, MinecraftVersion, downloadProgressEventHandler, cancellationToken);
 		if (vanillaServerJarPath == null) {
 			return new LaunchResult.CouldNotDownloadMinecraftServer();
 		}
 
-		var startInfo = new ProcessStartInfo {
+		ServerJarInfo? serverJar;
-			FileName = javaRuntimeExecutable.ExecutablePath,
+		try {
-			WorkingDirectory = instanceProperties.InstanceFolder,
+			serverJar = await PrepareServerJar(logger, vanillaServerJarPath, cancellationToken);
-			RedirectStandardInput = true,
+		} catch (OperationCanceledException) {
-			RedirectStandardOutput = true,
+			throw;
-			RedirectStandardError = true,
+		} catch (Exception e) {
-			UseShellExecute = false,
+			logger.Error(e, "Caught exception while preparing the server jar.");
-			CreateNoWindow = false
+			return new LaunchResult.CouldNotPrepareMinecraftServerLauncher();
-		};
+		}
 
-		var jvmArguments = new JvmArgumentBuilder(instanceProperties.JvmProperties, instanceProperties.JvmArguments);
+		if (!File.Exists(serverJar.FilePath)) {
-		CustomizeJvmArguments(jvmArguments);
+			logger.Error("Missing prepared server or launcher jar: {FilePath}", serverJar.FilePath);
-
+			return new LaunchResult.CouldNotPrepareMinecraftServerLauncher();
-		var serverJarPath = await PrepareServerJar(vanillaServerJarPath, instanceProperties.InstanceFolder, cancellationToken);
+		}
-		var processArguments = startInfo.ArgumentList;
-		jvmArguments.Build(processArguments);
-		processArguments.Add("-jar");
-		processArguments.Add(serverJarPath);
-		processArguments.Add("nogui");
-
-		var process = new Process { StartInfo = startInfo };
-		var session = new InstanceSession(instanceProperties, process);
 
 		try {
 			await AcceptEula(instanceProperties);
@@ -61,10 +55,32 @@ public abstract class BaseLauncher {
 			return new LaunchResult.CouldNotConfigureMinecraftServer();
 		}
 		
+		var processConfigurator = new ProcessConfigurator {
+			FileName = javaRuntimeExecutable.ExecutablePath,
+			WorkingDirectory = instanceProperties.InstanceFolder,
+			RedirectInput = true,
+			UseShellExecute = false
+		};
+		
+		var jvmArguments = new JvmArgumentBuilder(instanceProperties.JvmProperties, instanceProperties.JvmArguments);
+		CustomizeJvmArguments(jvmArguments);
+
+		var processArguments = processConfigurator.ArgumentList;
+		jvmArguments.Build(processArguments);
+		
+		foreach (var extraArgument in serverJar.ExtraArgs) {
+			processArguments.Add(extraArgument);
+		}
+		
+		processArguments.Add("-jar");
+		processArguments.Add(serverJar.FilePath);
+		processArguments.Add("nogui");
+
+		var process = processConfigurator.CreateProcess();
+		var instanceProcess = new InstanceProcess(instanceProperties, process);
+
 		try {
 			process.Start();
-			process.BeginOutputReadLine();
-			process.BeginErrorReadLine();
 		} catch (Exception launchException) {
 			logger.Error(launchException, "Caught exception launching the server process.");
 			
@@ -77,13 +93,13 @@ public abstract class BaseLauncher {
 			return new LaunchResult.CouldNotStartMinecraftServer();
 		}
 
-		return new LaunchResult.Success(session);
+		return new LaunchResult.Success(instanceProcess);
 	}
 
 	private protected virtual void CustomizeJvmArguments(JvmArgumentBuilder arguments) {}
 
-	private protected virtual Task<string> PrepareServerJar(string serverJarPath, string instanceFolderPath, CancellationToken cancellationToken) {
+	private protected virtual Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
-		return Task.FromResult(serverJarPath);
+		return Task.FromResult(new ServerJarInfo(serverJarPath));
 	}
 
 	private static async Task AcceptEula(InstanceProperties instanceProperties) {

Agent/Phantom.Agent.Minecraft/Launcher/IServerLauncher.cs

@@ -0,0 +1,8 @@
+using Phantom.Agent.Minecraft.Server;
+using Serilog;
+
+namespace Phantom.Agent.Minecraft.Launcher;
+
+public interface IServerLauncher {
+	Task<LaunchResult> Launch(ILogger logger, LaunchServices services, EventHandler<DownloadProgressEventArgs> downloadProgressEventHandler, CancellationToken cancellationToken);
+}

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

@@ -5,7 +5,7 @@ namespace Phantom.Agent.Minecraft.Launcher;
 public abstract record LaunchResult {
 	private LaunchResult() {}
 
-	public sealed record Success(InstanceSession Session) : LaunchResult;
+	public sealed record Success(InstanceProcess Process) : LaunchResult;
 
 	public sealed record InvalidJavaRuntime : LaunchResult;
 	
@@ -13,6 +13,8 @@ public abstract record LaunchResult {
 
 	public sealed record CouldNotDownloadMinecraftServer : LaunchResult;
 	
+	public sealed record CouldNotPrepareMinecraftServerLauncher : LaunchResult;
+	
 	public sealed record CouldNotConfigureMinecraftServer : LaunchResult;
 	
 	public sealed record CouldNotStartMinecraftServer : LaunchResult;

Agent/Phantom.Agent.Minecraft/Launcher/ServerJarInfo.cs

@@ -0,0 +1,7 @@
+using System.Collections.Immutable;
+
+namespace Phantom.Agent.Minecraft.Launcher;
+
+sealed record ServerJarInfo(string FilePath, ImmutableArray<string> ExtraArgs) {
+	public ServerJarInfo(string filePath) : this(filePath, ImmutableArray<string>.Empty) {}
+}

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

@@ -0,0 +1,55 @@
+using System.Collections.Immutable;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Utils.IO;
+using Serilog;
+
+namespace Phantom.Agent.Minecraft.Launcher.Types; 
+
+public sealed class FabricLauncher : BaseLauncher {
+	public FabricLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}
+	
+	private protected override async Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
+		var serverJarParentFolderPath = Directory.GetParent(serverJarPath);
+		if (serverJarParentFolderPath == null) {
+			throw new ArgumentException("Could not get parent folder from: " + serverJarPath, nameof(serverJarPath));
+		}
+		
+		var launcherJarPath = Path.Combine(serverJarParentFolderPath.FullName, "fabric.jar");
+		
+		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";
+		logger.Information("Downloading Fabric launcher from: {Url}", installerUrl);
+		
+		using var http = new HttpClient();
+		
+		var response = await http.GetAsync(installerUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+		response.EnsureSuccessStatusCode();
+		
+		try {
+			await using var fileStream = new FileStream(targetFilePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
+			await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
+			await responseStream.CopyToAsync(fileStream, cancellationToken);
+		} catch (Exception) {
+			TryDeleteLauncherAfterFailure(logger, targetFilePath);
+			throw;
+		}
+	}
+
+	private static void TryDeleteLauncherAfterFailure(ILogger logger, string filePath) {
+		if (File.Exists(filePath)) {
+			try {
+				File.Delete(filePath);
+			} catch (Exception e) {
+				logger.Warning(e, "Could not clean up partially downloaded Fabric launcher: {FilePath}", filePath);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,12 @@
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Java;
+
+namespace Phantom.Agent.Minecraft.Launcher.Types; 
+
+public class ForgeLauncher : BaseLauncher {
+	public ForgeLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}
+	
+	private protected override void CustomizeJvmArguments(JvmArgumentBuilder arguments) {
+		arguments.AddProperty("terminal.ansi", "true"); // TODO
+	}
+}

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

@@ -0,0 +1,14 @@
+using Phantom.Agent.Minecraft.Server;
+using Serilog;
+
+namespace Phantom.Agent.Minecraft.Launcher.Types; 
+
+public sealed class InvalidLauncher : IServerLauncher {
+	public static InvalidLauncher Instance { get; } = new ();
+	
+	private InvalidLauncher() {}
+	
+	public Task<LaunchResult> Launch(ILogger logger, LaunchServices services, EventHandler<DownloadProgressEventArgs> downloadProgressEventHandler, CancellationToken cancellationToken) {
+		return Task.FromResult<LaunchResult>(new LaunchResult.CouldNotPrepareMinecraftServerLauncher());
+	}
+}

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

@@ -17,6 +17,7 @@
     <ProjectReference Include="..\..\Utils\Phantom.Utils.Collections\Phantom.Utils.Collections.csproj" />
     <ProjectReference Include="..\..\Utils\Phantom.Utils.Cryptography\Phantom.Utils.Cryptography.csproj" />
     <ProjectReference Include="..\..\Utils\Phantom.Utils.IO\Phantom.Utils.IO.csproj" />
+    <ProjectReference Include="..\..\Utils\Phantom.Utils.Runtime\Phantom.Utils.Runtime.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -1,6 +1,6 @@
 using System.Security.Cryptography;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Logging;
-using Phantom.Common.Minecraft;
 using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
 using Phantom.Utils.Runtime;
@@ -11,8 +11,6 @@ namespace Phantom.Agent.Minecraft.Server;
 sealed class MinecraftServerExecutableDownloader {
 	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftServerExecutableDownloader>();
 
-	private readonly MinecraftVersions minecraftVersions;
-	
 	public Task<string?> Task { get; }
 	public event EventHandler<DownloadProgressEventArgs>? DownloadProgress;
 	public event EventHandler? Completed;
@@ -20,17 +18,15 @@ sealed class MinecraftServerExecutableDownloader {
 	private readonly CancellationTokenSource cancellationTokenSource = new ();
 	private int listeners = 0;
 
-	public MinecraftServerExecutableDownloader(MinecraftVersions minecraftVersions, string version, string filePath, MinecraftServerExecutableDownloadListener listener) {
+	public MinecraftServerExecutableDownloader(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath, MinecraftServerExecutableDownloadListener listener) {
-		this.minecraftVersions = minecraftVersions;
-		
 		Register(listener);
-		Task = DownloadAndGetPath(version, filePath);
+		Task = DownloadAndGetPath(fileDownloadInfo, minecraftVersion, filePath);
 		Task.ContinueWith(OnCompleted, TaskScheduler.Default);
 	}
 
 	public void Register(MinecraftServerExecutableDownloadListener listener) {
 		++listeners;
-		Logger.Verbose("Registered download listener, current listener count: {Listeners}", listeners);
+		Logger.Debug("Registered download listener, current listener count: {Listeners}", listeners);
 		
 		DownloadProgress += listener.DownloadProgressEventHandler;
 		listener.CancellationToken.Register(Unregister, listener);
@@ -41,11 +37,11 @@ sealed class MinecraftServerExecutableDownloader {
 		DownloadProgress -= listener.DownloadProgressEventHandler;
 
 		if (--listeners <= 0) {
-			Logger.Verbose("Unregistered last download listener, cancelling download.");
+			Logger.Debug("Unregistered last download listener, cancelling download.");
 			cancellationTokenSource.Cancel();
 		}
 		else {
-			Logger.Verbose("Unregistered download listener, current listener count: {Listeners}", listeners);
+			Logger.Debug("Unregistered download listener, current listener count: {Listeners}", listeners);
 		}
 	}
 
@@ -54,7 +50,7 @@ sealed class MinecraftServerExecutableDownloader {
 	}
 
 	private void OnCompleted(Task task) {
-		Logger.Verbose("Download task completed.");
+		Logger.Debug("Download task completed.");
 		Completed?.Invoke(this, EventArgs.Empty);
 		Completed = null;
 		DownloadProgress = null;
@@ -72,33 +68,26 @@ sealed class MinecraftServerExecutableDownloader {
 		}
 	}
 
-	private async Task<string?> DownloadAndGetPath(string version, string filePath) {
+	private async Task<string?> DownloadAndGetPath(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath) {
-		Logger.Information("Downloading server version {Version}...", version);
-
 		string tmpFilePath = filePath + ".tmp";
 
 		var cancellationToken = cancellationTokenSource.Token;
 		try {
-			var serverExecutableInfo = await minecraftVersions.GetServerExecutableInfo(version, cancellationToken);
+			Logger.Information("Downloading server version {Version} from: {Url} ({Size})", minecraftVersion, fileDownloadInfo.DownloadUrl, fileDownloadInfo.Size.ToHumanReadable(decimalPlaces: 1));
-			if (serverExecutableInfo == null) {
-				return null;
-			}
-
-			Logger.Information("Downloading server executable from: {Url} ({Size})", serverExecutableInfo.DownloadUrl, serverExecutableInfo.Size.ToHumanReadable(decimalPlaces: 1));
 			try {
 				using var http = new HttpClient();
-				await FetchServerExecutableFile(http, new DownloadProgressCallback(this), serverExecutableInfo, tmpFilePath, cancellationToken);
+				await FetchServerExecutableFile(http, new DownloadProgressCallback(this), fileDownloadInfo, tmpFilePath, cancellationToken);
 			} catch (Exception) {
 				TryDeleteExecutableAfterFailure(tmpFilePath);
 				throw;
 			}
 
 			File.Move(tmpFilePath, filePath, true);
-			Logger.Information("Server version {Version} downloaded.", version);
+			Logger.Information("Server version {Version} downloaded.", minecraftVersion);
 
 			return filePath;
 		} catch (OperationCanceledException) {
-			Logger.Information("Download for server version {Version} was cancelled.", version);
+			Logger.Information("Download for server version {Version} was cancelled.", minecraftVersion);
 			throw;
 		} catch (StopProcedureException) {
 			return null;
@@ -110,17 +99,17 @@ sealed class MinecraftServerExecutableDownloader {
 		}
 	}
 
-	private static async Task FetchServerExecutableFile(HttpClient http, DownloadProgressCallback progressCallback, MinecraftServerExecutableInfo info, string filePath, CancellationToken cancellationToken) {
+	private static async Task FetchServerExecutableFile(HttpClient http, DownloadProgressCallback progressCallback, FileDownloadInfo fileDownloadInfo, string filePath, CancellationToken cancellationToken) {
 		Sha1String downloadedFileHash;
 
 		try {
-			var response = await http.GetAsync(info.DownloadUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+			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, info.Size.Bytes);
+			using var streamCopier = new MinecraftServerDownloadStreamCopier(progressCallback, fileDownloadInfo.Size.Bytes);
 			downloadedFileHash = await streamCopier.Copy(responseStream, fileStream, cancellationToken);
 		} catch (OperationCanceledException) {
 			throw;
@@ -129,8 +118,8 @@ sealed class MinecraftServerExecutableDownloader {
 			throw StopProcedureException.Instance;
 		}
 
-		if (!downloadedFileHash.Equals(info.Hash)) {
+		if (!downloadedFileHash.Equals(fileDownloadInfo.Hash)) {
-			Logger.Error("Downloaded server executable has mismatched SHA1 hash. Expected {Expected}, got {Actual}.", info.Hash, downloadedFileHash);
+			Logger.Error("Downloaded server executable has mismatched SHA1 hash. Expected {Expected}, got {Actual}.", fileDownloadInfo.Hash, downloadedFileHash);
 			throw StopProcedureException.Instance;
 		}
 	}

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

@@ -1,33 +1,37 @@
 using System.Text.RegularExpressions;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Logging;
-using Phantom.Common.Minecraft;
 using Phantom.Utils.IO;
 using Serilog;
 
 namespace Phantom.Agent.Minecraft.Server;
 
-public sealed partial class MinecraftServerExecutables : IDisposable {
+public sealed partial class MinecraftServerExecutables {
 	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftServerExecutables>();
 
 	[GeneratedRegex(@"[^a-zA-Z0-9_\-\.]", RegexOptions.Compiled)]
 	private static partial Regex VersionFolderSanitizeRegex();
 
 	private readonly string basePath;
-	private readonly MinecraftVersions minecraftVersions = new ();
 	private readonly Dictionary<string, MinecraftServerExecutableDownloader> runningDownloadersByVersion = new ();
 
 	public MinecraftServerExecutables(string basePath) {
 		this.basePath = basePath;
 	}
 
-	internal async Task<string?> DownloadAndGetPath(string version, EventHandler<DownloadProgressEventArgs> progressEventHandler, CancellationToken cancellationToken) {
+	internal async Task<string?> DownloadAndGetPath(FileDownloadInfo? fileDownloadInfo, string minecraftVersion, EventHandler<DownloadProgressEventArgs> progressEventHandler, CancellationToken cancellationToken) {
-		string serverExecutableFolderPath = Path.Combine(basePath, VersionFolderSanitizeRegex().Replace(version, "_"));
+		string serverExecutableFolderPath = Path.Combine(basePath, VersionFolderSanitizeRegex().Replace(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) {
@@ -39,26 +43,22 @@ public sealed partial class MinecraftServerExecutables : IDisposable {
 		MinecraftServerExecutableDownloadListener listener = new (progressEventHandler, cancellationToken);
 
 		lock (this) {
-			if (runningDownloadersByVersion.TryGetValue(version, out downloader)) {
+			if (runningDownloadersByVersion.TryGetValue(minecraftVersion, out downloader)) {
-				Logger.Information("A download for server version {Version} is already running, waiting for it to finish...", version);
+				Logger.Information("A download for server version {Version} is already running, waiting for it to finish...", minecraftVersion);
 				downloader.Register(listener);
 			}
 			else {
-				downloader = new MinecraftServerExecutableDownloader(minecraftVersions, version, serverExecutableFilePath, listener);
+				downloader = new MinecraftServerExecutableDownloader(fileDownloadInfo, minecraftVersion, serverExecutableFilePath, listener);
 				downloader.Completed += (_, _) => {
 					lock (this) {
-						runningDownloadersByVersion.Remove(version);
+						runningDownloadersByVersion.Remove(minecraftVersion);
 					}
 				};
 
-				runningDownloadersByVersion[version] = downloader;
+				runningDownloadersByVersion[minecraftVersion] = downloader;
 			}
 		}
 
 		return await downloader.Task.WaitAsync(cancellationToken);
 	}
-
-	public void Dispose() {
-		minecraftVersions.Dispose();
-	}
 }

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

@@ -84,7 +84,7 @@ public sealed class ServerStatusProtocol {
 				return null;
 			}
 			
-			logger.Verbose("Detected {OnlinePlayerCount} online player(s).", onlinePlayerCount);
+			logger.Debug("Detected {OnlinePlayerCount} online player(s).", onlinePlayerCount);
 			return onlinePlayerCount;
 		} finally {
 			ArrayPool<byte>.Shared.Return(messageBuffer);

Agent/Phantom.Agent.Rpc/RpcLauncher.cs

@@ -69,7 +69,7 @@ public sealed class RpcLauncher : RpcRuntime<ClientSocket> {
 		} catch (OperationCanceledException) {
 			// Ignore.
 		} finally {
-			logger.Verbose("ZeroMQ client stopped receiving messages.");
+			logger.Debug("ZeroMQ client stopped receiving messages.");
 
 			disconnectSemaphore.Wait(CancellationToken.None);
 			keepAliveLoop.Cancel();

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

@@ -44,7 +44,7 @@ sealed class BackupArchiver {
 		return false;
 	}
 
-	public async Task ArchiveWorld(BackupCreationResult.Builder resultBuilder) {
+	public async Task<string?> ArchiveWorld(BackupCreationResult.Builder resultBuilder) {
 		string guid = instanceProperties.InstanceGuid.ToString();
 		string currentDateTime = DateTime.Now.ToString("yyyyMMdd-HHmmss");
 		string backupFolderPath = Path.Combine(destinationBasePath, guid);
@@ -53,7 +53,7 @@ sealed class BackupArchiver {
 		if (File.Exists(backupFilePath)) {
 			resultBuilder.Kind = BackupCreationResultKind.BackupFileAlreadyExists;
 			logger.Warning("Skipping backup, file already exists: {File}", backupFilePath);
-			return;
+			return null;
 		}
 		
 		try {
@@ -61,18 +61,16 @@ sealed class BackupArchiver {
 		} catch (Exception e) {
 			resultBuilder.Kind = BackupCreationResultKind.CouldNotCreateBackupFolder;
 			logger.Error(e, "Could not create backup folder: {Folder}", backupFolderPath);
-			return;
+			return null;
 		}
 
 		string temporaryFolderPath = Path.Combine(temporaryBasePath, guid + "_" + currentDateTime);
 		if (!await CopyWorldAndCreateTarArchive(temporaryFolderPath, backupFilePath, resultBuilder)) {
-			return;
+			return null;
 		}
 		
-		var compressedFilePath = await BackupCompressor.Compress(backupFilePath, cancellationToken);
+		logger.Debug("Created world backup: {FilePath}", backupFilePath);
-		if (compressedFilePath == null) {
+		return backupFilePath;
-			resultBuilder.Warnings |= BackupCreationWarnings.CouldNotCompressWorldArchive;
-		}
 	}
 
 	private async Task<bool> CopyWorldAndCreateTarArchive(string temporaryFolderPath, string backupFilePath, BackupCreationResult.Builder resultBuilder) {
@@ -137,7 +135,7 @@ sealed class BackupArchiver {
 		foreach (FileInfo file in sourceFolder.EnumerateFiles()) {
 			var filePath = relativePath.Add(file.Name);
 			if (IsFileSkipped(filePath)) {
-				logger.Verbose("Skipping file: {File}", string.Join('/', filePath));
+				logger.Debug("Skipping file: {File}", string.Join('/', filePath));
 				continue;
 			}
 
@@ -152,7 +150,7 @@ sealed class BackupArchiver {
 		foreach (DirectoryInfo directory in sourceFolder.EnumerateDirectories()) {
 			var folderPath = relativePath.Add(directory.Name);
 			if (IsFolderSkipped(folderPath)) {
-				logger.Verbose("Skipping folder: {Folder}", string.Join('/', folderPath));
+				logger.Debug("Skipping folder: {Folder}", string.Join('/', folderPath));
 				continue;
 			}
 			

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

@@ -1,15 +1,16 @@
-using System.Diagnostics;
+using Phantom.Common.Logging;
-using Phantom.Common.Logging;
+using Phantom.Utils.Runtime;
 using Serilog;
 
 namespace Phantom.Agent.Services.Backups; 
 
 static class BackupCompressor {
 	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(BackupCompressor));
+	private static ILogger ZstdLogger { get; } = PhantomLogger.Create(nameof(BackupCompressor), "Zstd");
 	
-	private const int Quality = 10;
+	private const string Quality = "-10";
-	private const int Memory = 26;
+	private const string Memory = "--long=26";
-	private const int Threads = 3;
+	private const string Threads = "-T3";
 	
 	public static async Task<string?> Compress(string sourceFilePath, CancellationToken cancellationToken) {
 		if (sourceFilePath.Contains('"')) {
@@ -39,65 +40,30 @@ static class BackupCompressor {
 			return false;
 		}
 
-		var startInfo = new ProcessStartInfo {
+		var launcher = new ProcessConfigurator {
 			FileName = "zstd",
 			WorkingDirectory = workingDirectory,
-			Arguments = $"-{Quality} --long={Memory} -T{Threads} -c --rm --no-progress -c -o \"{destinationFilePath}\" -- \"{sourceFilePath}\"",
+			ArgumentList = {
-			RedirectStandardOutput = true,
+				Quality,
-			RedirectStandardError = true
+				Memory,
+				Threads,
+				"-c",
+				"--rm",
+				"--no-progress",
+				"-c",
+				"-o", destinationFilePath,
+				"--", sourceFilePath
+			}
 		};
 
-		using var process = new Process { StartInfo = startInfo };
+		static void OnZstdOutput(object? sender, Process.Output output) {
-		process.OutputDataReceived += OnZstdProcessOutput;
+			if (!string.IsNullOrWhiteSpace(output.Line)) {
-		process.ErrorDataReceived += OnZstdProcessOutput;
+				ZstdLogger.Debug("[Output] {Line}", output.Line);
-
-		try {
-			process.Start();
-			process.BeginOutputReadLine();
-			process.BeginErrorReadLine();
-		} catch (Exception e) {
-			Logger.Error(e, "Caught exception launching zstd process.");
-		}
-
-		try {
-			await process.WaitForExitAsync(cancellationToken);
-		} catch (OperationCanceledException) {
-			await TryKillProcess(process);
-			return false;
-		} catch (Exception e) {
-			Logger.Error(e, "Caught exception waiting for zstd process to exit.");
-			return false;
-		}
-
-		if (!process.HasExited) {
-			await TryKillProcess(process);
-			return false;
-		}
-
-		if (process.ExitCode != 0) {
-			Logger.Error("Zstd process exited with code {ExitCode}.", process.ExitCode);
-			return false;
-		}
-
-		return true;
-	}
-
-	private static void OnZstdProcessOutput(object sender, DataReceivedEventArgs e) {
-		if (!string.IsNullOrWhiteSpace(e.Data)) {
-			Logger.Verbose("[Zstd] {Line}", e.Data);
 			}
 		}
 
-	private static async Task TryKillProcess(Process process) {
+		var process = new OneShotProcess(ZstdLogger, launcher);
-		CancellationTokenSource timeout = new CancellationTokenSource(TimeSpan.FromSeconds(1));
+		process.OutputReceived += OnZstdOutput;
-
+		return await process.Run(cancellationToken);
-		try {
-			process.Kill();
-			await process.WaitForExitAsync(timeout.Token);
-		} catch (OperationCanceledException) {
-			Logger.Error("Timed out waiting for killed zstd process to exit.");
-		} catch (Exception e) {
-			Logger.Error(e, "Caught exception killing zstd process.");
-		}
 	}
 }

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

@@ -1,13 +1,11 @@
-using System.Text.RegularExpressions;
+using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Command;
-using Phantom.Agent.Minecraft.Instance;
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Logging;
 using Serilog;
 
 namespace Phantom.Agent.Services.Backups;
 
-sealed partial class BackupManager {
+sealed class BackupManager {
 	private readonly string destinationBasePath;
 	private readonly string temporaryBasePath;
 
@@ -16,9 +14,9 @@ sealed partial class BackupManager {
 		this.temporaryBasePath = Path.Combine(agentFolders.TemporaryFolderPath, "backups");
 	}
 
-	public async Task<BackupCreationResult> CreateBackup(string loggerName, InstanceSession session, CancellationToken cancellationToken) {
+	public async Task<BackupCreationResult> CreateBackup(string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
 		try {
-			if (!await session.BackupSemaphore.Wait(TimeSpan.FromSeconds(1), cancellationToken)) {
+			if (!await process.BackupSemaphore.Wait(TimeSpan.FromSeconds(1), cancellationToken)) {
 				return new BackupCreationResult(BackupCreationResultKind.BackupAlreadyRunning);
 			}
 		} catch (ObjectDisposedException) {
@@ -28,9 +26,9 @@ sealed partial class BackupManager {
 		}
 
 		try {
-			return await new BackupCreator(destinationBasePath, temporaryBasePath, loggerName, session, cancellationToken).CreateBackup();
+			return await new BackupCreator(destinationBasePath, temporaryBasePath, loggerName, process, cancellationToken).CreateBackup();
 		} finally {
-			session.BackupSemaphore.Release();
+			process.BackupSemaphore.Release();
 		}
 	}
 
@@ -39,62 +37,53 @@ sealed partial class BackupManager {
 		private readonly string temporaryBasePath;
 		private readonly string loggerName;
 		private readonly ILogger logger;
-		private readonly InstanceSession session;
+		private readonly InstanceProcess process;
-		private readonly BackupCommandListener listener;
 		private readonly CancellationToken cancellationToken;
 
-		public BackupCreator(string destinationBasePath, string temporaryBasePath, string loggerName, InstanceSession session, CancellationToken cancellationToken) {
+		public BackupCreator(string destinationBasePath, string temporaryBasePath, string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
 			this.destinationBasePath = destinationBasePath;
 			this.temporaryBasePath = temporaryBasePath;
 			this.loggerName = loggerName;
 			this.logger = PhantomLogger.Create<BackupManager>(loggerName);
-			this.session = session;
+			this.process = process;
-			this.listener = new BackupCommandListener(logger);
 			this.cancellationToken = cancellationToken;
 		}
 
 		public async Task<BackupCreationResult> CreateBackup() {
 			logger.Information("Backup started.");
-			session.AddOutputListener(listener.OnOutput, maxLinesToReadFromHistory: 0);
-			try {
-				var resultBuilder = new BackupCreationResult.Builder();
 			
-				await RunBackupProcedure(resultBuilder);
+			var resultBuilder = new BackupCreationResult.Builder();
+			string? backupFilePath;
+			
+			using (var dispatcher = new BackupServerCommandDispatcher(logger, process, cancellationToken)) {
+				backupFilePath = await CreateWorldArchive(dispatcher, resultBuilder);
+			}
+			
+			if (backupFilePath != null) {
+				await CompressWorldArchive(backupFilePath, resultBuilder);
+			}
 			
 			var result = resultBuilder.Build();
-				if (result.Kind == BackupCreationResultKind.Success) {
+			LogBackupResult(result);
-					var warningCount = result.Warnings.Count();
-					if (warningCount == 0) {
-						logger.Information("Backup finished successfully.");
-					}
-					else {
-						logger.Warning("Backup finished with {Warnings} warning(s).", warningCount);
-					}
-				}
-				else {
-					logger.Warning("Backup failed: {Reason}", result.Kind.ToSentence());
-				}
-				
 			return result;
-			} finally {
-				session.RemoveOutputListener(listener.OnOutput);
-			}
 		}
 
-		private async Task RunBackupProcedure(BackupCreationResult.Builder resultBuilder) {
+		private async Task<string?> CreateWorldArchive(BackupServerCommandDispatcher dispatcher, BackupCreationResult.Builder resultBuilder) {
 			try {
-				await DisableAutomaticSaving();
+				await dispatcher.DisableAutomaticSaving();
-				await SaveAllChunks();
+				await dispatcher.SaveAllChunks();
-				await new BackupArchiver(destinationBasePath, temporaryBasePath, loggerName, session.InstanceProperties, cancellationToken).ArchiveWorld(resultBuilder);
+				return await new BackupArchiver(destinationBasePath, temporaryBasePath, loggerName, process.InstanceProperties, cancellationToken).ArchiveWorld(resultBuilder);
 			} catch (OperationCanceledException) {
 				resultBuilder.Kind = BackupCreationResultKind.BackupCancelled;
 				logger.Warning("Backup creation was cancelled.");
+				return null;
 			} catch (Exception e) {
 				resultBuilder.Kind = BackupCreationResultKind.UnknownError;
 				logger.Error(e, "Caught exception while creating an instance backup.");
+				return null;
 			} finally {
 				try {
-					await EnableAutomaticSaving();
+					await dispatcher.EnableAutomaticSaving();
 				} catch (OperationCanceledException) {
 					// ignore
 				} catch (Exception e) {
@@ -104,66 +93,25 @@ sealed partial class BackupManager {
 			}
 		}
 
-		private async Task DisableAutomaticSaving() {
+		private async Task CompressWorldArchive(string filePath, BackupCreationResult.Builder resultBuilder) {
-			await session.SendCommand(MinecraftCommand.SaveOff, cancellationToken);
+			var compressedFilePath = await BackupCompressor.Compress(filePath, cancellationToken);
-			await listener.AutomaticSavingDisabled.Task.WaitAsync(cancellationToken);
+			if (compressedFilePath == null) {
-		}
+				resultBuilder.Warnings |= BackupCreationWarnings.CouldNotCompressWorldArchive;
-
-		private async Task SaveAllChunks() {
-			// TODO Try if not flushing and waiting a few seconds before flushing reduces lag.
-			await session.SendCommand(MinecraftCommand.SaveAll(flush: true), cancellationToken);
-			await listener.SavedTheGame.Task.WaitAsync(cancellationToken);
-		}
-
-		private async Task EnableAutomaticSaving() {
-			await session.SendCommand(MinecraftCommand.SaveOn, cancellationToken);
-			await listener.AutomaticSavingEnabled.Task.WaitAsync(cancellationToken);
 			}
 		}
 
-	private sealed partial class BackupCommandListener {
+		private void LogBackupResult(BackupCreationResult result) {
-		[GeneratedRegex(@"^\[(?:.*?)\] \[Server thread/INFO\]: (.*?)$", RegexOptions.NonBacktracking)]
+			if (result.Kind != BackupCreationResultKind.Success) {
-		private static partial Regex ServerThreadInfoRegex();
+				logger.Warning("Backup failed: {Reason}", result.Kind.ToSentence());
-
-		private readonly ILogger logger;
-
-		public BackupCommandListener(ILogger logger) {
-			this.logger = logger;
-		}
-
-		public TaskCompletionSource AutomaticSavingDisabled { get; } = new ();
-		public TaskCompletionSource SavedTheGame { get; } = new ();
-		public TaskCompletionSource AutomaticSavingEnabled { get; } = new ();
-
-		public void OnOutput(object? sender, string? line) {
-			if (line == null) {
 				return;
 			}
 			
-			var match = ServerThreadInfoRegex().Match(line);
+			var warningCount = result.Warnings.Count();
-			if (!match.Success) {
+			if (warningCount > 0) {
-				return;
+				logger.Warning("Backup finished with {Warnings} warning(s).", warningCount);
-			}
-
-			string info = match.Groups[1].Value;
-
-			if (!AutomaticSavingDisabled.Task.IsCompleted) {
-				if (info == "Automatic saving is now disabled") {
-					logger.Verbose("Detected that automatic saving is disabled.");
-					AutomaticSavingDisabled.SetResult();
-				}
-			}
-			else if (!SavedTheGame.Task.IsCompleted) {
-				if (info == "Saved the game") {
-					logger.Verbose("Detected that the game is saved.");
-					SavedTheGame.SetResult();
-				}
-			}
-			else if (!AutomaticSavingEnabled.Task.IsCompleted) {
-				if (info == "Automatic saving is now enabled") {
-					logger.Verbose("Detected that automatic saving is enabled.");
-					AutomaticSavingEnabled.SetResult();
 			}
+			else {
+				logger.Information("Backup finished successfully.");
 			}
 		}
 	}

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

@@ -14,15 +14,17 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 
 	private readonly string loggerName;
 	private readonly BackupManager backupManager;
-	private readonly InstanceSession session;
+	private readonly InstanceProcess process;
 	private readonly int serverPort;
 	private readonly ServerStatusProtocol serverStatusProtocol;
 	private readonly ManualResetEventSlim serverOutputWhileWaitingForOnlinePlayers = new ();
 	
-	public BackupScheduler(TaskManager taskManager, BackupManager backupManager, InstanceSession session, int serverPort, string loggerName) : base(PhantomLogger.Create<BackupScheduler>(loggerName), taskManager, "Backup scheduler for " + loggerName) {
+	public event EventHandler<BackupCreationResult>? BackupCompleted; 
+
+	public BackupScheduler(TaskManager taskManager, BackupManager backupManager, InstanceProcess process, int serverPort, string loggerName) : base(PhantomLogger.Create<BackupScheduler>(loggerName), taskManager, "Backup scheduler for " + loggerName) {
 		this.loggerName = loggerName;
 		this.backupManager = backupManager;
-		this.session = session;
+		this.process = process;
 		this.serverPort = serverPort;
 		this.serverStatusProtocol = new ServerStatusProtocol(loggerName);
 	}
@@ -33,6 +35,8 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 			
 		while (!CancellationToken.IsCancellationRequested) {
 			var result = await CreateBackup();
+			BackupCompleted?.Invoke(this, result);
+			
 			if (result.Kind.ShouldRetry()) {
 				Logger.Warning("Scheduled backup failed, retrying in {Minutes} minutes.", BackupFailureRetryDelay.TotalMinutes);
 				await Task.Delay(BackupFailureRetryDelay, CancellationToken);
@@ -46,13 +50,13 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 	}
 
 	private async Task<BackupCreationResult> CreateBackup() {
-		return await backupManager.CreateBackup(loggerName, session, CancellationToken.None);
+		return await backupManager.CreateBackup(loggerName, process, CancellationToken.None);
 	}
 
 	private async Task WaitForOnlinePlayers() {
 		bool needsToLogOfflinePlayersMessage = true;
 		
-		session.AddOutputListener(ServerOutputListener, maxLinesToReadFromHistory: 0);
+		process.AddOutputListener(ServerOutputListener, maxLinesToReadFromHistory: 0);
 		try {
 			while (!CancellationToken.IsCancellationRequested) {
 				serverOutputWhileWaitingForOnlinePlayers.Reset();
@@ -75,18 +79,18 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 
 				await Task.Delay(TimeSpan.FromSeconds(10), CancellationToken);
 				
-				Logger.Verbose("Waiting for server output before checking for online players again...");
+				Logger.Debug("Waiting for server output before checking for online players again...");
 				await serverOutputWhileWaitingForOnlinePlayers.WaitHandle.WaitOneAsync(CancellationToken);
 			}
 		} finally {
-			session.RemoveOutputListener(ServerOutputListener);
+			process.RemoveOutputListener(ServerOutputListener);
 		}
 	}
 
 	private void ServerOutputListener(object? sender, string line) {
 		if (!serverOutputWhileWaitingForOnlinePlayers.IsSet) {
 			serverOutputWhileWaitingForOnlinePlayers.Set();
-			Logger.Verbose("Detected server output, signalling to check for online players again.");
+			Logger.Debug("Detected server output, signalling to check for online players again.");
 		}
 	}
 }

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

@@ -0,0 +1,80 @@
+using System.Text.RegularExpressions;
+using Phantom.Agent.Minecraft.Command;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Utils.Runtime;
+using Serilog;
+
+namespace Phantom.Agent.Services.Backups;
+
+sealed partial class BackupServerCommandDispatcher : IDisposable {
+	[GeneratedRegex(@"^\[(?:.*?)\] \[Server thread/INFO\]: (.*?)$", RegexOptions.NonBacktracking)]
+	private static partial Regex ServerThreadInfoRegex();
+
+	private readonly ILogger logger;
+	private readonly InstanceProcess process;
+	private readonly CancellationToken cancellationToken;
+
+	private readonly TaskCompletionSource automaticSavingDisabled = Tasks.CreateCompletionSource();
+	private readonly TaskCompletionSource savedTheGame = Tasks.CreateCompletionSource();
+	private readonly TaskCompletionSource automaticSavingEnabled = Tasks.CreateCompletionSource();
+
+	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);
+	}
+
+	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);
+	}
+
+	public async Task EnableAutomaticSaving() {
+		await process.SendCommand(MinecraftCommand.SaveOn, cancellationToken);
+		await automaticSavingEnabled.Task.WaitAsync(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") {
+				logger.Debug("Detected that automatic saving is disabled.");
+				automaticSavingDisabled.SetResult();
+			}
+		}
+		else if (!savedTheGame.Task.IsCompleted) {
+			if (info == "Saved the game") {
+				logger.Debug("Detected that the game is saved.");
+				savedTheGame.SetResult();
+			}
+		}
+		else if (!automaticSavingEnabled.Task.IsCompleted) {
+			if (info == "Automatic saving is now enabled") {
+				logger.Debug("Detected that automatic saving is enabled.");
+				automaticSavingEnabled.SetResult();
+			}
+		}
+	}
+}

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

@@ -18,20 +18,17 @@ sealed class Instance : IDisposable {
 		return prefix[..prefix.IndexOf('-')] + "/" + Interlocked.Increment(ref loggerSequenceId);
 	}
 
-	public static async Task<Instance> Create(InstanceConfiguration configuration, InstanceServices services, BaseLauncher launcher) {
+	private InstanceServices Services { get; }
-		var instance = new Instance(configuration, services, launcher);
-		await instance.ReportLastStatus();
-		return instance;
-	}
 	
 	public InstanceConfiguration Configuration { get; private set; }
-	private InstanceServices Services { get; }
+	private IServerLauncher Launcher { get; set; }
-	private BaseLauncher Launcher { get; set; }
 
 	private readonly string shortName;
 	private readonly ILogger logger;
 
 	private IInstanceStatus currentStatus;
+	private int statusUpdateCounter;
+	
 	private IInstanceState currentState;
 	private readonly SemaphoreSlim stateTransitioningActionSemaphore = new (1, 1);
 
@@ -39,20 +36,44 @@ sealed class Instance : IDisposable {
 	
 	public event EventHandler? IsRunningChanged; 
 
-	private Instance(InstanceConfiguration configuration, InstanceServices services, BaseLauncher launcher) {
+	public Instance(InstanceServices services, InstanceConfiguration configuration, IServerLauncher launcher) {
 		this.shortName = GetLoggerName(configuration.InstanceGuid);
 		this.logger = PhantomLogger.Create<Instance>(shortName);
 
-		this.Configuration = configuration;
 		this.Services = services;
+		this.Configuration = configuration;
 		this.Launcher = launcher;
 		
 		this.currentState = new InstanceNotRunningState();
 		this.currentStatus = InstanceStatus.NotRunning;
 	}
 
-	private async Task ReportLastStatus() {
+	private void TryUpdateStatus(string taskName, Func<Task> getUpdateTask) {
+		int myStatusUpdateCounter = Interlocked.Increment(ref statusUpdateCounter);
+		
+		Services.TaskManager.Run(taskName, async () => {
+			if (myStatusUpdateCounter == statusUpdateCounter) {
+				await getUpdateTask();
+			}
+		});
+	}
+
+	public void ReportLastStatus() {
+		TryUpdateStatus("Report last status of instance " + shortName, async () => {
 			await ServerMessaging.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, currentStatus));
+		});
+	}
+
+	private void ReportAndSetStatus(IInstanceStatus status) {
+		TryUpdateStatus("Report status of instance " + shortName + " as " + status.GetType().Name, async () => {
+			currentStatus = status;
+			await ServerMessaging.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, status));
+		});
+	}
+
+	private void ReportEvent(IInstanceEvent instanceEvent) {
+		var message = new ReportInstanceEventMessage(Guid.NewGuid(), DateTime.UtcNow, Configuration.InstanceGuid, instanceEvent);
+		Services.TaskManager.Run("Report event for instance " + shortName, async () => await ServerMessaging.Send(message));
 	}
 	
 	private void TransitionState(IInstanceState newState) {
@@ -64,7 +85,7 @@ sealed class Instance : IDisposable {
 			disposable.Dispose();
 		}
 
-		logger.Verbose("Transitioning instance state to: {NewState}", newState.GetType().Name);
+		logger.Debug("Transitioning instance state to: {NewState}", newState.GetType().Name);
 		
 		var wasRunning = IsRunning;
 		currentState = newState;
@@ -80,12 +101,11 @@ sealed class Instance : IDisposable {
 		return newStateAndResult.Result;
 	}
 
-	public async Task Reconfigure(InstanceConfiguration configuration, BaseLauncher launcher, CancellationToken cancellationToken) {
+	public async Task Reconfigure(InstanceConfiguration configuration, IServerLauncher launcher, CancellationToken cancellationToken) {
 		await stateTransitioningActionSemaphore.WaitAsync(cancellationToken);
 		try {
 			Configuration = configuration;
 			Launcher = launcher;
-			await ReportLastStatus();
 		} finally {
 			stateTransitioningActionSemaphore.Release();
 		}
@@ -134,9 +154,7 @@ sealed class Instance : IDisposable {
 		private readonly Instance instance;
 		private readonly CancellationToken shutdownCancellationToken;
 		
-		private int statusUpdateCounter;
+		public InstanceContextImpl(Instance instance, CancellationToken shutdownCancellationToken) : base(instance.Services, instance.Configuration, instance.Launcher) {
-
-		public InstanceContextImpl(Instance instance, CancellationToken shutdownCancellationToken) : base(instance.Configuration, instance.Services, instance.Launcher) {
 			this.instance = instance;
 			this.shutdownCancellationToken = shutdownCancellationToken;
 		}
@@ -144,15 +162,12 @@ sealed class Instance : IDisposable {
 		public override ILogger Logger => instance.logger;
 		public override string ShortName => instance.shortName;
 
-		public override void ReportStatus(IInstanceStatus newStatus) {
+		public override void SetStatus(IInstanceStatus newStatus) {
-			int myStatusUpdateCounter = Interlocked.Increment(ref statusUpdateCounter);
+			instance.ReportAndSetStatus(newStatus);
-			
-			instance.Services.TaskManager.Run("Report status of instance " + instance.shortName + " as " + newStatus.GetType().Name, async () => {
-				if (myStatusUpdateCounter == statusUpdateCounter) {
-					instance.currentStatus = newStatus;
-					await ServerMessaging.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, newStatus));
 		}
-			});
+
+		public override void ReportEvent(IInstanceEvent instanceEvent) {
+			instance.ReportEvent(instanceEvent);
 		}
 
 		public override void TransitionState(Func<(IInstanceState, IInstanceStatus?)> newStateAndStatus) {
@@ -162,17 +177,17 @@ sealed class Instance : IDisposable {
 				
 				if (!instance.IsRunning) {
 					// Only InstanceSessionManager is allowed to transition an instance out of a non-running state.
-					instance.logger.Verbose("Cancelled state transition to {State} because instance is not running.", state.GetType().Name);
+					instance.logger.Debug("Cancelled state transition to {State} because instance is not running.", state.GetType().Name);
 					return;
 				}
 				
 				if (state is not InstanceNotRunningState && shutdownCancellationToken.IsCancellationRequested) {
-					instance.logger.Verbose("Cancelled state transition to {State} due to Agent shutdown.", state.GetType().Name);
+					instance.logger.Debug("Cancelled state transition to {State} due to Agent shutdown.", state.GetType().Name);
 					return;
 				}
 
 				if (status != null) {
-					ReportStatus(status);
+					SetStatus(status);
 				}
 
 				instance.TransitionState(state);

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

@@ -6,20 +6,27 @@ using Serilog;
 namespace Phantom.Agent.Services.Instances;
 
 abstract class InstanceContext {
-	public InstanceConfiguration Configuration { get; }
 	public InstanceServices Services { get; }
-	public BaseLauncher Launcher { get; }
+	public InstanceConfiguration Configuration { get; }
+	public IServerLauncher Launcher { get; }
 	
 	public abstract ILogger Logger { get; }
 	public abstract string ShortName { get; }
 
-	protected InstanceContext(InstanceConfiguration configuration, InstanceServices services, BaseLauncher launcher) {
+	protected InstanceContext(InstanceServices services, InstanceConfiguration configuration, IServerLauncher launcher) {
+		Services = services;
 		Configuration = configuration;
 		Launcher = launcher;
-		Services = services;
 	}
 
-	public abstract void ReportStatus(IInstanceStatus newStatus);
+	public abstract void SetStatus(IInstanceStatus newStatus);
+
+	public void SetLaunchFailedStatusAndReportEvent(InstanceLaunchFailReason reason) {
+		SetStatus(InstanceStatus.Failed(reason));
+		ReportEvent(new InstanceLaunchFailedEvent(reason));
+	}
+
+	public abstract void ReportEvent(IInstanceEvent instanceEvent);
 	public abstract void TransitionState(Func<(IInstanceState, IInstanceStatus?)> newStateAndStatus);
 
 	public void TransitionState(IInstanceState newState, IInstanceStatus? newStatus = null) {

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

@@ -27,7 +27,6 @@ sealed class InstanceSessionManager : IDisposable {
 	private readonly AgentInfo agentInfo;
 	private readonly string basePath;
 
-	private readonly MinecraftServerExecutables minecraftServerExecutables;
 	private readonly InstanceServices instanceServices;
 	private readonly Dictionary<Guid, Instance> instances = new ();
 
@@ -38,11 +37,12 @@ sealed class InstanceSessionManager : IDisposable {
 	public InstanceSessionManager(AgentInfo agentInfo, AgentFolders agentFolders, JavaRuntimeRepository javaRuntimeRepository, TaskManager taskManager, BackupManager backupManager) {
 		this.agentInfo = agentInfo;
 		this.basePath = agentFolders.InstancesFolderPath;
-		this.minecraftServerExecutables = new MinecraftServerExecutables(agentFolders.ServerExecutableFolderPath);
 		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);
 	}
 
@@ -71,7 +71,7 @@ sealed class InstanceSessionManager : IDisposable {
 		});
 	}
 
-	public async Task<InstanceActionResult<ConfigureInstanceResult>> Configure(InstanceConfiguration configuration) {
+	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());
@@ -90,22 +90,33 @@ sealed class InstanceSessionManager : IDisposable {
 				configuration.JvmArguments,
 				instanceFolder,
 				configuration.MinecraftVersion,
-				new ServerProperties(configuration.ServerPort, configuration.RconPort)
+				new ServerProperties(configuration.ServerPort, configuration.RconPort),
+				launchProperties
 			);
 
-			BaseLauncher launcher = new VanillaLauncher(properties);
+			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 = await Instance.Create(configuration, instanceServices, launcher);
+				instances[instanceGuid] = instance = new Instance(instanceServices, configuration, launcher);
-				instance.IsRunningChanged += OnInstanceIsRunningChanged;
 				Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, configuration.InstanceGuid);
+				
+				instance.ReportLastStatus();
+				instance.IsRunningChanged += OnInstanceIsRunningChanged;
 			}
 
-			if (configuration.LaunchAutomatically) {
+			if (launchNow) {
 				await LaunchInternal(instance);
 			}
 
@@ -179,7 +190,6 @@ sealed class InstanceSessionManager : IDisposable {
 
 	public void Dispose() {
 		DisposeAllInstances();
-		minecraftServerExecutables.Dispose();
 		shutdownCancellationTokenSource.Dispose();
 		semaphore.Dispose();
 	}

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

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

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

@@ -1,6 +1,7 @@
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Agent.Minecraft.Server;
+using Phantom.Agent.Services.Instances.Sessions;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
@@ -24,7 +25,7 @@ sealed class InstanceLaunchingState : IInstanceState, IDisposable {
 		launchTask.ContinueWith(OnLaunchFailure, CancellationToken.None, TaskContinuationOptions.NotOnRanToCompletion, TaskScheduler.Default);
 	}
 
-	private async Task<InstanceSession> DoLaunch() {
+	private async Task<InstanceProcess> DoLaunch() {
 		var cancellationToken = cancellationTokenSource.Token;
 		cancellationToken.ThrowIfCancellationRequested();
 
@@ -33,7 +34,7 @@ sealed class InstanceLaunchingState : IInstanceState, IDisposable {
 
 			if (lastDownloadProgress != progress) {
 				lastDownloadProgress = progress;
-				context.ReportStatus(InstanceStatus.Downloading(progress));
+				context.SetStatus(InstanceStatus.Downloading(progress));
 			}
 		}
 
@@ -47,6 +48,9 @@ sealed class InstanceLaunchingState : IInstanceState, IDisposable {
 		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.");
 		}
@@ -58,29 +62,36 @@ sealed class InstanceLaunchingState : IInstanceState, IDisposable {
 			throw new LaunchFailureException(InstanceLaunchFailReason.UnknownError, "Session failed to launch.");
 		}
 
-		context.ReportStatus(InstanceStatus.Launching);
+		context.SetStatus(InstanceStatus.Launching);
-		return launchSuccess.Session;
+		return launchSuccess.Process;
 	}
 
-	private void OnLaunchSuccess(Task<InstanceSession> task) {
+	private void OnLaunchSuccess(Task<InstanceProcess> task) {
 		context.TransitionState(() => {
+			context.ReportEvent(InstanceEvent.LaunchSucceded);
+			
+			var process = task.Result;
+			var session = new InstanceSession(process, context);
+			
 			if (cancellationTokenSource.IsCancellationRequested) {
-				context.Services.PortManager.Release(context.Configuration);
+				return (new InstanceStoppingState(context, process, session), InstanceStatus.Stopping);
-				return (new InstanceNotRunningState(), InstanceStatus.NotRunning);
 			}
 			else {
-				return (new InstanceRunningState(context, task.Result), null);
+				return (new InstanceRunningState(context, process, session), null);
 			}
 		});
 	}
 
 	private void OnLaunchFailure(Task task) {
+		if (task.IsFaulted) {
 			if (task.Exception is { InnerException: LaunchFailureException e }) {
 				context.Logger.Error(e.LogMessage);
-			context.ReportStatus(InstanceStatus.Failed(e.Reason));
+				context.SetLaunchFailedStatusAndReportEvent(e.Reason);
 			}
 			else {
-			context.ReportStatus(InstanceStatus.Failed(InstanceLaunchFailReason.UnknownError));
+				context.Logger.Error(task.Exception, "Caught exception while launching instance.");
+				context.SetLaunchFailedStatusAndReportEvent(InstanceLaunchFailReason.UnknownError);
+			}
 		}
 
 		context.Services.PortManager.Release(context.Configuration);

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

@@ -16,12 +16,12 @@ sealed class InstanceNotRunningState : IInstanceState {
 			_                                         => null
 		};
 
-		if (failReason != null) {
+		if (failReason is {} reason) {
-			context.ReportStatus(InstanceStatus.Failed(failReason.Value));
+			context.SetLaunchFailedStatusAndReportEvent(reason);
 			return (this, LaunchInstanceResult.LaunchInitiated);
 		}
 		
-		context.ReportStatus(InstanceStatus.Launching);
+		context.SetStatus(InstanceStatus.Launching);
 		return (new InstanceLaunchingState(context), LaunchInstanceResult.LaunchInitiated);
 	}
 

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

@@ -1,6 +1,8 @@
 using Phantom.Agent.Minecraft.Command;
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Services.Backups;
+using Phantom.Agent.Services.Instances.Sessions;
+using Phantom.Common.Data.Backups;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
@@ -9,55 +11,51 @@ namespace Phantom.Agent.Services.Instances.States;
 
 sealed class InstanceRunningState : IInstanceState {
 	private readonly InstanceContext context;
-	private readonly InstanceSession session;
+	private readonly InstanceProcess process;
-	private readonly InstanceLogSender logSender;
 	private readonly BackupScheduler backupScheduler;
-	private readonly SessionObjects sessionObjects;
+	private readonly RunningSessionDisposer runningSessionDisposer;
 	
 	private readonly CancellationTokenSource delayedStopCancellationTokenSource = new ();
 	private bool stateOwnsDelayedStopCancellationTokenSource = true;
 	private bool isStopping;
 
-	public InstanceRunningState(InstanceContext context, InstanceSession session) {
+	public InstanceRunningState(InstanceContext context, InstanceProcess process, InstanceSession session) {
 		this.context = context;
-		this.session = session;
+		this.process = process;
-		this.logSender = new InstanceLogSender(context.Services.TaskManager, context.Configuration.InstanceGuid, context.ShortName);
+		this.backupScheduler = new BackupScheduler(context.Services.TaskManager, context.Services.BackupManager, process, context.Configuration.ServerPort, context.ShortName);
-		this.backupScheduler = new BackupScheduler(context.Services.TaskManager, context.Services.BackupManager, session, context.Configuration.ServerPort, context.ShortName);
+		this.backupScheduler.BackupCompleted += OnScheduledBackupCompleted;
-		this.sessionObjects = new SessionObjects(this);
+		this.runningSessionDisposer = new RunningSessionDisposer(this, session);
 	}
 
 	public void Initialize() {
-		session.AddOutputListener(SessionOutput);
+		process.Ended += ProcessEnded;
-		session.SessionEnded += SessionEnded;
 		
-		if (session.HasEnded) {
+		if (process.HasEnded) {
-			if (sessionObjects.Dispose()) {
+			if (runningSessionDisposer.Dispose()) {
 				context.Logger.Warning("Session ended immediately after it was started.");
+				context.ReportEvent(InstanceEvent.Stopped);
 				context.Services.TaskManager.Run("Transition state of instance " + context.ShortName + " to not running", () => context.TransitionState(new InstanceNotRunningState(), InstanceStatus.Failed(InstanceLaunchFailReason.UnknownError)));
 			}
 		}
 		else {
-			context.ReportStatus(InstanceStatus.Running);
+			context.SetStatus(InstanceStatus.Running);
 			context.Logger.Information("Session started.");
 		}
 	}
 
-	private void SessionOutput(object? sender, string line) {
+	private void ProcessEnded(object? sender, EventArgs e) {
-		context.Logger.Verbose("[Server] {Line}", line);
+		if (!runningSessionDisposer.Dispose()) {
-		logSender.Enqueue(line);
-	}
-
-	private void SessionEnded(object? sender, EventArgs e) {
-		if (!sessionObjects.Dispose()) {
 			return;
 		}
 
 		if (isStopping) {
 			context.Logger.Information("Session ended.");
+			context.ReportEvent(InstanceEvent.Stopped);
 			context.TransitionState(new InstanceNotRunningState(), InstanceStatus.NotRunning);
 		}
 		else {
 			context.Logger.Information("Session ended unexpectedly, restarting...");
+			context.ReportEvent(InstanceEvent.Crashed);
 			context.TransitionState(new InstanceLaunchingState(context), InstanceStatus.Restarting);
 		}
 	}
@@ -83,9 +81,9 @@ sealed class InstanceRunningState : IInstanceState {
 	}
 
 	private IInstanceState PrepareStoppedState() {
-		session.SessionEnded -= SessionEnded;
+		process.Ended -= ProcessEnded;
 		backupScheduler.Stop();
-		return new InstanceStoppingState(context, session, sessionObjects);
+		return new InstanceStoppingState(context, process, runningSessionDisposer);
 	}
 
 	private void CancelDelayedStop() {
@@ -112,7 +110,7 @@ sealed class InstanceRunningState : IInstanceState {
 				}
 			}
 		} catch (OperationCanceledException) {
-			context.Logger.Verbose("Cancelled delayed stop.");
+			context.Logger.Debug("Cancelled delayed stop.");
 			return;
 		} catch (ObjectDisposedException) {
 			return;
@@ -129,7 +127,7 @@ sealed class InstanceRunningState : IInstanceState {
 	public async Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
 		try {
 			context.Logger.Information("Sending command: {Command}", command);
-			await session.SendCommand(command, cancellationToken);
+			await process.SendCommand(command, cancellationToken);
 			return true;
 		} catch (OperationCanceledException) {
 			return false;
@@ -139,12 +137,18 @@ sealed class InstanceRunningState : IInstanceState {
 		}
 	}
 
-	public sealed class SessionObjects {
+	private void OnScheduledBackupCompleted(object? sender, BackupCreationResult e) {
+		context.ReportEvent(new InstanceBackupCompletedEvent(e.Kind, e.Warnings));
+	}
+
+	private sealed class RunningSessionDisposer : IDisposable {
 		private readonly InstanceRunningState state;
+		private readonly InstanceSession session;
 		private bool isDisposed;
 
-		public SessionObjects(InstanceRunningState state) {
+		public RunningSessionDisposer(InstanceRunningState state, InstanceSession session) {
 			this.state = state;
+			this.session = session;
 		}
 
 		public bool Dispose() {
@@ -163,10 +167,12 @@ sealed class InstanceRunningState : IInstanceState {
 				state.CancelDelayedStop();
 			}
 			
-			state.logSender.Stop();
+			session.Dispose();
-			state.session.Dispose();
-			state.context.Services.PortManager.Release(state.context.Configuration);
 			return true;
 		}
+
+		void IDisposable.Dispose() {
+			Dispose();
+		}
 	}
 }

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

@@ -9,27 +9,27 @@ namespace Phantom.Agent.Services.Instances.States;
 
 sealed class InstanceStoppingState : IInstanceState, IDisposable {
 	private readonly InstanceContext context;
-	private readonly InstanceSession session;
+	private readonly InstanceProcess process;
-	private readonly InstanceRunningState.SessionObjects sessionObjects;
+	private readonly IDisposable sessionDisposer;
 
-	public InstanceStoppingState(InstanceContext context, InstanceSession session, InstanceRunningState.SessionObjects sessionObjects) {
+	public InstanceStoppingState(InstanceContext context, InstanceProcess process, IDisposable sessionDisposer) {
-		this.sessionObjects = sessionObjects;
-		this.session = session;
 		this.context = context;
+		this.process = process;
+		this.sessionDisposer = sessionDisposer;
 	}
 
 	public void Initialize() {
 		context.Logger.Information("Session stopping.");
-		context.ReportStatus(InstanceStatus.Stopping);
+		context.SetStatus(InstanceStatus.Stopping);
 		context.Services.TaskManager.Run("Stop procedure for instance " + context.ShortName, DoStop);
 	}
 
 	private async Task DoStop() {
 		try {
 			// Do not release the semaphore after this point.
-			if (!await session.BackupSemaphore.CancelAndWait(TimeSpan.FromSeconds(1))) {
+			if (!await process.BackupSemaphore.CancelAndWait(TimeSpan.FromSeconds(1))) {
 				context.Logger.Information("Waiting for backup to finish...");
-				await session.BackupSemaphore.CancelAndWait(Timeout.InfiniteTimeSpan);
+				await process.BackupSemaphore.CancelAndWait(Timeout.InfiniteTimeSpan);
 			}
 			
 			context.Logger.Information("Sending stop command...");
@@ -39,6 +39,7 @@ sealed class InstanceStoppingState : IInstanceState, IDisposable {
 			await DoWaitForSessionToEnd();
 		} finally {
 			context.Logger.Information("Session stopped.");
+			context.ReportEvent(InstanceEvent.Stopped);
 			context.TransitionState(new InstanceNotRunningState(), InstanceStatus.NotRunning);
 		}
 	}
@@ -46,10 +47,10 @@ sealed class InstanceStoppingState : IInstanceState, IDisposable {
 	private async Task DoSendStopCommand() {
 		using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(5));
 		try {
-			await session.SendCommand(MinecraftCommand.Stop, timeout.Token);
+			await process.SendCommand(MinecraftCommand.Stop, timeout.Token);
 		} catch (OperationCanceledException) {
 			// ignore
-		} catch (ObjectDisposedException e) when (e.ObjectName == typeof(Process).FullName && session.HasEnded) {
+		} catch (ObjectDisposedException e) when (e.ObjectName == typeof(Process).FullName && process.HasEnded) {
 			// ignore
 		} catch (Exception e) {
 			context.Logger.Warning(e, "Caught exception while sending stop command.");
@@ -59,11 +60,11 @@ sealed class InstanceStoppingState : IInstanceState, IDisposable {
 	private async Task DoWaitForSessionToEnd() {
 		using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(55));
 		try {
-			await session.WaitForExit(timeout.Token);
+			await process.WaitForExit(timeout.Token);
 		} catch (OperationCanceledException) {
 			try {
 				context.Logger.Warning("Waiting timed out, killing session...");
-				session.Kill();
+				process.Kill();
 			} catch (Exception e) {
 				context.Logger.Error(e, "Caught exception while killing session.");
 			}
@@ -83,6 +84,6 @@ sealed class InstanceStoppingState : IInstanceState, IDisposable {
 	}
 
 	public void Dispose() {
-		sessionObjects.Dispose();
+		sessionDisposer.Dispose();
 	}
 }

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

@@ -1,4 +1,5 @@
 using Phantom.Agent.Rpc;
+using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Logging;
 using Phantom.Common.Messages;
@@ -26,12 +27,15 @@ public sealed class MessageListener : IMessageToAgentListener {
 	public async Task<NoReply> HandleRegisterAgentSuccess(RegisterAgentSuccessMessage message) {
 		Logger.Information("Agent authentication successful.");
 
-		foreach (var instanceInfo in message.InitialInstances) {
+		void ShutdownAfterConfigurationFailed(InstanceConfiguration configuration) {
-			var result = await agent.InstanceSessionManager.Configure(instanceInfo);
+			Logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configuration.InstanceName, configuration.InstanceGuid);
-			if (!result.Is(ConfigureInstanceResult.Success)) {
-				Logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", instanceInfo.InstanceName, instanceInfo.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;
 			}
 		}
@@ -55,8 +59,12 @@ public sealed class MessageListener : IMessageToAgentListener {
 		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 agent.InstanceSessionManager.Configure(message.Configuration);
+		return await HandleConfigureInstance(message, alwaysReportStatus: false);
 	}
 
 	public async Task<InstanceActionResult<LaunchInstanceResult>> HandleLaunchInstance(LaunchInstanceMessage message) {

Common/Phantom.Common.Data/Backups/BackupCreationWarnings.cs

@@ -14,4 +14,8 @@ public static class BackupCreationWarningsExtensions {
 	public static int Count(this BackupCreationWarnings warnings) {
 		return BitOperations.PopCount((byte) warnings);
 	}
+
+	public static IEnumerable<BackupCreationWarnings> ListFlags(this BackupCreationWarnings warnings) {
+		return Enum.GetValues<BackupCreationWarnings>().Where(warning => warning != BackupCreationWarnings.None && warnings.HasFlag(warning));
+	}
 }

Common/Phantom.Common.Data/Instance/IInstanceEvent.cs

@@ -0,0 +1,55 @@
+using MemoryPack;
+using Phantom.Common.Data.Backups;
+
+namespace Phantom.Common.Data.Instance;
+
+[MemoryPackable]
+[MemoryPackUnion(0, typeof(InstanceLaunchSuccededEvent))]
+[MemoryPackUnion(1, typeof(InstanceLaunchFailedEvent))]
+[MemoryPackUnion(2, typeof(InstanceCrashedEvent))]
+[MemoryPackUnion(3, typeof(InstanceStoppedEvent))]
+[MemoryPackUnion(4, typeof(InstanceBackupCompletedEvent))]
+public partial interface IInstanceEvent {
+	void Accept(IInstanceEventVisitor visitor);
+}
+
+[MemoryPackable]
+public sealed partial record InstanceLaunchSuccededEvent : IInstanceEvent {
+	public void Accept(IInstanceEventVisitor visitor) {
+		visitor.OnLaunchSucceeded(this);
+	}
+}
+
+[MemoryPackable]
+public sealed partial record InstanceLaunchFailedEvent([property: MemoryPackOrder(0)] InstanceLaunchFailReason Reason) : IInstanceEvent {
+	public void Accept(IInstanceEventVisitor visitor) {
+		visitor.OnLaunchFailed(this);
+	}
+}
+
+[MemoryPackable]
+public sealed partial record InstanceCrashedEvent : IInstanceEvent {
+	public void Accept(IInstanceEventVisitor visitor) {
+		visitor.OnCrashed(this);
+	}
+}
+
+[MemoryPackable]
+public sealed partial record InstanceStoppedEvent : IInstanceEvent {
+	public void Accept(IInstanceEventVisitor visitor) {
+		visitor.OnStopped(this);
+	}
+}
+
+[MemoryPackable]
+public sealed partial record InstanceBackupCompletedEvent([property: MemoryPackOrder(0)] BackupCreationResultKind Kind, [property: MemoryPackOrder(1)] BackupCreationWarnings Warnings) : IInstanceEvent {
+	public void Accept(IInstanceEventVisitor visitor) {
+		visitor.OnBackupCompleted(this);
+	}
+}
+
+public static class InstanceEvent {
+	public static readonly IInstanceEvent LaunchSucceded = new InstanceLaunchSuccededEvent();
+	public static readonly IInstanceEvent Crashed = new InstanceCrashedEvent();
+	public static readonly IInstanceEvent Stopped = new InstanceStoppedEvent();
+}

Common/Phantom.Common.Data/Instance/IInstanceEventVisitor.cs

@@ -0,0 +1,9 @@
+namespace Phantom.Common.Data.Instance; 
+
+public interface IInstanceEventVisitor {
+	void OnLaunchSucceeded(InstanceLaunchSuccededEvent e);
+	void OnLaunchFailed(InstanceLaunchFailedEvent e);
+	void OnCrashed(InstanceCrashedEvent e);
+	void OnStopped(InstanceStoppedEvent e);
+	void OnBackupCompleted(InstanceBackupCompletedEvent e);
+}

Common/Phantom.Common.Data/Instance/InstanceConfiguration.cs

@@ -15,6 +15,5 @@ public sealed partial record InstanceConfiguration(
 	[property: MemoryPackOrder(6)] MinecraftServerKind MinecraftServerKind,
 	[property: MemoryPackOrder(7)] RamAllocationUnits MemoryAllocation,
 	[property: MemoryPackOrder(8)] Guid JavaRuntimeGuid,
-	[property: MemoryPackOrder(9)] ImmutableArray<string> JvmArguments,
+	[property: MemoryPackOrder(9)] ImmutableArray<string> JvmArguments
-	[property: MemoryPackOrder(10)] bool LaunchAutomatically
 );

Common/Phantom.Common.Data/Instance/InstanceLaunchFailReason.cs

@@ -10,6 +10,7 @@ public enum InstanceLaunchFailReason : byte {
 	InvalidJvmArguments,
 	CouldNotDownloadMinecraftServer,
 	CouldNotConfigureMinecraftServer,
+	CouldNotPrepareMinecraftServerLauncher,
 	CouldNotStartMinecraftServer
 }
 
@@ -24,6 +25,7 @@ public static class InstanceLaunchFailReasonExtensions {
 			InstanceLaunchFailReason.InvalidJvmArguments                    => "Invalid JVM arguments.",
 			InstanceLaunchFailReason.CouldNotDownloadMinecraftServer        => "Could not download Minecraft server.",
 			InstanceLaunchFailReason.CouldNotConfigureMinecraftServer       => "Could not configure Minecraft server.",
+			InstanceLaunchFailReason.CouldNotPrepareMinecraftServerLauncher => "Could not prepare Minecraft server launcher.",
 			InstanceLaunchFailReason.CouldNotStartMinecraftServer           => "Could not start Minecraft server.",
 			_                                                               => "Unknown error."
 		};

Common/Phantom.Common.Data/Instance/InstanceLaunchProperties.cs

@@ -0,0 +1,9 @@
+using MemoryPack;
+using Phantom.Common.Data.Minecraft;
+
+namespace Phantom.Common.Data.Instance; 
+
+[MemoryPackable]
+public sealed partial record InstanceLaunchProperties(
+	[property: MemoryPackOrder(0)] FileDownloadInfo? ServerDownloadInfo
+);

Common/Phantom.Common.Data/Minecraft/FileDownloadInfo.cs

@@ -0,0 +1,30 @@
+using MemoryPack;
+using Phantom.Utils.Cryptography;
+using Phantom.Utils.IO;
+
+namespace Phantom.Common.Data.Minecraft; 
+
+[MemoryPackable]
+public sealed partial class FileDownloadInfo {
+	[MemoryPackOrder(0)]
+	public string DownloadUrl { get; }
+	
+	[MemoryPackOrder(1)]
+	[MemoryPackInclude]
+	private readonly string hash;
+	
+	[MemoryPackIgnore]
+	public Sha1String Hash => Sha1String.FromString(hash);
+	
+	[MemoryPackOrder(2)]
+	public FileSize Size { get; }
+	
+	public FileDownloadInfo(string downloadUrl, Sha1String hash, FileSize size) : this(downloadUrl, hash.ToString(), size) {}
+
+	[MemoryPackConstructor]
+	private FileDownloadInfo(string downloadUrl, string hash, FileSize size) {
+		this.DownloadUrl = downloadUrl;
+		this.hash = hash;
+		this.Size = size;
+	}
+}

Common/Phantom.Common.Data/Minecraft/MinecraftServerKind.cs

@@ -1,5 +1,6 @@
 namespace Phantom.Common.Data.Minecraft; 
 
 public enum MinecraftServerKind : ushort {
-	Vanilla = 1
+	Vanilla = 1,
+	Fabric = 2
 }

Common/Phantom.Common.Logging/Phantom.Common.Logging.csproj

@@ -8,6 +8,7 @@
   
   <ItemGroup>
     <PackageReference Include="Serilog" />
+    <PackageReference Include="Serilog.Sinks.Async" />
     <PackageReference Include="Serilog.Sinks.Console" />
   </ItemGroup>
 

Common/Phantom.Common.Logging/PhantomLogger.cs

@@ -18,7 +18,7 @@ public static class PhantomLogger {
 		       .MinimumLevel.Override("Microsoft.EntityFrameworkCore.Database.Command", DefaultLogLevel.Coerce(LogEventLevel.Warning))
 		       .Filter.ByExcluding(static e => e.Exception is OperationCanceledException)
 		       .Enrich.FromLogContext()
-		       .WriteTo.Console(outputTemplate: template, formatProvider: CultureInfo.InvariantCulture, theme: AnsiConsoleTheme.Literate)
+		       .WriteTo.Async(c => c.Console(outputTemplate: template, formatProvider: CultureInfo.InvariantCulture, theme: AnsiConsoleTheme.Literate))
 		       .CreateLogger();
 	}
 

Common/Phantom.Common.Messages/IMessageToServerListener.cs

@@ -12,6 +12,7 @@ public interface IMessageToServerListener {
 	Task<NoReply> HandleAdvertiseJavaRuntimes(AdvertiseJavaRuntimesMessage message);
 	Task<NoReply> HandleReportAgentStatus(ReportAgentStatusMessage message);
 	Task<NoReply> HandleReportInstanceStatus(ReportInstanceStatusMessage message);
+	Task<NoReply> HandleReportInstanceEvent(ReportInstanceEventMessage message);
 	Task<NoReply> HandleInstanceOutput(InstanceOutputMessage message);
 	Task<NoReply> HandleReply(ReplyMessage message);
 }

Common/Phantom.Common.Messages/MessageRegistries.cs

@@ -27,6 +27,7 @@ public static class MessageRegistries {
 		ToServer.Add<ReportInstanceStatusMessage>(4);
 		ToServer.Add<InstanceOutputMessage>(5);
 		ToServer.Add<ReportAgentStatusMessage>(6);
+		ToServer.Add<ReportInstanceEventMessage>(7);
 		ToServer.Add<ReplyMessage>(127);
 	}
 }

Common/Phantom.Common.Messages/ToAgent/ConfigureInstanceMessage.cs

@@ -6,7 +6,9 @@ namespace Phantom.Common.Messages.ToAgent;
 
 [MemoryPackable]
 public sealed partial record ConfigureInstanceMessage(
-	[property: MemoryPackOrder(0)] InstanceConfiguration Configuration
+	[property: MemoryPackOrder(0)] InstanceConfiguration Configuration,
+	[property: MemoryPackOrder(1)] InstanceLaunchProperties LaunchProperties,
+	[property: MemoryPackOrder(2)] bool LaunchNow = false
 ) : IMessageToAgent<InstanceActionResult<ConfigureInstanceResult>> {
 	public Task<InstanceActionResult<ConfigureInstanceResult>> Accept(IMessageToAgentListener listener) {
 		return listener.HandleConfigureInstance(this);

Common/Phantom.Common.Messages/ToAgent/RegisterAgentSuccessMessage.cs

@@ -1,13 +1,12 @@
 using System.Collections.Immutable;
 using MemoryPack;
-using Phantom.Common.Data.Instance;
 using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.ToAgent;
 
 [MemoryPackable]
 public sealed partial record RegisterAgentSuccessMessage(
-	[property: MemoryPackOrder(0)] ImmutableArray<InstanceConfiguration> InitialInstances
+	[property: MemoryPackOrder(0)] ImmutableArray<ConfigureInstanceMessage> InitialInstanceConfigurations
 ) : IMessageToAgent {
 	public Task<NoReply> Accept(IMessageToAgentListener listener) {
 		return listener.HandleRegisterAgentSuccess(this);

Common/Phantom.Common.Messages/ToServer/ReportInstanceEventMessage.cs

@@ -0,0 +1,17 @@
+using MemoryPack;
+using Phantom.Common.Data.Instance;
+using Phantom.Utils.Rpc.Message;
+
+namespace Phantom.Common.Messages.ToServer; 
+
+[MemoryPackable]
+public sealed partial record ReportInstanceEventMessage(
+	[property: MemoryPackOrder(0)] Guid EventGuid,
+	[property: MemoryPackOrder(1)] DateTime UtcTime,
+	[property: MemoryPackOrder(2)] Guid InstanceGuid,
+	[property: MemoryPackOrder(3)] IInstanceEvent Event
+) : IMessageToServer {
+	public Task<NoReply> Accept(IMessageToServerListener listener) {
+		return listener.HandleReportInstanceEvent(this);
+	}
+}

Common/Phantom.Common.Minecraft/MinecraftServerExecutableInfo.cs

@@ -1,10 +0,0 @@
-using Phantom.Utils.Cryptography;
-using Phantom.Utils.IO;
-
-namespace Phantom.Common.Minecraft; 
-
-public sealed record MinecraftServerExecutableInfo(
-	string DownloadUrl,
-	Sha1String Hash,
-	FileSize Size
-);

Common/Phantom.Common.Minecraft/Phantom.Common.Minecraft.csproj

@@ -6,11 +6,4 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
-  <ItemGroup>
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.IO\Phantom.Utils.IO.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Runtime\Phantom.Utils.Runtime.csproj" />
-    <ProjectReference Include="..\Phantom.Common.Data\Phantom.Common.Data.csproj" />
-    <ProjectReference Include="..\Phantom.Common.Logging\Phantom.Common.Logging.csproj" />
-  </ItemGroup>
-  
 </Project>

Packages.props

@@ -20,6 +20,7 @@
   <ItemGroup>
     <PackageReference Update="Serilog"               Version="2.12.0" />
     <PackageReference Update="Serilog.AspNetCore"    Version="6.1.0" />
+    <PackageReference Update="Serilog.Sinks.Async"   Version="1.5.0" />
     <PackageReference Update="Serilog.Sinks.Console" Version="4.1.0" />
   </ItemGroup>
   

PhantomPanel.sln

@@ -36,6 +36,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Server.Database", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Server.Database.Postgres", "Server\Phantom.Server.Database.Postgres\Phantom.Server.Database.Postgres.csproj", "{81625B4A-3DB6-48BD-A739-D23DA02107D1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Server.Minecraft", "Server\Phantom.Server.Minecraft\Phantom.Server.Minecraft.csproj", "{4B3B73E6-48DD-4846-87FD-DFB86619B67C}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Server.Rpc", "Server\Phantom.Server.Rpc\Phantom.Server.Rpc.csproj", "{79312D72-44E0-431D-96A4-4C0A066B9671}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Server.Services", "Server\Phantom.Server.Services\Phantom.Server.Services.csproj", "{90F0F1B1-EB0A-49C9-8DF0-1153A87F77C9}"
@@ -118,6 +120,10 @@ Global
 		{81625B4A-3DB6-48BD-A739-D23DA02107D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81625B4A-3DB6-48BD-A739-D23DA02107D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81625B4A-3DB6-48BD-A739-D23DA02107D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B3B73E6-48DD-4846-87FD-DFB86619B67C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B3B73E6-48DD-4846-87FD-DFB86619B67C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B3B73E6-48DD-4846-87FD-DFB86619B67C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B3B73E6-48DD-4846-87FD-DFB86619B67C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{79312D72-44E0-431D-96A4-4C0A066B9671}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{79312D72-44E0-431D-96A4-4C0A066B9671}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{79312D72-44E0-431D-96A4-4C0A066B9671}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -184,6 +190,7 @@ Global
 		{A0F1C595-96B6-4DBF-8C16-6B99223F8F35} = {8AC8FB6C-033A-4626-820F-ED0F908756B2}
 		{E3AD566F-384A-489A-A3BB-EA3BA400C18C} = {8AC8FB6C-033A-4626-820F-ED0F908756B2}
 		{81625B4A-3DB6-48BD-A739-D23DA02107D1} = {8AC8FB6C-033A-4626-820F-ED0F908756B2}
+		{4B3B73E6-48DD-4846-87FD-DFB86619B67C} = {8AC8FB6C-033A-4626-820F-ED0F908756B2}
 		{79312D72-44E0-431D-96A4-4C0A066B9671} = {8AC8FB6C-033A-4626-820F-ED0F908756B2}
 		{90F0F1B1-EB0A-49C9-8DF0-1153A87F77C9} = {8AC8FB6C-033A-4626-820F-ED0F908756B2}
 		{7CA2E5FE-E507-4DC6-930C-E18711A9F856} = {8AC8FB6C-033A-4626-820F-ED0F908756B2}

Server/Phantom.Server.Database.Postgres/Migrations/20230213040522_AuditLogRename.Designer.cs

@@ -0,0 +1,466 @@
+// <auto-generated />
+using System;
+using System.Text.Json;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Phantom.Server.Database;
+
+#nullable disable
+
+namespace Phantom.Server.Database.Postgres.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20230213040522_AuditLogRename")]
+    partial class AuditLogRename
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.1")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("Roles", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("RoleClaims", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("Users", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserClaims", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserLogins", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("UserRoles", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("UserTokens", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+                {
+                    b.Property<Guid>("AgentGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BuildVersion")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("MaxInstances")
+                        .HasColumnType("integer");
+
+                    b.Property<ushort>("MaxMemory")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ProtocolVersion")
+                        .HasColumnType("integer");
+
+                    b.HasKey("AgentGuid");
+
+                    b.ToTable("Agents", "agents");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<JsonDocument>("Data")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("UtcTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AuditLog", "system");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+                {
+                    b.Property<Guid>("InstanceGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AgentGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("InstanceName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("JavaRuntimeGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("JvmArguments")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("LaunchAutomatically")
+                        .HasColumnType("boolean");
+
+                    b.Property<ushort>("MemoryAllocation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("MinecraftServerKind")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("MinecraftVersion")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RconPort")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ServerPort")
+                        .HasColumnType("integer");
+
+                    b.HasKey("InstanceGuid");
+
+                    b.ToTable("Instances", "agents");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Permissions", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+                {
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PermissionId")
+                        .HasColumnType("text");
+
+                    b.HasKey("RoleId", "PermissionId");
+
+                    b.HasIndex("PermissionId");
+
+                    b.ToTable("RolePermissions", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PermissionId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "PermissionId");
+
+                    b.HasIndex("PermissionId");
+
+                    b.ToTable("UserPermissions", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+                {
+                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                        .WithMany()
+                        .HasForeignKey("PermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+                {
+                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                        .WithMany()
+                        .HasForeignKey("PermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Server/Phantom.Server.Database.Postgres/Migrations/20230213040522_AuditLogRename.cs

@@ -0,0 +1,92 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Phantom.Server.Database.Postgres.Migrations
+{
+    /// <inheritdoc />
+    public partial class AuditLogRename : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_AuditEvents_Users_UserId",
+                schema: "system",
+                table: "AuditEvents");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_AuditEvents",
+                schema: "system",
+                table: "AuditEvents");
+
+            migrationBuilder.RenameTable(
+                name: "AuditEvents",
+                schema: "system",
+                newName: "AuditLog",
+                newSchema: "system");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_AuditEvents_UserId",
+                schema: "system",
+                table: "AuditLog",
+                newName: "IX_AuditLog_UserId");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_AuditLog",
+                schema: "system",
+                table: "AuditLog",
+                column: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_AuditLog_Users_UserId",
+                schema: "system",
+                table: "AuditLog",
+                column: "UserId",
+                principalSchema: "identity",
+                principalTable: "Users",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_AuditLog_Users_UserId",
+                schema: "system",
+                table: "AuditLog");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_AuditLog",
+                schema: "system",
+                table: "AuditLog");
+
+            migrationBuilder.RenameTable(
+                name: "AuditLog",
+                schema: "system",
+                newName: "AuditEvents",
+                newSchema: "system");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_AuditLog_UserId",
+                schema: "system",
+                table: "AuditEvents",
+                newName: "IX_AuditEvents_UserId");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_AuditEvents",
+                schema: "system",
+                table: "AuditEvents",
+                column: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_AuditEvents_Users_UserId",
+                schema: "system",
+                table: "AuditEvents",
+                column: "UserId",
+                principalSchema: "identity",
+                principalTable: "Users",
+                principalColumn: "Id");
+        }
+    }
+}

Server/Phantom.Server.Database.Postgres/Migrations/20230215101444_EventLog.Designer.cs

@@ -0,0 +1,498 @@
+// <auto-generated />
+using System;
+using System.Text.Json;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Phantom.Server.Database;
+
+#nullable disable
+
+namespace Phantom.Server.Database.Postgres.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20230215101444_EventLog")]
+    partial class EventLog
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.1")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("Roles", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("RoleClaims", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("Users", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserClaims", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserLogins", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("UserRoles", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("UserTokens", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+                {
+                    b.Property<Guid>("AgentGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BuildVersion")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("MaxInstances")
+                        .HasColumnType("integer");
+
+                    b.Property<ushort>("MaxMemory")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ProtocolVersion")
+                        .HasColumnType("integer");
+
+                    b.HasKey("AgentGuid");
+
+                    b.ToTable("Agents", "agents");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<JsonDocument>("Data")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("UtcTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AuditLog", "system");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.EventLogEntity", b =>
+                {
+                    b.Property<Guid>("EventGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AgentGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<JsonDocument>("Data")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("UtcTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("EventGuid");
+
+                    b.ToTable("EventLog", "system");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+                {
+                    b.Property<Guid>("InstanceGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AgentGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("InstanceName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("JavaRuntimeGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("JvmArguments")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("LaunchAutomatically")
+                        .HasColumnType("boolean");
+
+                    b.Property<ushort>("MemoryAllocation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("MinecraftServerKind")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("MinecraftVersion")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RconPort")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ServerPort")
+                        .HasColumnType("integer");
+
+                    b.HasKey("InstanceGuid");
+
+                    b.ToTable("Instances", "agents");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Permissions", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+                {
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PermissionId")
+                        .HasColumnType("text");
+
+                    b.HasKey("RoleId", "PermissionId");
+
+                    b.HasIndex("PermissionId");
+
+                    b.ToTable("RolePermissions", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PermissionId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "PermissionId");
+
+                    b.HasIndex("PermissionId");
+
+                    b.ToTable("UserPermissions", "identity");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+                {
+                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                        .WithMany()
+                        .HasForeignKey("PermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+                {
+                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                        .WithMany()
+                        .HasForeignKey("PermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Server/Phantom.Server.Database.Postgres/Migrations/20230215101444_EventLog.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Text.Json;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Phantom.Server.Database.Postgres.Migrations
+{
+    /// <inheritdoc />
+    public partial class EventLog : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EventLog",
+                schema: "system",
+                columns: table => new
+                {
+                    EventGuid = table.Column<Guid>(type: "uuid", nullable: false),
+                    UtcTime = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    AgentGuid = table.Column<Guid>(type: "uuid", nullable: true),
+                    EventType = table.Column<string>(type: "text", nullable: false),
+                    SubjectType = table.Column<string>(type: "text", nullable: false),
+                    SubjectId = table.Column<string>(type: "text", nullable: false),
+                    Data = table.Column<JsonDocument>(type: "jsonb", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EventLog", x => x.EventGuid);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EventLog",
+                schema: "system");
+        }
+    }
+}

Server/Phantom.Server.Database.Postgres/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -18,7 +18,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.0-rc.1.22426.7")
+                .HasAnnotation("ProductVersion", "7.0.1")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -247,7 +247,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Agents", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
+            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
                 {
                     b.Property<long>("Id")
                         .ValueGeneratedOnAdd()
@@ -280,7 +280,39 @@ namespace Phantom.Server.Database.Postgres.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("AuditEvents", "system");
+                    b.ToTable("AuditLog", "system");
+                });
+
+            modelBuilder.Entity("Phantom.Server.Database.Entities.EventLogEntity", b =>
+                {
+                    b.Property<Guid>("EventGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AgentGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<JsonDocument>("Data")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("UtcTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("EventGuid");
+
+                    b.ToTable("EventLog", "system");
                 });
 
             modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
@@ -419,7 +451,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
+            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
                 {
                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
                         .WithMany()

Server/Phantom.Server.Database/ApplicationDbContext.cs

@@ -20,7 +20,8 @@ public class ApplicationDbContext : IdentityDbContext {
 	
 	public DbSet<AgentEntity> Agents { get; set; } = null!;
 	public DbSet<InstanceEntity> Instances { get; set; } = null!;
-	public DbSet<AuditEventEntity> AuditEvents { get; set; } = null!;
+	public DbSet<AuditLogEntity> AuditLog { get; set; } = null!;
+	public DbSet<EventLogEntity> EventLog { get; set; } = null!;
 
 	public AgentEntityUpsert AgentUpsert { get; }
 	public InstanceEntityUpsert InstanceUpsert { get; }
@@ -60,8 +61,10 @@ public class ApplicationDbContext : IdentityDbContext {
 	protected override void ConfigureConventions(ModelConfigurationBuilder builder) {
 		base.ConfigureConventions(builder);
 
-		builder.Properties<AuditEventType>().HaveConversion<EnumToStringConverter<AuditEventType>>();
+		builder.Properties<AuditLogEventType>().HaveConversion<EnumToStringConverter<AuditLogEventType>>();
-		builder.Properties<AuditSubjectType>().HaveConversion<EnumToStringConverter<AuditSubjectType>>();
+		builder.Properties<AuditLogSubjectType>().HaveConversion<EnumToStringConverter<AuditLogSubjectType>>();
+		builder.Properties<EventLogEventType>().HaveConversion<EnumToStringConverter<EventLogEventType>>();
+		builder.Properties<EventLogSubjectType>().HaveConversion<EnumToStringConverter<EventLogSubjectType>>();
 		builder.Properties<MinecraftServerKind>().HaveConversion<EnumToStringConverter<MinecraftServerKind>>();
 		builder.Properties<RamAllocationUnits>().HaveConversion<RamAllocationUnitsConverter>();
 	}

Server/Phantom.Server.Database/Entities/AuditLogEntity.cs

@@ -7,10 +7,10 @@ using Phantom.Server.Database.Enums;
 
 namespace Phantom.Server.Database.Entities; 
 
-[Table("AuditEvents", Schema = "system")]
+[Table("AuditLog", Schema = "system")]
 [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]
 [SuppressMessage("ReSharper", "ClassWithVirtualMembersNeverInherited.Global")]
-public class AuditEventEntity : IDisposable {
+public class AuditLogEntity : IDisposable {
 	[Key]
 	[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
 	[SuppressMessage("ReSharper", "UnusedMember.Global")]
@@ -18,19 +18,19 @@ public class AuditEventEntity : IDisposable {
 
 	public string? UserId { get; set; }
 	public DateTime UtcTime { get; set; } // Note: Converting to UTC is not best practice, but for historical records it's good enough.
-	public AuditEventType EventType { get; set; }
+	public AuditLogEventType EventType { get; set; }
-	public AuditSubjectType SubjectType { get; set; }
+	public AuditLogSubjectType SubjectType { get; set; }
 	public string SubjectId { get; set; }
 	public JsonDocument? Data { get; set; }
 
 	public virtual IdentityUser? User { get; set; }
 	
 	[SuppressMessage("ReSharper", "UnusedMember.Global")]
-	internal AuditEventEntity() {
+	internal AuditLogEntity() {
 		SubjectId = string.Empty;
 	}
 
-	public AuditEventEntity(string? userId, AuditEventType eventType, string subjectId, Dictionary<string, object?>? data) {
+	public AuditLogEntity(string? userId, AuditLogEventType eventType, string subjectId, Dictionary<string, object?>? data) {
 		UserId = userId;
 		UtcTime = DateTime.UtcNow;
 		EventType = eventType;

Server/Phantom.Server.Database/Entities/EventLogEntity.cs

@@ -0,0 +1,41 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using Phantom.Server.Database.Enums;
+
+namespace Phantom.Server.Database.Entities; 
+
+[Table("EventLog", Schema = "system")]
+[SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]
+[SuppressMessage("ReSharper", "ClassWithVirtualMembersNeverInherited.Global")]
+public sealed class EventLogEntity : IDisposable {
+	[Key]
+	public Guid EventGuid { get; set; }
+
+	public DateTime UtcTime { get; set; } // Note: Converting to UTC is not best practice, but for historical records it's good enough.
+	public Guid? AgentGuid { get; set; }
+	public EventLogEventType EventType { get; set; }
+	public EventLogSubjectType SubjectType { get; set; }
+	public string SubjectId { get; set; }
+	public JsonDocument? Data { get; set; }
+	
+	[SuppressMessage("ReSharper", "UnusedMember.Global")]
+	internal EventLogEntity() {
+		SubjectId = string.Empty;
+	}
+
+	public EventLogEntity(Guid eventGuid, DateTime utcTime, Guid? agentGuid, EventLogEventType eventType, string subjectId, Dictionary<string, object?>? data) {
+		EventGuid = eventGuid;
+		UtcTime = utcTime;
+		AgentGuid = agentGuid;
+		EventType = eventType;
+		SubjectType = eventType.GetSubjectType();
+		SubjectId = subjectId;
+		Data = data == null ? null : JsonSerializer.SerializeToDocument(data);
+	}
+
+	public void Dispose() {
+		Data?.Dispose();
+	}
+}

Server/Phantom.Server.Database/Enums/AuditEventType.cs

@@ -1,54 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace Phantom.Server.Database.Enums;
-
-public enum AuditEventType {
-	AdministratorUserCreated,
-	AdministratorUserModified,
-	UserLoggedIn,
-	UserLoggedOut,
-	UserCreated,
-	UserRolesChanged,
-	UserDeleted,
-	InstanceCreated,
-	InstanceEdited,
-	InstanceLaunched,
-	InstanceStopped,
-	InstanceCommandExecuted
-}
-
-public static partial class AuditEventCategoryExtensions {
-	private static readonly Dictionary<AuditEventType, AuditSubjectType> SubjectTypes = new () {
-		{ AuditEventType.AdministratorUserCreated,  AuditSubjectType.User },
-		{ AuditEventType.AdministratorUserModified, AuditSubjectType.User },
-		{ AuditEventType.UserLoggedIn,              AuditSubjectType.User },
-		{ AuditEventType.UserLoggedOut,             AuditSubjectType.User },
-		{ AuditEventType.UserCreated,               AuditSubjectType.User },
-		{ AuditEventType.UserRolesChanged,          AuditSubjectType.User },
-		{ AuditEventType.UserDeleted,               AuditSubjectType.User },
-		{ AuditEventType.InstanceCreated,           AuditSubjectType.Instance },
-		{ AuditEventType.InstanceEdited,            AuditSubjectType.Instance },
-		{ AuditEventType.InstanceLaunched,          AuditSubjectType.Instance },
-		{ AuditEventType.InstanceStopped,           AuditSubjectType.Instance },
-		{ AuditEventType.InstanceCommandExecuted,   AuditSubjectType.Instance }
-	};
-
-	static AuditEventCategoryExtensions() {
-		foreach (var eventType in Enum.GetValues<AuditEventType>()) {
-			if (!SubjectTypes.ContainsKey(eventType)) {
-				throw new Exception("Missing mapping from " + eventType + " to a subject type.");
-			}
-		}
-	}
-
-	internal static AuditSubjectType GetSubjectType(this AuditEventType type) {
-		return SubjectTypes[type];
-	}
-	
-	[GeneratedRegex(@"\B([A-Z])", RegexOptions.NonBacktracking)]
-	private static partial Regex FindCapitalLettersRegex();
-
-	public static string ToNiceString(this AuditEventType type) {
-		return FindCapitalLettersRegex().Replace(type.ToString(), static match => " " + match.Groups[1].Value.ToLowerInvariant());
-	}
-}

Server/Phantom.Server.Database/Enums/AuditLogEventType.cs

@@ -0,0 +1,45 @@
+namespace Phantom.Server.Database.Enums;
+
+public enum AuditLogEventType {
+	AdministratorUserCreated,
+	AdministratorUserModified,
+	UserLoggedIn,
+	UserLoggedOut,
+	UserCreated,
+	UserRolesChanged,
+	UserDeleted,
+	InstanceCreated,
+	InstanceEdited,
+	InstanceLaunched,
+	InstanceStopped,
+	InstanceCommandExecuted
+}
+
+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.UserRolesChanged,          AuditLogSubjectType.User },
+		{ AuditLogEventType.UserDeleted,               AuditLogSubjectType.User },
+		{ AuditLogEventType.InstanceCreated,           AuditLogSubjectType.Instance },
+		{ AuditLogEventType.InstanceEdited,            AuditLogSubjectType.Instance },
+		{ AuditLogEventType.InstanceLaunched,          AuditLogSubjectType.Instance },
+		{ AuditLogEventType.InstanceStopped,           AuditLogSubjectType.Instance },
+		{ AuditLogEventType.InstanceCommandExecuted,   AuditLogSubjectType.Instance }
+	};
+
+	static AuditLogEventTypeExtensions() {
+		foreach (var eventType in Enum.GetValues<AuditLogEventType>()) {
+			if (!SubjectTypes.ContainsKey(eventType)) {
+				throw new Exception("Missing mapping from " + eventType + " to a subject type.");
+			}
+		}
+	}
+
+	internal static AuditLogSubjectType GetSubjectType(this AuditLogEventType type) {
+		return SubjectTypes[type];
+	}
+}

Server/Phantom.Server.Database/Enums/AuditLogSubjectType.cs

@@ -1,6 +1,6 @@
 namespace Phantom.Server.Database.Enums; 
 
-public enum AuditSubjectType {
+public enum AuditLogSubjectType {
 	User,
 	Instance
 }

Server/Phantom.Server.Database/Enums/EventLogEventType.cs

@@ -0,0 +1,35 @@
+namespace Phantom.Server.Database.Enums;
+
+public enum EventLogEventType {
+	InstanceLaunchSucceded,
+	InstanceLaunchFailed,
+	InstanceCrashed,
+	InstanceStopped,
+	InstanceBackupSucceeded,
+	InstanceBackupSucceededWithWarnings,
+	InstanceBackupFailed,
+}
+
+internal static class EventLogEventTypeExtensions {
+	private static readonly Dictionary<EventLogEventType, EventLogSubjectType> SubjectTypes = new () {
+		{ EventLogEventType.InstanceLaunchSucceded, 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 },
+	};
+
+	static EventLogEventTypeExtensions() {
+		foreach (var eventType in Enum.GetValues<EventLogEventType>()) {
+			if (!SubjectTypes.ContainsKey(eventType)) {
+				throw new Exception("Missing mapping from " + eventType + " to a subject type.");
+			}
+		}
+	}
+
+	public static EventLogSubjectType GetSubjectType(this EventLogEventType type) {
+		return SubjectTypes[type];
+	}
+}

Server/Phantom.Server.Database/Enums/EventLogSubjectType.cs

@@ -0,0 +1,5 @@
+namespace Phantom.Server.Database.Enums; 
+
+public enum EventLogSubjectType {
+	Instance
+}

Server/Phantom.Server.Minecraft/MinecraftVersionApi.cs

@@ -1,5 +1,4 @@
 using System.Collections.Immutable;
-using System.Diagnostics;
 using System.Net.Http.Json;
 using System.Text.Json;
 using Phantom.Common.Data.Minecraft;
@@ -9,71 +8,39 @@ using Phantom.Utils.IO;
 using Phantom.Utils.Runtime;
 using Serilog;
 
-namespace Phantom.Common.Minecraft;
+namespace Phantom.Server.Minecraft;
 
-public sealed class MinecraftVersions : IDisposable {
+sealed class MinecraftVersionApi : IDisposable {
-	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftVersions>();
+	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftVersionApi>();
-	private static readonly TimeSpan CacheRetentionTime = TimeSpan.FromMinutes(10);
 	
 	private const string VersionManifestUrl = "https://launchermeta.mojang.com/mc/game/version_manifest.json";
 	
 	private readonly HttpClient http = new ();
 
-	private readonly Stopwatch cacheTimer = new ();
-	private readonly SemaphoreSlim cachedVersionsSemaphore = new (1, 1);
-
-	private ImmutableArray<MinecraftVersion>? cachedVersions;
-	private ImmutableArray<MinecraftVersion>? CachedVersionsUnlessExpired => cacheTimer.IsRunning && cacheTimer.Elapsed < CacheRetentionTime ? cachedVersions : null;
-
 	public void Dispose() {
 		http.Dispose();
-		cachedVersionsSemaphore.Dispose();
 	}
 
 	public async Task<ImmutableArray<MinecraftVersion>> GetVersions(CancellationToken cancellationToken) {
-		if (CachedVersionsUnlessExpired is {} earlyResult) {
+		return await FetchVersions(cancellationToken) ?? ImmutableArray<MinecraftVersion>.Empty;
-			return earlyResult;
-		}
-
-		try {
-			await cachedVersionsSemaphore.WaitAsync(cancellationToken);
-		} catch (OperationCanceledException) {
-			return ImmutableArray<MinecraftVersion>.Empty;
-		}
-
-		try {
-			if (CachedVersionsUnlessExpired is {} racedResult) {
-				return racedResult;
-			}
-
-			ImmutableArray<MinecraftVersion> versions = await FetchVersions(cancellationToken) ?? ImmutableArray<MinecraftVersion>.Empty;
-			Logger.Information("Refreshed Minecraft version cache, {Versions} version(s) found.", versions.Length);
-			
-			cachedVersions = versions;
-			cacheTimer.Restart();
-			return versions;
-		} finally {
-			cachedVersionsSemaphore.Release();
-		}
 	}
 	
 	private async Task<ImmutableArray<MinecraftVersion>?> FetchVersions(CancellationToken cancellationToken) {
 		return await FetchOrFailSilently(async () => {
-			var versionManifest = await FetchJson(http, VersionManifestUrl, "version manifest", cancellationToken);
+			var versionManifest = await FetchJson(VersionManifestUrl, "version manifest", cancellationToken);
 			return GetVersionsFromManifest(versionManifest);
 		});
 	}
 	
-	public async Task<MinecraftServerExecutableInfo?> GetServerExecutableInfo(string version, CancellationToken cancellationToken) {
+	public async Task<FileDownloadInfo?> GetServerExecutableInfo(ImmutableArray<MinecraftVersion> versions, string version, CancellationToken cancellationToken) {
-		return await FetchOrFailSilently(async () => {
-			var versions = await GetVersions(cancellationToken);
 		var versionObject = versions.FirstOrDefault(v => v.Id == version);
 		if (versionObject == null) {
 			Logger.Error("Version {Version} was not found in version manifest.", version);
 			return null;
 		}
 		
-			var versionMetadata = await FetchJson(http, versionObject.MetadataUrl, "version metadata", cancellationToken);
+		return await FetchOrFailSilently(async () => {
+			var versionMetadata = await FetchJson(versionObject.MetadataUrl, "version metadata", cancellationToken);
 			return GetServerExecutableInfoFromMetadata(versionMetadata);
 		});
 	}
@@ -81,8 +48,6 @@ public sealed class MinecraftVersions : IDisposable {
 	private static async Task<T?> FetchOrFailSilently<T>(Func<Task<T?>> task) {
 		try {
 			return await task();
-		} catch (OperationCanceledException) {
-			return default;
 		} catch (StopProcedureException) {
 			return default;
 		} catch (Exception e) {
@@ -91,13 +56,11 @@ public sealed class MinecraftVersions : IDisposable {
 		}
 	}
 
-	private static async Task<JsonElement> FetchJson(HttpClient http, string url, string description, CancellationToken cancellationToken) {
+	private async Task<JsonElement> FetchJson(string url, string description, CancellationToken cancellationToken) {
-		Logger.Information("Fetching {Description} JSON from: {Url}", description, url);
+		Logger.Debug("Fetching {Description} JSON from: {Url}", description, url);
 
 		try {
 			return await http.GetFromJsonAsync<JsonElement>(url, cancellationToken);
-		} catch (OperationCanceledException) {
-			throw StopProcedureException.Instance;
 		} catch (HttpRequestException e) {
 			Logger.Error(e, "Unable to download {Description}.", description);
 			throw StopProcedureException.Instance;
@@ -117,7 +80,7 @@ public sealed class MinecraftVersions : IDisposable {
 			} catch (StopProcedureException) {}
 		}
 
-		return foundVersions.ToImmutable();
+		return foundVersions.MoveToImmutable();
 	}
 
 	private static MinecraftVersion GetVersionFromManifestEntry(JsonElement versionElement) {
@@ -129,7 +92,7 @@ public sealed class MinecraftVersions : IDisposable {
 
 		var type = MinecraftVersionTypes.FromString(typeString);
 		if (type == MinecraftVersionType.Other) {
-			Logger.Verbose("Unknown version type: {Type} ({Version})", typeString, id);
+			Logger.Warning("Unknown version type: {Type} ({Version})", typeString, id);
 		}
 
 		JsonElement urlElement = GetJsonPropertyOrThrow(versionElement, "url", JsonValueKind.String, "version entry in version manifest");
@@ -148,7 +111,7 @@ public sealed class MinecraftVersions : IDisposable {
 		return new MinecraftVersion(id, type, url);
 	}
 
-	private static MinecraftServerExecutableInfo GetServerExecutableInfoFromMetadata(JsonElement versionMetadata) {
+	private static FileDownloadInfo GetServerExecutableInfoFromMetadata(JsonElement versionMetadata) {
 		JsonElement downloadsElement = GetJsonPropertyOrThrow(versionMetadata, "downloads", JsonValueKind.Object, "version metadata");
 		JsonElement serverElement = GetJsonPropertyOrThrow(downloadsElement, "server", JsonValueKind.Object, "downloads object in version metadata");
 		JsonElement urlElement = GetJsonPropertyOrThrow(serverElement, "url", JsonValueKind.String, "downloads.server object in version metadata");
@@ -182,7 +145,7 @@ public sealed class MinecraftVersions : IDisposable {
 			throw StopProcedureException.Instance;
 		}
 
-		return new MinecraftServerExecutableInfo(url, hash, new FileSize(size));
+		return new FileDownloadInfo(url, hash, new FileSize(size));
 	}
 
 	private static JsonElement GetJsonPropertyOrThrow(JsonElement parentElement, string propertyKey, JsonValueKind expectedKind, string location) {

Server/Phantom.Server.Minecraft/MinecraftVersions.cs

@@ -0,0 +1,75 @@
+using System.Collections.Immutable;
+using System.Diagnostics;
+using Phantom.Common.Data.Minecraft;
+using Phantom.Common.Logging;
+using Serilog;
+
+namespace Phantom.Server.Minecraft;
+
+public sealed class MinecraftVersions : IDisposable {
+	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftVersions>();
+	private static readonly TimeSpan CacheRetentionTime = TimeSpan.FromMinutes(10);
+
+	private readonly MinecraftVersionApi api = new ();
+	private readonly Stopwatch cacheTimer = new ();
+	private readonly SemaphoreSlim cacheSemaphore = new (1, 1);
+
+	private bool IsCacheNotExpired => cacheTimer.IsRunning && cacheTimer.Elapsed < CacheRetentionTime;
+	
+	private ImmutableArray<MinecraftVersion>? cachedVersions;
+	private readonly Dictionary<string, FileDownloadInfo?> cachedServerExecutables = new ();
+
+	public void Dispose() {
+		api.Dispose();
+		cacheSemaphore.Dispose();
+	}
+
+	public async Task<ImmutableArray<MinecraftVersion>> GetVersions(CancellationToken cancellationToken) {
+		return await GetCachedObject(() => cachedVersions != null, () => cachedVersions.GetValueOrDefault(), v => cachedVersions = v, LoadVersions, cancellationToken);
+	}
+
+	private async Task<ImmutableArray<MinecraftVersion>> LoadVersions(CancellationToken cancellationToken) {
+		ImmutableArray<MinecraftVersion> versions = await api.GetVersions(cancellationToken);
+		Logger.Information("Refreshed Minecraft version cache, {Versions} version(s) found.", versions.Length);
+		return versions;
+	}
+
+	public async Task<FileDownloadInfo?> GetServerExecutableInfo(string version, CancellationToken cancellationToken) {
+		var versions = await GetVersions(cancellationToken);
+		return await GetCachedObject(() => cachedServerExecutables.ContainsKey(version), () => cachedServerExecutables[version], v => cachedServerExecutables[version] = v, ct => LoadServerExecutableInfo(versions, version, ct), cancellationToken);
+	}
+
+	private async Task<FileDownloadInfo?> LoadServerExecutableInfo(ImmutableArray<MinecraftVersion> versions, string version, CancellationToken cancellationToken) {
+		var info = await api.GetServerExecutableInfo(versions, version, cancellationToken);
+			
+		if (info == null) {
+			Logger.Information("Refreshed Minecraft {Version} server executable cache, no file found.", version);
+		}
+		else {
+			Logger.Information("Refreshed Minecraft {Version} server executable cache, found file: {Url}.", version, info.DownloadUrl);
+		}
+
+		return info;
+	}
+
+	private async Task<T> GetCachedObject<T>(Func<bool> isLoaded, Func<T> fieldGetter, Action<T> fieldSetter, Func<CancellationToken, Task<T>> fieldLoader, CancellationToken cancellationToken) {
+		if (IsCacheNotExpired && isLoaded()) {
+			return fieldGetter();
+		}
+
+		await cacheSemaphore.WaitAsync(cancellationToken);
+		try {
+			if (IsCacheNotExpired && isLoaded()) {
+				return fieldGetter();
+			}
+
+			T result = await fieldLoader(cancellationToken);
+			fieldSetter(result);
+			
+			cacheTimer.Restart();
+			return result;
+		} finally {
+			cacheSemaphore.Release();
+		}
+	}
+}

Server/Phantom.Server.Minecraft/Phantom.Server.Minecraft.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  
+  <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.Runtime\Phantom.Utils.Runtime.csproj" />
+  </ItemGroup>
+
+</Project>

Server/Phantom.Server.Rpc/RpcLauncher.cs

@@ -46,7 +46,7 @@ public sealed class RpcLauncher : RpcRuntime<ServerSocket> {
 
 		void OnConnectionClosed(object? sender, RpcClientConnectionClosedEventArgs e) {
 			clients.Remove(e.RoutingId);
-			logger.Verbose("Closed connection to {RoutingId}.", e.RoutingId);
+			logger.Debug("Closed connection to {RoutingId}.", e.RoutingId);
 		}
 
 		while (!cancellationToken.IsCancellationRequested) {

Server/Phantom.Server.Services/Agents/AgentManager.cs

@@ -82,7 +82,9 @@ public sealed class AgentManager {
 
 		Logger.Information("Registered agent \"{Name}\" (GUID {Guid}).", agent.Name, agent.Guid);
 
-		await connection.Send(new RegisterAgentSuccessMessage(instanceManager.GetInstanceConfigurationsForAgent(agent.Guid)));
+		var instanceConfigurations = await instanceManager.GetInstanceConfigurationsForAgent(agent.Guid);
+		await connection.Send(new RegisterAgentSuccessMessage(instanceConfigurations));
+		
 		return true;
 	}
 

Server/Phantom.Server.Services/Audit/AuditEvent.cs

@@ -1,6 +0,0 @@
-using System.Text.Json;
-using Phantom.Server.Database.Enums;
-
-namespace Phantom.Server.Services.Audit; 
-
-public sealed record AuditEvent(DateTime UtcTime, string? UserId, string? UserName, AuditEventType EventType, AuditSubjectType SubjectType, string? SubjectId, JsonDocument? Data);

Server/Phantom.Server.Services/Audit/AuditLog.EventTypes.cs

@@ -5,23 +5,23 @@ namespace Phantom.Server.Services.Audit;
 
 public sealed partial class AuditLog {
 	public Task AddAdministratorUserCreatedEvent(IdentityUser administratorUser) {
-		return AddEvent(AuditEventType.AdministratorUserCreated, administratorUser.Id);
+		return AddItem(AuditLogEventType.AdministratorUserCreated, administratorUser.Id);
 	}
 
 	public Task AddAdministratorUserModifiedEvent(IdentityUser administratorUser) {
-		return AddEvent(AuditEventType.AdministratorUserModified, administratorUser.Id);
+		return AddItem(AuditLogEventType.AdministratorUserModified, administratorUser.Id);
 	}
 
 	public void AddUserLoggedInEvent(string userId) {
-		AddEvent(userId, AuditEventType.UserLoggedIn, userId);
+		AddItem(userId, AuditLogEventType.UserLoggedIn, userId);
 	}
 
 	public void AddUserLoggedOutEvent(string userId) {
-		AddEvent(userId, AuditEventType.UserLoggedOut, userId);
+		AddItem(userId, AuditLogEventType.UserLoggedOut, userId);
 	}
 	
 	public Task AddUserCreatedEvent(IdentityUser user) {
-		return AddEvent(AuditEventType.UserCreated, user.Id);
+		return AddItem(AuditLogEventType.UserCreated, user.Id);
 	}
 
 	public Task AddUserRolesChangedEvent(IdentityUser user, List<string> addedToRoles, List<string> removedFromRoles) {
@@ -37,35 +37,35 @@ public sealed partial class AuditLog {
 			extra["removedFromRoles"] = removedFromRoles;
 		}
 		
-		return AddEvent(AuditEventType.UserDeleted, user.Id, extra);
+		return AddItem(AuditLogEventType.UserDeleted, user.Id, extra);
 	}
 	
 	public Task AddUserDeletedEvent(IdentityUser user) {
-		return AddEvent(AuditEventType.UserDeleted, user.Id, new Dictionary<string, object?> {
+		return AddItem(AuditLogEventType.UserDeleted, user.Id, new Dictionary<string, object?> {
 			{ "username", user.UserName }
 		});
 	}
 
 	public Task AddInstanceCreatedEvent(Guid instanceGuid) {
-		return AddEvent(AuditEventType.InstanceCreated, instanceGuid.ToString());
+		return AddItem(AuditLogEventType.InstanceCreated, instanceGuid.ToString());
 	}
 
 	public Task AddInstanceEditedEvent(Guid instanceGuid) {
-		return AddEvent(AuditEventType.InstanceEdited, instanceGuid.ToString());
+		return AddItem(AuditLogEventType.InstanceEdited, instanceGuid.ToString());
 	}
 	
 	public Task AddInstanceLaunchedEvent(Guid instanceGuid) {
-		return AddEvent(AuditEventType.InstanceLaunched, instanceGuid.ToString());
+		return AddItem(AuditLogEventType.InstanceLaunched, instanceGuid.ToString());
 	}
 
 	public Task AddInstanceCommandExecutedEvent(Guid instanceGuid, string command) {
-		return AddEvent(AuditEventType.InstanceCommandExecuted, instanceGuid.ToString(), new Dictionary<string, object?> {
+		return AddItem(AuditLogEventType.InstanceCommandExecuted, instanceGuid.ToString(), new Dictionary<string, object?> {
 			{ "command", command }
 		});
 	}
 
 	public Task AddInstanceStoppedEvent(Guid instanceGuid, int stopInSeconds) {
-		return AddEvent(AuditEventType.InstanceStopped, instanceGuid.ToString(), new Dictionary<string, object?> {
+		return AddItem(AuditLogEventType.InstanceStopped, instanceGuid.ToString(), new Dictionary<string, object?> {
 			{ "stop_in_seconds", stopInSeconds.ToString() }
 		});
 	}

Server/Phantom.Server.Services/Audit/AuditLog.cs

@@ -28,29 +28,29 @@ public sealed partial class AuditLog {
 		return identityLookup.GetAuthenticatedUserId(authenticationState.User);
 	}
 
-	private async Task AddEventToDatabase(AuditEventEntity eventEntity) {
+	private async Task AddEntityToDatabase(AuditLogEntity logEntity) {
 		using var scope = databaseProvider.CreateScope();
-		scope.Ctx.AuditEvents.Add(eventEntity);
+		scope.Ctx.AuditLog.Add(logEntity);
 		await scope.Ctx.SaveChangesAsync(cancellationToken);
 	}
 
-	private void AddEvent(string? userId, AuditEventType eventType, string subjectId, Dictionary<string, object?>? extra = null) {
+	private void AddItem(string? userId, AuditLogEventType eventType, string subjectId, Dictionary<string, object?>? extra = null) {
-		var eventEntity = new AuditEventEntity(userId, eventType, subjectId, extra);
+		var logEntity = new AuditLogEntity(userId, eventType, subjectId, extra);
-		taskManager.Run("Store audit log event", () => AddEventToDatabase(eventEntity));
+		taskManager.Run("Store audit log item to database", () => AddEntityToDatabase(logEntity));
 	}
 
-	private async Task AddEvent(AuditEventType eventType, string subjectId, Dictionary<string, object?>? extra = null) {
+	private async Task AddItem(AuditLogEventType eventType, string subjectId, Dictionary<string, object?>? extra = null) {
-		AddEvent(await GetCurrentAuthenticatedUserId(), eventType, subjectId, extra);
+		AddItem(await GetCurrentAuthenticatedUserId(), eventType, subjectId, extra);
 	}
 
-	public async Task<AuditEvent[]> GetEvents(int count, CancellationToken cancellationToken) {
+	public async Task<AuditLogItem[]> GetItems(int count, CancellationToken cancellationToken) {
 		using var scope = databaseProvider.CreateScope();
-		return await scope.Ctx.AuditEvents
+		return await scope.Ctx.AuditLog
 		                  .Include(static entity => entity.User)
 		                  .AsQueryable()
 		                  .OrderByDescending(static entity => entity.UtcTime)
 		                  .Take(count)
-		                  .Select(static entity => new AuditEvent(entity.UtcTime, entity.UserId, entity.User == null ? null : entity.User.UserName, entity.EventType, entity.SubjectType, entity.SubjectId, entity.Data))
+		                  .Select(static entity => new AuditLogItem(entity.UtcTime, entity.UserId, entity.User == null ? null : entity.User.UserName, entity.EventType, entity.SubjectType, entity.SubjectId, entity.Data))
 		                  .ToArrayAsync(cancellationToken);
 	}
 }

Server/Phantom.Server.Services/Audit/AuditLogItem.cs

@@ -0,0 +1,6 @@
+using System.Text.Json;
+using Phantom.Server.Database.Enums;
+
+namespace Phantom.Server.Services.Audit; 
+
+public sealed record AuditLogItem(DateTime UtcTime, string? UserId, string? UserName, AuditLogEventType EventType, AuditLogSubjectType SubjectType, string? SubjectId, JsonDocument? Data);

Server/Phantom.Server.Services/Events/EventLog.InstanceEventVisitor.cs

@@ -0,0 +1,65 @@
+using Phantom.Common.Data.Backups;
+using Phantom.Common.Data.Instance;
+using Phantom.Server.Database.Enums;
+
+namespace Phantom.Server.Services.Events;
+
+public sealed partial class EventLog {
+	internal IInstanceEventVisitor CreateInstanceEventVisitor(Guid eventGuid, DateTime utcTime, Guid agentGuid, Guid instanceGuid) {
+		return new InstanceEventVisitor(this, utcTime, eventGuid, agentGuid, instanceGuid);
+	}
+
+	private sealed class InstanceEventVisitor : IInstanceEventVisitor {
+		private readonly EventLog eventLog;
+		private readonly Guid eventGuid;
+		private readonly DateTime utcTime;
+		private readonly Guid agentGuid;
+		private readonly Guid instanceGuid;
+
+		public InstanceEventVisitor(EventLog eventLog, DateTime utcTime, Guid eventGuid, Guid agentGuid, Guid instanceGuid) {
+			this.eventLog = eventLog;
+			this.eventGuid = eventGuid;
+			this.utcTime = utcTime;
+			this.agentGuid = agentGuid;
+			this.instanceGuid = instanceGuid;
+		}
+
+		public void OnLaunchSucceeded(InstanceLaunchSuccededEvent e) {
+			eventLog.AddItem(eventGuid, utcTime, agentGuid, EventLogEventType.InstanceLaunchSucceded, instanceGuid.ToString());
+		}
+
+		public void OnLaunchFailed(InstanceLaunchFailedEvent e) {
+			eventLog.AddItem(eventGuid, utcTime, agentGuid, EventLogEventType.InstanceLaunchFailed, instanceGuid.ToString(), new Dictionary<string, object?> {
+				{ "reason", e.Reason.ToString() }
+			});
+		}
+
+		public void OnCrashed(InstanceCrashedEvent e) {
+			eventLog.AddItem(eventGuid, utcTime, agentGuid, EventLogEventType.InstanceCrashed, instanceGuid.ToString());
+		}
+
+		public void OnStopped(InstanceStoppedEvent e) {
+			eventLog.AddItem(eventGuid, utcTime, agentGuid, EventLogEventType.InstanceStopped, instanceGuid.ToString());
+		}
+
+		public void OnBackupCompleted(InstanceBackupCompletedEvent e) {
+			var eventType = e.Kind switch {
+				BackupCreationResultKind.Success when e.Warnings != BackupCreationWarnings.None => EventLogEventType.InstanceBackupSucceededWithWarnings,
+				BackupCreationResultKind.Success                                                => EventLogEventType.InstanceBackupSucceeded,
+				_                                                                               => EventLogEventType.InstanceBackupFailed
+			};
+
+			var dictionary = new Dictionary<string, object?>();
+
+			if (eventType == EventLogEventType.InstanceBackupFailed) {
+				dictionary["reason"] = e.Kind.ToString();
+			}
+
+			if (e.Warnings != BackupCreationWarnings.None) {
+				dictionary["warnings"] = e.Warnings.ListFlags().Select(static warning => warning.ToString()).ToArray();
+			}
+
+			eventLog.AddItem(eventGuid, utcTime, agentGuid, eventType, instanceGuid.ToString(), dictionary.Count == 0 ? null : dictionary);
+		}
+	}
+}

Server/Phantom.Server.Services/Events/EventLog.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore;
+using Phantom.Server.Database;
+using Phantom.Server.Database.Entities;
+using Phantom.Server.Database.Enums;
+using Phantom.Utils.Runtime;
+
+namespace Phantom.Server.Services.Events; 
+
+public sealed partial class EventLog {
+	private readonly CancellationToken cancellationToken;
+	private readonly DatabaseProvider databaseProvider;
+	private readonly TaskManager taskManager;
+	
+	public EventLog(ServiceConfiguration serviceConfiguration, DatabaseProvider databaseProvider, TaskManager taskManager) {
+		this.cancellationToken = serviceConfiguration.CancellationToken;
+		this.databaseProvider = databaseProvider;
+		this.taskManager = taskManager;
+	}
+
+	private async Task AddEntityToDatabase(EventLogEntity logEntity) {
+		using var scope = databaseProvider.CreateScope();
+		scope.Ctx.EventLog.Add(logEntity);
+		await scope.Ctx.SaveChangesAsync(cancellationToken);
+	}
+
+	private void AddItem(Guid eventGuid, DateTime utcTime, Guid? agentGuid, EventLogEventType eventType, string subjectId, Dictionary<string, object?>? extra = null) {
+		var logEntity = new EventLogEntity(eventGuid, utcTime, agentGuid, eventType, subjectId, extra);
+		taskManager.Run("Store event log item to database", () => AddEntityToDatabase(logEntity));
+	}
+
+	public async Task<EventLogItem[]> GetItems(int count, CancellationToken cancellationToken) {
+		using var scope = databaseProvider.CreateScope();
+		return await scope.Ctx.EventLog
+		                  .AsQueryable()
+		                  .OrderByDescending(static entity => entity.UtcTime)
+		                  .Take(count)
+		                  .Select(static entity => new EventLogItem(entity.UtcTime, entity.AgentGuid, entity.EventType, entity.SubjectType, entity.SubjectId, entity.Data))
+		                  .ToArrayAsync(cancellationToken);
+	}
+}

Server/Phantom.Server.Services/Events/EventLogItem.cs

@@ -0,0 +1,6 @@
+using System.Text.Json;
+using Phantom.Server.Database.Enums;
+
+namespace Phantom.Server.Services.Events; 
+
+public sealed record EventLogItem(DateTime UtcTime, Guid? AgentGuid, EventLogEventType EventType, EventLogSubjectType SubjectType, string SubjectId, JsonDocument? Data);

Server/Phantom.Server.Services/Instances/AddOrEditInstanceResult.cs

@@ -5,6 +5,7 @@ public enum AddOrEditInstanceResult : byte {
 	Success,
 	InstanceNameMustNotBeEmpty,
 	InstanceMemoryMustNotBeZero,
+	MinecraftVersionDownloadInfoNotFound,
 	AgentNotFound
 }
 
@@ -14,6 +15,7 @@ public static class AddOrEditInstanceResultExtensions {
 			AddOrEditInstanceResult.Success                              => "Success.",
 			AddOrEditInstanceResult.InstanceNameMustNotBeEmpty           => "Instance name must not be empty.",
 			AddOrEditInstanceResult.InstanceMemoryMustNotBeZero          => "Memory must not be 0 MB.",
+			AddOrEditInstanceResult.MinecraftVersionDownloadInfoNotFound => "Could not find download information for the selected Minecraft version.",
 			AddOrEditInstanceResult.AgentNotFound                        => "Agent not found.",
 			_                                                            => "Unknown error."
 		};

Server/Phantom.Server.Services/Instances/Instance.cs

@@ -4,7 +4,8 @@ namespace Phantom.Server.Services.Instances;
 
 public sealed record Instance(
 	InstanceConfiguration Configuration,
-	IInstanceStatus Status
+	IInstanceStatus Status,
+	bool LaunchAutomatically
 ) {
-	internal Instance(InstanceConfiguration configuration) : this(configuration, InstanceStatus.Offline) {}
+	internal Instance(InstanceConfiguration configuration, bool launchAutomatically = false) : this(configuration, InstanceStatus.Offline, launchAutomatically) {}
 }

Server/Phantom.Server.Services/Instances/InstanceManager.cs

@@ -10,6 +10,7 @@ using Phantom.Common.Messages.ToAgent;
 using Phantom.Common.Minecraft;
 using Phantom.Server.Database;
 using Phantom.Server.Database.Entities;
+using Phantom.Server.Minecraft;
 using Phantom.Server.Services.Agents;
 using Phantom.Utils.Collections;
 using Phantom.Utils.Events;
@@ -26,12 +27,14 @@ public sealed class InstanceManager {
 
 	private readonly CancellationToken cancellationToken;
 	private readonly AgentManager agentManager;
+	private readonly MinecraftVersions minecraftVersions;
 	private readonly DatabaseProvider databaseProvider;
 	private readonly SemaphoreSlim modifyInstancesSemaphore = new (1, 1);
 
-	public InstanceManager(ServiceConfiguration configuration, AgentManager agentManager, DatabaseProvider databaseProvider) {
+	public InstanceManager(ServiceConfiguration configuration, AgentManager agentManager, MinecraftVersions minecraftVersions, DatabaseProvider databaseProvider) {
 		this.cancellationToken = configuration.CancellationToken;
 		this.agentManager = agentManager;
+		this.minecraftVersions = minecraftVersions;
 		this.databaseProvider = databaseProvider;
 	}
 
@@ -49,11 +52,10 @@ public sealed class InstanceManager {
 				entity.MinecraftServerKind,
 				entity.MemoryAllocation,
 				entity.JavaRuntimeGuid,
-				JvmArgumentsHelper.Split(entity.JvmArguments),
+				JvmArgumentsHelper.Split(entity.JvmArguments)
-				entity.LaunchAutomatically
 			);
 
-			var instance = new Instance(configuration);
+			var instance = new Instance(configuration, entity.LaunchAutomatically);
 			instances.ByGuid[instance.Configuration.InstanceGuid] = instance;
 		}
 	}
@@ -73,23 +75,29 @@ public sealed class InstanceManager {
 			return InstanceActionResult.Concrete(AddOrEditInstanceResult.InstanceMemoryMustNotBeZero);
 		}
 		
+		var serverExecutableInfo = await minecraftVersions.GetServerExecutableInfo(configuration.MinecraftVersion, cancellationToken);
+		if (serverExecutableInfo == null) {
+			return InstanceActionResult.Concrete(AddOrEditInstanceResult.MinecraftVersionDownloadInfoNotFound);
+		}
+
 		InstanceActionResult<AddOrEditInstanceResult> result;
 		bool isNewInstance;
 
 		await modifyInstancesSemaphore.WaitAsync(cancellationToken);
 		try {
-			var instance = new Instance(configuration);
+			isNewInstance = !instances.ByGuid.TryReplace(configuration.InstanceGuid, instance => instance with { Configuration = configuration });
-			instances.ByGuid.AddOrReplace(instance.Configuration.InstanceGuid, instance, out var oldInstance);
+			if (isNewInstance) {
+				instances.ByGuid.TryAdd(configuration.InstanceGuid, new Instance(configuration));
+			}
 
-			var reply = await agentManager.SendMessage<ConfigureInstanceMessage, InstanceActionResult<ConfigureInstanceResult>>(configuration.AgentGuid, new ConfigureInstanceMessage(configuration), TimeSpan.FromSeconds(10));
+			var message = new ConfigureInstanceMessage(configuration, new InstanceLaunchProperties(serverExecutableInfo));
+			var reply = await agentManager.SendMessage<ConfigureInstanceMessage, InstanceActionResult<ConfigureInstanceResult>>(configuration.AgentGuid, message, TimeSpan.FromSeconds(10));
 			
 			result = reply.DidNotReplyIfNull().Map(static result => result switch {
 				ConfigureInstanceResult.Success => AddOrEditInstanceResult.Success,
 				_                               => AddOrEditInstanceResult.UnknownError
 			});
 			
-			isNewInstance = oldInstance == null;
-			
 			if (result.Is(AddOrEditInstanceResult.Success)) {
 				using var scope = databaseProvider.CreateScope();
 				InstanceEntity entity = scope.Ctx.InstanceUpsert.Fetch(configuration.InstanceGuid);
@@ -103,7 +111,6 @@ public sealed class InstanceManager {
 				entity.MemoryAllocation = configuration.MemoryAllocation;
 				entity.JavaRuntimeGuid = configuration.JavaRuntimeGuid;
 				entity.JvmArguments = JvmArgumentsHelper.Join(configuration.JvmArguments);
-				entity.LaunchAutomatically = configuration.LaunchAutomatically;
 
 				await scope.Ctx.SaveChangesAsync(cancellationToken);
 			}
@@ -180,9 +187,7 @@ public sealed class InstanceManager {
 	private async Task SetInstanceShouldLaunchAutomatically(Guid instanceGuid, bool shouldLaunchAutomatically) {
 		await modifyInstancesSemaphore.WaitAsync(cancellationToken);
 		try {
-			instances.ByGuid.TryReplace(instanceGuid, instance => instance with {
+			instances.ByGuid.TryReplace(instanceGuid, instance => instance with { LaunchAutomatically = shouldLaunchAutomatically });
-				Configuration = instance.Configuration with { LaunchAutomatically = shouldLaunchAutomatically }
-			});
 
 			using var scope = databaseProvider.CreateScope();
 			var entity = await scope.Ctx.Instances.FindAsync(instanceGuid, cancellationToken);
@@ -199,8 +204,15 @@ public sealed class InstanceManager {
 		return await SendInstanceActionMessage<SendCommandToInstanceMessage, SendCommandToInstanceResult>(instanceGuid, new SendCommandToInstanceMessage(instanceGuid, command));
 	}
 
-	internal ImmutableArray<InstanceConfiguration> GetInstanceConfigurationsForAgent(Guid agentGuid) {
+	internal async Task<ImmutableArray<ConfigureInstanceMessage>> GetInstanceConfigurationsForAgent(Guid agentGuid) {
-		return instances.ByGuid.ValuesCopy.Select(static instance => instance.Configuration).Where(configuration => configuration.AgentGuid == agentGuid).ToImmutableArray();
+		var configurationMessages = ImmutableArray.CreateBuilder<ConfigureInstanceMessage>();
+		
+		foreach (var (configuration, _, launchAutomatically) in instances.ByGuid.ValuesCopy.Where(instance => instance.Configuration.AgentGuid == agentGuid)) {
+			var serverExecutableInfo = await minecraftVersions.GetServerExecutableInfo(configuration.MinecraftVersion, cancellationToken);
+			configurationMessages.Add(new ConfigureInstanceMessage(configuration, new InstanceLaunchProperties(serverExecutableInfo), launchAutomatically));
+		}
+
+		return configurationMessages.ToImmutable();
 	}
 
 	private sealed class ObservableInstances : ObservableState<ImmutableDictionary<Guid, Instance>> {

Server/Phantom.Server.Services/Phantom.Server.Services.csproj

@@ -16,6 +16,7 @@
     <ProjectReference Include="..\..\Utils\Phantom.Utils.Collections\Phantom.Utils.Collections.csproj" />
     <ProjectReference Include="..\..\Utils\Phantom.Utils.Events\Phantom.Utils.Events.csproj" />
     <ProjectReference Include="..\Phantom.Server.Database\Phantom.Server.Database.csproj" />
+    <ProjectReference Include="..\Phantom.Server.Minecraft\Phantom.Server.Minecraft.csproj" />
     <ProjectReference Include="..\Phantom.Server.Rpc\Phantom.Server.Rpc.csproj" />
   </ItemGroup>
 

Server/Phantom.Server.Services/Rpc/MessageToServerListener.cs

@@ -6,8 +6,10 @@ using Phantom.Common.Messages.ToAgent;
 using Phantom.Common.Messages.ToServer;
 using Phantom.Server.Rpc;
 using Phantom.Server.Services.Agents;
+using Phantom.Server.Services.Events;
 using Phantom.Server.Services.Instances;
 using Phantom.Utils.Rpc.Message;
+using Phantom.Utils.Runtime;
 
 namespace Phantom.Server.Services.Rpc;
 
@@ -18,28 +20,28 @@ public sealed class MessageToServerListener : IMessageToServerListener {
 	private readonly AgentJavaRuntimesManager agentJavaRuntimesManager;
 	private readonly InstanceManager instanceManager;
 	private readonly InstanceLogManager instanceLogManager;
+	private readonly EventLog eventLog;
 
-	private Guid? agentGuid;
+	private readonly TaskCompletionSource<Guid> agentGuidWaiter = Tasks.CreateCompletionSource<Guid>();
-	private readonly TaskCompletionSource<Guid> agentGuidWaiter = new ();
 
 	public bool IsDisposed { get; private set; }
 
-	internal MessageToServerListener(RpcClientConnection connection, ServiceConfiguration configuration, AgentManager agentManager, AgentJavaRuntimesManager agentJavaRuntimesManager, InstanceManager instanceManager, InstanceLogManager instanceLogManager) {
+	internal MessageToServerListener(RpcClientConnection connection, ServiceConfiguration configuration, AgentManager agentManager, AgentJavaRuntimesManager agentJavaRuntimesManager, InstanceManager instanceManager, InstanceLogManager instanceLogManager, EventLog eventLog) {
 		this.connection = connection;
 		this.cancellationToken = configuration.CancellationToken;
 		this.agentManager = agentManager;
 		this.agentJavaRuntimesManager = agentJavaRuntimesManager;
 		this.instanceManager = instanceManager;
 		this.instanceLogManager = instanceLogManager;
+		this.eventLog = eventLog;
 	}
 
 	public async Task<NoReply> HandleRegisterAgent(RegisterAgentMessage message) {
-		if (agentGuid != null && agentGuid != message.AgentInfo.Guid) {
+		if (agentGuidWaiter.Task.IsCompleted && agentGuidWaiter.Task.Result != message.AgentInfo.Guid) {
 			await connection.Send(new RegisterAgentFailureMessage(RegisterAgentFailure.ConnectionAlreadyHasAnAgent));
 		}
 		else if (await agentManager.RegisterAgent(message.AuthToken, message.AgentInfo, instanceManager, connection)) {
 			var guid = message.AgentInfo.Guid;
-			agentGuid = guid;
 			agentGuidWaiter.SetResult(guid);
 		}
 		
@@ -80,6 +82,11 @@ public sealed class MessageToServerListener : IMessageToServerListener {
 		return Task.FromResult(NoReply.Instance);
 	}
 
+	public async Task<NoReply> HandleReportInstanceEvent(ReportInstanceEventMessage message) {
+		message.Event.Accept(eventLog.CreateInstanceEventVisitor(message.EventGuid, message.UtcTime, await WaitForAgentGuid(), message.InstanceGuid));
+		return NoReply.Instance;
+	}
+
 	public Task<NoReply> HandleInstanceOutput(InstanceOutputMessage message) {
 		instanceLogManager.AddLines(message.InstanceGuid, message.Lines);
 		return Task.FromResult(NoReply.Instance);

Server/Phantom.Server.Services/Rpc/MessageToServerListenerFactory.cs

@@ -1,5 +1,6 @@
 using Phantom.Server.Rpc;
 using Phantom.Server.Services.Agents;
+using Phantom.Server.Services.Events;
 using Phantom.Server.Services.Instances;
 
 namespace Phantom.Server.Services.Rpc; 
@@ -10,16 +11,18 @@ public sealed class MessageToServerListenerFactory {
 	private readonly AgentJavaRuntimesManager agentJavaRuntimesManager;
 	private readonly InstanceManager instanceManager;
 	private readonly InstanceLogManager instanceLogManager;
+	private readonly EventLog eventLog;
 
-	public MessageToServerListenerFactory(ServiceConfiguration configuration, AgentManager agentManager, AgentJavaRuntimesManager agentJavaRuntimesManager, InstanceManager instanceManager, InstanceLogManager instanceLogManager) {
+	public MessageToServerListenerFactory(ServiceConfiguration configuration, AgentManager agentManager, AgentJavaRuntimesManager agentJavaRuntimesManager, InstanceManager instanceManager, InstanceLogManager instanceLogManager, EventLog eventLog) {
 		this.configuration = configuration;
 		this.agentManager = agentManager;
 		this.agentJavaRuntimesManager = agentJavaRuntimesManager;
 		this.instanceManager = instanceManager;
 		this.instanceLogManager = instanceLogManager;
+		this.eventLog = eventLog;
 	}
 
 	public MessageToServerListener CreateListener(RpcClientConnection connection) {
-		return new MessageToServerListener(connection, configuration, agentManager, agentJavaRuntimesManager, instanceManager, instanceLogManager);
+		return new MessageToServerListener(connection, configuration, agentManager, agentJavaRuntimesManager, instanceManager, instanceLogManager, eventLog);
 	}
 }

Server/Phantom.Server.Web.Identity/Authentication/PhantomLoginManager.cs

@@ -40,7 +40,7 @@ public sealed class PhantomLoginManager {
 		
 		var result = await signInManager.CheckPasswordSignInAsync(user, password, lockoutOnFailure: true);
 		if (result == SignInResult.Success) {
-			Logger.Verbose("Created login token for {Username}.", username);
+			Logger.Debug("Created login token for {Username}.", username);
 			
 			string token = TokenGenerator.Create(60);
 			loginStore.Add(token, user, password, returnUrl ?? string.Empty);

Server/Phantom.Server.Web.Identity/Authentication/PhantomLoginStore.cs

@@ -30,7 +30,7 @@ public sealed class PhantomLoginStore {
 
 				foreach (var (token, entry) in loginEntries) {
 					if (entry.IsExpired) {
-						Logger.Verbose("Expired login entry for {Username}.", entry.User.UserName);
+						Logger.Debug("Expired login entry for {Username}.", entry.User.UserName);
 						loginEntries.TryRemove(token, out _);
 					}
 				}
@@ -50,7 +50,7 @@ public sealed class PhantomLoginStore {
 		}
 
 		if (entry.IsExpired) {
-			Logger.Verbose("Expired login entry for {Username}.", entry.User.UserName);
+			Logger.Debug("Expired login entry for {Username}.", entry.User.UserName);
 			return null;
 		}
 		

Server/Phantom.Server.Web.Identity/Data/Permission.cs

@@ -34,4 +34,7 @@ public sealed record Permission(string Id, Permission? Parent) {
 	
 	public const string ViewAuditPolicy = "Audit.View";
 	public static readonly Permission ViewAudit = Register(ViewAuditPolicy);
+	
+	public const string ViewEventsPolicy = "Events.View";
+	public static readonly Permission ViewEvents = Register(ViewEventsPolicy);
 }

Server/Phantom.Server.Web.Identity/Data/Role.cs

@@ -13,5 +13,5 @@ public sealed record Role(string Name, ImmutableArray<Permission> Permissions) {
 	}
 
 	public static readonly Role Administrator = Register("Administrator", Permission.All.ToImmutableArray());
-	public static readonly Role InstanceManager = Register("Instance Manager", ImmutableArray.Create(Permission.ViewInstances, Permission.ViewInstanceLogs, Permission.CreateInstances, Permission.ControlInstances));
+	public static readonly Role InstanceManager = Register("Instance Manager", ImmutableArray.Create(Permission.ViewInstances, Permission.ViewInstanceLogs, Permission.CreateInstances, Permission.ControlInstances, Permission.ViewEvents));
 }

Server/Phantom.Server.Web/Layout/NavMenu.razor

@@ -35,6 +35,10 @@
           <NavMenuItem Label="Audit Log" Icon="clipboard" Href="audit" />
         }
         
+        @if (permissions.Check(Permission.ViewEvents)) {
+          <NavMenuItem Label="Event Log" Icon="project" Href="events" />
+        }
+        
         <NavMenuItem Label="Logout" Icon="account-logout" Href="logout" />
       </Authorized>
     </AuthorizeView>

Server/Phantom.Server.Web/Pages/Audit.razor

@@ -24,27 +24,27 @@
     </tr>
   </thead>
   <tbody>
-    @foreach (var eventEntity in events) {
+    @foreach (var logItem in logItems) {
-      DateTimeOffset time = eventEntity.UtcTime.ToLocalTime();
+      DateTimeOffset time = logItem.UtcTime.ToLocalTime();
       <tr>
         <td class="text-end">
           <time datetime="@time.ToString("o")">@time.ToString()</time>
         </td>
         <td>
-          @(eventEntity.UserName ?? "-")
+          @(logItem.UserName ?? "-")
           <br>
-          <code class="text-uppercase">@eventEntity.UserId</code>
+          <code class="text-uppercase">@logItem.UserId</code>
         </td>
-        <td>@eventEntity.EventType.ToNiceString()</td>
+        <td>@logItem.EventType.ToNiceString()</td>
         <td>
-          @if (eventEntity.SubjectId is {} subjectId && GetSubjectName(eventEntity.SubjectType, subjectId) is {} subjectName) {
+          @if (logItem.SubjectId is {} subjectId && GetSubjectName(logItem.SubjectType, subjectId) is {} subjectName) {
             @subjectName
             <br>
           }
-          <code class="text-uppercase">@(eventEntity.SubjectId ?? "-")</code>
+          <code class="text-uppercase">@(logItem.SubjectId ?? "-")</code>
         </td>
         <td>
-          <code>@eventEntity.Data?.RootElement.ToString()</code>
+          <code>@logItem.Data?.RootElement.ToString()</code>
         </td>
       </tr>
     }
@@ -54,7 +54,7 @@
 @code {
 
   private CancellationTokenSource? initializationCancellationTokenSource;
-  private AuditEvent[] events = Array.Empty<AuditEvent>();
+  private AuditLogItem[] logItems = Array.Empty<AuditLogItem>();
   private Dictionary<string, string>? userNamesById;
   private ImmutableDictionary<Guid, string> instanceNamesByGuid = ImmutableDictionary<Guid, string>.Empty;
 
@@ -63,7 +63,7 @@
     var cancellationToken = initializationCancellationTokenSource.Token;
 
     try {
-      events = await AuditLog.GetEvents(50, cancellationToken);
+      logItems = await AuditLog.GetItems(50, cancellationToken);
       userNamesById = await UserManager.Users.ToDictionaryAsync(static user => user.Id, static user => user.UserName ?? user.Id, cancellationToken);
       instanceNamesByGuid = InstanceManager.GetInstanceNames();
     } finally {
@@ -71,10 +71,10 @@
     }
   }
   
-  private string? GetSubjectName(AuditSubjectType type, string id) {
+  private string? GetSubjectName(AuditLogSubjectType type, string id) {
     return type switch {
-           AuditSubjectType.Instance => instanceNamesByGuid.TryGetValue(Guid.Parse(id), out var name) ? name : null,
+           AuditLogSubjectType.Instance => instanceNamesByGuid.TryGetValue(Guid.Parse(id), out var name) ? name : null,
-           AuditSubjectType.User     => userNamesById != null && userNamesById.TryGetValue(id, out var name) ? name : null,
+           AuditLogSubjectType.User     => userNamesById != null && userNamesById.TryGetValue(id, out var name) ? name : null,
            _                            => null
     };
   }

Server/Phantom.Server.Web/Pages/Events.razor

@@ -0,0 +1,95 @@
+@page "/events"
+@attribute [Authorize(Permission.ViewEventsPolicy)]
+@using System.Collections.Immutable
+@using Phantom.Server.Services.Agents
+@using Phantom.Server.Services.Events
+@using Phantom.Server.Services.Instances
+@using Phantom.Server.Database.Enums
+@implements IDisposable
+@inject AgentManager AgentManager
+@inject EventLog EventLog
+@inject InstanceManager InstanceManager
+
+<h1>Event Log</h1>
+
+<table class="table">
+  <thead>
+    <tr>
+      <Column Width="165px" Class="text-end">Time</Column>
+      <Column Width="320px; 20%">Agent</Column>
+      <Column Width="160px">Event Type</Column>
+      <Column Width="320px; 20%">Subject</Column>
+      <Column Width="100px; 60%">Data</Column>
+    </tr>
+  </thead>
+  <tbody>
+    @foreach (var logItem in logItems) {
+      DateTimeOffset time = logItem.UtcTime.ToLocalTime();
+      <tr>
+        <td class="text-end">
+          <time datetime="@time.ToString("o")">@time.ToString()</time>
+        </td>
+        <td>
+          @if (logItem.AgentGuid is {} agentGuid) {
+            @(GetAgentName(agentGuid))
+            <br>
+            <code class="text-uppercase">@agentGuid</code>
+          }
+          else {
+            <text>-</text>
+          }
+        </td>
+        <td>@logItem.EventType.ToNiceString()</td>
+        <td>
+          @if (GetSubjectName(logItem.SubjectType, logItem.SubjectId) is {} subjectName) {
+            @subjectName
+            <br>
+          }
+          <code class="text-uppercase">@logItem.SubjectId</code>
+        </td>
+        <td>
+          <code>@logItem.Data?.RootElement.ToString()</code>
+        </td>
+      </tr>
+    }
+  </tbody>
+</table>
+
+@code {
+
+  private CancellationTokenSource? initializationCancellationTokenSource;
+  private EventLogItem[] logItems = Array.Empty<EventLogItem>();
+  private ImmutableDictionary<Guid, string> agentNamesByGuid = ImmutableDictionary<Guid, string>.Empty;
+  private ImmutableDictionary<Guid, string> instanceNamesByGuid = ImmutableDictionary<Guid, string>.Empty;
+
+  protected override async Task OnInitializedAsync() {
+    initializationCancellationTokenSource = new CancellationTokenSource();
+    var cancellationToken = initializationCancellationTokenSource.Token;
+
+    try {
+      logItems = await EventLog.GetItems(50, cancellationToken);
+      agentNamesByGuid = AgentManager.GetAgents().ToImmutableDictionary(static kvp => kvp.Key, static kvp => kvp.Value.Name);
+      instanceNamesByGuid = InstanceManager.GetInstanceNames();
+    } finally {
+      initializationCancellationTokenSource.Dispose();
+    }
+  }
+
+  private string GetAgentName(Guid agentGuid) {
+    return agentNamesByGuid.TryGetValue(agentGuid, out var name) ? name : "?";
+  }
+  
+  private string? GetSubjectName(EventLogSubjectType type, string id) {
+    return type switch {
+           EventLogSubjectType.Instance => instanceNamesByGuid.TryGetValue(Guid.Parse(id), out var name) ? name : null,
+           _                            => null
+    };
+  }
+
+  public void Dispose() {
+    try {
+      initializationCancellationTokenSource?.Cancel();
+    } catch (ObjectDisposedException) {}
+  }
+
+}

Server/Phantom.Server.Web/Pages/Instances.razor

@@ -29,7 +29,7 @@
   </thead>
   @if (!instances.IsEmpty) {
     <tbody>
-      @foreach (var (configuration, status) in instances) {
+      @foreach (var (configuration, status, _) in instances) {
         var agentName = agentNames.TryGetValue(configuration.AgentGuid, out var name) ? name : string.Empty;
         var instanceGuid = configuration.InstanceGuid.ToString();
         <tr>

Server/Phantom.Server.Web/Shared/InstanceAddOrEditForm.razor

@@ -1,5 +1,6 @@
 @using Phantom.Common.Data.Minecraft
 @using Phantom.Common.Minecraft
+@using Phantom.Server.Minecraft
 @using Phantom.Server.Services.Agents
 @using Phantom.Server.Services.Audit
 @using Phantom.Server.Services.Instances
@@ -324,8 +325,7 @@
       form.MinecraftServerKind,
       form.MemoryAllocation ?? RamAllocationUnits.Zero,
       form.JavaRuntimeGuid.GetValueOrDefault(),
-      JvmArgumentsHelper.Split(form.JvmArguments),
+      JvmArgumentsHelper.Split(form.JvmArguments)
-      EditedInstanceConfiguration?.LaunchAutomatically ?? false
     );
 
     var result = await InstanceManager.AddOrEditInstance(instance);

Server/Phantom.Server.Web/Utils/EnumNameConverter.cs

@@ -0,0 +1,12 @@
+using System.Text.RegularExpressions;
+
+namespace Phantom.Server.Web.Utils;
+
+static partial class EnumNameConverter {
+	[GeneratedRegex(@"\B([A-Z])", RegexOptions.NonBacktracking)]
+	private static partial Regex FindCapitalLettersRegex();
+
+	public static string ToNiceString<T>(this T type) where T : Enum {
+		return FindCapitalLettersRegex().Replace(type.ToString(), static match => " " + match.Groups[1].Value.ToLowerInvariant());
+	}
+}

Server/Phantom.Server.Web/_Imports.razor

@@ -17,4 +17,5 @@
 @using Phantom.Server.Web.Identity.Data
 @using Phantom.Server.Web.Layout
 @using Phantom.Server.Web.Shared
+@using Phantom.Server.Web.Utils
 @attribute [Authorize]

Server/Phantom.Server/Phantom.Server.csproj

@@ -14,10 +14,10 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" />
     <ProjectReference Include="..\..\Common\Phantom.Common.Logging\Phantom.Common.Logging.csproj" />
-    <ProjectReference Include="..\..\Common\Phantom.Common.Minecraft\Phantom.Common.Minecraft.csproj" />
     <ProjectReference Include="..\..\Utils\Phantom.Utils.IO\Phantom.Utils.IO.csproj" />
     <ProjectReference Include="..\..\Utils\Phantom.Utils.Runtime\Phantom.Utils.Runtime.csproj" />
     <ProjectReference Include="..\Phantom.Server.Database.Postgres\Phantom.Server.Database.Postgres.csproj" />
+    <ProjectReference Include="..\Phantom.Server.Minecraft\Phantom.Server.Minecraft.csproj" />
     <ProjectReference Include="..\Phantom.Server.Rpc\Phantom.Server.Rpc.csproj" />
     <ProjectReference Include="..\Phantom.Server.Services\Phantom.Server.Services.csproj" />
     <ProjectReference Include="..\Phantom.Server.Web\Phantom.Server.Web.csproj" />

Server/Phantom.Server/WebConfigurator.cs

@@ -1,9 +1,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using Phantom.Common.Data.Agent;
-using Phantom.Common.Minecraft;
+using Phantom.Server.Minecraft;
 using Phantom.Server.Services;
 using Phantom.Server.Services.Agents;
 using Phantom.Server.Services.Audit;
+using Phantom.Server.Services.Events;
 using Phantom.Server.Services.Instances;
 using Phantom.Server.Services.Rpc;
 using Phantom.Server.Services.Users;
@@ -29,6 +30,7 @@ sealed class WebConfigurator : WebLauncher.IConfigurator {
 		services.AddSingleton(agentToken);
 		services.AddSingleton<AgentManager>();
 		services.AddSingleton<AgentJavaRuntimesManager>();
+		services.AddSingleton<EventLog>();
 		services.AddSingleton<InstanceManager>();
 		services.AddSingleton<InstanceLogManager>();
 		services.AddSingleton<MinecraftVersions>();

Utils/Phantom.Utils.Rpc/Message/MessageReplyTracker.cs

@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using Phantom.Utils.Runtime;
 using Serilog;
 
 namespace Phantom.Utils.Rpc.Message;
@@ -15,7 +16,7 @@ public sealed class MessageReplyTracker {
 
 	public uint RegisterReply() {
 		var sequenceId = Interlocked.Increment(ref lastSequenceId);
-		replyTasks[sequenceId] = new TaskCompletionSource<byte[]>(TaskCreationOptions.None);
+		replyTasks[sequenceId] = Tasks.CreateCompletionSource<byte[]>();
 		return sequenceId;
 	}
 

Utils/Phantom.Utils.Rpc/RpcRuntime.cs

@@ -43,7 +43,11 @@ public abstract class RpcRuntime<TSocket> where TSocket : ThreadSafeSocket, new(
 		Connect(socket);
 
 		void RunTask() {
+			try {
 				Run(socket, replyTracker, taskManager);
+			} catch (Exception e) {
+				runtimeLogger.Error(e, "Caught exception in RPC thread.");
+			}
 		}
 		
 		try {

Utils/Phantom.Utils.Runtime/CancellableBackgroundTask.cs

@@ -15,7 +15,7 @@ public abstract class CancellableBackgroundTask {
 	}
 
 	private async Task Run() {
-		Logger.Verbose("Task started.");
+		Logger.Debug("Task started.");
 
 		try {
 			await RunTask();
@@ -25,7 +25,7 @@ public abstract class CancellableBackgroundTask {
 			Logger.Fatal(e, "Caught exception in task.");
 		} finally {
 			cancellationTokenSource.Dispose();
-			Logger.Verbose("Task stopped.");
+			Logger.Debug("Task stopped.");
 		}
 	}
 	

Utils/Phantom.Utils.Runtime/OneShotProcess.cs

@@ -0,0 +1,63 @@
+using Serilog;
+
+namespace Phantom.Utils.Runtime;
+
+public sealed class OneShotProcess {
+	private readonly ILogger logger;
+	private readonly ProcessConfigurator configurator;
+	
+	public event EventHandler<Process.Output>? OutputReceived;
+	
+	public OneShotProcess(ILogger logger, ProcessConfigurator configurator) {
+		this.logger = logger;
+		this.configurator = configurator;
+	}
+
+	public async Task<bool> Run(CancellationToken cancellationToken) {
+		using var process = configurator.CreateProcess();
+		process.OutputReceived += OutputReceived;
+
+		try {
+			process.Start();
+		} catch (Exception e) {
+			logger.Error(e, "Caught exception launching process.");
+			return false;
+		}
+
+		try {
+			await process.WaitForExitAsync(cancellationToken);
+		} catch (OperationCanceledException) {
+			await TryKillProcess(process);
+			return false;
+		} catch (Exception e) {
+			logger.Error(e, "Caught exception waiting for process to exit.");
+			return false;
+		}
+
+		if (!process.HasExited) {
+			await TryKillProcess(process);
+			return false;
+		}
+
+		if (process.ExitCode != 0) {
+			logger.Error("Process exited with code {ExitCode}.", process.ExitCode);
+			return false;
+		}
+
+		logger.Debug("Process finished successfully.");
+		return true;
+	}
+
+	private async Task TryKillProcess(Process process) {
+		using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(2));
+
+		try {
+			process.Kill();
+			await process.WaitForExitAsync(timeout.Token);
+		} catch (OperationCanceledException) {
+			logger.Error("Timed out waiting for killed process to exit.");
+		} catch (Exception e) {
+			logger.Error(e, "Caught exception killing process.");
+		}
+	}
+}

Utils/Phantom.Utils.Runtime/Process.cs

@@ -0,0 +1,92 @@
+using System.Diagnostics;
+
+namespace Phantom.Utils.Runtime;
+
+public sealed class Process : IDisposable {
+	public readonly record struct Output(string Line, bool IsError);
+	
+	public event EventHandler<Output>? OutputReceived;
+	
+	public event EventHandler Exited {
+		add {
+			wrapped.EnableRaisingEvents = true;
+			wrapped.Exited += value;
+		}
+		remove {
+			wrapped.Exited -= value;
+		}
+	}
+
+	public bool HasExited => wrapped.HasExited;
+	public int ExitCode => wrapped.ExitCode;
+	public StreamWriter StandardInput => wrapped.StandardInput;
+
+	private readonly System.Diagnostics.Process wrapped;
+
+	internal Process(System.Diagnostics.Process wrapped) {
+		this.wrapped = wrapped;
+	}
+
+	public void Start() {
+		if (!OperatingSystem.IsWindows()) {
+			this.wrapped.OutputDataReceived += OnStandardOutputDataReceived;
+			this.wrapped.ErrorDataReceived += OnStandardErrorDataReceived;
+		}
+			
+		this.wrapped.Start();
+
+		// https://github.com/dotnet/runtime/issues/81896
+		if (OperatingSystem.IsWindows()) {
+			Task.Factory.StartNew(ReadStandardOutputSynchronously, TaskCreationOptions.LongRunning);
+			Task.Factory.StartNew(ReadStandardErrorSynchronously, TaskCreationOptions.LongRunning);
+		}
+		else {
+			this.wrapped.BeginOutputReadLine();
+			this.wrapped.BeginErrorReadLine();
+		}
+	}
+
+	private void OnStandardOutputDataReceived(object sender, DataReceivedEventArgs e) {
+		OnStandardStreamDataReceived(e.Data, isError: false);
+	}
+
+	private void OnStandardErrorDataReceived(object sender, DataReceivedEventArgs e) {
+		OnStandardStreamDataReceived(e.Data, isError: true);
+	}
+
+	private void OnStandardStreamDataReceived(string? line, bool isError) {
+		if (line != null) {
+			OutputReceived?.Invoke(this, new Output(line, isError));
+		}
+	}
+
+	private void ReadStandardOutputSynchronously() {
+		ReadStandardStreamSynchronously(wrapped.StandardOutput, isError: false);
+	}
+
+	private void ReadStandardErrorSynchronously() {
+		ReadStandardStreamSynchronously(wrapped.StandardError, isError: true);
+	}
+
+	private void ReadStandardStreamSynchronously(StreamReader reader, bool isError) {
+		try {
+			while (reader.ReadLine() is {} line) {
+				OutputReceived?.Invoke(this, new Output(line, isError));
+			}
+		} catch (ObjectDisposedException) {
+			// Ignore.
+		}
+	}
+
+	public Task WaitForExitAsync(CancellationToken cancellationToken) {
+		return wrapped.WaitForExitAsync(cancellationToken);
+	}
+
+	public void Kill(bool entireProcessTree = false) {
+		wrapped.Kill(entireProcessTree);
+	}
+
+	public void Dispose() {
+		wrapped.Dispose();
+	}
+}

Utils/Phantom.Utils.Runtime/ProcessConfigurator.cs

@@ -0,0 +1,37 @@
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace Phantom.Utils.Runtime; 
+
+public sealed class ProcessConfigurator {
+	private readonly ProcessStartInfo startInfo = new () {
+		RedirectStandardOutput = true,
+		RedirectStandardError = true
+	};
+	
+	public string FileName {
+		get => startInfo.FileName;
+		set => startInfo.FileName = value;
+	}
+
+	public Collection<string> ArgumentList => startInfo.ArgumentList;
+
+	public string WorkingDirectory {
+		get => startInfo.WorkingDirectory;
+		set => startInfo.WorkingDirectory = value;
+	}
+
+	public bool RedirectInput {
+		get => startInfo.RedirectStandardInput;
+		set => startInfo.RedirectStandardInput = value;
+	}
+	
+	public bool UseShellExecute {
+		get => startInfo.UseShellExecute;
+		set => startInfo.UseShellExecute = value;
+	}
+
+	public Process CreateProcess() {
+		return new Process(new System.Diagnostics.Process { StartInfo = startInfo });
+	}
+}

Utils/Phantom.Utils.Runtime/Tasks.cs

@@ -0,0 +1,11 @@
+namespace Phantom.Utils.Runtime; 
+
+public static class Tasks {
+	public static TaskCompletionSource CreateCompletionSource() {
+		return new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+	}
+
+	public static TaskCompletionSource<T> CreateCompletionSource<T>() {
+		return new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);
+	}
+}