WIP

.run/Agent 1.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Agent 1" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Agent/debug/Phantom.Agent.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/bin/Debug/net7.0/Phantom.Agent.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent1" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -22,7 +22,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net7.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 2.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Agent 2" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Agent/debug/Phantom.Agent.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/bin/Debug/net7.0/Phantom.Agent.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent2" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -22,7 +22,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net7.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 3.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Agent 3" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Agent/debug/Phantom.Agent.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/bin/Debug/net7.0/Phantom.Agent.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent3" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -22,7 +22,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net7.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Compile Bootstrap.run.xml

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

.run/Server.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Server" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Controller/debug/Phantom.Controller.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/Server/Phantom.Server/bin/Debug/net7.0/Phantom.Server.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Server" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -17,14 +17,14 @@
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/Controller/Phantom.Controller/Phantom.Controller.csproj" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/Server/Phantom.Server/Phantom.Server.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net7.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>

AddMigration.bat

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

AddMigration.sh

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

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

@@ -1,12 +1,13 @@
 using Phantom.Utils.Collections;
-using Phantom.Utils.Processes;
+using Phantom.Utils.Runtime;
 
 namespace Phantom.Agent.Minecraft.Instance; 
 
 public sealed class InstanceProcess : IDisposable {
 	public InstanceProperties InstanceProperties { get; }
+	public CancellableSemaphore BackupSemaphore { get; } = new (1, 1);
 	
-	private readonly RingBuffer<string> outputBuffer = new (100);
+	private readonly RingBuffer<string> outputBuffer = new (10000);
 	private event EventHandler<string>? OutputEvent;
 
 	public event EventHandler? Ended;
@@ -60,6 +61,7 @@ public sealed class InstanceProcess : IDisposable {
 
 	public void Dispose() {
 		process.Dispose();
+		BackupSemaphore.Dispose();
 		OutputEvent = null;
 		Ended = null;
 	}

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

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

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

@@ -79,9 +79,10 @@ public sealed class JavaRuntimeDiscovery {
 			WorkingDirectory = Path.GetDirectoryName(javaExecutablePath),
 			Arguments = "-XshowSettings:properties -version",
 			RedirectStandardInput = false,
-			RedirectStandardOutput = false,
+			RedirectStandardOutput = true,
 			RedirectStandardError = true,
-			UseShellExecute = false
+			UseShellExecute = false,
+			CreateNoWindow = false
 		};
 
 		var process = new Process { StartInfo = startInfo };

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

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

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

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

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

@@ -8,6 +8,8 @@ public abstract record LaunchResult {
 	public sealed record Success(InstanceProcess Process) : LaunchResult;
 
 	public sealed record InvalidJavaRuntime : LaunchResult;
+	
+	public sealed record InvalidJvmArguments : LaunchResult;
 
 	public sealed record CouldNotDownloadMinecraftServer : LaunchResult;
 	

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/Phantom.Agent.Minecraft.csproj

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

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

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

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

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

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

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

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

@@ -78,7 +78,7 @@ public sealed class ServerStatusProtocol {
 				return null;
 			}
 
-			string onlinePlayerCountStr = Encoding.BigEndianUnicode.GetString(messageBuffer.AsSpan((separator1 + 1)..(separator2 - 1)));
+			string onlinePlayerCountStr = Encoding.BigEndianUnicode.GetString(messageBuffer[(separator1 + 1)..(separator2 - 1)]);
 			if (!int.TryParse(onlinePlayerCountStr, out int onlinePlayerCount)) {
 				logger.Error("Could not parse online player count in response from server: {OnlinePlayerCount}.", onlinePlayerCountStr);
 				return null;

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

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Agent/Phantom.Agent.Rpc/RpcLauncher.cs

@@ -6,14 +6,14 @@ using Phantom.Common.Messages.BiDirectional;
 using Phantom.Common.Messages.ToServer;
 using Phantom.Utils.Rpc;
 using Phantom.Utils.Rpc.Message;
-using Phantom.Utils.Tasks;
+using Phantom.Utils.Runtime;
 using Serilog;
 using Serilog.Events;
 
 namespace Phantom.Agent.Rpc;
 
 public sealed class RpcLauncher : RpcRuntime<ClientSocket> {
-	public static Task Launch(RpcConfiguration config, AgentAuthToken authToken, AgentInfo agentInfo, Func<RpcServerConnection, IMessageToAgentListener> listenerFactory, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) {
+	public static async Task Launch(RpcConfiguration config, AgentAuthToken authToken, AgentInfo agentInfo, Func<RpcServerConnection, IMessageToAgentListener> listenerFactory, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) {
 		var socket = new ClientSocket();
 		var options = socket.Options;
 
@@ -21,7 +21,7 @@ public sealed class RpcLauncher : RpcRuntime<ClientSocket> {
 		options.CurveCertificate = new NetMQCertificate();
 		options.HelloMessage = MessageRegistries.ToServer.Write(new RegisterAgentMessage(authToken, agentInfo)).ToArray();
 
-		return new RpcLauncher(config, socket, agentInfo.Guid, listenerFactory, disconnectSemaphore, receiveCancellationToken).Launch();
+		await new RpcLauncher(config, socket, agentInfo.Guid, listenerFactory, disconnectSemaphore, receiveCancellationToken).Launch();
 	}
 
 	private readonly RpcConfiguration config;

Agent/Phantom.Agent.Services/AgentServiceConfiguration.cs

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

Agent/Phantom.Agent.Services/AgentServices.cs

@@ -3,7 +3,7 @@ using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances;
 using Phantom.Common.Data.Agent;
 using Phantom.Common.Logging;
-using Phantom.Utils.Tasks;
+using Phantom.Utils.Runtime;
 using Serilog;
 
 namespace Phantom.Agent.Services;
@@ -18,10 +18,10 @@ public sealed class AgentServices {
 	internal JavaRuntimeRepository JavaRuntimeRepository { get; }
 	internal InstanceSessionManager InstanceSessionManager { get; }
 
-	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders, AgentServiceConfiguration serviceConfiguration) {
+	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders) {
 		this.AgentFolders = agentFolders;
 		this.TaskManager = new TaskManager(PhantomLogger.Create<TaskManager, AgentServices>());
-		this.BackupManager = new BackupManager(agentFolders, serviceConfiguration.MaxConcurrentCompressionTasks);
+		this.BackupManager = new BackupManager(agentFolders);
 		this.JavaRuntimeRepository = new JavaRuntimeRepository();
 		this.InstanceSessionManager = new InstanceSessionManager(agentInfo, agentFolders, JavaRuntimeRepository, TaskManager, BackupManager);
 	}
@@ -35,10 +35,10 @@ public sealed class AgentServices {
 	public async Task Shutdown() {
 		Logger.Information("Stopping services...");
 		
-		await InstanceSessionManager.DisposeAsync();
-		await TaskManager.Stop();
+		await InstanceSessionManager.StopAll();
+		InstanceSessionManager.Dispose();
 		
-		BackupManager.Dispose();
+		await TaskManager.Stop();
 		
 		Logger.Information("Services stopped.");
 	}

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

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

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

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

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

@@ -1,11 +1,8 @@
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Server;
-using Phantom.Agent.Services.Instances;
-using Phantom.Agent.Services.Instances.Procedures;
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Logging;
-using Phantom.Utils.Tasks;
-using Phantom.Utils.Threading;
+using Phantom.Utils.Runtime;
 
 namespace Phantom.Agent.Services.Backups;
 
@@ -15,23 +12,21 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 	private static readonly TimeSpan BackupInterval = TimeSpan.FromMinutes(30);
 	private static readonly TimeSpan BackupFailureRetryDelay = TimeSpan.FromMinutes(5);
 
+	private readonly string loggerName;
 	private readonly BackupManager backupManager;
 	private readonly InstanceProcess process;
-	private readonly IInstanceContext context;
-	private readonly SemaphoreSlim backupSemaphore = new (1, 1);
 	private readonly int serverPort;
 	private readonly ServerStatusProtocol serverStatusProtocol;
 	private readonly ManualResetEventSlim serverOutputWhileWaitingForOnlinePlayers = new ();
 	
 	public event EventHandler<BackupCreationResult>? BackupCompleted; 
 
-	public BackupScheduler(TaskManager taskManager, BackupManager backupManager, InstanceProcess process, IInstanceContext context, int serverPort) : base(PhantomLogger.Create<BackupScheduler>(context.ShortName), taskManager, "Backup scheduler for " + context.ShortName) {
+	public BackupScheduler(TaskManager taskManager, BackupManager backupManager, InstanceProcess process, int serverPort, string loggerName) : base(PhantomLogger.Create<BackupScheduler>(loggerName), taskManager, "Backup scheduler for " + loggerName) {
+		this.loggerName = loggerName;
 		this.backupManager = backupManager;
 		this.process = process;
-		this.context = context;
 		this.serverPort = serverPort;
-		this.serverStatusProtocol = new ServerStatusProtocol(context.ShortName);
-		Start();
+		this.serverStatusProtocol = new ServerStatusProtocol(loggerName);
 	}
 
 	protected override async Task RunTask() {
@@ -55,17 +50,7 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 	}
 
 	private async Task<BackupCreationResult> CreateBackup() {
-		if (!await backupSemaphore.WaitAsync(TimeSpan.FromSeconds(1))) {
-			return new BackupCreationResult(BackupCreationResultKind.BackupAlreadyRunning);
-		}
-		
-		try {
-			var procedure = new BackupInstanceProcedure(backupManager);
-			context.EnqueueProcedure(procedure);
-			return await procedure.Result;
-		} finally {
-			backupSemaphore.Release();
-		}
+		return await backupManager.CreateBackup(loggerName, process, CancellationToken.None);
 	}
 
 	private async Task WaitForOnlinePlayers() {
@@ -108,9 +93,4 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 			Logger.Debug("Detected server output, signalling to check for online players again.");
 		}
 	}
-
-	protected override void Dispose() {
-		backupSemaphore.Dispose();
-		serverOutputWhileWaitingForOnlinePlayers.Dispose();
-	}
 }

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

@@ -1,7 +1,7 @@
 using System.Text.RegularExpressions;
 using Phantom.Agent.Minecraft.Command;
 using Phantom.Agent.Minecraft.Instance;
-using Phantom.Utils.Tasks;
+using Phantom.Utils.Runtime;
 using Serilog;
 
 namespace Phantom.Agent.Services.Backups;
@@ -14,9 +14,9 @@ sealed partial class BackupServerCommandDispatcher : IDisposable {
 	private readonly InstanceProcess process;
 	private readonly CancellationToken cancellationToken;
 
-	private readonly TaskCompletionSource automaticSavingDisabled = AsyncTasks.CreateCompletionSource();
-	private readonly TaskCompletionSource savedTheGame = AsyncTasks.CreateCompletionSource();
-	private readonly TaskCompletionSource automaticSavingEnabled = AsyncTasks.CreateCompletionSource();
+	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;

Agent/Phantom.Agent.Services/Instances/IInstanceContext.cs

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

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

@@ -1,6 +1,5 @@
 using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Agent.Rpc;
-using Phantom.Agent.Services.Instances.Procedures;
 using Phantom.Agent.Services.Instances.States;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
@@ -11,12 +10,18 @@ using Serilog;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed class Instance : IAsyncDisposable {
+sealed class Instance : IDisposable {
+	private static uint loggerSequenceId = 0;
+
+	private static string GetLoggerName(Guid guid) {
+		var prefix = guid.ToString();
+		return prefix[..prefix.IndexOf('-')] + "/" + Interlocked.Increment(ref loggerSequenceId);
+	}
+
 	private InstanceServices Services { get; }
 	
 	public InstanceConfiguration Configuration { get; private set; }
 	private IServerLauncher Launcher { get; set; }
-	private readonly SemaphoreSlim configurationSemaphore = new (1, 1);
 
 	private readonly string shortName;
 	private readonly ILogger logger;
@@ -25,14 +30,14 @@ sealed class Instance : IAsyncDisposable {
 	private int statusUpdateCounter;
 	
 	private IInstanceState currentState;
+	private readonly SemaphoreSlim stateTransitioningActionSemaphore = new (1, 1);
+
 	public bool IsRunning => currentState is not InstanceNotRunningState;
 	
 	public event EventHandler? IsRunningChanged; 
-	
-	private readonly InstanceProcedureManager procedureManager;
 
-	public Instance(string shortName, InstanceServices services, InstanceConfiguration configuration, IServerLauncher launcher) {
-		this.shortName = shortName;
+	public Instance(InstanceServices services, InstanceConfiguration configuration, IServerLauncher launcher) {
+		this.shortName = GetLoggerName(configuration.InstanceGuid);
 		this.logger = PhantomLogger.Create<Instance>(shortName);
 
 		this.Services = services;
@@ -41,8 +46,6 @@ sealed class Instance : IAsyncDisposable {
 		
 		this.currentState = new InstanceNotRunningState();
 		this.currentStatus = InstanceStatus.NotRunning;
-		
-		this.procedureManager = new InstanceProcedureManager(this, new Context(this), services.TaskManager);
 	}
 
 	private void TryUpdateStatus(string taskName, Func<Task> getUpdateTask) {
@@ -63,10 +66,8 @@ sealed class Instance : IAsyncDisposable {
 
 	private void ReportAndSetStatus(IInstanceStatus status) {
 		TryUpdateStatus("Report status of instance " + shortName + " as " + status.GetType().Name, async () => {
-			if (status != currentStatus) {
-				currentStatus = status;
-				await ServerMessaging.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, status));
-			}
+			currentStatus = status;
+			await ServerMessaging.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, status));
 		});
 	}
 
@@ -75,7 +76,7 @@ sealed class Instance : IAsyncDisposable {
 		Services.TaskManager.Run("Report event for instance " + shortName, async () => await ServerMessaging.Send(message));
 	}
 	
-	internal void TransitionState(IInstanceState newState) {
+	private void TransitionState(IInstanceState newState) {
 		if (currentState == newState) {
 			return;
 		}
@@ -95,94 +96,114 @@ sealed class Instance : IAsyncDisposable {
 		}
 	}
 
+	private T TransitionStateAndReturn<T>((IInstanceState State, T Result) newStateAndResult) {
+		TransitionState(newStateAndResult.State);
+		return newStateAndResult.Result;
+	}
+
 	public async Task Reconfigure(InstanceConfiguration configuration, IServerLauncher launcher, CancellationToken cancellationToken) {
-		await configurationSemaphore.WaitAsync(cancellationToken);
+		await stateTransitioningActionSemaphore.WaitAsync(cancellationToken);
 		try {
 			Configuration = configuration;
 			Launcher = launcher;
 		} finally {
-			configurationSemaphore.Release();
+			stateTransitioningActionSemaphore.Release();
 		}
 	}
 
-	public async Task<LaunchInstanceResult> Launch(CancellationToken cancellationToken) {
-		if (IsRunning) {
-			return LaunchInstanceResult.InstanceAlreadyRunning;
-		}
-
-		if (await procedureManager.GetCurrentProcedure(cancellationToken) is LaunchInstanceProcedure) {
-			return LaunchInstanceResult.InstanceAlreadyLaunching;
-		}
-		
-		LaunchInstanceProcedure procedure;
-		
-		await configurationSemaphore.WaitAsync(cancellationToken);
+	public async Task<LaunchInstanceResult> Launch(CancellationToken shutdownCancellationToken) {
+		await stateTransitioningActionSemaphore.WaitAsync(shutdownCancellationToken);
 		try {
-			procedure = new LaunchInstanceProcedure(Configuration, Launcher);
+			return TransitionStateAndReturn(currentState.Launch(new InstanceContextImpl(this, shutdownCancellationToken)));
+		} catch (Exception e) {
+			logger.Error(e, "Caught exception while launching instance.");
+			return LaunchInstanceResult.UnknownError;
 		} finally {
-			configurationSemaphore.Release();
+			stateTransitioningActionSemaphore.Release();
 		}
-		
-		ReportAndSetStatus(InstanceStatus.Launching);
-		await procedureManager.Enqueue(procedure);
-		return LaunchInstanceResult.LaunchInitiated;
 	}
 
-	public async Task<StopInstanceResult> Stop(MinecraftStopStrategy stopStrategy, CancellationToken cancellationToken) {
-		if (!IsRunning) {
-			return StopInstanceResult.InstanceAlreadyStopped;
+	public async Task<StopInstanceResult> Stop(MinecraftStopStrategy stopStrategy) {
+		await stateTransitioningActionSemaphore.WaitAsync();
+		try {
+			return TransitionStateAndReturn(currentState.Stop(stopStrategy));
+		} catch (Exception e) {
+			logger.Error(e, "Caught exception while stopping instance.");
+			return StopInstanceResult.UnknownError;
+		} finally {
+			stateTransitioningActionSemaphore.Release();
 		}
-		
-		if (await procedureManager.GetCurrentProcedure(cancellationToken) is StopInstanceProcedure) {
-			return StopInstanceResult.InstanceAlreadyStopping;
+	}
+
+	public async Task StopAndWait(TimeSpan waitTime) {
+		await Stop(MinecraftStopStrategy.Instant);
+
+		using var waitTokenSource = new CancellationTokenSource(waitTime);
+		var waitToken = waitTokenSource.Token;
+
+		while (currentState is not InstanceNotRunningState) {
+			await Task.Delay(TimeSpan.FromMilliseconds(250), waitToken);
 		}
-		
-		ReportAndSetStatus(InstanceStatus.Stopping);
-		await procedureManager.Enqueue(new StopInstanceProcedure(stopStrategy));
-		return StopInstanceResult.StopInitiated;
 	}
 
 	public async Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
 		return await currentState.SendCommand(command, cancellationToken);
 	}
 
-	public async ValueTask DisposeAsync() {
-		await procedureManager.DisposeAsync();
-
-		while (currentState is not InstanceNotRunningState) {
-			await Task.Delay(TimeSpan.FromMilliseconds(250), CancellationToken.None);
-		}
-
-		if (currentState is IDisposable disposable) {
-			disposable.Dispose();
-		}
-		
-		configurationSemaphore.Dispose();
-	}
-
-	private sealed class Context : IInstanceContext {
-		public string ShortName => instance.shortName;
-		public ILogger Logger => instance.logger;
-		
-		public InstanceServices Services => instance.Services;
-		public IInstanceState CurrentState => instance.currentState;
-
+	private sealed class InstanceContextImpl : InstanceContext {
 		private readonly Instance instance;
+		private readonly CancellationToken shutdownCancellationToken;
 		
-		public Context(Instance instance) {
+		public InstanceContextImpl(Instance instance, CancellationToken shutdownCancellationToken) : base(instance.Services, instance.Configuration, instance.Launcher) {
 			this.instance = instance;
+			this.shutdownCancellationToken = shutdownCancellationToken;
 		}
 
-		public void SetStatus(IInstanceStatus newStatus) {
+		public override ILogger Logger => instance.logger;
+		public override string ShortName => instance.shortName;
+
+		public override void SetStatus(IInstanceStatus newStatus) {
 			instance.ReportAndSetStatus(newStatus);
 		}
 
-		public void ReportEvent(IInstanceEvent instanceEvent) {
+		public override void ReportEvent(IInstanceEvent instanceEvent) {
 			instance.ReportEvent(instanceEvent);
 		}
 
-		public void EnqueueProcedure(IInstanceProcedure procedure, bool immediate) {
-			Services.TaskManager.Run("Enqueue procedure for instance " + instance.shortName, () => instance.procedureManager.Enqueue(procedure, immediate));
+		public override void TransitionState(Func<(IInstanceState, IInstanceStatus?)> newStateAndStatus) {
+			instance.stateTransitioningActionSemaphore.Wait(CancellationToken.None);
+			try {
+				var (state, status) = newStateAndStatus();
+				
+				if (!instance.IsRunning) {
+					// Only InstanceSessionManager is allowed to transition an instance out of a non-running state.
+					instance.logger.Debug("Cancelled state transition to {State} because instance is not running.", state.GetType().Name);
+					return;
+				}
+				
+				if (state is not InstanceNotRunningState && shutdownCancellationToken.IsCancellationRequested) {
+					instance.logger.Debug("Cancelled state transition to {State} due to Agent shutdown.", state.GetType().Name);
+					return;
+				}
+
+				if (status != null) {
+					SetStatus(status);
+				}
+
+				instance.TransitionState(state);
+			} catch (Exception e) {
+				instance.logger.Error(e, "Caught exception during state transition.");
+			} finally {
+				instance.stateTransitioningActionSemaphore.Release();
+			}
+		}
+	}
+
+	public void Dispose() {
+		stateTransitioningActionSemaphore.Dispose();
+		
+		if (currentState is IDisposable disposable) {
+			disposable.Dispose();
 		}
 	}
 }

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

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

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

@@ -1,62 +1,36 @@
 using System.Collections.Immutable;
-using System.Threading.Channels;
 using Phantom.Agent.Rpc;
 using Phantom.Common.Logging;
 using Phantom.Common.Messages.ToServer;
-using Phantom.Utils.Tasks;
+using Phantom.Utils.Collections;
+using Phantom.Utils.Runtime;
 
 namespace Phantom.Agent.Services.Instances;
 
 sealed class InstanceLogSender : CancellableBackgroundTask {
-	private static readonly BoundedChannelOptions BufferOptions = new (capacity: 64) {
-		SingleReader = true,
-		SingleWriter = true,
-		FullMode = BoundedChannelFullMode.DropNewest
-	};
-	
 	private static readonly TimeSpan SendDelay = TimeSpan.FromMilliseconds(200);
 
 	private readonly Guid instanceGuid;
-	private readonly Channel<string> outputChannel;
-	
-	private int droppedLinesSinceLastSend;
+
+	private readonly SemaphoreSlim semaphore = new (1, 1);
+	private readonly RingBuffer<string> buffer = new (1000);
 
 	public InstanceLogSender(TaskManager taskManager, Guid instanceGuid, string loggerName) : base(PhantomLogger.Create<InstanceLogSender>(loggerName), taskManager, "Instance log sender for " + loggerName) {
 		this.instanceGuid = instanceGuid;
-		this.outputChannel = Channel.CreateBounded<string>(BufferOptions, OnLineDropped);
-		Start();
 	}
 	
 	protected override async Task RunTask() {
-		var lineReader = outputChannel.Reader;
-		var lineBuilder = ImmutableArray.CreateBuilder<string>();
-		
 		try {
-			while (await lineReader.WaitToReadAsync(CancellationToken)) {
+			while (!CancellationToken.IsCancellationRequested) {
+				await SendOutputToServer(await DequeueOrThrow());
 				await Task.Delay(SendDelay, CancellationToken);
-				await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
 			}
 		} catch (OperationCanceledException) {
 			// Ignore.
 		}
 
 		// Flush remaining lines.
-		await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
-	}
-
-	private ImmutableArray<string> ReadLinesFromChannel(ChannelReader<string> reader, ImmutableArray<string>.Builder builder) {
-		builder.Clear();
-		
-		while (reader.TryRead(out string? line)) {
-			builder.Add(line);
-		}
-		
-		int droppedLines = Interlocked.Exchange(ref droppedLinesSinceLastSend, 0);
-		if (droppedLines > 0) {
-			builder.Add($"Dropped {droppedLines} {(droppedLines == 1 ? "line" : "lines")} due to buffer overflow.");
-		}
-		
-		return builder.ToImmutable();
+		await SendOutputToServer(DequeueWithoutSemaphore());
 	}
 
 	private async Task SendOutputToServer(ImmutableArray<string> lines) {
@@ -65,18 +39,33 @@ sealed class InstanceLogSender : CancellableBackgroundTask {
 		}
 	}
 
-	private void OnLineDropped(string line) {
-		Logger.Warning("Buffer is full, dropped line: {Line}", line);
-		Interlocked.Increment(ref droppedLinesSinceLastSend);
+	private ImmutableArray<string> DequeueWithoutSemaphore() {
+		ImmutableArray<string> lines = buffer.Count > 0 ? buffer.EnumerateLast(uint.MaxValue).ToImmutableArray() : ImmutableArray<string>.Empty;
+		buffer.Clear();
+		return lines;
+	}
+
+	private async Task<ImmutableArray<string>> DequeueOrThrow() {
+		await semaphore.WaitAsync(CancellationToken);
+
+		try {
+			return DequeueWithoutSemaphore();
+		} finally {
+			semaphore.Release();
+		}
 	}
 
 	public void Enqueue(string line) {
-		outputChannel.Writer.TryWrite(line);
-	}
+		try {
+			semaphore.Wait(CancellationToken);
+		} catch (Exception) {
+			return;
+		}
 
-	protected override void Dispose() {
-		if (!outputChannel.Writer.TryComplete()) {
-			Logger.Error("Could not mark channel as completed.");
+		try {
+			buffer.Add(line);
+		} finally {
+			semaphore.Release();
 		}
 	}
 }

Agent/Phantom.Agent.Services/Instances/InstanceProcedureManager.cs

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

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

@@ -1,6 +1,6 @@
 using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Agent.Services.Backups;
-using Phantom.Utils.Tasks;
+using Phantom.Utils.Runtime;
 
 namespace Phantom.Agent.Services.Instances; 
 

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

@@ -16,14 +16,14 @@ using Phantom.Common.Data.Replies;
 using Phantom.Common.Logging;
 using Phantom.Common.Messages.ToServer;
 using Phantom.Utils.IO;
-using Phantom.Utils.Tasks;
+using Phantom.Utils.Runtime;
 using Serilog;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed class InstanceSessionManager : IAsyncDisposable {
+sealed class InstanceSessionManager : IDisposable {
 	private static readonly ILogger Logger = PhantomLogger.Create<InstanceSessionManager>();
-
+	
 	private readonly AgentInfo agentInfo;
 	private readonly string basePath;
 
@@ -34,17 +34,15 @@ sealed class InstanceSessionManager : IAsyncDisposable {
 	private readonly CancellationToken shutdownCancellationToken;
 	private readonly SemaphoreSlim semaphore = new (1, 1);
 
-	private uint instanceLoggerSequenceId = 0;
-
 	public InstanceSessionManager(AgentInfo agentInfo, AgentFolders agentFolders, JavaRuntimeRepository javaRuntimeRepository, TaskManager taskManager, BackupManager backupManager) {
 		this.agentInfo = agentInfo;
 		this.basePath = agentFolders.InstancesFolderPath;
 		this.shutdownCancellationToken = shutdownCancellationTokenSource.Token;
-
+		
 		var minecraftServerExecutables = new MinecraftServerExecutables(agentFolders.ServerExecutableFolderPath);
 		var launchServices = new LaunchServices(minecraftServerExecutables, javaRuntimeRepository);
 		var portManager = new PortManager(agentInfo.AllowedServerPorts, agentInfo.AllowedRconPorts);
-
+		
 		this.instanceServices = new InstanceServices(taskManager, portManager, backupManager, launchServices);
 	}
 
@@ -78,7 +76,7 @@ sealed class InstanceSessionManager : IAsyncDisposable {
 			var instanceGuid = configuration.InstanceGuid;
 			var instanceFolder = Path.Combine(basePath, instanceGuid.ToString());
 			Directories.Create(instanceFolder, Chmod.URWX_GRX);
-
+			
 			var heapMegabytes = configuration.MemoryAllocation.InMegabytes;
 			var jvmProperties = new JvmProperties(
 				InitialHeapMegabytes: heapMegabytes / 2,
@@ -105,15 +103,15 @@ sealed class InstanceSessionManager : IAsyncDisposable {
 			if (instances.TryGetValue(instanceGuid, out var instance)) {
 				await instance.Reconfigure(configuration, launcher, shutdownCancellationToken);
 				Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, configuration.InstanceGuid);
-
+				
 				if (alwaysReportStatus) {
 					instance.ReportLastStatus();
 				}
 			}
 			else {
-				instances[instanceGuid] = instance = new Instance(GetInstanceLoggerName(instanceGuid), instanceServices, configuration, launcher);
+				instances[instanceGuid] = instance = new Instance(instanceServices, configuration, launcher);
 				Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, configuration.InstanceGuid);
-
+				
 				instance.ReportLastStatus();
 				instance.IsRunningChanged += OnInstanceIsRunningChanged;
 			}
@@ -126,11 +124,6 @@ sealed class InstanceSessionManager : IAsyncDisposable {
 		});
 	}
 
-	private string GetInstanceLoggerName(Guid guid) {
-		var prefix = guid.ToString();
-		return prefix[..prefix.IndexOf('-')] + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
-	}
-
 	private ImmutableArray<Instance> GetRunningInstancesInternal() {
 		return instances.Values.Where(static instance => instance.IsRunning).ToImmutableArray();
 	}
@@ -174,23 +167,38 @@ sealed class InstanceSessionManager : IAsyncDisposable {
 	}
 
 	public Task<InstanceActionResult<StopInstanceResult>> Stop(Guid instanceGuid, MinecraftStopStrategy stopStrategy) {
-		return AcquireSemaphoreAndRunWithInstance(instanceGuid, instance => instance.Stop(stopStrategy, shutdownCancellationToken));
+		return AcquireSemaphoreAndRunWithInstance(instanceGuid, instance => instance.Stop(stopStrategy));
 	}
 
 	public Task<InstanceActionResult<SendCommandToInstanceResult>> SendCommand(Guid instanceGuid, string command) {
 		return AcquireSemaphoreAndRunWithInstance(instanceGuid, async instance => await instance.SendCommand(command, shutdownCancellationToken) ? SendCommandToInstanceResult.Success : SendCommandToInstanceResult.UnknownError);
 	}
 
-	public async ValueTask DisposeAsync() {
-		Logger.Information("Stopping all instances...");
-		
+	public async Task StopAll() {
 		shutdownCancellationTokenSource.Cancel();
+		
+		Logger.Information("Stopping all instances...");
 
 		await semaphore.WaitAsync(CancellationToken.None);
-		await Task.WhenAll(instances.Values.Select(static instance => instance.DisposeAsync().AsTask()));
-		instances.Clear();
-		
+		try {
+			await Task.WhenAll(instances.Values.Select(static instance => instance.StopAndWait(TimeSpan.FromSeconds(30))));
+			DisposeAllInstances();
+		} finally {
+			semaphore.Release();
+		}
+	}
+
+	public void Dispose() {
+		DisposeAllInstances();
 		shutdownCancellationTokenSource.Dispose();
 		semaphore.Dispose();
 	}
+
+	private void DisposeAllInstances() {
+		foreach (var (_, instance) in instances) {
+			instance.Dispose();
+		}
+
+		instances.Clear();
+	}
 }

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

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

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

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

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

@@ -1,97 +0,0 @@
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Minecraft.Server;
-using Phantom.Agent.Services.Instances.States;
-using Phantom.Common.Data.Instance;
-
-namespace Phantom.Agent.Services.Instances.Procedures;
-
-sealed record LaunchInstanceProcedure(InstanceConfiguration Configuration, IServerLauncher Launcher, bool IsRestarting = false) : IInstanceProcedure {
-	public async Task<IInstanceState?> Run(IInstanceContext context, CancellationToken cancellationToken) {
-		if (!IsRestarting && context.CurrentState is InstanceRunningState) {
-			return null;
-		}
-		
-		context.SetStatus(IsRestarting ? InstanceStatus.Restarting : InstanceStatus.Launching);
-
-		InstanceLaunchFailReason? failReason = context.Services.PortManager.Reserve(Configuration) switch {
-			PortManager.Result.ServerPortNotAllowed   => InstanceLaunchFailReason.ServerPortNotAllowed,
-			PortManager.Result.ServerPortAlreadyInUse => InstanceLaunchFailReason.ServerPortAlreadyInUse,
-			PortManager.Result.RconPortNotAllowed     => InstanceLaunchFailReason.RconPortNotAllowed,
-			PortManager.Result.RconPortAlreadyInUse   => InstanceLaunchFailReason.RconPortAlreadyInUse,
-			_                                         => null
-		};
-
-		if (failReason is {} reason) {
-			context.SetLaunchFailedStatusAndReportEvent(reason);
-			return new InstanceNotRunningState();
-		}
-		
-		context.Logger.Information("Session starting...");
-		try {
-			InstanceProcess process = await DoLaunch(context, cancellationToken);
-			return new InstanceRunningState(Configuration, Launcher, process, context);
-		} catch (OperationCanceledException) {
-			context.SetStatus(InstanceStatus.NotRunning);
-		} catch (LaunchFailureException e) {
-			context.Logger.Error(e.LogMessage);
-			context.SetLaunchFailedStatusAndReportEvent(e.Reason);
-		} catch (Exception e) {
-			context.Logger.Error(e, "Caught exception while launching instance.");
-			context.SetLaunchFailedStatusAndReportEvent(InstanceLaunchFailReason.UnknownError);
-		}
-		
-		context.Services.PortManager.Release(Configuration);
-		return new InstanceNotRunningState();
-	}
-
-	private async Task<InstanceProcess> DoLaunch(IInstanceContext context, CancellationToken cancellationToken) {
-		cancellationToken.ThrowIfCancellationRequested();
-
-		byte lastDownloadProgress = byte.MaxValue;
-
-		void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
-			byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, 100);
-
-			if (lastDownloadProgress != progress) {
-				lastDownloadProgress = progress;
-				context.SetStatus(InstanceStatus.Downloading(progress));
-			}
-		}
-
-		var launchResult = await Launcher.Launch(context.Logger, context.Services.LaunchServices, OnDownloadProgress, cancellationToken);
-		if (launchResult is LaunchResult.InvalidJavaRuntime) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.JavaRuntimeNotFound, "Session failed to launch, invalid Java runtime.");
-		}
-		else if (launchResult is LaunchResult.CouldNotDownloadMinecraftServer) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotDownloadMinecraftServer, "Session failed to launch, could not download Minecraft server.");
-		}
-		else if (launchResult is LaunchResult.CouldNotPrepareMinecraftServerLauncher) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotPrepareMinecraftServerLauncher, "Session failed to launch, could not prepare Minecraft server launcher.");
-		}
-		else if (launchResult is LaunchResult.CouldNotConfigureMinecraftServer) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotConfigureMinecraftServer, "Session failed to launch, could not configure Minecraft server.");
-		}
-		else if (launchResult is LaunchResult.CouldNotStartMinecraftServer) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotStartMinecraftServer, "Session failed to launch, could not start Minecraft server.");
-		}
-
-		if (launchResult is not LaunchResult.Success launchSuccess) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.UnknownError, "Session failed to launch.");
-		}
-
-		context.SetStatus(InstanceStatus.Running);
-		context.ReportEvent(InstanceEvent.LaunchSucceded);
-		return launchSuccess.Process;
-	}
-
-	private sealed class LaunchFailureException : Exception {
-		public InstanceLaunchFailReason Reason { get; }
-		public string LogMessage { get; }
-
-		public LaunchFailureException(InstanceLaunchFailReason reason, string logMessage) {
-			this.Reason = reason;
-			this.LogMessage = logMessage;
-		}
-	}
-}

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

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

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

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

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/IInstanceState.cs

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

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

@@ -54,8 +54,6 @@ public sealed class MessageListener : IMessageToAgentListener {
 		};
 
 		Logger.Fatal("Agent authentication failed: {Error}", errorMessage);
-		
-		PhantomLogger.Dispose();
 		Environment.Exit(1);
 
 		return Task.FromResult(NoReply.Instance);

Agent/Phantom.Agent/Phantom.Agent.csproj

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

Agent/Phantom.Agent/Program.cs

@@ -7,7 +7,6 @@ using Phantom.Common.Data.Agent;
 using Phantom.Common.Logging;
 using Phantom.Utils.Rpc;
 using Phantom.Utils.Runtime;
-using Phantom.Utils.Tasks;
 
 const int ProtocolVersion = 1;
 
@@ -18,34 +17,32 @@ PosixSignals.RegisterCancellation(shutdownCancellationTokenSource, static () =>
 	PhantomLogger.Root.InformationHeading("Stopping Phantom Panel agent...");
 });
 
-ThreadPool.SetMinThreads(workerThreads: 2, completionPortThreads: 1);
-
 try {
 	var fullVersion = AssemblyAttributes.GetFullVersion(Assembly.GetExecutingAssembly());
 
 	PhantomLogger.Root.InformationHeading("Initializing Phantom Panel agent...");
 	PhantomLogger.Root.Information("Agent version: {Version}", fullVersion);
 
-	var (serverHost, serverPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts, maxConcurrentBackupCompressionTasks) = Variables.LoadOrStop();
+	var (serverHost, serverPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts) = Variables.LoadOrExit();
 
 	var agentKey = await AgentKey.Load(agentKeyToken, agentKeyFilePath);
 	if (agentKey == null) {
-		return 1;
+		Environment.Exit(1);
 	}
 
 	var folders = new AgentFolders("./data", "./temp", javaSearchPath);
 	if (!folders.TryCreate()) {
-		return 1;
+		Environment.Exit(1);
 	}
 
 	var agentGuid = await GuidFile.CreateOrLoad(folders.DataFolderPath);
 	if (agentGuid == null) {
-		return 1;
+		Environment.Exit(1);
 	}
 
 	var (serverCertificate, agentToken) = agentKey.Value;
 	var agentInfo = new AgentInfo(agentGuid.Value, agentName, ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
-	var agentServices = new AgentServices(agentInfo, folders, new AgentServiceConfiguration(maxConcurrentBackupCompressionTasks));
+	var agentServices = new AgentServices(agentInfo, folders);
 
 	MessageListener MessageListenerFactory(RpcServerConnection connection) {
 		return new MessageListener(connection, agentServices, shutdownCancellationTokenSource);
@@ -68,15 +65,10 @@ try {
 		await rpcTask;
 		rpcDisconnectSemaphore.Dispose();
 	}
-
-	return 0;
 } catch (OperationCanceledException) {
-	return 0;
-} catch (StopProcedureException) {
-	return 1;
+	// Ignore.
 } catch (Exception e) {
 	PhantomLogger.Root.Fatal(e, "Caught exception in entry point.");
-	return 1;
 } finally {
 	shutdownCancellationTokenSource.Dispose();
 

Agent/Phantom.Agent/Variables.cs

@@ -15,8 +15,7 @@ sealed record Variables(
 	ushort MaxInstances,
 	RamAllocationUnits MaxMemory,
 	AllowedPorts AllowedServerPorts,
-	AllowedPorts AllowedRconPorts,
-	ushort MaxConcurrentBackupCompressionTasks
+	AllowedPorts AllowedRconPorts
 ) {
 	private static Variables LoadOrThrow() {
 		var (agentKeyToken, agentKeyFilePath) = EnvironmentVariables.GetEitherString("AGENT_KEY", "AGENT_KEY_FILE").Require;
@@ -32,8 +31,7 @@ sealed record Variables(
 			(ushort) EnvironmentVariables.GetInteger("MAX_INSTANCES", min: 1, max: 10000).Require,
 			EnvironmentVariables.GetString("MAX_MEMORY").MapParse(RamAllocationUnits.FromString).Require,
 			EnvironmentVariables.GetString("ALLOWED_SERVER_PORTS").MapParse(AllowedPorts.FromString).Require,
-			EnvironmentVariables.GetString("ALLOWED_RCON_PORTS").MapParse(AllowedPorts.FromString).Require,
-			(ushort) EnvironmentVariables.GetInteger("MAX_CONCURRENT_BACKUP_COMPRESSION_TASKS", min: 1, max: 10000).WithDefault(1)
+			EnvironmentVariables.GetString("ALLOWED_RCON_PORTS").MapParse(AllowedPorts.FromString).Require
 		);
 	}
 
@@ -41,12 +39,13 @@ sealed record Variables(
 		return JavaRuntimeDiscovery.GetSystemSearchPath() ?? throw new Exception("Could not automatically determine the path to Java installations on this system. Please set the JAVA_SEARCH_PATH environment variable to the folder containing Java installations.");
 	}
 
-	public static Variables LoadOrStop() {
+	public static Variables LoadOrExit() {
 		try {
 			return LoadOrThrow();
 		} catch (Exception e) {
 			PhantomLogger.Root.Fatal(e.Message);
-			throw StopProcedureException.Instance;
+			Environment.Exit(1);
+			throw;
 		}
 	}
 }

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

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

Common/Phantom.Common.Data/Agent/AgentAuthToken.cs

@@ -4,7 +4,7 @@ using MemoryPack;
 
 namespace Phantom.Common.Data.Agent;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
 public sealed partial class AgentAuthToken {
 	internal const int Length = 12;

Common/Phantom.Common.Data/Agent/AgentInfo.cs

@@ -2,7 +2,7 @@
 
 namespace Phantom.Common.Data.Agent;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record AgentInfo(
 	[property: MemoryPackOrder(0)] Guid Guid,
 	[property: MemoryPackOrder(1)] string Name,

Common/Phantom.Common.Data/AllowedPorts.cs

@@ -4,7 +4,7 @@ using MemoryPack;
 
 namespace Phantom.Common.Data;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial class AllowedPorts {
 	[MemoryPackOrder(0)]
 	[MemoryPackInclude]
@@ -53,6 +53,6 @@ public sealed partial class AllowedPorts {
 	}
 
 	public static AllowedPorts FromString(string definitions) {
-		return FromString(definitions.AsSpan());
+		return FromString((ReadOnlySpan<char>) definitions);
 	}
 }

Common/Phantom.Common.Data/Backups/BackupCreationResult.cs

@@ -2,7 +2,7 @@
 
 namespace Phantom.Common.Data.Backups;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record BackupCreationResult(
 	[property: MemoryPackOrder(0)] BackupCreationResultKind Kind,
 	[property: MemoryPackOrder(1)] BackupCreationWarnings Warnings = BackupCreationWarnings.None

Common/Phantom.Common.Data/Backups/BackupCreationResultKind.cs

@@ -20,4 +20,18 @@ public static class BackupCreationResultSummaryExtensions {
 		       kind != BackupCreationResultKind.BackupAlreadyRunning &&
 		       kind != BackupCreationResultKind.BackupFileAlreadyExists;
 	}
+
+	public static string ToSentence(this BackupCreationResultKind kind) {
+		return kind switch {
+			BackupCreationResultKind.Success                            => "Backup created successfully.",
+			BackupCreationResultKind.InstanceNotRunning                 => "Instance is not running.",
+			BackupCreationResultKind.BackupCancelled                    => "Backup cancelled.",
+			BackupCreationResultKind.BackupAlreadyRunning               => "A backup is already being created.",
+			BackupCreationResultKind.BackupFileAlreadyExists            => "Backup with the same name already exists.",
+			BackupCreationResultKind.CouldNotCreateBackupFolder         => "Could not create backup folder.",
+			BackupCreationResultKind.CouldNotCopyWorldToTemporaryFolder => "Could not copy world to temporary folder.",
+			BackupCreationResultKind.CouldNotCreateWorldArchive         => "Could not create world archive.",
+			_                                                           => "Unknown error."
+		};
+	}
 }

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

@@ -13,35 +13,35 @@ public partial interface IInstanceEvent {
 	void Accept(IInstanceEventVisitor visitor);
 }
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceLaunchSuccededEvent : IInstanceEvent {
 	public void Accept(IInstanceEventVisitor visitor) {
 		visitor.OnLaunchSucceeded(this);
 	}
 }
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceLaunchFailedEvent([property: MemoryPackOrder(0)] InstanceLaunchFailReason Reason) : IInstanceEvent {
 	public void Accept(IInstanceEventVisitor visitor) {
 		visitor.OnLaunchFailed(this);
 	}
 }
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceCrashedEvent : IInstanceEvent {
 	public void Accept(IInstanceEventVisitor visitor) {
 		visitor.OnCrashed(this);
 	}
 }
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceStoppedEvent : IInstanceEvent {
 	public void Accept(IInstanceEventVisitor visitor) {
 		visitor.OnStopped(this);
 	}
 }
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[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);

Common/Phantom.Common.Data/Instance/IInstanceStatus.cs

@@ -14,31 +14,31 @@ namespace Phantom.Common.Data.Instance;
 [MemoryPackUnion(8, typeof(InstanceIsFailed))]
 public partial interface IInstanceStatus {}
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceIsOffline : IInstanceStatus;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceIsInvalid([property: MemoryPackOrder(0)] string Reason) : IInstanceStatus;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceIsNotRunning : IInstanceStatus;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceIsDownloading([property: MemoryPackOrder(0)] byte Progress) : IInstanceStatus;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceIsLaunching : IInstanceStatus;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceIsRunning : IInstanceStatus;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceIsRestarting : IInstanceStatus;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceIsStopping : IInstanceStatus;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceIsFailed([property: MemoryPackOrder(0)] InstanceLaunchFailReason Reason) : IInstanceStatus;
 
 public static class InstanceStatus {

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

@@ -4,7 +4,7 @@ using Phantom.Common.Data.Minecraft;
 
 namespace Phantom.Common.Data.Instance;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceConfiguration(
 	[property: MemoryPackOrder(0)] Guid AgentGuid,
 	[property: MemoryPackOrder(1)] Guid InstanceGuid,

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

@@ -1,14 +1,33 @@
 namespace Phantom.Common.Data.Instance;
 
 public enum InstanceLaunchFailReason : byte {
-	UnknownError                           = 0,
-	ServerPortNotAllowed                   = 1,
-	ServerPortAlreadyInUse                 = 2,
-	RconPortNotAllowed                     = 3,
-	RconPortAlreadyInUse                   = 4,
-	JavaRuntimeNotFound                    = 5,
-	CouldNotDownloadMinecraftServer        = 6,
-	CouldNotConfigureMinecraftServer       = 7,
-	CouldNotPrepareMinecraftServerLauncher = 8,
-	CouldNotStartMinecraftServer           = 9
+	UnknownError,
+	ServerPortNotAllowed,
+	ServerPortAlreadyInUse,
+	RconPortNotAllowed,
+	RconPortAlreadyInUse,
+	JavaRuntimeNotFound,
+	InvalidJvmArguments,
+	CouldNotDownloadMinecraftServer,
+	CouldNotConfigureMinecraftServer,
+	CouldNotPrepareMinecraftServerLauncher,
+	CouldNotStartMinecraftServer
+}
+
+public static class InstanceLaunchFailReasonExtensions {
+	public static string ToSentence(this InstanceLaunchFailReason reason) {
+		return reason switch {
+			InstanceLaunchFailReason.ServerPortNotAllowed                   => "Server port not allowed.",
+			InstanceLaunchFailReason.ServerPortAlreadyInUse                 => "Server port already in use.",
+			InstanceLaunchFailReason.RconPortNotAllowed                     => "Rcon port not allowed.",
+			InstanceLaunchFailReason.RconPortAlreadyInUse                   => "Rcon port already in use.",
+			InstanceLaunchFailReason.JavaRuntimeNotFound                    => "Java runtime not found.",
+			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

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

Common/Phantom.Common.Data/Java/JavaRuntime.cs

@@ -3,7 +3,7 @@ using MemoryPack;
 
 namespace Phantom.Common.Data.Java;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record JavaRuntime(
 	[property: MemoryPackOrder(0)] string MainVersion,
 	[property: MemoryPackOrder(1)] string FullVersion,

Common/Phantom.Common.Data/Java/TaggedJavaRuntime.cs

@@ -2,7 +2,7 @@
 
 namespace Phantom.Common.Data.Java; 
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record TaggedJavaRuntime(
 	[property: MemoryPackOrder(0)] Guid Guid,
 	[property: MemoryPackOrder(1)] JavaRuntime Runtime

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

@@ -4,7 +4,7 @@ using Phantom.Utils.IO;
 
 namespace Phantom.Common.Data.Minecraft; 
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial class FileDownloadInfo {
 	[MemoryPackOrder(0)]
 	public string DownloadUrl { get; }

Common/Phantom.Common.Data/Minecraft/MinecraftStopStrategy.cs

@@ -2,7 +2,7 @@
 
 namespace Phantom.Common.Data.Minecraft;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public readonly partial record struct MinecraftStopStrategy(
 	[property: MemoryPackOrder(0)] ushort Seconds
 ) {

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

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

Common/Phantom.Common.Data/PortRange.cs

@@ -3,7 +3,7 @@ using MemoryPack;
 
 namespace Phantom.Common.Data;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 readonly partial record struct PortRange(
 	[property: MemoryPackOrder(0)] ushort FirstPort,
 	[property: MemoryPackOrder(1)] ushort LastPort

Common/Phantom.Common.Data/RamAllocationUnits.cs

@@ -6,7 +6,7 @@ namespace Phantom.Common.Data;
 /// <summary>
 /// Represents a number of RAM allocation units, using the conversion factor of 256 MB per unit. Supports allocations up to 16 TB minus 256 MB (65535 units).
 /// </summary>
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
 public readonly partial record struct RamAllocationUnits(
 	[property: MemoryPackOrder(0)] ushort RawValue
@@ -98,6 +98,6 @@ public readonly partial record struct RamAllocationUnits(
 	/// </summary>
 	/// <exception cref="ArgumentOutOfRangeException">If the <paramref name="definition"/> is in the incorrect format, or the value cannot be converted via <see cref="FromMegabytes"/>.</exception>
 	public static RamAllocationUnits FromString(string definition) {
-		return FromString(definition.AsSpan());
+		return FromString((ReadOnlySpan<char>) definition);
 	}
 }

Common/Phantom.Common.Data/Replies/InstanceActionResult.cs

@@ -2,7 +2,7 @@
 
 namespace Phantom.Common.Data.Replies;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceActionResult<T>(
 	[property: MemoryPackOrder(0)] InstanceActionGeneralResult GeneralResult,
 	[property: MemoryPackOrder(1)] T? ConcreteResult

Common/Phantom.Common.Data/Replies/LaunchInstanceResult.cs

@@ -1,9 +1,25 @@
 namespace Phantom.Common.Data.Replies;
 
 public enum LaunchInstanceResult : byte {
-	LaunchInitiated          = 1,
-	InstanceAlreadyLaunching = 2,
-	InstanceAlreadyRunning   = 3,
-	InstanceLimitExceeded    = 4,
-	MemoryLimitExceeded      = 5
+	UnknownError,
+	LaunchInitiated,
+	InstanceAlreadyLaunching,
+	InstanceAlreadyRunning,
+	InstanceIsStopping,
+	InstanceLimitExceeded,
+	MemoryLimitExceeded
+}
+
+public static class LaunchInstanceResultExtensions {
+	public static string ToSentence(this LaunchInstanceResult reason) {
+		return reason switch {
+			LaunchInstanceResult.LaunchInitiated          => "Launch initiated.",
+			LaunchInstanceResult.InstanceAlreadyLaunching => "Instance is already launching.",
+			LaunchInstanceResult.InstanceAlreadyRunning   => "Instance is already running.",
+			LaunchInstanceResult.InstanceIsStopping       => "Instance is stopping.",
+			LaunchInstanceResult.InstanceLimitExceeded    => "Agent does not have any more available instances.",
+			LaunchInstanceResult.MemoryLimitExceeded      => "Agent does not have enough available memory.",
+			_                                             => "Unknown error."
+		};
+	}
 }

Common/Phantom.Common.Data/Replies/SendCommandToInstanceResult.cs

@@ -4,3 +4,12 @@ public enum SendCommandToInstanceResult : byte {
 	UnknownError,
 	Success
 }
+
+public static class SendCommandToInstanceResultExtensions {
+	public static string ToSentence(this SendCommandToInstanceResult reason) {
+		return reason switch {
+			SendCommandToInstanceResult.Success => "Command sent.",
+			_                                   => "Unknown error."
+		};
+	}
+}

Common/Phantom.Common.Data/Replies/StopInstanceResult.cs

@@ -1,7 +1,19 @@
 namespace Phantom.Common.Data.Replies;
 
 public enum StopInstanceResult : byte {
-	StopInitiated           = 1,
-	InstanceAlreadyStopping = 2,
-	InstanceAlreadyStopped  = 3
+	UnknownError,
+	StopInitiated,
+	InstanceAlreadyStopping,
+	InstanceAlreadyStopped
+}
+
+public static class StopInstanceResultExtensions {
+	public static string ToSentence(this StopInstanceResult reason) {
+		return reason switch {
+			StopInstanceResult.StopInitiated           => "Stopping initiated.",
+			StopInstanceResult.InstanceAlreadyStopping => "Instance is already stopping.",
+			StopInstanceResult.InstanceAlreadyStopped  => "Instance is already stopped.",
+			_                                          => "Unknown error."
+		};
+	}
 }

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

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Common/Phantom.Common.Messages/BiDirectional/ReplyMessage.cs

@@ -3,7 +3,7 @@ using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.BiDirectional;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record ReplyMessage(
 	[property: MemoryPackOrder(0)] uint SequenceId,
 	[property: MemoryPackOrder(1)] byte[] SerializedReply

Common/Phantom.Common.Messages/Phantom.Common.Messages.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

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

@@ -4,7 +4,7 @@ using Phantom.Common.Data.Replies;
 
 namespace Phantom.Common.Messages.ToAgent;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record ConfigureInstanceMessage(
 	[property: MemoryPackOrder(0)] InstanceConfiguration Configuration,
 	[property: MemoryPackOrder(1)] InstanceLaunchProperties LaunchProperties,

Common/Phantom.Common.Messages/ToAgent/LaunchInstanceMessage.cs

@@ -3,7 +3,7 @@ using Phantom.Common.Data.Replies;
 
 namespace Phantom.Common.Messages.ToAgent; 
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record LaunchInstanceMessage(
 	[property: MemoryPackOrder(0)] Guid InstanceGuid
 ) : IMessageToAgent<InstanceActionResult<LaunchInstanceResult>> {

Common/Phantom.Common.Messages/ToAgent/RegisterAgentFailureMessage.cs

@@ -4,7 +4,7 @@ using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.ToAgent;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record RegisterAgentFailureMessage(
 	[property: MemoryPackOrder(0)] RegisterAgentFailure FailureKind
 ) : IMessageToAgent {

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

@@ -4,7 +4,7 @@ using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.ToAgent;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record RegisterAgentSuccessMessage(
 	[property: MemoryPackOrder(0)] ImmutableArray<ConfigureInstanceMessage> InitialInstanceConfigurations
 ) : IMessageToAgent {

Common/Phantom.Common.Messages/ToAgent/SendCommandToInstanceMessage.cs

@@ -3,7 +3,7 @@ using Phantom.Common.Data.Replies;
 
 namespace Phantom.Common.Messages.ToAgent; 
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record SendCommandToInstanceMessage(
 	[property: MemoryPackOrder(0)] Guid InstanceGuid,
 	[property: MemoryPackOrder(1)] string Command

Common/Phantom.Common.Messages/ToAgent/StopInstanceMessage.cs

@@ -4,7 +4,7 @@ using Phantom.Common.Data.Replies;
 
 namespace Phantom.Common.Messages.ToAgent; 
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record StopInstanceMessage(
 	[property: MemoryPackOrder(0)] Guid InstanceGuid,
 	[property: MemoryPackOrder(1)] MinecraftStopStrategy StopStrategy

Common/Phantom.Common.Messages/ToServer/AdvertiseJavaRuntimesMessage.cs

@@ -5,7 +5,7 @@ using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.ToServer; 
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record AdvertiseJavaRuntimesMessage(
 	[property: MemoryPackOrder(0)] ImmutableArray<TaggedJavaRuntime> Runtimes
 ) : IMessageToServer {

Common/Phantom.Common.Messages/ToServer/AgentIsAliveMessage.cs

@@ -3,7 +3,7 @@ using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.ToServer; 
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record AgentIsAliveMessage : IMessageToServer {
 	public Task<NoReply> Accept(IMessageToServerListener listener) {
 		return listener.HandleAgentIsAlive(this);

Common/Phantom.Common.Messages/ToServer/InstanceOutputMessage.cs

@@ -4,7 +4,7 @@ using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.ToServer;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record InstanceOutputMessage(
 	[property: MemoryPackOrder(0)] Guid InstanceGuid,
 	[property: MemoryPackOrder(1)] ImmutableArray<string> Lines

Common/Phantom.Common.Messages/ToServer/RegisterAgentMessage.cs

@@ -4,7 +4,7 @@ using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.ToServer;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record RegisterAgentMessage(
 	[property: MemoryPackOrder(0)] AgentAuthToken AuthToken,
 	[property: MemoryPackOrder(1)] AgentInfo AgentInfo

Common/Phantom.Common.Messages/ToServer/ReportAgentStatusMessage.cs

@@ -4,8 +4,8 @@ using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.ToServer; 
 
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record ReportAgentStatusMessage(
+[MemoryPackable]
+public partial record ReportAgentStatusMessage(
 	[property: MemoryPackOrder(0)] int RunningInstanceCount,
 	[property: MemoryPackOrder(1)] RamAllocationUnits RunningInstanceMemory
 ) : IMessageToServer {

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

@@ -4,7 +4,7 @@ using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.ToServer; 
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record ReportInstanceEventMessage(
 	[property: MemoryPackOrder(0)] Guid EventGuid,
 	[property: MemoryPackOrder(1)] DateTime UtcTime,

Common/Phantom.Common.Messages/ToServer/ReportInstanceStatusMessage.cs

@@ -4,7 +4,7 @@ using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.ToServer;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record ReportInstanceStatusMessage(
 	[property: MemoryPackOrder(0)] Guid InstanceGuid,
 	[property: MemoryPackOrder(1)] IInstanceStatus InstanceStatus

Common/Phantom.Common.Messages/ToServer/UnregisterAgentMessage.cs

@@ -3,7 +3,7 @@ using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.ToServer;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+[MemoryPackable]
 public sealed partial record UnregisterAgentMessage(
 	[property: MemoryPackOrder(0)] Guid AgentGuid
 ) : IMessageToServer {

Common/Phantom.Common.Minecraft/JvmArgumentsHelper.cs

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

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

@@ -1,12 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
-  <ItemGroup>
-    <PackageReference Include="Serilog" />
-  </ItemGroup>
-  
 </Project>

Controller/Phantom.Controller.Database.Postgres/Migrations/20231008122637_ReplaceIdentity.Designer.cs

@@ -1,180 +0,0 @@
-// <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.Controller.Database;
-
-#nullable disable
-
-namespace Phantom.Controller.Database.Postgres.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20231008122637_ReplaceIdentity")]
-    partial class ReplaceIdentity
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.11")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Phantom.Controller.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.Controller.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<Guid?>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<DateTime>("UtcTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("AuditLog", "system");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.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.Controller.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.Controller.Database.Entities.PermissionEntity", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Permissions", "identity");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Controller/Phantom.Controller.Database.Postgres/Migrations/20231008122637_ReplaceIdentity.cs

@@ -1,373 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace Phantom.Controller.Database.Postgres.Migrations
-{
-    /// <inheritdoc />
-    public partial class ReplaceIdentity : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_AuditLog_Users_UserId",
-                schema: "system",
-                table: "AuditLog");
-
-            migrationBuilder.DropTable(
-                name: "RoleClaims",
-                schema: "identity");
-
-            migrationBuilder.DropTable(
-                name: "RolePermissions",
-                schema: "identity");
-
-            migrationBuilder.DropTable(
-                name: "UserClaims",
-                schema: "identity");
-
-            migrationBuilder.DropTable(
-                name: "UserLogins",
-                schema: "identity");
-
-            migrationBuilder.DropTable(
-                name: "UserPermissions",
-                schema: "identity");
-
-            migrationBuilder.DropTable(
-                name: "UserRoles",
-                schema: "identity");
-
-            migrationBuilder.DropTable(
-                name: "UserTokens",
-                schema: "identity");
-
-            migrationBuilder.DropTable(
-                name: "Roles",
-                schema: "identity");
-
-            migrationBuilder.DropTable(
-                name: "Users",
-                schema: "identity");
-
-            migrationBuilder.DropIndex(
-                name: "IX_AuditLog_UserId",
-                schema: "system",
-                table: "AuditLog");
-
-            migrationBuilder.DropColumn(
-                name: "UserId",
-                schema: "system",
-                table: "AuditLog");
-
-            migrationBuilder.AddColumn<Guid>(
-                name: "UserGuid",
-                schema: "system",
-                table: "AuditLog",
-                type: "uuid",
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "UserGuid",
-                schema: "system",
-                table: "AuditLog");
-
-            migrationBuilder.AddColumn<string>(
-                name: "UserId",
-                schema: "system",
-                table: "AuditLog",
-                type: "text",
-                nullable: true);
-
-            migrationBuilder.CreateTable(
-                name: "Roles",
-                schema: "identity",
-                columns: table => new
-                {
-                    Id = table.Column<string>(type: "text", nullable: false),
-                    ConcurrencyStamp = table.Column<string>(type: "text", nullable: true),
-                    Name = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
-                    NormalizedName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Roles", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Users",
-                schema: "identity",
-                columns: table => new
-                {
-                    Id = table.Column<string>(type: "text", nullable: false),
-                    AccessFailedCount = table.Column<int>(type: "integer", nullable: false),
-                    ConcurrencyStamp = table.Column<string>(type: "text", nullable: true),
-                    Email = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
-                    EmailConfirmed = table.Column<bool>(type: "boolean", nullable: false),
-                    LockoutEnabled = table.Column<bool>(type: "boolean", nullable: false),
-                    LockoutEnd = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: true),
-                    NormalizedEmail = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
-                    NormalizedUserName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
-                    PasswordHash = table.Column<string>(type: "text", nullable: true),
-                    PhoneNumber = table.Column<string>(type: "text", nullable: true),
-                    PhoneNumberConfirmed = table.Column<bool>(type: "boolean", nullable: false),
-                    SecurityStamp = table.Column<string>(type: "text", nullable: true),
-                    TwoFactorEnabled = table.Column<bool>(type: "boolean", nullable: false),
-                    UserName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Users", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "RoleClaims",
-                schema: "identity",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ClaimType = table.Column<string>(type: "text", nullable: true),
-                    ClaimValue = table.Column<string>(type: "text", nullable: true),
-                    RoleId = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_RoleClaims", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_RoleClaims_Roles_RoleId",
-                        column: x => x.RoleId,
-                        principalSchema: "identity",
-                        principalTable: "Roles",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "RolePermissions",
-                schema: "identity",
-                columns: table => new
-                {
-                    RoleId = table.Column<string>(type: "text", nullable: false),
-                    PermissionId = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_RolePermissions", x => new { x.RoleId, x.PermissionId });
-                    table.ForeignKey(
-                        name: "FK_RolePermissions_Permissions_PermissionId",
-                        column: x => x.PermissionId,
-                        principalSchema: "identity",
-                        principalTable: "Permissions",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_RolePermissions_Roles_RoleId",
-                        column: x => x.RoleId,
-                        principalSchema: "identity",
-                        principalTable: "Roles",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "UserClaims",
-                schema: "identity",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ClaimType = table.Column<string>(type: "text", nullable: true),
-                    ClaimValue = table.Column<string>(type: "text", nullable: true),
-                    UserId = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_UserClaims", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_UserClaims_Users_UserId",
-                        column: x => x.UserId,
-                        principalSchema: "identity",
-                        principalTable: "Users",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "UserLogins",
-                schema: "identity",
-                columns: table => new
-                {
-                    LoginProvider = table.Column<string>(type: "text", nullable: false),
-                    ProviderKey = table.Column<string>(type: "text", nullable: false),
-                    ProviderDisplayName = table.Column<string>(type: "text", nullable: true),
-                    UserId = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_UserLogins", x => new { x.LoginProvider, x.ProviderKey });
-                    table.ForeignKey(
-                        name: "FK_UserLogins_Users_UserId",
-                        column: x => x.UserId,
-                        principalSchema: "identity",
-                        principalTable: "Users",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "UserPermissions",
-                schema: "identity",
-                columns: table => new
-                {
-                    UserId = table.Column<string>(type: "text", nullable: false),
-                    PermissionId = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_UserPermissions", x => new { x.UserId, x.PermissionId });
-                    table.ForeignKey(
-                        name: "FK_UserPermissions_Permissions_PermissionId",
-                        column: x => x.PermissionId,
-                        principalSchema: "identity",
-                        principalTable: "Permissions",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_UserPermissions_Users_UserId",
-                        column: x => x.UserId,
-                        principalSchema: "identity",
-                        principalTable: "Users",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "UserRoles",
-                schema: "identity",
-                columns: table => new
-                {
-                    UserId = table.Column<string>(type: "text", nullable: false),
-                    RoleId = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_UserRoles", x => new { x.UserId, x.RoleId });
-                    table.ForeignKey(
-                        name: "FK_UserRoles_Roles_RoleId",
-                        column: x => x.RoleId,
-                        principalSchema: "identity",
-                        principalTable: "Roles",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_UserRoles_Users_UserId",
-                        column: x => x.UserId,
-                        principalSchema: "identity",
-                        principalTable: "Users",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "UserTokens",
-                schema: "identity",
-                columns: table => new
-                {
-                    UserId = table.Column<string>(type: "text", nullable: false),
-                    LoginProvider = table.Column<string>(type: "text", nullable: false),
-                    Name = table.Column<string>(type: "text", nullable: false),
-                    Value = table.Column<string>(type: "text", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_UserTokens", x => new { x.UserId, x.LoginProvider, x.Name });
-                    table.ForeignKey(
-                        name: "FK_UserTokens_Users_UserId",
-                        column: x => x.UserId,
-                        principalSchema: "identity",
-                        principalTable: "Users",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AuditLog_UserId",
-                schema: "system",
-                table: "AuditLog",
-                column: "UserId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_RoleClaims_RoleId",
-                schema: "identity",
-                table: "RoleClaims",
-                column: "RoleId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_RolePermissions_PermissionId",
-                schema: "identity",
-                table: "RolePermissions",
-                column: "PermissionId");
-
-            migrationBuilder.CreateIndex(
-                name: "RoleNameIndex",
-                schema: "identity",
-                table: "Roles",
-                column: "NormalizedName",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserClaims_UserId",
-                schema: "identity",
-                table: "UserClaims",
-                column: "UserId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserLogins_UserId",
-                schema: "identity",
-                table: "UserLogins",
-                column: "UserId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserPermissions_PermissionId",
-                schema: "identity",
-                table: "UserPermissions",
-                column: "PermissionId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserRoles_RoleId",
-                schema: "identity",
-                table: "UserRoles",
-                column: "RoleId");
-
-            migrationBuilder.CreateIndex(
-                name: "EmailIndex",
-                schema: "identity",
-                table: "Users",
-                column: "NormalizedEmail");
-
-            migrationBuilder.CreateIndex(
-                name: "UserNameIndex",
-                schema: "identity",
-                table: "Users",
-                column: "NormalizedUserName",
-                unique: true);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_AuditLog_Users_UserId",
-                schema: "system",
-                table: "AuditLog",
-                column: "UserId",
-                principalSchema: "identity",
-                principalTable: "Users",
-                principalColumn: "Id");
-        }
-    }
-}

Controller/Phantom.Controller.Database.Postgres/Migrations/20231008123315_ReplaceIdentity2.Designer.cs

@@ -1,323 +0,0 @@
-// <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.Controller.Database;
-
-#nullable disable
-
-namespace Phantom.Controller.Database.Postgres.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20231008123315_ReplaceIdentity2")]
-    partial class ReplaceIdentity2
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.11")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Phantom.Controller.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.Controller.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<Guid?>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<DateTime>("UtcTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserGuid");
-
-                    b.ToTable("AuditLog", "system");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.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.Controller.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.Controller.Database.Entities.PermissionEntity", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Permissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RoleEntity", b =>
-                {
-                    b.Property<Guid>("RoleGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("RoleGuid");
-
-                    b.ToTable("Roles", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
-                {
-                    b.Property<Guid>("RoleGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("PermissionId")
-                        .HasColumnType("text");
-
-                    b.HasKey("RoleGuid", "PermissionId");
-
-                    b.HasIndex("PermissionId");
-
-                    b.ToTable("RolePermissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("PasswordHash")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("UserGuid");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.ToTable("Users", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("PermissionId")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserGuid", "PermissionId");
-
-                    b.HasIndex("PermissionId");
-
-                    b.ToTable("UserPermissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("RoleGuid")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("UserGuid", "RoleGuid");
-
-                    b.HasIndex("RoleGuid");
-
-                    b.ToTable("UserRoles", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
-                        .WithMany()
-                        .HasForeignKey("PermissionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", null)
-                        .WithMany()
-                        .HasForeignKey("RoleGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
-                        .WithMany()
-                        .HasForeignKey("PermissionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", "Role")
-                        .WithMany()
-                        .HasForeignKey("RoleGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Role");
-
-                    b.Navigation("User");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Controller/Phantom.Controller.Database.Postgres/Migrations/20231008123315_ReplaceIdentity2.cs

@@ -1,198 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Phantom.Controller.Database.Postgres.Migrations
-{
-    /// <inheritdoc />
-    public partial class ReplaceIdentity2 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Roles",
-                schema: "identity",
-                columns: table => new
-                {
-                    RoleGuid = table.Column<Guid>(type: "uuid", nullable: false),
-                    Name = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Roles", x => x.RoleGuid);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Users",
-                schema: "identity",
-                columns: table => new
-                {
-                    UserGuid = table.Column<Guid>(type: "uuid", nullable: false),
-                    Name = table.Column<string>(type: "text", nullable: false),
-                    PasswordHash = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Users", x => x.UserGuid);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "RolePermissions",
-                schema: "identity",
-                columns: table => new
-                {
-                    RoleGuid = table.Column<Guid>(type: "uuid", nullable: false),
-                    PermissionId = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_RolePermissions", x => new { x.RoleGuid, x.PermissionId });
-                    table.ForeignKey(
-                        name: "FK_RolePermissions_Permissions_PermissionId",
-                        column: x => x.PermissionId,
-                        principalSchema: "identity",
-                        principalTable: "Permissions",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_RolePermissions_Roles_RoleGuid",
-                        column: x => x.RoleGuid,
-                        principalSchema: "identity",
-                        principalTable: "Roles",
-                        principalColumn: "RoleGuid",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "UserPermissions",
-                schema: "identity",
-                columns: table => new
-                {
-                    UserGuid = table.Column<Guid>(type: "uuid", nullable: false),
-                    PermissionId = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_UserPermissions", x => new { x.UserGuid, x.PermissionId });
-                    table.ForeignKey(
-                        name: "FK_UserPermissions_Permissions_PermissionId",
-                        column: x => x.PermissionId,
-                        principalSchema: "identity",
-                        principalTable: "Permissions",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_UserPermissions_Users_UserGuid",
-                        column: x => x.UserGuid,
-                        principalSchema: "identity",
-                        principalTable: "Users",
-                        principalColumn: "UserGuid",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "UserRoles",
-                schema: "identity",
-                columns: table => new
-                {
-                    UserGuid = table.Column<Guid>(type: "uuid", nullable: false),
-                    RoleGuid = table.Column<Guid>(type: "uuid", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_UserRoles", x => new { x.UserGuid, x.RoleGuid });
-                    table.ForeignKey(
-                        name: "FK_UserRoles_Roles_RoleGuid",
-                        column: x => x.RoleGuid,
-                        principalSchema: "identity",
-                        principalTable: "Roles",
-                        principalColumn: "RoleGuid",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_UserRoles_Users_UserGuid",
-                        column: x => x.UserGuid,
-                        principalSchema: "identity",
-                        principalTable: "Users",
-                        principalColumn: "UserGuid",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AuditLog_UserGuid",
-                schema: "system",
-                table: "AuditLog",
-                column: "UserGuid");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_RolePermissions_PermissionId",
-                schema: "identity",
-                table: "RolePermissions",
-                column: "PermissionId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserPermissions_PermissionId",
-                schema: "identity",
-                table: "UserPermissions",
-                column: "PermissionId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserRoles_RoleGuid",
-                schema: "identity",
-                table: "UserRoles",
-                column: "RoleGuid");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Users_Name",
-                schema: "identity",
-                table: "Users",
-                column: "Name",
-                unique: true);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_AuditLog_Users_UserGuid",
-                schema: "system",
-                table: "AuditLog",
-                column: "UserGuid",
-                principalSchema: "identity",
-                principalTable: "Users",
-                principalColumn: "UserGuid",
-                onDelete: ReferentialAction.SetNull);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_AuditLog_Users_UserGuid",
-                schema: "system",
-                table: "AuditLog");
-
-            migrationBuilder.DropTable(
-                name: "RolePermissions",
-                schema: "identity");
-
-            migrationBuilder.DropTable(
-                name: "UserPermissions",
-                schema: "identity");
-
-            migrationBuilder.DropTable(
-                name: "UserRoles",
-                schema: "identity");
-
-            migrationBuilder.DropTable(
-                name: "Roles",
-                schema: "identity");
-
-            migrationBuilder.DropTable(
-                name: "Users",
-                schema: "identity");
-
-            migrationBuilder.DropIndex(
-                name: "IX_AuditLog_UserGuid",
-                schema: "system",
-                table: "AuditLog");
-        }
-    }
-}

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

@@ -1,320 +0,0 @@
-// <auto-generated />
-using System;
-using System.Text.Json;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Controller.Database;
-
-#nullable disable
-
-namespace Phantom.Controller.Database.Postgres.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    partial class ApplicationDbContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.11")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Phantom.Controller.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.Controller.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<Guid?>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<DateTime>("UtcTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserGuid");
-
-                    b.ToTable("AuditLog", "system");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.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.Controller.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.Controller.Database.Entities.PermissionEntity", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Permissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RoleEntity", b =>
-                {
-                    b.Property<Guid>("RoleGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("RoleGuid");
-
-                    b.ToTable("Roles", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
-                {
-                    b.Property<Guid>("RoleGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("PermissionId")
-                        .HasColumnType("text");
-
-                    b.HasKey("RoleGuid", "PermissionId");
-
-                    b.HasIndex("PermissionId");
-
-                    b.ToTable("RolePermissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("PasswordHash")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("UserGuid");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.ToTable("Users", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("PermissionId")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserGuid", "PermissionId");
-
-                    b.HasIndex("PermissionId");
-
-                    b.ToTable("UserPermissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("RoleGuid")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("UserGuid", "RoleGuid");
-
-                    b.HasIndex("RoleGuid");
-
-                    b.ToTable("UserRoles", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
-                        .WithMany()
-                        .HasForeignKey("PermissionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", null)
-                        .WithMany()
-                        .HasForeignKey("RoleGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
-                        .WithMany()
-                        .HasForeignKey("PermissionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", "Role")
-                        .WithMany()
-                        .HasForeignKey("RoleGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Role");
-
-                    b.Navigation("User");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Controller/Phantom.Controller.Database/Entities/RoleEntity.cs

@@ -1,17 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Phantom.Controller.Database.Entities; 
-
-[Table("Roles", Schema = "identity")]
-public sealed class RoleEntity {
-	[Key]
-	public Guid RoleGuid { get; set; }
-
-	public string Name { get; set; }
-
-	public RoleEntity(Guid roleGuid, string name) {
-		RoleGuid = roleGuid;
-		Name = name;
-	}
-}

Controller/Phantom.Controller.Database/Entities/UserEntity.cs

@@ -1,19 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Phantom.Controller.Database.Entities; 
-
-[Table("Users", Schema = "identity")]
-public sealed class UserEntity {
-	[Key]
-	public Guid UserGuid { get; set; }
-
-	public string Name { get; set; }
-	public string PasswordHash { get; set; }
-
-	public UserEntity(Guid userGuid, string name) {
-		UserGuid = userGuid;
-		Name = name;
-		PasswordHash = null!;
-	}
-}

Controller/Phantom.Controller.Database/Entities/UserRoleEntity.cs

@@ -1,19 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Phantom.Controller.Database.Entities; 
-
-[Table("UserRoles", Schema = "identity")]
-public sealed class UserRoleEntity {
-	public Guid UserGuid { get; set; }
-	public Guid RoleGuid { get; set; }
-
-	public UserEntity User { get; set; }
-	public RoleEntity Role { get; set; }
-
-	public UserRoleEntity(Guid userGuid, Guid roleGuid) {
-		UserGuid = userGuid;
-		RoleGuid = roleGuid;
-		User = null!;
-		Role = null!;
-	}
-}

Controller/Phantom.Controller.Database/Enums/EventLogSubjectType.cs

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