Replace NetMQ with custom TCP logic

.config/dotnet-tools.json

@@ -3,11 +3,10 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "10.0.1",
+      "version": "8.0.3",
       "commands": [
         "dotnet-ef"
-      ],
+      ]
-      "rollForward": false
     }
   }
 }

.run/Agent 1.run.xml

@@ -5,7 +5,8 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
-      <env name="AGENT_KEY_FILE" value="./key" />
+      <env name="AGENT_KEY" value="K5ZRZYYJ9GWM2FS6XH5N5QQ7WZRPNDGHYMN5QP7RP6PPY27KRPMSYGCN" />
+      <env name="AGENT_NAME" value="Agent 1" />
       <env name="ALLOWED_RCON_PORTS" value="25575,27000,27001" />
       <env name="ALLOWED_SERVER_PORTS" value="25565,26000,26001" />
       <env name="CONTROLLER_HOST" value="localhost" />
@@ -13,12 +14,14 @@
       <env name="MAX_INSTANCES" value="3" />
       <env name="MAX_MEMORY" value="12G" />
     </envs>
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="ENV_FILE_PATHS" value="" />
     <option name="REDIRECT_INPUT_PATH" value="" />
-    <option name="MIXED_MODE_DEBUG" value="0" />
+    <option name="PTY_MODE" value="Auto" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
     <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/Phantom.Agent.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />

.run/Agent 2.run.xml

@@ -5,7 +5,8 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent2" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
-      <env name="AGENT_KEY_FILE" value="./key" />
+      <env name="AGENT_KEY" value="K5ZRZYYJ9GWM2FS6XH5N5QQ7WZRPNDGHYMN5QP7RP6PPY27KRPMSYGCN" />
+      <env name="AGENT_NAME" value="Agent 2" />
       <env name="ALLOWED_RCON_PORTS" value="27002-27006" />
       <env name="ALLOWED_SERVER_PORTS" value="26002-26006" />
       <env name="CONTROLLER_HOST" value="localhost" />
@@ -13,12 +14,14 @@
       <env name="MAX_INSTANCES" value="5" />
       <env name="MAX_MEMORY" value="10G" />
     </envs>
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="ENV_FILE_PATHS" value="" />
     <option name="REDIRECT_INPUT_PATH" value="" />
-    <option name="MIXED_MODE_DEBUG" value="0" />
+    <option name="PTY_MODE" value="Auto" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
     <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/Phantom.Agent.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />

.run/Agent 3.run.xml

@@ -5,7 +5,8 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent3" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
-      <env name="AGENT_KEY_FILE" value="./key" />
+      <env name="AGENT_KEY" value="K5ZRZYYJ9GWM2FS6XH5N5QQ7WZRPNDGHYMN5QP7RP6PPY27KRPMSYGCN" />
+      <env name="AGENT_NAME" value="Agent 3" />
       <env name="ALLOWED_RCON_PORTS" value="27007" />
       <env name="ALLOWED_SERVER_PORTS" value="26007" />
       <env name="CONTROLLER_HOST" value="localhost" />
@@ -13,12 +14,14 @@
       <env name="MAX_INSTANCES" value="1" />
       <env name="MAX_MEMORY" value="2560M" />
     </envs>
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="ENV_FILE_PATHS" value="" />
     <option name="REDIRECT_INPUT_PATH" value="" />
-    <option name="MIXED_MODE_DEBUG" value="0" />
+    <option name="PTY_MODE" value="Auto" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
     <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/Phantom.Agent.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />

.run/Web.run.xml

@@ -7,15 +7,17 @@
     <envs>
       <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
       <env name="CONTROLLER_HOST" value="localhost" />
-      <env name="WEB_KEY" value="G9WXPDGCGHJD9W9XBPMNYWN6YTK7NKRWHT29P2XKNDCBWKHWXP2YQRFB2GCTKHSWT5CZFDTFKW52TCM9GDRW" />
+      <env name="WEB_KEY" value="T5Y722D2GZBXT2H27QS95P2YQRFB2GCTKHSWT5CZFDTFKW52TCM9GDRW" />
       <env name="WEB_SERVER_HOST" value="localhost" />
     </envs>
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="ENV_FILE_PATHS" value="" />
     <option name="REDIRECT_INPUT_PATH" value="" />
-    <option name="MIXED_MODE_DEBUG" value="0" />
+    <option name="PTY_MODE" value="Auto" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
     <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Web/Phantom.Web/Phantom.Web.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />

.workdir/Controller/secrets/agent.auth

@@ -0,0 +1 @@
+皛<EFBFBD>H嶗鰂g<EFBFBD>

.workdir/Controller/secrets/web.auth

@@ -1,2 +1 @@
-qﾐﾓh4ぴHｦ､7胥<37>H`├W
+‚U<E2809A>/»ב¸תq
-ｳ4u`G

Agent/Phantom.Agent.Minecraft.Tests/Java/JavaPropertiesStreamTests.cs

@@ -1,289 +0,0 @@
-using System.Collections.Immutable;
-using NUnit.Framework;
-using Phantom.Agent.Minecraft.Java;
-using Phantom.Utils.Collections;
-
-namespace Phantom.Agent.Minecraft.Tests.Java;
-
-[TestFixture]
-public sealed class JavaPropertiesStreamTests {
-	public sealed class Reader {
-		private static async Task<ImmutableArray<KeyValuePair<string, string>>> Parse(string contents) {
-			using var stream = new MemoryStream(JavaPropertiesStream.Encoding.GetBytes(contents));
-			using var properties = new JavaPropertiesStream.Reader(stream);
-			return await properties.ReadProperties(CancellationToken.None).ToImmutableArrayAsync();
-		}
-		
-		private static ImmutableArray<KeyValuePair<string, string>> KeyValue(string key, string value) {
-			return [new KeyValuePair<string, string>(key, value)];
-		}
-		
-		[TestCase("")]
-		[TestCase("\n")]
-		public async Task EmptyLinesAreIgnored(string contents) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(ImmutableArray<KeyValuePair<string, string>>.Empty));
-		}
-		
-		[TestCase("# Comment")]
-		[TestCase("! Comment")]
-		[TestCase("# Comment\n! Comment")]
-		public async Task CommentsAreIgnored(string contents) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(ImmutableArray<KeyValuePair<string, string>>.Empty));
-		}
-		
-		[TestCase("key=value")]
-		[TestCase("key= value")]
-		[TestCase("key =value")]
-		[TestCase("key = value")]
-		[TestCase("key:value")]
-		[TestCase("key: value")]
-		[TestCase("key :value")]
-		[TestCase("key : value")]
-		[TestCase("key value")]
-		[TestCase("key\tvalue")]
-		[TestCase("key\fvalue")]
-		[TestCase("key \t\fvalue")]
-		public async Task SimpleKeyValue(string contents) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", "value")));
-		}
-		
-		[TestCase("key")]
-		[TestCase(" key")]
-		[TestCase(" key ")]
-		[TestCase("key=")]
-		[TestCase("key:")]
-		public async Task KeyWithoutValue(string contents) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", "")));
-		}
-		
-		[TestCase(@"\#key=value", "#key")]
-		[TestCase(@"\!key=value", "!key")]
-		public async Task KeyBeginsWithEscapedComment(string contents, string expectedKey) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue(expectedKey, "value")));
-		}
-		
-		[TestCase(@"\=key=value", "=key")]
-		[TestCase(@"\:key=value", ":key")]
-		[TestCase(@"\ key=value", " key")]
-		[TestCase("\\\tkey=value", "\tkey")]
-		[TestCase("\\\fkey=value", "\fkey")]
-		public async Task KeyBeginsWithEscapedDelimiter(string contents, string expectedKey) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue(expectedKey, "value")));
-		}
-		
-		[TestCase(@"start\=end=value", "start=end")]
-		[TestCase(@"start\:end:value", "start:end")]
-		[TestCase(@"start\ end value", "start end")]
-		[TestCase(@"start\ \:\=end = value", "start :=end")]
-		[TestCase("start\\ \\\t\\\fend = value", "start \t\fend")]
-		public async Task KeyContainsEscapedDelimiter(string contents, string expectedKey) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue(expectedKey, "value")));
-		}
-		
-		[TestCase(@"key = \ value", " value")]
-		[TestCase("key = \\\tvalue", "\tvalue")]
-		[TestCase("key = \\\fvalue", "\fvalue")]
-		[TestCase("key=\\ \\\t\\\fvalue", " \t\fvalue")]
-		public async Task ValueBeginsWithEscapedWhitespace(string contents, string expectedValue) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", expectedValue)));
-		}
-		
-		[TestCase(@"key = value\", "value")]
-		public async Task ValueEndsWithTrailingBackslash(string contents, string expectedValue) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", expectedValue)));
-		}
-		
-		[TestCase("key=\\\0", "\0")]
-		[TestCase(@"key=\\", "\\")]
-		[TestCase(@"key=\t", "\t")]
-		[TestCase(@"key=\n", "\n")]
-		[TestCase(@"key=\r", "\r")]
-		[TestCase(@"key=\f", "\f")]
-		[TestCase(@"key=\u3053\u3093\u306b\u3061\u306f", "こんにちは")]
-		[TestCase(@"key=\u3053\u3093\u306B\u3061\u306F", "こんにちは")]
-		[TestCase("key=\\\0\\\\\\t\\n\\r\\f\\u3053", "\0\\\t\n\r\fこ")]
-		public async Task ValueContainsEscapedSpecialCharacters(string contents, string expectedValue) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", expectedValue)));
-		}
-		
-		[TestCase("key=first\\\nsecond", "first\nsecond")]
-		[TestCase("key=first\\\n    second", "first\nsecond")]
-		[TestCase("key=first\\\n#second", "first\n#second")]
-		[TestCase("key=first\\\n!second", "first\n!second")]
-		public async Task ValueContainsNewLine(string contents, string expectedValue) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", expectedValue)));
-		}
-		
-		[TestCase("key=first\\\n    \\ second", "first\n second")]
-		[TestCase("key=first\\\n    \\\tsecond", "first\n\tsecond")]
-		[TestCase("key=first\\\n    \\\fsecond", "first\n\fsecond")]
-		[TestCase("key=first\\\n \t\f\\ second", "first\n second")]
-		public async Task ValueContainsNewLineWithEscapedLeadingWhitespace(string contents, string expectedValue) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", expectedValue)));
-		}
-		
-		[Test]
-		public async Task ExampleFile() {
-			// From Wikipedia: https://en.wikipedia.org/wiki/.properties
-			const string ExampleFile = """
-			                           # You are reading a comment in ".properties" file.
-			                           ! The exclamation mark ('!') can also be used for comments.
-			                           # Comments are ignored.
-			                           # Blank lines are also ignored.
-			                           
-			                           # Lines with "properties" contain a key and a value separated by a delimiting character.
-			                           # There are 3 delimiting characters: equal ('='), colon (':') and whitespace (' ', '\t' and '\f').
-			                           website = https://en.wikipedia.org/
-			                           language : English
-			                           topic .properties files
-			                           # A word on a line will just create a key with no value.
-			                           empty
-			                           # Whitespace that appears between the key, the delimiter and the value is ignored.
-			                           # This means that the following are equivalent (other than for readability).
-			                           hello=hello
-			                           hello = hello
-			                           # To start the value with whitespace, escape it with a backslash ('\').
-			                           whitespaceStart = \ <-This space is not ignored.
-			                           # Keys with the same name will be overwritten by the key that is the furthest in a file.
-			                           # For example the final value for "duplicateKey" will be "second".
-			                           duplicateKey = first
-			                           duplicateKey = second
-			                           # To use the delimiter characters inside a key, you need to escape them with a ('\').
-			                           # However, there is no need to do this in the value.
-			                           delimiterCharacters\:\=\ = This is the value for the key "delimiterCharacters\:\=\ "
-			                           # Adding a backslash ('\') at the end of a line means that the value continues on the next line.
-			                           multiline = This line \
-			                           continues
-			                           # If you want your value to include a backslash ('\'), it should be escaped by another backslash ('\').
-			                           path = c:\\wiki\\templates
-			                           # This means that if the number of backslashes ('\') at the end of the line is even, the next line is not included in the value. 
-			                           # In the following example, the value for "evenKey" is "This is on one line\".
-			                           evenKey = This is on one line\\
-			                           # This line is a normal comment and is not included in the value for "evenKey".
-			                           # If the number of backslash ('\') is odd, then the next line is included in the value.
-			                           # In the following example, the value for "oddKey" is "This is line one and\# This is line two".
-			                           oddKey = This is line one and\\\
-			                           # This is line two
-			                           # Whitespace characters at the beginning of a line is removed.
-			                           # Make sure to add the spaces you need before the backslash ('\') on the first line. 
-			                           # If you add them at the beginning of the next line, they will be removed.
-			                           # In the following example, the value for "welcome" is "Welcome to Wikipedia!".
-			                           welcome = Welcome to \
-			                                     Wikipedia!
-			                           # If you need to add newlines and carriage returns, they need to be escaped using ('\n') and ('\r') respectively.
-			                           # You can also optionally escape tabs with ('\t') for readability purposes.
-			                           valueWithEscapes = This is a newline\n and a carriage return\r and a tab\t.
-			                           # You can also use Unicode escape characters (maximum of four hexadecimal digits).
-			                           # In the following example, the value for "encodedHelloInJapanese" is "こんにちは".
-			                           encodedHelloInJapanese = \u3053\u3093\u306b\u3061\u306f
-			                           """;
-			
-			ImmutableArray<KeyValuePair<string, string>> result = [
-				new ("website", "https://en.wikipedia.org/"),
-				new ("language", "English"),
-				new ("topic", ".properties files"),
-				new ("empty", ""),
-				new ("hello", "hello"),
-				new ("hello", "hello"),
-				new ("whitespaceStart", @" <-This space is not ignored."),
-				new ("duplicateKey", "first"),
-				new ("duplicateKey", "second"),
-				new ("delimiterCharacters:= ", @"This is the value for the key ""delimiterCharacters:= """),
-				new ("multiline", "This line \ncontinues"),
-				new ("path", @"c:\wiki\templates"),
-				new ("evenKey", @"This is on one line\"),
-				new ("oddKey", "This is line one and\\\n# This is line two"),
-				new ("welcome", "Welcome to \nWikipedia!"),
-				new ("valueWithEscapes", "This is a newline\n and a carriage return\r and a tab\t."),
-				new ("encodedHelloInJapanese", "こんにちは"),
-			];
-			
-			Assert.That(await Parse(ExampleFile), Is.EquivalentTo(result));
-		}
-	}
-	
-	public sealed class Writer {
-		private static async Task<string> Write(Func<JavaPropertiesStream.Writer, Task> write) {
-			using var stream = new MemoryStream();
-			
-			await using (var writer = new JavaPropertiesStream.Writer(stream)) {
-				await write(writer);
-			}
-			
-			return JavaPropertiesStream.Encoding.GetString(stream.ToArray());
-		}
-		
-		[TestCase("one line comment", "# one line comment\n")]
-		[TestCase("こんにちは", "# \\u3053\\u3093\\u306B\\u3061\\u306F\n")]
-		[TestCase("first line\nsecond line\r\nthird line", "# first line\n# second line\n# third line\n")]
-		public async Task Comment(string comment, string contents) {
-			Assert.That(await Write(writer => writer.WriteComment(comment, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[TestCase("key", "value", "key=value\n")]
-		[TestCase("key", "", "key=\n")]
-		[TestCase("", "value", "=value\n")]
-		public async Task SimpleKeyValue(string key, string value, string contents) {
-			Assert.That(await Write(writer => writer.WriteProperty(key, value, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[TestCase("#key", "value", "\\#key=value\n")]
-		[TestCase("!key", "value", "\\!key=value\n")]
-		public async Task KeyBeginsWithEscapedComment(string key, string value, string contents) {
-			Assert.That(await Write(writer => writer.WriteProperty(key, value, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[TestCase("=key", "value", "\\=key=value\n")]
-		[TestCase(":key", "value", "\\:key=value\n")]
-		[TestCase(" key", "value", "\\ key=value\n")]
-		[TestCase("\tkey", "value", "\\tkey=value\n")]
-		[TestCase("\fkey", "value", "\\fkey=value\n")]
-		public async Task KeyBeginsWithEscapedDelimiter(string key, string value, string contents) {
-			Assert.That(await Write(writer => writer.WriteProperty(key, value, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[TestCase("start=end", "value", "start\\=end=value\n")]
-		[TestCase("start:end", "value", "start\\:end=value\n")]
-		[TestCase("start end", "value", "start\\ end=value\n")]
-		[TestCase("start :=end", "value", "start\\ \\:\\=end=value\n")]
-		[TestCase("start \t\fend", "value", "start\\ \\t\\fend=value\n")]
-		public async Task KeyContainsEscapedDelimiter(string key, string value, string contents) {
-			Assert.That(await Write(writer => writer.WriteProperty(key, value, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[TestCase("\\", "value", "\\\\=value\n")]
-		[TestCase("\t", "value", "\\t=value\n")]
-		[TestCase("\n", "value", "\\n=value\n")]
-		[TestCase("\r", "value", "\\r=value\n")]
-		[TestCase("\f", "value", "\\f=value\n")]
-		[TestCase("こんにちは", "value", "\\u3053\\u3093\\u306B\\u3061\\u306F=value\n")]
-		[TestCase("\\\t\n\r\fこ", "value", "\\\\\\t\\n\\r\\f\\u3053=value\n")]
-		[TestCase("first-line\nsecond-line\r\nthird-line", "value", "first-line\\nsecond-line\\r\\nthird-line=value\n")]
-		public async Task KeyContainsEscapedSpecialCharacters(string key, string value, string contents) {
-			Assert.That(await Write(writer => writer.WriteProperty(key, value, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[TestCase("key", "\\", "key=\\\\\n")]
-		[TestCase("key", "\t", "key=\\t\n")]
-		[TestCase("key", "\n", "key=\\n\n")]
-		[TestCase("key", "\r", "key=\\r\n")]
-		[TestCase("key", "\f", "key=\\f\n")]
-		[TestCase("key", "こんにちは", "key=\\u3053\\u3093\\u306B\\u3061\\u306F\n")]
-		[TestCase("key", "\\\t\n\r\fこ", "key=\\\\\\t\\n\\r\\f\\u3053\n")]
-		[TestCase("key", "first line\nsecond line\r\nthird line", "key=first line\\nsecond line\\r\\nthird line\n")]
-		public async Task ValueContainsEscapedSpecialCharacters(string key, string value, string contents) {
-			Assert.That(await Write(writer => writer.WriteProperty(key, value, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[Test]
-		public async Task ExampleFile() {
-			string contents = await Write(static async writer => {
-				await writer.WriteComment("Comment", CancellationToken.None);
-				await writer.WriteProperty("key", "value", CancellationToken.None);
-				await writer.WriteProperty("multiline", "first line\nsecond line", CancellationToken.None);
-			});
-			
-			Assert.That(contents, Is.EqualTo("# Comment\nkey=value\nmultiline=first line\\nsecond line\n"));
-		}
-	}
-}

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

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="NUnit" />
-    <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="NUnit.Analyzers" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
-  </ItemGroup>
-
-</Project>

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

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

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

@@ -1,58 +1,92 @@
-namespace Phantom.Agent.Minecraft.Java;
+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 void SetAll(IDictionary<string, string> values) {
+	public async Task EditOrCreate(string filePath) {
-		foreach ((string key, string value) in values) {
-			Set(key, value);
-		}
-	}
-	
-	public async Task EditOrCreate(string filePath, string comment, CancellationToken cancellationToken) {
 		if (File.Exists(filePath)) {
 			string tmpFilePath = filePath + ".tmp";
-			await Edit(filePath, tmpFilePath, comment, cancellationToken);
+			File.Copy(filePath, tmpFilePath, overwrite: true);
+			await EditFromCopyOrCreate(filePath, tmpFilePath);
 			File.Move(tmpFilePath, filePath, overwrite: true);
 		}
 		else {
-			await Create(filePath, comment, cancellationToken);
+			await EditFromCopyOrCreate(null, filePath);
 		}
 	}
 	
-	private async Task Create(string targetFilePath, string comment, CancellationToken cancellationToken) {
+	private async Task EditFromCopyOrCreate(string? sourceFilePath, string targetFilePath) {
-		await using var targetWriter = new JavaPropertiesStream.Writer(targetFilePath);
+		var properties = new JavaProperties();
 		
-		await targetWriter.WriteComment(comment, cancellationToken);
+		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 ((string key, string value) in overriddenProperties) {
+		foreach (var (key, value) in overriddenProperties) {
-			await targetWriter.WriteProperty(key, value, cancellationToken);
+			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 async Task Edit(string sourceFilePath, string targetFilePath, string comment, CancellationToken cancellationToken) {
+	private static async Task WriteProperty(StreamWriter writer, string key, string value) {
-		using var sourceReader = new JavaPropertiesStream.Reader(sourceFilePath);
+		await WritePropertyComponent(writer, key, escapeSpaces: true);
-		await using var targetWriter = new JavaPropertiesStream.Writer(targetFilePath);
+		await writer.WriteAsync('=');
+		await WritePropertyComponent(writer, value, escapeSpaces: false);
+		await writer.WriteLineAsync();
+	}
 	
-		await targetWriter.WriteComment(comment, cancellationToken);
+	private static async Task WritePropertyComponent(TextWriter writer, string component, bool escapeSpaces) {
-		
+		for (int index = 0; index < component.Length; index++) {
-		var remainingOverriddenPropertyKeys = new HashSet<string>(overriddenProperties.Keys);
+			var c = component[index];
-		
+			switch (c) {
-		await foreach ((string key, string value) in sourceReader.ReadProperties(cancellationToken)) {
+				case '\\':
-			if (remainingOverriddenPropertyKeys.Remove(key)) {
+				case '#':
-				await targetWriter.WriteProperty(key, overriddenProperties[key], cancellationToken);
+				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;
 			}
-			else {
-				await targetWriter.WriteProperty(key, value, cancellationToken);
-			}
-		}
-		
-		foreach (string key in remainingOverriddenPropertyKeys) {
-			await targetWriter.WriteProperty(key, overriddenProperties[key], cancellationToken);
 		}
 	}
 }

Agent/Phantom.Agent.Minecraft/Java/JavaPropertiesStream.cs

@@ -1,284 +0,0 @@
-using System.Buffers;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Text;
-using Phantom.Utils.Collections;
-
-namespace Phantom.Agent.Minecraft.Java;
-
-static class JavaPropertiesStream {
-	internal static readonly Encoding Encoding = Encoding.GetEncoding("ISO-8859-1");
-	
-	private static FileStreamOptions CreateFileStreamOptions(FileMode mode, FileAccess access) {
-		return new FileStreamOptions {
-			Mode = mode,
-			Access = access,
-			Share = FileShare.Read,
-			Options = FileOptions.SequentialScan,
-		};
-	}
-	
-	internal sealed class Reader : IDisposable {
-		private static readonly SearchValues<char> LineStartWhitespace = SearchValues.Create(' ', '\t', '\f');
-		private static readonly SearchValues<char> KeyValueDelimiter = SearchValues.Create('=', ':', ' ', '\t', '\f');
-		private static readonly SearchValues<char> Backslash = SearchValues.Create('\\');
-		
-		private readonly StreamReader reader;
-		
-		public Reader(Stream stream) {
-			this.reader = new StreamReader(stream, Encoding, leaveOpen: false);
-		}
-		
-		public Reader(string path) {
-			this.reader = new StreamReader(path, Encoding, detectEncodingFromByteOrderMarks: false, CreateFileStreamOptions(FileMode.Open, FileAccess.Read));
-		}
-		
-		public async IAsyncEnumerable<KeyValuePair<string, string>> ReadProperties([EnumeratorCancellation] CancellationToken cancellationToken) {
-			await foreach (string line in ReadLogicalLines(cancellationToken)) {
-				yield return ParseLine(line.AsSpan());
-			}
-		}
-		
-		private async IAsyncEnumerable<string> ReadLogicalLines([EnumeratorCancellation] CancellationToken cancellationToken) {
-			StringBuilder nextLogicalLine = new StringBuilder();
-			
-			while (await reader.ReadLineAsync(cancellationToken) is {} line) {
-				var span = line.AsSpan();
-				int startIndex = span.IndexOfAnyExcept(LineStartWhitespace);
-				if (startIndex == -1) {
-					continue;
-				}
-				
-				if (nextLogicalLine.Length == 0 && (span[0] == '#' || span[0] == '!')) {
-					continue;
-				}
-				
-				span = span[startIndex..];
-				
-				if (IsEndEscaped(span)) {
-					nextLogicalLine.Append(span[..^1]);
-					nextLogicalLine.Append('\n');
-				}
-				else {
-					nextLogicalLine.Append(span);
-					yield return nextLogicalLine.ToString();
-					nextLogicalLine.Clear();
-				}
-			}
-			
-			if (nextLogicalLine.Length > 0) {
-				yield return nextLogicalLine.ToString(startIndex: 0, nextLogicalLine.Length - 1); // Remove trailing new line.
-			}
-		}
-		
-		private static KeyValuePair<string, string> ParseLine(ReadOnlySpan<char> line) {
-			int delimiterIndex = -1;
-			
-			foreach (int candidateIndex in line.IndicesOf(KeyValueDelimiter)) {
-				if (candidateIndex == 0 || !IsEndEscaped(line[..candidateIndex])) {
-					delimiterIndex = candidateIndex;
-					break;
-				}
-			}
-			
-			if (delimiterIndex == -1) {
-				return new KeyValuePair<string, string>(line.ToString(), string.Empty);
-			}
-			
-			string key = ReadPropertyComponent(line[..delimiterIndex]);
-			
-			line = line[(delimiterIndex + 1)..];
-			int valueStartIndex = line.IndexOfAnyExcept(KeyValueDelimiter);
-			string value = valueStartIndex == -1 ? string.Empty : ReadPropertyComponent(line[valueStartIndex..]);
-			
-			return new KeyValuePair<string, string>(key, value);
-		}
-		
-		private static string ReadPropertyComponent(ReadOnlySpan<char> component) {
-			StringBuilder builder = new StringBuilder();
-			int nextStartIndex = 0;
-			
-			foreach (int backslashIndex in component.IndicesOf(Backslash)) {
-				if (backslashIndex == component.Length - 1) {
-					break;
-				}
-				
-				if (backslashIndex < nextStartIndex) {
-					continue;
-				}
-				
-				builder.Append(component[nextStartIndex..backslashIndex]);
-				
-				int escapedIndex = backslashIndex + 1;
-				int escapedLength = 1;
-				
-				char c = component[escapedIndex];
-				switch (c) {
-					case 't':
-						builder.Append('\t');
-						break;
-					
-					case 'n':
-						builder.Append('\n');
-						break;
-					
-					case 'r':
-						builder.Append('\r');
-						break;
-					
-					case 'f':
-						builder.Append('\f');
-						break;
-					
-					case 'u':
-						escapedLength += 4;
-						
-						int hexRangeStart = escapedIndex + 1;
-						int hexRangeEnd = hexRangeStart + 4;
-						
-						if (hexRangeEnd - 1 < component.Length) {
-							var hexString = component[hexRangeStart..hexRangeEnd];
-							int hexValue = int.Parse(hexString, NumberStyles.HexNumber);
-							builder.Append((char) hexValue);
-						}
-						else {
-							throw new FormatException("Malformed \\uxxxx encoding.");
-						}
-						
-						break;
-					
-					default:
-						builder.Append(c);
-						break;
-				}
-				
-				nextStartIndex = escapedIndex + escapedLength;
-			}
-			
-			builder.Append(component[nextStartIndex..]);
-			return builder.ToString();
-		}
-		
-		private static bool IsEndEscaped(ReadOnlySpan<char> span) {
-			if (span.EndsWith('\\')) {
-				int trailingBackslashCount = span.Length - span.TrimEnd('\\').Length;
-				return trailingBackslashCount % 2 == 1;
-			}
-			else {
-				return false;
-			}
-		}
-		
-		public void Dispose() {
-			reader.Dispose();
-		}
-	}
-	
-	internal sealed class Writer : IAsyncDisposable {
-		private const string CommentStart = "# ";
-		
-		private readonly StreamWriter writer;
-		private readonly Memory<char> oneCharBuffer = new char[1];
-		
-		public Writer(Stream stream) {
-			this.writer = new StreamWriter(stream, Encoding, leaveOpen: false);
-		}
-		
-		public Writer(string path) {
-			this.writer = new StreamWriter(path, Encoding, CreateFileStreamOptions(FileMode.Create, FileAccess.Write));
-		}
-		
-		public async Task WriteComment(string comment, CancellationToken cancellationToken) {
-			await Write(CommentStart, cancellationToken);
-			
-			for (int index = 0; index < comment.Length; index++) {
-				char c = comment[index];
-				switch (c) {
-					case var _ when c > 31 && c < 127:
-						await Write(c, cancellationToken);
-						break;
-					
-					case '\n':
-					case '\r':
-						await Write(c: '\n', cancellationToken);
-						await Write(CommentStart, cancellationToken);
-						
-						if (index < comment.Length - 1 && comment[index + 1] == '\n') {
-							index++;
-						}
-						
-						break;
-					
-					default:
-						await Write("\\u", cancellationToken);
-						await Write(((int) c).ToString("X4"), cancellationToken);
-						break;
-				}
-			}
-			
-			await Write(c: '\n', cancellationToken);
-		}
-		
-		public async Task WriteProperty(string key, string value, CancellationToken cancellationToken) {
-			await WritePropertyComponent(key, escapeSpaces: true, cancellationToken);
-			await Write(c: '=', cancellationToken);
-			await WritePropertyComponent(value, escapeSpaces: false, cancellationToken);
-			await Write(c: '\n', cancellationToken);
-		}
-		
-		private async Task WritePropertyComponent(string component, bool escapeSpaces, CancellationToken cancellationToken) {
-			for (int index = 0; index < component.Length; index++) {
-				char c = component[index];
-				switch (c) {
-					case '\\':
-					case '#':
-					case '!':
-					case '=':
-					case ':':
-					case ' ' when escapeSpaces || index == 0:
-						await Write(c: '\\', cancellationToken);
-						await Write(c, cancellationToken);
-						break;
-					
-					case var _ when c > 31 && c < 127:
-						await Write(c, cancellationToken);
-						break;
-					
-					case '\t':
-						await Write("\\t", cancellationToken);
-						break;
-					
-					case '\n':
-						await Write("\\n", cancellationToken);
-						break;
-					
-					case '\r':
-						await Write("\\r", cancellationToken);
-						break;
-					
-					case '\f':
-						await Write("\\f", cancellationToken);
-						break;
-					
-					default:
-						await Write("\\u", cancellationToken);
-						await Write(((int) c).ToString("X4"), cancellationToken);
-						break;
-				}
-			}
-		}
-		
-		private Task Write(char c, CancellationToken cancellationToken) {
-			oneCharBuffer.Span[0] = c;
-			return writer.WriteAsync(oneCharBuffer, cancellationToken);
-		}
-		
-		private Task Write(string value, CancellationToken cancellationToken) {
-			return writer.WriteAsync(value.AsMemory(), cancellationToken);
-		}
-		
-		public async ValueTask DisposeAsync() {
-			await writer.DisposeAsync();
-		}
-	}
-}

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

@@ -1,7 +1,5 @@
 using System.Diagnostics;
-using System.Runtime.CompilerServices;
 using Phantom.Common.Data.Java;
-using Phantom.Utils.Collections;
 using Phantom.Utils.IO;
 using Phantom.Utils.Logging;
 using Serilog;
@@ -21,14 +19,13 @@ public sealed class JavaRuntimeDiscovery {
 		return null;
 	}
 	
-	public static async Task<JavaRuntimeRepository> Scan(string folderPath, CancellationToken cancellationToken) {
+	public static IAsyncEnumerable<JavaRuntimeExecutable> Scan(string folderPath) {
-		var runtimes = await new JavaRuntimeDiscovery().ScanInternal(folderPath, cancellationToken).ToImmutableArrayAsync(cancellationToken);
+		return new JavaRuntimeDiscovery().ScanInternal(folderPath);
-		return new JavaRuntimeRepository(runtimes);
 	}
 	
 	private readonly Dictionary<string, int> duplicateDisplayNames = new ();
 	
-	private async IAsyncEnumerable<JavaRuntimeExecutable> ScanInternal(string folderPath, [EnumeratorCancellation] CancellationToken cancellationToken) {
+	private async IAsyncEnumerable<JavaRuntimeExecutable> ScanInternal(string folderPath) {
 		Logger.Information("Starting Java runtime scan in: {FolderPath}", folderPath);
 		
 		string javaExecutableName = OperatingSystem.IsWindows() ? "java.exe" : "java";
@@ -38,10 +35,8 @@ public sealed class JavaRuntimeDiscovery {
 			RecurseSubdirectories = true,
 			ReturnSpecialDirectories = false,
 			IgnoreInaccessible = true,
-			AttributesToSkip = FileAttributes.Hidden | FileAttributes.ReparsePoint | FileAttributes.System,
+			AttributesToSkip = FileAttributes.Hidden | FileAttributes.ReparsePoint | FileAttributes.System
 		}).Order()) {
-			cancellationToken.ThrowIfCancellationRequested();
-			
 			var javaExecutablePath = Paths.NormalizeSlashes(Path.Combine(binFolderPath, javaExecutableName));
 			
 			FileAttributes javaExecutableAttributes;
@@ -59,7 +54,7 @@ public sealed class JavaRuntimeDiscovery {
 			
 			JavaRuntime? foundRuntime;
 			try {
-				foundRuntime = await TryReadJavaRuntimeInformationFromProcess(javaExecutablePath, cancellationToken);
+				foundRuntime = await TryReadJavaRuntimeInformationFromProcess(javaExecutablePath);
 			} catch (OperationCanceledException) {
 				Logger.Error("Java process did not exit in time.");
 				continue;
@@ -78,7 +73,7 @@ public sealed class JavaRuntimeDiscovery {
 		}
 	}
 	
-	private async Task<JavaRuntime?> TryReadJavaRuntimeInformationFromProcess(string javaExecutablePath, CancellationToken cancellationToken) {
+	private async Task<JavaRuntime?> TryReadJavaRuntimeInformationFromProcess(string javaExecutablePath) {
 		var startInfo = new ProcessStartInfo {
 			FileName = javaExecutablePath,
 			WorkingDirectory = Path.GetDirectoryName(javaExecutablePath),
@@ -86,29 +81,32 @@ public sealed class JavaRuntimeDiscovery {
 			RedirectStandardInput = false,
 			RedirectStandardOutput = false,
 			RedirectStandardError = true,
-			UseShellExecute = false,
+			UseShellExecute = false
 		};
 		
-		using var timeoutCancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
+		var process = new Process { StartInfo = startInfo };
-		using var combinedCancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(timeoutCancellationTokenSource.Token, cancellationToken);
+		var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
 		
-		using var process = new Process();
+		try {
-		process.StartInfo = startInfo;
+			process.Start();
-		process.Start();
 			
-		JavaRuntimeBuilder runtimeBuilder = new ();
+			JavaRuntimeBuilder runtimeBuilder = new ();
 			
-		while (await process.StandardError.ReadLineAsync(combinedCancellationTokenSource.Token) is {} line) {
+			while (await process.StandardError.ReadLineAsync(cancellationTokenSource.Token) is {} line) {
-			ExtractJavaVersionPropertiesFromLine(line, runtimeBuilder);
+				ExtractJavaVersionPropertiesFromLine(line, runtimeBuilder);
 				
-			JavaRuntime? runtime = runtimeBuilder.TryBuild(duplicateDisplayNames);
+				JavaRuntime? runtime = runtimeBuilder.TryBuild(duplicateDisplayNames);
-			if (runtime != null) {
+				if (runtime != null) {
-				return runtime;
+					return runtime;
+				}
 			}
-		}
 			
-		await process.WaitForExitAsync(combinedCancellationTokenSource.Token);
+			await process.WaitForExitAsync(cancellationTokenSource.Token);
-		return null;
+			return null;
+		} finally {
+			process.Dispose();
+			cancellationTokenSource.Dispose();
+		}
 	}
 	
 	private static void ExtractJavaVersionPropertiesFromLine(ReadOnlySpan<char> line, JavaRuntimeBuilder runtimeBuilder) {

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

@@ -2,4 +2,12 @@
 
 namespace Phantom.Agent.Minecraft.Java;
 
-public sealed record JavaRuntimeExecutable(string ExecutablePath, JavaRuntime Runtime);
+public sealed class JavaRuntimeExecutable {
+	internal string ExecutablePath { get; }
+	internal JavaRuntime Runtime { get; }
+	
+	internal JavaRuntimeExecutable(string executablePath, JavaRuntime runtime) {
+		this.ExecutablePath = executablePath;
+		this.Runtime = runtime;
+	}
+}

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

@@ -6,27 +6,41 @@ using Phantom.Utils.Cryptography;
 namespace Phantom.Agent.Minecraft.Java;
 
 public sealed class JavaRuntimeRepository {
-	private readonly ImmutableDictionary<Guid, JavaRuntimeExecutable> runtimesByGuid;
+	private readonly Dictionary<string, Guid> guidsByPath = new ();
-	
+	private readonly Dictionary<Guid, JavaRuntimeExecutable> runtimesByGuid = new ();
-	internal JavaRuntimeRepository(ImmutableArray<JavaRuntimeExecutable> runtimes) {
+	private readonly ReaderWriterLockSlim rwLock = new (LockRecursionPolicy.NoRecursion);
-		var runtimesByGuidBuilder = ImmutableDictionary.CreateBuilder<Guid, JavaRuntimeExecutable>();
-		
-		foreach (JavaRuntimeExecutable runtime in runtimes) {
-			runtimesByGuidBuilder.Add(GenerateStableGuid(runtime.ExecutablePath), runtime);
-		}
-		
-		runtimesByGuid = runtimesByGuidBuilder.ToImmutable();
-	}
 	
 	public ImmutableArray<TaggedJavaRuntime> All {
-		[SuppressMessage("ReSharper", "UseCollectionExpression")]
+		get {
-		get => runtimesByGuid.Select(static kvp => new TaggedJavaRuntime(kvp.Key, kvp.Value.Runtime))
+			rwLock.EnterReadLock();
-		                     .OrderBy(static taggedRuntime => taggedRuntime.Runtime)
+			try {
-		                     .ToImmutableArray();
+				return runtimesByGuid.Select(static kvp => new TaggedJavaRuntime(kvp.Key, kvp.Value.Runtime)).OrderBy(static taggedRuntime => taggedRuntime.Runtime).ToImmutableArray();
+			} finally {
+				rwLock.ExitReadLock();
+			}
+		}
+	}
+	
+	public void Include(JavaRuntimeExecutable runtime) {
+		rwLock.EnterWriteLock();
+		try {
+			if (!guidsByPath.TryGetValue(runtime.ExecutablePath, out var guid)) {
+				guidsByPath[runtime.ExecutablePath] = guid = GenerateStableGuid(runtime.ExecutablePath);
+			}
+			
+			runtimesByGuid[guid] = runtime;
+		} finally {
+			rwLock.ExitWriteLock();
+		}
 	}
 	
 	public bool TryGetByGuid(Guid guid, [MaybeNullWhen(false)] out JavaRuntimeExecutable runtime) {
-		return runtimesByGuid.TryGetValue(guid, out runtime);
+		rwLock.EnterReadLock();
+		try {
+			return runtimesByGuid.TryGetValue(guid, out runtime);
+		} finally {
+			rwLock.ExitReadLock();
+		}
 	}
 	
 	private static Guid GenerateStableGuid(string executablePath) {

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

@@ -2,8 +2,13 @@
 
 namespace Phantom.Agent.Minecraft.Java;
 
-sealed class JvmArgumentBuilder(JvmProperties basicProperties) {
+sealed class JvmArgumentBuilder {
-	private readonly List<string> customArguments = [];
+	private readonly JvmProperties basicProperties;
+	private readonly List<string> customArguments = new ();
+	
+	public JvmArgumentBuilder(JvmProperties basicProperties) {
+		this.basicProperties = basicProperties;
+	}
 	
 	public void Add(string argument) {
 		customArguments.Add(argument);

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

@@ -0,0 +1,116 @@
+using System.Text;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Minecraft.Server;
+using Phantom.Utils.Processes;
+using Serilog;
+
+namespace Phantom.Agent.Minecraft.Launcher;
+
+public abstract class BaseLauncher : IServerLauncher {
+	private readonly InstanceProperties instanceProperties;
+	
+	protected string MinecraftVersion => instanceProperties.ServerVersion;
+	
+	private protected BaseLauncher(InstanceProperties instanceProperties) {
+		this.instanceProperties = instanceProperties;
+	}
+	
+	public async Task<LaunchResult> Launch(ILogger logger, LaunchServices services, EventHandler<DownloadProgressEventArgs> downloadProgressEventHandler, CancellationToken cancellationToken) {
+		if (!services.JavaRuntimeRepository.TryGetByGuid(instanceProperties.JavaRuntimeGuid, out var javaRuntimeExecutable)) {
+			return new LaunchResult.InvalidJavaRuntime();
+		}
+		
+		var vanillaServerJarPath = await services.ServerExecutables.DownloadAndGetPath(instanceProperties.LaunchProperties.ServerDownloadInfo, MinecraftVersion, downloadProgressEventHandler, cancellationToken);
+		if (vanillaServerJarPath == null) {
+			return new LaunchResult.CouldNotDownloadMinecraftServer();
+		}
+		
+		ServerJarInfo? serverJar;
+		try {
+			serverJar = await PrepareServerJar(logger, vanillaServerJarPath, cancellationToken);
+		} catch (OperationCanceledException) {
+			throw;
+		} catch (Exception e) {
+			logger.Error(e, "Caught exception while preparing the server jar.");
+			return new LaunchResult.CouldNotPrepareMinecraftServerLauncher();
+		}
+		
+		if (!File.Exists(serverJar.FilePath)) {
+			logger.Error("Missing prepared server or launcher jar: {FilePath}", serverJar.FilePath);
+			return new LaunchResult.CouldNotPrepareMinecraftServerLauncher();
+		}
+		
+		try {
+			await AcceptEula(instanceProperties);
+			await UpdateServerProperties(instanceProperties);
+		} catch (Exception e) {
+			logger.Error(e, "Caught exception while configuring the server.");
+			return new LaunchResult.CouldNotConfigureMinecraftServer();
+		}
+		
+		var processConfigurator = new ProcessConfigurator {
+			FileName = javaRuntimeExecutable.ExecutablePath,
+			WorkingDirectory = instanceProperties.InstanceFolder,
+			RedirectInput = true,
+			UseShellExecute = false
+		};
+		
+		var processArguments = processConfigurator.ArgumentList;
+		PrepareJvmArguments(serverJar).Build(processArguments);
+		processArguments.Add("-jar");
+		processArguments.Add(serverJar.FilePath);
+		processArguments.Add("nogui");
+		
+		var process = processConfigurator.CreateProcess();
+		var instanceProcess = new InstanceProcess(instanceProperties, process);
+		
+		try {
+			process.Start();
+		} catch (Exception launchException) {
+			logger.Error(launchException, "Caught exception launching the server process.");
+			
+			try {
+				process.Kill();
+			} catch (Exception killException) {
+				logger.Error(killException, "Caught exception trying to kill the server process after a failed launch.");
+			}
+			
+			return new LaunchResult.CouldNotStartMinecraftServer();
+		}
+		
+		return new LaunchResult.Success(instanceProcess);
+	}
+	
+	private JvmArgumentBuilder PrepareJvmArguments(ServerJarInfo serverJar) {
+		var builder = new JvmArgumentBuilder(instanceProperties.JvmProperties);
+		
+		foreach (string argument in instanceProperties.JvmArguments) {
+			builder.Add(argument);
+		}
+		
+		foreach (var argument in serverJar.ExtraArgs) {
+			builder.Add(argument);
+		}
+		
+		CustomizeJvmArguments(builder);
+		return builder;
+	}
+	
+	private protected virtual void CustomizeJvmArguments(JvmArgumentBuilder arguments) {}
+	
+	private protected virtual Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
+		return Task.FromResult(new ServerJarInfo(serverJarPath));
+	}
+	
+	private static async Task AcceptEula(InstanceProperties instanceProperties) {
+		var eulaFilePath = Path.Combine(instanceProperties.InstanceFolder, "eula.txt");
+		await File.WriteAllLinesAsync(eulaFilePath, new[] { "# EULA", "eula=true" }, Encoding.UTF8);
+	}
+	
+	private static async Task UpdateServerProperties(InstanceProperties instanceProperties) {
+		var serverPropertiesEditor = new JavaPropertiesFileEditor();
+		instanceProperties.ServerProperties.SetTo(serverPropertiesEditor);
+		await serverPropertiesEditor.EditOrCreate(Path.Combine(instanceProperties.InstanceFolder, "server.properties"));
+	}
+}

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

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

Agent/Phantom.Agent.Minecraft/Launcher/InstanceLauncher.cs

@@ -1,115 +0,0 @@
-using System.Collections.Immutable;
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Java;
-using Phantom.Agent.Minecraft.Server;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Instance.Launch;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Utils.Processes;
-using Serilog;
-
-namespace Phantom.Agent.Minecraft.Launcher;
-
-public sealed class InstanceLauncher(
-	FileDownloadManager downloadManager,
-	IInstancePathResolver pathResolver,
-	IInstanceValueResolver valueResolver,
-	InstanceProperties instanceProperties,
-	InstanceLaunchRecipe launchRecipe
-) {
-	public async Task<LaunchResult> Launch(ILogger logger, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) {
-		string? executablePath = launchRecipe.Executable.Resolve(pathResolver);
-		if (executablePath == null) {
-			logger.Error("Could not resolve server executable: {Path}", launchRecipe.Executable);
-			return new LaunchResult.CouldNotFindServerExecutable();
-		}
-		
-		var stepVisitor = new StepExecutor(downloadManager, pathResolver, reportStatus, cancellationToken);
-		var steps = launchRecipe.Preparation;
-		
-		for (int stepIndex = 0; stepIndex < steps.Length; stepIndex++) {
-			var step = steps[stepIndex];
-			try {
-				await step.Run(stepVisitor);
-			} catch (Exception e) {
-				logger.Error(e, "Failed preparation step {StepIndex} out of {StepCount}: {Step}", stepIndex, steps.Length, step);
-				return new LaunchResult.CouldNotPrepareServerInstance();
-			}
-		}
-		
-		var processConfigurator = new ProcessConfigurator {
-			FileName = executablePath,
-			WorkingDirectory = instanceProperties.InstanceFolder,
-			RedirectInput = true,
-			UseShellExecute = false,
-		};
-		
-		var processArguments = processConfigurator.ArgumentList;
-		
-		foreach (var value in launchRecipe.Arguments) {
-			if (value.Resolve(valueResolver) is {} resolved) {
-				processArguments.Add(resolved);
-			}
-			else {
-				logger.Error("Could not resolve server executable argument: {Value}", value);
-				return new LaunchResult.CouldNotPrepareServerInstance();
-			}
-		}
-		
-		var process = processConfigurator.CreateProcess();
-		var instanceProcess = new InstanceProcess(instanceProperties, process);
-		
-		try {
-			process.Start();
-		} catch (Exception launchException) {
-			logger.Error(launchException, "Caught exception launching the server process.");
-			
-			try {
-				process.Kill();
-			} catch (Exception killException) {
-				logger.Error(killException, "Caught exception trying to kill the server process after a failed launch.");
-			}
-			
-			return new LaunchResult.CouldNotStartServerExecutable();
-		}
-		
-		return new LaunchResult.Success(instanceProcess);
-	}
-	
-	private sealed class StepExecutor(FileDownloadManager downloadManager, IInstancePathResolver pathResolver, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) : IInstanceLaunchStepExecutor {
-		public async Task DownloadFile(FileDownloadInfo downloadInfo, IInstancePath path) {
-			string? filePath = path.Resolve(pathResolver);
-			if (filePath == null) {
-				throw new FileNotFoundException("Could not resolve path");
-			}
-			
-			byte? lastDownloadProgress = null;
-			
-			void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
-				byte? progress = args.TotalBytes is not {} totalBytes ? null : (byte) Math.Min(args.DownloadedBytes * 100 / totalBytes, val2: 100);
-				
-				if (lastDownloadProgress != progress) {
-					lastDownloadProgress = progress;
-					reportStatus(InstanceStatus.Downloading(progress));
-				}
-			}
-			
-			if (await downloadManager.DownloadAndGetPath(downloadInfo, filePath, OnDownloadProgress, cancellationToken) == null) {
-				throw new FileNotFoundException("Could not download file");
-			}
-			
-			reportStatus(null);
-		}
-		
-		public async Task EditPropertiesFile(InstancePath.Local path, string comment, ImmutableDictionary<string, string> newValues) {
-			string? filePath = path.Resolve(pathResolver);
-			if (filePath == null) {
-				throw new FileNotFoundException("Could not resolve path");
-			}
-			
-			var editor = new JavaPropertiesFileEditor();
-			editor.SetAll(newValues);
-			await editor.EditOrCreate(filePath, comment, cancellationToken);
-		}
-	}
-}

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

@@ -7,9 +7,13 @@ public abstract record LaunchResult {
 	
 	public sealed record Success(InstanceProcess Process) : LaunchResult;
 	
-	public sealed record CouldNotPrepareServerInstance : LaunchResult;
+	public sealed record InvalidJavaRuntime : LaunchResult;
 	
-	public sealed record CouldNotFindServerExecutable : LaunchResult;
+	public sealed record CouldNotDownloadMinecraftServer : LaunchResult;
 	
-	public sealed record CouldNotStartServerExecutable : LaunchResult;
+	public sealed record CouldNotPrepareMinecraftServerLauncher : LaunchResult;
+	
+	public sealed record CouldNotConfigureMinecraftServer : LaunchResult;
+	
+	public sealed record CouldNotStartMinecraftServer : LaunchResult;
 }

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

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

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

@@ -0,0 +1,55 @@
+using System.Collections.Immutable;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Utils.IO;
+using Serilog;
+
+namespace Phantom.Agent.Minecraft.Launcher.Types;
+
+public sealed class FabricLauncher : BaseLauncher {
+	public FabricLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}
+	
+	private protected override async Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
+		var serverJarParentFolderPath = Directory.GetParent(serverJarPath);
+		if (serverJarParentFolderPath == null) {
+			throw new ArgumentException("Could not get parent folder from: " + serverJarPath, nameof(serverJarPath));
+		}
+		
+		var launcherJarPath = Path.Combine(serverJarParentFolderPath.FullName, "fabric.jar");
+		
+		if (!File.Exists(launcherJarPath)) {
+			await DownloadLauncher(logger, launcherJarPath, cancellationToken);
+		}
+		
+		return new ServerJarInfo(launcherJarPath, ImmutableArray.Create("-Dfabric.installer.server.gameJar=" + Paths.NormalizeSlashes(serverJarPath)));
+	}
+	
+	private async Task DownloadLauncher(ILogger logger, string targetFilePath, CancellationToken cancellationToken) {
+		// TODO customizable loader version, probably with a dedicated temporary folder
+		string installerUrl = $"https://meta.fabricmc.net/v2/versions/loader/{MinecraftVersion}/stable/stable/server/jar";
+		logger.Information("Downloading Fabric launcher from: {Url}", installerUrl);
+		
+		using var http = new HttpClient();
+		
+		var response = await http.GetAsync(installerUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+		response.EnsureSuccessStatusCode();
+		
+		try {
+			await using var fileStream = new FileStream(targetFilePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
+			await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
+			await responseStream.CopyToAsync(fileStream, cancellationToken);
+		} catch (Exception) {
+			TryDeleteLauncherAfterFailure(logger, targetFilePath);
+			throw;
+		}
+	}
+	
+	private static void TryDeleteLauncherAfterFailure(ILogger logger, string filePath) {
+		if (File.Exists(filePath)) {
+			try {
+				File.Delete(filePath);
+			} catch (Exception e) {
+				logger.Warning(e, "Could not clean up partially downloaded Fabric launcher: {FilePath}", filePath);
+			}
+		}
+	}
+}

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

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

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

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

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <InternalsVisibleTo Include="Phantom.Agent.Minecraft.Tests" />
+    <PackageReference Include="Kajabity.Tools.Java" />
   </ItemGroup>
   
   <ItemGroup>

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

@@ -0,0 +1,22 @@
+namespace Phantom.Agent.Minecraft.Properties;
+
+static class MinecraftServerProperties {
+	private sealed class Boolean : MinecraftServerProperty<bool> {
+		public Boolean(string key) : base(key) {}
+		
+		protected override bool Read(string value) => value.Equals("true", StringComparison.OrdinalIgnoreCase);
+		protected override string Write(bool value) => value ? "true" : "false";
+	}
+	
+	private sealed class UnsignedShort : MinecraftServerProperty<ushort> {
+		public UnsignedShort(string key) : base(key) {}
+		
+		protected override ushort Read(string value) => ushort.Parse(value);
+		protected override string Write(ushort value) => value.ToString();
+	}
+	
+	public static readonly MinecraftServerProperty<ushort> ServerPort = new UnsignedShort("server-port");
+	public static readonly MinecraftServerProperty<ushort> RconPort = new UnsignedShort("rcon.port");
+	public static readonly MinecraftServerProperty<bool> EnableRcon = new Boolean("enable-rcon");
+	public static readonly MinecraftServerProperty<bool> SyncChunkWrites = new Boolean("sync-chunk-writes");
+}

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

@@ -0,0 +1,18 @@
+using Phantom.Agent.Minecraft.Java;
+
+namespace Phantom.Agent.Minecraft.Properties;
+
+abstract class MinecraftServerProperty<T> {
+	private readonly string key;
+	
+	protected MinecraftServerProperty(string key) {
+		this.key = key;
+	}
+	
+	protected abstract T Read(string value);
+	protected abstract string Write(T value);
+	
+	public void Set(JavaPropertiesFileEditor properties, T value) {
+		properties.Set(key, Write(value));
+	}
+}

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

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

Agent/Phantom.Agent.Minecraft/Server/DownloadProgressEventArgs.cs

@@ -2,9 +2,9 @@
 
 public sealed class DownloadProgressEventArgs : EventArgs {
 	public ulong DownloadedBytes { get; }
-	public ulong? TotalBytes { get; }
+	public ulong TotalBytes { get; }
 	
-	internal DownloadProgressEventArgs(ulong downloadedBytes, ulong? totalBytes) {
+	internal DownloadProgressEventArgs(ulong downloadedBytes, ulong totalBytes) {
 		DownloadedBytes = downloadedBytes;
 		TotalBytes = totalBytes;
 	}

Agent/Phantom.Agent.Minecraft/Server/FileDownloadListener.cs

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

Agent/Phantom.Agent.Minecraft/Server/FileDownloadManager.cs

@@ -1,52 +0,0 @@
-using Phantom.Common.Data.Minecraft;
-using Phantom.Utils.IO;
-using Phantom.Utils.Logging;
-using Serilog;
-
-namespace Phantom.Agent.Minecraft.Server;
-
-public sealed class FileDownloadManager {
-	private static readonly ILogger Logger = PhantomLogger.Create<FileDownloadManager>();
-	
-	private readonly Dictionary<string, FileDownloader> runningDownloadersByPath = new ();
-	
-	internal async Task<string?> DownloadAndGetPath(FileDownloadInfo fileDownloadInfo, string filePath, EventHandler<DownloadProgressEventArgs> progressEventHandler, CancellationToken cancellationToken) {
-		var fileInfo = new FileInfo(filePath);
-		if (fileInfo.Exists) {
-			return filePath;
-		}
-		
-		filePath = fileInfo.FullName;
-		
-		if (Directory.GetParent(filePath) is {} parentPath) {
-			try {
-				Directories.Create(parentPath.FullName, Chmod.URWX_GRX);
-			} catch (Exception e) {
-				Logger.Error(e, "Unable to create folder: {FolderName}", parentPath.FullName);
-				return null;
-			}
-		}
-		
-		FileDownloader? downloader;
-		FileDownloadListener listener = new (progressEventHandler, cancellationToken);
-		
-		lock (this) {
-			if (runningDownloadersByPath.TryGetValue(filePath, out downloader)) {
-				Logger.Information("A download for {Path} is already running, waiting for it to finish...", filePath);
-				downloader.Register(listener);
-			}
-			else {
-				downloader = new FileDownloader(fileDownloadInfo, filePath, listener);
-				downloader.Completed += (_, _) => {
-					lock (this) {
-						runningDownloadersByPath.Remove(filePath);
-					}
-				};
-				
-				runningDownloadersByPath[filePath] = downloader;
-			}
-		}
-		
-		return await downloader.Task.WaitAsync(cancellationToken);
-	}
-}

Agent/Phantom.Agent.Minecraft/Server/FileDownloader.cs

@@ -1,202 +0,0 @@
-using System.Security.Cryptography;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Utils.Cryptography;
-using Phantom.Utils.IO;
-using Phantom.Utils.Logging;
-using Phantom.Utils.Net;
-using Phantom.Utils.Runtime;
-using Serilog;
-
-namespace Phantom.Agent.Minecraft.Server;
-
-sealed class FileDownloader {
-	private static readonly ILogger Logger = PhantomLogger.Create<FileDownloader>();
-	
-	public Task<string?> Task { get; }
-	public event EventHandler<DownloadProgressEventArgs>? DownloadProgress;
-	public event EventHandler? Completed;
-	
-	private readonly CancellationTokenSource cancellationTokenSource = new ();
-	
-	private readonly List<CancellationTokenRegistration> listenerCancellationRegistrations = [];
-	private int listenerCount = 0;
-	
-	public FileDownloader(FileDownloadInfo fileDownloadInfo, string filePath, FileDownloadListener listener) {
-		Register(listener);
-		Task = DownloadFileAndGetFinalPath(fileDownloadInfo, filePath, new DownloadProgressCallback(this), cancellationTokenSource.Token);
-		Task.ContinueWith(OnCompleted, TaskScheduler.Default);
-	}
-	
-	public void Register(FileDownloadListener listener) {
-		int newListenerCount;
-		
-		lock (this) {
-			newListenerCount = ++listenerCount;
-			
-			DownloadProgress += listener.DownloadProgressEventHandler;
-			listenerCancellationRegistrations.Add(listener.CancellationToken.Register(Unregister, listener));
-		}
-		
-		Logger.Debug("Registered download listener, current listener count: {Listeners}", newListenerCount);
-	}
-	
-	private void Unregister(object? listenerObject) {
-		int newListenerCount;
-		
-		lock (this) {
-			FileDownloadListener listener = (FileDownloadListener) listenerObject!;
-			DownloadProgress -= listener.DownloadProgressEventHandler;
-			
-			newListenerCount = --listenerCount;
-			if (newListenerCount <= 0) {
-				cancellationTokenSource.Cancel();
-			}
-		}
-		
-		if (newListenerCount <= 0) {
-			Logger.Debug("Unregistered last download listener, cancelling download.");
-		}
-		else {
-			Logger.Debug("Unregistered download listener, current listener count: {Listeners}", newListenerCount);
-		}
-	}
-	
-	private void ReportDownloadProgress(DownloadProgressEventArgs args) {
-		DownloadProgress?.Invoke(this, args);
-	}
-	
-	private void OnCompleted(Task task) {
-		Logger.Debug("Download task completed.");
-		
-		lock (this) {
-			Completed?.Invoke(this, EventArgs.Empty);
-			Completed = null;
-			DownloadProgress = null;
-			
-			foreach (var registration in listenerCancellationRegistrations) {
-				registration.Dispose();
-			}
-			
-			listenerCancellationRegistrations.Clear();
-			cancellationTokenSource.Dispose();
-		}
-	}
-	
-	private sealed class DownloadProgressCallback(FileDownloader downloader) {
-		public void ReportProgress(ulong downloadedBytes, ulong? totalBytes) {
-			downloader.ReportDownloadProgress(new DownloadProgressEventArgs(downloadedBytes, totalBytes));
-		}
-	}
-	
-	private static async Task<string?> DownloadFileAndGetFinalPath(FileDownloadInfo fileDownloadInfo, string filePath, DownloadProgressCallback progressCallback, CancellationToken cancellationToken) {
-		string tmpFilePath = filePath + ".tmp";
-		
-		try {
-			await DownloadFile(tmpFilePath, fileDownloadInfo, progressCallback, cancellationToken);
-			MoveDownloadedFile(filePath, tmpFilePath);
-		} catch (Exception) {
-			TryDeletePartiallyDownloadedFile(tmpFilePath);
-			throw;
-		}
-		
-		return filePath;
-	}
-	
-	private static async Task DownloadFile(string filePath, FileDownloadInfo fileDownloadInfo, DownloadProgressCallback progressCallback, CancellationToken cancellationToken) {
-		string downloadUrl = fileDownloadInfo.DownloadUrl;
-		
-		DownloadResult result;
-		try {
-			var httpClient = new HttpClient();
-			var response = await httpClient.GetAsync(downloadUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
-			response.EnsureSuccessStatusCode();
-			
-			FileSize? fileSize = response.Headers.ContentLength;
-			ulong? fileSizeBytes = fileSize?.Bytes;
-			
-			Logger.Information("Downloading {Url} ({Size})...", downloadUrl, FormatFileSize(fileSize));
-			progressCallback.ReportProgress(downloadedBytes: 0, fileSizeBytes);
-			
-			await using var fileStream = new FileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
-			await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
-			
-			using var streamCopier = new DownloadStreamCopier(progressCallback, fileSizeBytes);
-			result = await streamCopier.Copy(responseStream, fileStream, cancellationToken);
-		} catch (OperationCanceledException) {
-			Logger.Information("File download was cancelled: {Url}", downloadUrl);
-			throw;
-		} catch (Exception e) {
-			Logger.Error(e, "Could not download file: {Url}", downloadUrl);
-			throw StopProcedureException.Instance;
-		}
-		
-		if (fileDownloadInfo.Hash is {} expectedHash && !result.Hash.Equals(expectedHash)) {
-			Logger.Error("Downloaded file from {Url} has mismatched SHA1 hash. Expected {Expected}, got {Actual}.", downloadUrl, expectedHash, result.Hash);
-			throw StopProcedureException.Instance;
-		}
-		
-		Logger.Information("Finished downloading {Url} ({Size}).", downloadUrl, FormatFileSize(result.Size));
-	}
-	
-	private static string FormatFileSize(FileSize? fileSize) {
-		return fileSize?.ToHumanReadable(decimalPlaces: 1) ?? "unknown size";
-	}
-	
-	private static void MoveDownloadedFile(string filePath, string tmpFilePath) {
-		try {
-			File.Move(tmpFilePath, filePath, overwrite: true);
-		} catch (Exception e) {
-			Logger.Error(e, "Could not move downloaded file from {SourcePath} to {TargetPath}", tmpFilePath, filePath);
-			throw StopProcedureException.Instance;
-		}
-	}
-	
-	private static void TryDeletePartiallyDownloadedFile(string filePath) {
-		if (!File.Exists(filePath)) {
-			return;
-		}
-		
-		try {
-			File.Delete(filePath);
-		} catch (Exception e) {
-			Logger.Warning(e, "Could not clean up partially downloaded file: {FilePath}", filePath);
-		}
-	}
-	
-	private sealed class DownloadStreamCopier : IDisposable {
-		private readonly StreamCopier streamCopier = new ();
-		private readonly IncrementalHash sha1 = IncrementalHash.CreateHash(HashAlgorithmName.SHA1);
-		
-		private readonly DownloadProgressCallback progressCallback;
-		private readonly ulong? totalBytes;
-		private ulong readBytes;
-		
-		public DownloadStreamCopier(DownloadProgressCallback progressCallback, ulong? totalBytes) {
-			this.progressCallback = progressCallback;
-			this.totalBytes = totalBytes;
-			this.streamCopier.BufferReady += OnBufferReady;
-		}
-		
-		private void OnBufferReady(object? sender, StreamCopier.BufferEventArgs args) {
-			sha1.AppendData(args.Buffer.Span);
-			
-			readBytes += (uint) args.Buffer.Length;
-			progressCallback.ReportProgress(readBytes, totalBytes);
-		}
-		
-		public async Task<DownloadResult> Copy(Stream source, Stream destination, CancellationToken cancellationToken) {
-			await streamCopier.Copy(source, destination, cancellationToken);
-			
-			FileSize size = new FileSize(readBytes);
-			Sha1String hash = Sha1String.FromBytes(sha1.GetHashAndReset());
-			return new DownloadResult(size, hash);
-		}
-		
-		public void Dispose() {
-			sha1.Dispose();
-			streamCopier.Dispose();
-		}
-	}
-	
-	private readonly record struct DownloadResult(FileSize Size, Sha1String Hash);
-}

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

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

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

@@ -0,0 +1,190 @@
+using System.Security.Cryptography;
+using Phantom.Common.Data.Minecraft;
+using Phantom.Utils.Cryptography;
+using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
+using Phantom.Utils.Runtime;
+using Serilog;
+
+namespace Phantom.Agent.Minecraft.Server;
+
+sealed class MinecraftServerExecutableDownloader {
+	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftServerExecutableDownloader>();
+	
+	public Task<string?> Task { get; }
+	public event EventHandler<DownloadProgressEventArgs>? DownloadProgress;
+	public event EventHandler? Completed;
+	
+	private readonly CancellationTokenSource cancellationTokenSource = new ();
+	
+	private readonly List<CancellationTokenRegistration> listenerCancellationRegistrations = new ();
+	private int listenerCount = 0;
+	
+	public MinecraftServerExecutableDownloader(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath, MinecraftServerExecutableDownloadListener listener) {
+		Register(listener);
+		Task = DownloadAndGetPath(fileDownloadInfo, minecraftVersion, filePath, new DownloadProgressCallback(this), cancellationTokenSource.Token);
+		Task.ContinueWith(OnCompleted, TaskScheduler.Default);
+	}
+	
+	public void Register(MinecraftServerExecutableDownloadListener listener) {
+		int newListenerCount;
+		
+		lock (this) {
+			newListenerCount = ++listenerCount;
+			
+			DownloadProgress += listener.DownloadProgressEventHandler;
+			listenerCancellationRegistrations.Add(listener.CancellationToken.Register(Unregister, listener));
+		}
+		
+		Logger.Debug("Registered download listener, current listener count: {Listeners}", newListenerCount);
+	}
+	
+	private void Unregister(object? listenerObject) {
+		int newListenerCount;
+		
+		lock (this) {
+			MinecraftServerExecutableDownloadListener listener = (MinecraftServerExecutableDownloadListener) listenerObject!;
+			DownloadProgress -= listener.DownloadProgressEventHandler;
+			
+			newListenerCount = --listenerCount;
+			if (newListenerCount <= 0) {
+				cancellationTokenSource.Cancel();
+			}
+		}
+		
+		if (newListenerCount <= 0) {
+			Logger.Debug("Unregistered last download listener, cancelling download.");
+		}
+		else {
+			Logger.Debug("Unregistered download listener, current listener count: {Listeners}", newListenerCount);
+		}
+	}
+	
+	private void ReportDownloadProgress(DownloadProgressEventArgs args) {
+		DownloadProgress?.Invoke(this, args);
+	}
+	
+	private void OnCompleted(Task task) {
+		Logger.Debug("Download task completed.");
+		
+		lock (this) {
+			Completed?.Invoke(this, EventArgs.Empty);
+			Completed = null;
+			DownloadProgress = null;
+			
+			foreach (var registration in listenerCancellationRegistrations) {
+				registration.Dispose();
+			}
+			
+			listenerCancellationRegistrations.Clear();
+			cancellationTokenSource.Dispose();
+		}
+	}
+	
+	private sealed class DownloadProgressCallback {
+		private readonly MinecraftServerExecutableDownloader downloader;
+		
+		public DownloadProgressCallback(MinecraftServerExecutableDownloader downloader) {
+			this.downloader = downloader;
+		}
+		
+		public void ReportProgress(ulong downloadedBytes, ulong totalBytes) {
+			downloader.ReportDownloadProgress(new DownloadProgressEventArgs(downloadedBytes, totalBytes));
+		}
+	}
+	
+	private static async Task<string?> DownloadAndGetPath(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath, DownloadProgressCallback progressCallback, CancellationToken cancellationToken) {
+		string tmpFilePath = filePath + ".tmp";
+		
+		try {
+			Logger.Information("Downloading server version {Version} from: {Url} ({Size})", minecraftVersion, fileDownloadInfo.DownloadUrl, fileDownloadInfo.Size.ToHumanReadable(decimalPlaces: 1));
+			try {
+				using var http = new HttpClient();
+				await FetchServerExecutableFile(http, progressCallback, fileDownloadInfo, tmpFilePath, cancellationToken);
+			} catch (Exception) {
+				TryDeleteExecutableAfterFailure(tmpFilePath);
+				throw;
+			}
+			
+			File.Move(tmpFilePath, filePath, true);
+			Logger.Information("Server version {Version} downloaded.", minecraftVersion);
+			
+			return filePath;
+		} catch (OperationCanceledException) {
+			Logger.Information("Download for server version {Version} was cancelled.", minecraftVersion);
+			throw;
+		} catch (StopProcedureException) {
+			return null;
+		} catch (Exception e) {
+			Logger.Error(e, "An unexpected error occurred.");
+			return null;
+		}
+	}
+	
+	private static async Task FetchServerExecutableFile(HttpClient http, DownloadProgressCallback progressCallback, FileDownloadInfo fileDownloadInfo, string filePath, CancellationToken cancellationToken) {
+		Sha1String downloadedFileHash;
+		
+		try {
+			var response = await http.GetAsync(fileDownloadInfo.DownloadUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+			response.EnsureSuccessStatusCode();
+			
+			await using var fileStream = new FileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
+			await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
+			
+			using var streamCopier = new MinecraftServerDownloadStreamCopier(progressCallback, fileDownloadInfo.Size.Bytes);
+			downloadedFileHash = await streamCopier.Copy(responseStream, fileStream, cancellationToken);
+		} catch (OperationCanceledException) {
+			throw;
+		} catch (Exception e) {
+			Logger.Error(e, "Unable to download server executable.");
+			throw StopProcedureException.Instance;
+		}
+		
+		if (!downloadedFileHash.Equals(fileDownloadInfo.Hash)) {
+			Logger.Error("Downloaded server executable has mismatched SHA1 hash. Expected {Expected}, got {Actual}.", fileDownloadInfo.Hash, downloadedFileHash);
+			throw StopProcedureException.Instance;
+		}
+	}
+	
+	private static void TryDeleteExecutableAfterFailure(string filePath) {
+		if (File.Exists(filePath)) {
+			try {
+				File.Delete(filePath);
+			} catch (Exception e) {
+				Logger.Warning(e, "Could not clean up partially downloaded server executable: {FilePath}", filePath);
+			}
+		}
+	}
+	
+	private sealed class MinecraftServerDownloadStreamCopier : IDisposable {
+		private readonly StreamCopier streamCopier = new ();
+		private readonly IncrementalHash sha1 = IncrementalHash.CreateHash(HashAlgorithmName.SHA1);
+		
+		private readonly DownloadProgressCallback progressCallback;
+		private readonly ulong totalBytes;
+		private ulong readBytes;
+		
+		public MinecraftServerDownloadStreamCopier(DownloadProgressCallback progressCallback, ulong totalBytes) {
+			this.progressCallback = progressCallback;
+			this.totalBytes = totalBytes;
+			this.streamCopier.BufferReady += OnBufferReady;
+		}
+		
+		private void OnBufferReady(object? sender, StreamCopier.BufferEventArgs args) {
+			sha1.AppendData(args.Buffer.Span);
+			
+			readBytes += (uint) args.Buffer.Length;
+			progressCallback.ReportProgress(readBytes, totalBytes);
+		}
+		
+		public async Task<Sha1String> Copy(Stream source, Stream destination, CancellationToken cancellationToken) {
+			await streamCopier.Copy(source, destination, cancellationToken);
+			return Sha1String.FromBytes(sha1.GetHashAndReset());
+		}
+		
+		public void Dispose() {
+			sha1.Dispose();
+			streamCopier.Dispose();
+		}
+	}
+}

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

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

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

@@ -24,7 +24,7 @@ public static class ServerStatusProtocol {
 	private static async Task<short> ReadStreamHeader(NetworkStream tcpStream, CancellationToken cancellationToken) {
 		var headerBuffer = ArrayPool<byte>.Shared.Rent(3);
 		try {
-			await tcpStream.ReadExactlyAsync(headerBuffer, offset: 0, count: 3, cancellationToken);
+			await tcpStream.ReadExactlyAsync(headerBuffer, 0, 3, cancellationToken);
 			
 			if (headerBuffer[0] != 0xFF) {
 				throw new ProtocolException("Unexpected first byte in response from server: " + headerBuffer[0]);
@@ -44,8 +44,8 @@ public static class ServerStatusProtocol {
 	private static async Task<InstancePlayerCounts> ReadPlayerCounts(NetworkStream tcpStream, int messageLength, CancellationToken cancellationToken) {
 		var messageBuffer = ArrayPool<byte>.Shared.Rent(messageLength);
 		try {
-			await tcpStream.ReadExactlyAsync(messageBuffer, offset: 0, messageLength, cancellationToken);
+			await tcpStream.ReadExactlyAsync(messageBuffer, 0, messageLength, cancellationToken);
-			return ReadPlayerCountsFromResponse(messageBuffer.AsSpan(start: 0, messageLength));
+			return ReadPlayerCountsFromResponse(messageBuffer.AsSpan(0, messageLength));
 		} finally {
 			ArrayPool<byte>.Shared.Return(messageBuffer);
 		}
@@ -54,7 +54,7 @@ public static class ServerStatusProtocol {
 	/// <summary>
 	/// Legacy query protocol uses the paragraph symbol (§) as separator encoded in UTF-16BE.
 	/// </summary>
-	private static readonly byte[] Separator = [0x00, 0xA7];
+	private static readonly byte[] Separator = { 0x00, 0xA7 };
 	
 	private static InstancePlayerCounts ReadPlayerCountsFromResponse(ReadOnlySpan<byte> messageBuffer) {
 		int lastSeparator = messageBuffer.LastIndexOf(Separator);

Agent/Phantom.Agent.Services/AgentFolders.cs

@@ -7,12 +7,12 @@ namespace Phantom.Agent.Services;
 public sealed class AgentFolders {
 	private static readonly ILogger Logger = PhantomLogger.Create<AgentFolders>();
 	
-	internal string DataFolderPath { get; }
+	public string DataFolderPath { get; }
-	internal string InstancesFolderPath { get; }
+	public string InstancesFolderPath { get; }
-	internal string BackupsFolderPath { get; }
+	public string BackupsFolderPath { get; }
 	
-	internal string TemporaryFolderPath { get; }
+	public string TemporaryFolderPath { get; }
-	internal string ServerExecutableFolderPath { get; }
+	public string ServerExecutableFolderPath { get; }
 	
 	public string JavaSearchFolderPath { get; }
 	

Agent/Phantom.Agent.Services/AgentRegistrationHandler.cs

@@ -1,85 +0,0 @@
-using System.Collections.Immutable;
-using Phantom.Agent.Services.Instances;
-using Phantom.Common.Data.Replies;
-using Phantom.Common.Messages.Agent.ToAgent;
-using Phantom.Utils.Logging;
-using Phantom.Utils.Tasks;
-using Phantom.Utils.Threading;
-using Serilog;
-
-namespace Phantom.Agent.Services;
-
-public sealed class AgentRegistrationHandler {
-	private readonly ILogger logger = PhantomLogger.Create<AgentRegistrationHandler>();
-	
-	private readonly ManualResetEventSlim newSessionEvent = new ();
-	private ImmutableArray<ConfigureInstanceMessage> lastConfigureInstanceMessages;
-	
-	internal void OnRegistrationComplete(ImmutableArray<ConfigureInstanceMessage> configureInstanceMessages) {
-		ImmutableInterlocked.InterlockedExchange(ref lastConfigureInstanceMessages, configureInstanceMessages);
-	}
-	
-	internal void OnNewSession() {
-		newSessionEvent.Set();
-	}
-	
-	public async Task<bool> Start(AgentServices agentServices, CancellationToken cancellationToken) {
-		var configureInstanceMessages = ImmutableInterlocked.InterlockedExchange(ref lastConfigureInstanceMessages, value: default);
-		if (configureInstanceMessages.IsDefault) {
-			logger.Fatal("Handshake failed.");
-			return false;
-		}
-		
-		foreach (var configureInstanceMessage in configureInstanceMessages) {
-			var configureInstanceResult = await agentServices.InstanceManager.Request(GetCommand(configureInstanceMessage), cancellationToken);
-			if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
-				logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configureInstanceMessage.Info.InstanceName, configureInstanceMessage.InstanceGuid);
-				return false;
-			}
-		}
-		
-		agentServices.InstanceTicketManager.RefreshAgentStatus();
-		
-		_ = HandleNewSessionRegistrations(agentServices, cancellationToken);
-		return true;
-	}
-	
-	private async Task HandleNewSessionRegistrations(AgentServices agentServices, CancellationToken cancellationToken) {
-		while (cancellationToken.Check()) {
-			await newSessionEvent.WaitHandle.WaitOneAsync(cancellationToken);
-			newSessionEvent.Reset();
-			
-			try {
-				await HandleNewSessionRegistration(agentServices, cancellationToken);
-			} catch (Exception e) {
-				logger.Error(e, "Could not configure instances after re-registration.");
-			}
-		}
-	}
-	
-	private async Task HandleNewSessionRegistration(AgentServices agentServices, CancellationToken cancellationToken) {
-		var configureInstanceMessages = ImmutableInterlocked.InterlockedExchange(ref lastConfigureInstanceMessages, value: default);
-		if (configureInstanceMessages.IsDefaultOrEmpty) {
-			return;
-		}
-		
-		foreach (var configureInstanceMessage in configureInstanceMessages) {
-			var configureInstanceResult = await agentServices.InstanceManager.Request(GetCommand(configureInstanceMessage), cancellationToken);
-			if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
-				logger.Error("Unable to configure instance \"{Name}\" (GUID {Guid}).", configureInstanceMessage.Info.InstanceName, configureInstanceMessage.InstanceGuid);
-			}
-		}
-		
-		agentServices.InstanceTicketManager.RefreshAgentStatus();
-	}
-	
-	private static InstanceManagerActor.ConfigureInstanceCommand GetCommand(ConfigureInstanceMessage configureInstanceMessage) {
-		return new InstanceManagerActor.ConfigureInstanceCommand(
-			configureInstanceMessage.InstanceGuid,
-			configureInstanceMessage.Info,
-			configureInstanceMessage.LaunchRecipe,
-			configureInstanceMessage.LaunchNow,
-			AlwaysReportStatus: true
-		);
-	}
-}

Agent/Phantom.Agent.Services/AgentServices.cs

@@ -1,9 +1,13 @@
-using Akka.Actor;
+using System.Collections.Immutable;
+using Akka.Actor;
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Messages.Agent.ToAgent;
+using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Actor;
 using Phantom.Utils.Logging;
 using Serilog;
@@ -15,6 +19,8 @@ public sealed class AgentServices {
 	
 	public ActorSystem ActorSystem { get; }
 	
+	private AgentInfo AgentInfo { get; }
+	private AgentFolders AgentFolders { get; }
 	private AgentState AgentState { get; }
 	private BackupManager BackupManager { get; }
 	
@@ -22,24 +28,64 @@ public sealed class AgentServices {
 	internal InstanceTicketManager InstanceTicketManager { get; }
 	internal ActorRef<InstanceManagerActor.ICommand> InstanceManager { get; }
 	
-	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders, AgentServiceConfiguration serviceConfiguration, ControllerConnection controllerConnection, JavaRuntimeRepository javaRuntimeRepository) {
+	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders, AgentServiceConfiguration serviceConfiguration, ControllerConnection controllerConnection) {
 		this.ActorSystem = ActorSystemFactory.Create("Agent");
 		
+		this.AgentInfo = agentInfo;
+		this.AgentFolders = agentFolders;
 		this.AgentState = new AgentState();
 		this.BackupManager = new BackupManager(agentFolders, serviceConfiguration.MaxConcurrentCompressionTasks);
 		
-		this.JavaRuntimeRepository = javaRuntimeRepository;
+		this.JavaRuntimeRepository = new JavaRuntimeRepository();
 		this.InstanceTicketManager = new InstanceTicketManager(agentInfo, controllerConnection);
 		
 		var instanceManagerInit = new InstanceManagerActor.Init(controllerConnection, agentFolders, AgentState, JavaRuntimeRepository, InstanceTicketManager, BackupManager);
 		this.InstanceManager = ActorSystem.ActorOf(InstanceManagerActor.Factory(instanceManagerInit), "InstanceManager");
 	}
 	
+	public async Task Initialize() {
+		await foreach (var runtime in JavaRuntimeDiscovery.Scan(AgentFolders.JavaSearchFolderPath)) {
+			JavaRuntimeRepository.Include(runtime);
+		}
+	}
+	
+	public  async Task<bool> Register(ControllerConnection connection, CancellationToken cancellationToken) {
+		Logger.Information("Registering with the controller...");
+		
+		ImmutableArray<ConfigureInstanceMessage> configureInstanceMessages;
+		try {
+			configureInstanceMessages = await connection.Send<RegisterAgentMessage, ImmutableArray<ConfigureInstanceMessage>>(new RegisterAgentMessage(AgentInfo), TimeSpan.FromMinutes(1), cancellationToken);
+		} catch (Exception e) {
+			Logger.Fatal(e, "Registration failed.");
+			return false;
+		}
+		
+		foreach (var configureInstanceMessage in configureInstanceMessages) {
+			var configureInstanceCommand = new InstanceManagerActor.ConfigureInstanceCommand(
+				configureInstanceMessage.InstanceGuid,
+				configureInstanceMessage.Configuration,
+				configureInstanceMessage.LaunchProperties,
+				configureInstanceMessage.LaunchNow,
+				AlwaysReportStatus: true
+			);
+			
+			var configureInstanceResult = await InstanceManager.Request(configureInstanceCommand, cancellationToken);
+			if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
+				Logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configureInstanceMessage.Configuration.InstanceName, configureInstanceMessage.InstanceGuid);
+				return false;
+			}
+		}
+		
+		await connection.Send(new AdvertiseJavaRuntimesMessage(JavaRuntimeRepository.All), cancellationToken);
+		InstanceTicketManager.RefreshAgentStatus();
+		
+		return true;
+	}
+	
 	public async Task Shutdown() {
 		Logger.Information("Stopping services...");
 		
 		await InstanceManager.Stop(new InstanceManagerActor.ShutdownCommand());
-		await InstanceTicketManager.Shutdown();
 		
 		BackupManager.Dispose();
 		

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

@@ -108,7 +108,7 @@ sealed class BackupArchiver {
 	
 	private async Task<bool> CreateTarArchive(string sourceFolderPath, string backupFilePath) {
 		try {
-			await TarFile.CreateFromDirectoryAsync(sourceFolderPath, backupFilePath, includeBaseDirectory: false, cancellationToken);
+			await TarFile.CreateFromDirectoryAsync(sourceFolderPath, backupFilePath, false, cancellationToken);
 			return true;
 		} catch (Exception e) {
 			logger.Error(e, "Could not create archive.");
@@ -135,7 +135,7 @@ sealed class BackupArchiver {
 		foreach (FileInfo file in sourceFolder.EnumerateFiles()) {
 			var filePath = relativePath.Add(file.Name);
 			if (IsFileSkipped(filePath)) {
-				logger.Debug("Skipping file: {File}", string.Join(separator: '/', filePath));
+				logger.Debug("Skipping file: {File}", string.Join('/', filePath));
 				continue;
 			}
 			
@@ -150,7 +150,7 @@ sealed class BackupArchiver {
 		foreach (DirectoryInfo directory in sourceFolder.EnumerateDirectories()) {
 			var folderPath = relativePath.Add(directory.Name);
 			if (IsFolderSkipped(folderPath)) {
-				logger.Debug("Skipping folder: {Folder}", string.Join(separator: '/', folderPath));
+				logger.Debug("Skipping folder: {Folder}", string.Join('/', folderPath));
 				continue;
 			}
 			
@@ -172,7 +172,7 @@ sealed class BackupArchiver {
 				}
 				else {
 					logger.Warning("Failed copying file {File}, retrying...", sourceFile.FullName);
-					await Task.Delay(millisecondsDelay: 200, cancellationToken);
+					await Task.Delay(200, cancellationToken);
 				}
 			}
 		}

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

@@ -50,8 +50,8 @@ static class BackupCompressor {
 				"--rm",
 				"--no-progress",
 				"-o", destinationFilePath,
-				"--", sourceFilePath,
+				"--", sourceFilePath
-			},
+			}
 		};
 		
 		static void OnZstdOutput(object? sender, Process.Output output) {

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

@@ -133,7 +133,7 @@ sealed class BackupManager : IDisposable {
 				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.",
+				_                                                           => "Unknown error."
 			};
 		}
 	}

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

@@ -14,7 +14,7 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 	
 	private readonly BackupManager backupManager;
 	private readonly InstanceContext context;
-	private readonly SemaphoreSlim backupSemaphore = new (initialCount: 1, maxCount: 1);
+	private readonly SemaphoreSlim backupSemaphore = new (1, 1);
 	private readonly ManualResetEventSlim serverOutputWhileWaitingForOnlinePlayers = new ();
 	private readonly InstancePlayerCountTracker playerCountTracker;
 	

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

@@ -1,7 +1,6 @@
 using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances.State;
-using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
@@ -24,30 +23,24 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
 	private readonly CancellationToken shutdownCancellationToken;
 	
 	private readonly Guid instanceGuid;
+	private readonly InstanceServices instanceServices;
 	private readonly InstanceTicketManager instanceTicketManager;
 	private readonly InstanceContext context;
 	
-	private readonly ControllerSendQueue<ReportInstanceStatusMessage> reportStatusQueue;
-	private readonly ControllerSendQueue<ReportInstanceEventMessage> reportEventsQueue;
-	
 	private readonly CancellationTokenSource actorCancellationTokenSource = new ();
 	
 	private IInstanceStatus currentStatus = InstanceStatus.NotRunning;
 	private InstanceRunningState? runningState = null;
 	
 	private InstanceActor(Init init) {
-		InstanceServices services = init.InstanceServices;
-		
 		this.agentState = init.AgentState;
 		this.instanceGuid = init.InstanceGuid;
+		this.instanceServices = init.InstanceServices;
 		this.instanceTicketManager = init.InstanceTicketManager;
 		this.shutdownCancellationToken = init.ShutdownCancellationToken;
 		
-		this.reportStatusQueue = new ControllerSendQueue<ReportInstanceStatusMessage>(services.ControllerConnection, init.ShortName + "-Status", capacity: 1, singleWriter: true);
-		this.reportEventsQueue = new ControllerSendQueue<ReportInstanceEventMessage>(services.ControllerConnection, init.ShortName + "-Events", capacity: 1000, singleWriter: true);
-		
 		var logger = PhantomLogger.Create<InstanceActor>(init.ShortName);
-		this.context = new InstanceContext(instanceGuid, init.ShortName, logger, services, reportEventsQueue, SelfTyped, actorCancellationTokenSource.Token);
+		this.context = new InstanceContext(instanceGuid, init.ShortName, logger, instanceServices, SelfTyped, actorCancellationTokenSource.Token);
 		
 		Receive<ReportInstanceStatusCommand>(ReportInstanceStatus);
 		ReceiveAsync<LaunchInstanceCommand>(LaunchInstance);
@@ -65,7 +58,7 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
 	
 	private void ReportCurrentStatus() {
 		agentState.UpdateInstance(new Instance(instanceGuid, currentStatus));
-		reportStatusQueue.Enqueue(new ReportInstanceStatusMessage(instanceGuid, currentStatus));
+		instanceServices.ControllerConnection.TrySend(new ReportInstanceStatusMessage(instanceGuid, currentStatus));
 	}
 	
 	private void TransitionState(InstanceRunningState? newState) {
@@ -78,11 +71,11 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
 		runningState?.Initialize();
 	}
 	
-	public interface ICommand;
+	public interface ICommand {}
 	
 	public sealed record ReportInstanceStatusCommand : ICommand;
 	
-	public sealed record LaunchInstanceCommand(InstanceInfo Info, InstanceLauncher Launcher, InstanceTicketManager.Ticket Ticket, bool IsRestarting) : ICommand;
+	public sealed record LaunchInstanceCommand(InstanceConfiguration Configuration, IServerLauncher Launcher, InstanceTicketManager.Ticket Ticket, bool IsRestarting) : ICommand;
 	
 	public sealed record StopInstanceCommand(MinecraftStopStrategy StopStrategy) : ICommand;
 	
@@ -100,14 +93,9 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
 	
 	private async Task LaunchInstance(LaunchInstanceCommand command) {
 		if (command.IsRestarting || runningState is null) {
-			var defaultLaunchStatus = command.IsRestarting ? InstanceStatus.Restarting : InstanceStatus.Launching;
+			SetAndReportStatus(command.IsRestarting ? InstanceStatus.Restarting : InstanceStatus.Launching);
-			SetAndReportStatus(defaultLaunchStatus);
 			
-			void UpdateStatus(IInstanceStatus? newStatus) {
+			var newState = await InstanceLaunchProcedure.Run(context, command.Configuration, command.Launcher, instanceTicketManager, command.Ticket, SetAndReportStatus, shutdownCancellationToken);
-				SetAndReportStatus(newStatus ?? defaultLaunchStatus);
-			}
-			
-			var newState = await InstanceLaunchProcedure.Run(context, command.Info, command.Launcher, instanceTicketManager, command.Ticket, UpdateStatus, shutdownCancellationToken);
 			if (newState is null) {
 				instanceTicketManager.Release(command.Ticket);
 			}
@@ -168,12 +156,6 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
 	private async Task Shutdown(ShutdownCommand command) {
 		await StopInstance(new StopInstanceCommand(MinecraftStopStrategy.Instant));
 		await actorCancellationTokenSource.CancelAsync();
-		
-		await Task.WhenAll(
-			reportStatusQueue.Shutdown(TimeSpan.FromSeconds(5)),
-			reportEventsQueue.Shutdown(TimeSpan.FromSeconds(5))
-		);
-		
 		Context.Stop(Self);
 	}
 }

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

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

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

@@ -1,12 +1,13 @@
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Minecraft.Launcher.Types;
+using Phantom.Agent.Minecraft.Properties;
 using Phantom.Agent.Minecraft.Server;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Instance.Launch;
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
 using Phantom.Utils.Actor;
@@ -26,11 +27,11 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 	}
 	
 	private readonly AgentState agentState;
-	private readonly AgentFolders agentFolders;
+	private readonly string basePath;
 	
 	private readonly InstanceServices instanceServices;
 	private readonly InstanceTicketManager instanceTicketManager;
-	private readonly Dictionary<Guid, Instance> instances = new ();
+	private readonly Dictionary<Guid, InstanceInfo> instances = new ();
 	
 	private readonly CancellationTokenSource shutdownCancellationTokenSource = new ();
 	private readonly CancellationToken shutdownCancellationToken;
@@ -39,12 +40,15 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 	
 	private InstanceManagerActor(Init init) {
 		this.agentState = init.AgentState;
-		this.agentFolders = init.AgentFolders;
+		this.basePath = init.AgentFolders.InstancesFolderPath;
-		
-		this.instanceServices = new InstanceServices(init.ControllerConnection, init.BackupManager, new FileDownloadManager(), init.JavaRuntimeRepository);
 		this.instanceTicketManager = init.InstanceTicketManager;
 		this.shutdownCancellationToken = shutdownCancellationTokenSource.Token;
 		
+		var minecraftServerExecutables = new MinecraftServerExecutables(init.AgentFolders.ServerExecutableFolderPath);
+		var launchServices = new LaunchServices(minecraftServerExecutables, init.JavaRuntimeRepository);
+		
+		this.instanceServices = new InstanceServices(init.ControllerConnection, init.BackupManager, launchServices);
+		
 		ReceiveAndReply<ConfigureInstanceCommand, Result<ConfigureInstanceResult, InstanceActionFailure>>(ConfigureInstance);
 		ReceiveAndReply<LaunchInstanceCommand, Result<LaunchInstanceResult, InstanceActionFailure>>(LaunchInstance);
 		ReceiveAndReply<StopInstanceCommand, Result<StopInstanceResult, InstanceActionFailure>>(StopInstance);
@@ -52,11 +56,16 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 		ReceiveAsync<ShutdownCommand>(Shutdown);
 	}
 	
-	private sealed record Instance(ActorRef<InstanceActor.ICommand> Actor, InstanceInfo Info, InstanceProperties Properties, InstanceLaunchRecipe? LaunchRecipe);
+	private string GetInstanceLoggerName(Guid guid) {
+		var prefix = guid.ToString();
+		return prefix[..prefix.IndexOf('-')] + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
+	}
 	
-	public interface ICommand;
+	private sealed record InstanceInfo(ActorRef<InstanceActor.ICommand> Actor, InstanceConfiguration Configuration, IServerLauncher Launcher);
 	
-	public sealed record ConfigureInstanceCommand(Guid InstanceGuid, InstanceInfo Info, InstanceLaunchRecipe? LaunchRecipe, bool LaunchNow, bool AlwaysReportStatus) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
+	public interface ICommand {}
+	
+	public sealed record ConfigureInstanceCommand(Guid InstanceGuid, InstanceConfiguration Configuration, InstanceLaunchProperties LaunchProperties, bool LaunchNow, bool AlwaysReportStatus) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
 	
 	public sealed record LaunchInstanceCommand(Guid InstanceGuid) : ICommand, ICanReply<Result<LaunchInstanceResult, InstanceActionFailure>>;
 	
@@ -68,40 +77,55 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 	
 	private Result<ConfigureInstanceResult, InstanceActionFailure> ConfigureInstance(ConfigureInstanceCommand command) {
 		var instanceGuid = command.InstanceGuid;
-		var instanceInfo = command.Info;
+		var configuration = command.Configuration;
-		var launchRecipe = command.LaunchRecipe;
+		
+		var instanceFolder = Path.Combine(basePath, instanceGuid.ToString());
+		Directories.Create(instanceFolder, Chmod.URWX_GRX);
+		
+		var heapMegabytes = configuration.MemoryAllocation.InMegabytes;
+		var jvmProperties = new JvmProperties(
+			InitialHeapMegabytes: heapMegabytes / 2,
+			MaximumHeapMegabytes: heapMegabytes
+		);
+		
+		var properties = new InstanceProperties(
+			instanceGuid,
+			configuration.JavaRuntimeGuid,
+			jvmProperties,
+			configuration.JvmArguments,
+			instanceFolder,
+			configuration.MinecraftVersion,
+			new ServerProperties(configuration.ServerPort, configuration.RconPort),
+			command.LaunchProperties
+		);
+		
+		IServerLauncher launcher = configuration.MinecraftServerKind switch {
+			MinecraftServerKind.Vanilla => new VanillaLauncher(properties),
+			MinecraftServerKind.Fabric  => new FabricLauncher(properties),
+			_                           => InvalidLauncher.Instance
+		};
 		
 		if (instances.TryGetValue(instanceGuid, out var instance)) {
 			instances[instanceGuid] = instance with {
-				Info = instanceInfo,
+				Configuration = configuration,
-				LaunchRecipe = launchRecipe,
+				Launcher = launcher
 			};
 			
-			Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", instanceInfo.InstanceName, instanceGuid);
+			Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);
 			
 			if (command.AlwaysReportStatus) {
 				instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
 			}
 		}
 		else {
-			var instanceLoggerName = PhantomLogger.ShortenGuid(instanceGuid) + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
+			var instanceInit = new InstanceActor.Init(agentState, instanceGuid, GetInstanceLoggerName(instanceGuid), instanceServices, instanceTicketManager, shutdownCancellationToken);
-			var instanceProperties = new InstanceProperties(instanceGuid, Path.Combine(agentFolders.InstancesFolderPath, instanceGuid.ToString()));
+			instances[instanceGuid] = instance = new InstanceInfo(Context.ActorOf(InstanceActor.Factory(instanceInit), "Instance-" + instanceGuid), configuration, launcher);
-			var instanceInit = new InstanceActor.Init(agentState, instanceGuid, instanceLoggerName, instanceServices, instanceTicketManager, shutdownCancellationToken);
-			instances[instanceGuid] = instance = new Instance(Context.ActorOf(InstanceActor.Factory(instanceInit), "Instance-" + instanceGuid), instanceInfo, instanceProperties, launchRecipe);
 			
-			Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", instanceInfo.InstanceName, instanceGuid);
+			Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);
 			
 			instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
 		}
 		
-		string instanceFolder = instance.Properties.InstanceFolder;
-		try {
-			Directories.Create(instanceFolder, Chmod.URWX_GRX);
-		} catch (Exception e) {
-			Logger.Error(e, "Could not create instance folder: {Path}", instanceFolder);
-			return ConfigureInstanceResult.CouldNotCreateInstanceFolder;
-		}
-		
 		if (command.LaunchNow) {
 			LaunchInstance(new LaunchInstanceCommand(instanceGuid));
 		}
@@ -111,21 +135,17 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 	
 	private Result<LaunchInstanceResult, InstanceActionFailure> LaunchInstance(LaunchInstanceCommand command) {
 		var instanceGuid = command.InstanceGuid;
-		if (!instances.TryGetValue(instanceGuid, out var instance)) {
+		if (!instances.TryGetValue(instanceGuid, out var instanceInfo)) {
 			return InstanceActionFailure.InstanceDoesNotExist;
 		}
 		
-		if (instance.LaunchRecipe is not {} launchRecipe) {
+		var ticket = instanceTicketManager.Reserve(instanceInfo.Configuration);
-			return LaunchInstanceResult.InvalidConfiguration;
-		}
-		
-		var ticket = instanceTicketManager.Reserve(instance.Info);
 		if (!ticket) {
 			return ticket.Error;
 		}
 		
-		if (agentState.InstancesByGuid.TryGetValue(instanceGuid, out var agentInstance)) {
+		if (agentState.InstancesByGuid.TryGetValue(instanceGuid, out var instance)) {
-			var status = agentInstance.Status;
+			var status = instance.Status;
 			if (status.IsRunning()) {
 				return LaunchInstanceResult.InstanceAlreadyRunning;
 			}
@@ -134,12 +154,7 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 			}
 		}
 		
-		var pathResolver = new InstancePathResolver(agentFolders, instanceServices.JavaRuntimeRepository, instance.Properties);
+		instanceInfo.Actor.Tell(new InstanceActor.LaunchInstanceCommand(instanceInfo.Configuration, instanceInfo.Launcher, ticket.Value, IsRestarting: false));
-		var valueResolver = new InstanceValueResolver(pathResolver);
-		var launcher = new InstanceLauncher(instanceServices.DownloadManager, pathResolver, valueResolver, instance.Properties, launchRecipe);
-		
-		instance.Actor.Tell(new InstanceActor.LaunchInstanceCommand(instance.Info, launcher, ticket.Value, IsRestarting: false));
-		
 		return LaunchInstanceResult.LaunchInitiated;
 	}
 	

Agent/Phantom.Agent.Services/Instances/InstancePathResolver.cs

@@ -1,30 +0,0 @@
-using System.Collections.Immutable;
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Java;
-using Phantom.Common.Data.Instance;
-
-namespace Phantom.Agent.Services.Instances;
-
-sealed class InstancePathResolver(AgentFolders agentFolders, JavaRuntimeRepository javaRuntimeRepository, InstanceProperties instanceProperties) : IInstancePathResolver {
-	public string Global(ImmutableArray<string> path) {
-		return CombinePath(agentFolders.ServerExecutableFolderPath, path);
-	}
-	
-	public string Local(ImmutableArray<string> path) {
-		return CombinePath(instanceProperties.InstanceFolder, path);
-	}
-	
-	public string? Runtime(Guid guid) {
-		if (javaRuntimeRepository.TryGetByGuid(guid, out var runtime)) {
-			return runtime.ExecutablePath;
-		}
-		else {
-			return null;
-		}
-	}
-	
-	private string CombinePath(string basePath, ImmutableArray<string> additionalParts) {
-		// TODO validation
-		return Path.Combine([basePath, ..additionalParts]);
-	}
-}

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

@@ -1,13 +1,7 @@
-using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Minecraft.Server;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Rpc;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed record InstanceServices(
+sealed record InstanceServices(ControllerConnection ControllerConnection, BackupManager BackupManager, LaunchServices LaunchServices);
-	ControllerConnection ControllerConnection,
-	BackupManager BackupManager,
-	FileDownloadManager DownloadManager,
-	JavaRuntimeRepository JavaRuntimeRepository
-);

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

@@ -1,5 +1,4 @@
-using System.Collections.Immutable;
+using Phantom.Agent.Services.Rpc;
-using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Agent;
 using Phantom.Common.Data.Instance;
@@ -10,24 +9,32 @@ using Serilog;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection controllerConnection) {
+sealed class InstanceTicketManager {
 	private static readonly ILogger Logger = PhantomLogger.Create<InstanceTicketManager>();
 	
-	private readonly ControllerSendQueue<ReportAgentStatusMessage> reportStatusQueue = new (controllerConnection, nameof(InstanceTicketManager), capacity: 1, singleWriter: true);
+	private readonly AgentInfo agentInfo;
+	private readonly ControllerConnection controllerConnection;
 	
-	private readonly HashSet<Guid> activeTicketGuids = [];
+	private readonly HashSet<Guid> activeTicketGuids = new ();
-	private readonly HashSet<ushort> usedPorts = [];
+	private readonly HashSet<ushort> usedPorts = new ();
 	private RamAllocationUnits usedMemory = new ();
 	
-	public Result<Ticket, LaunchInstanceResult> Reserve(InstanceInfo info) {
+	public InstanceTicketManager(AgentInfo agentInfo, ControllerConnection controllerConnection) {
-		var memoryAllocation = info.MemoryAllocation;
+		this.agentInfo = agentInfo;
+		this.controllerConnection = controllerConnection;
+	}
 	
-		if (!agentInfo.AllowedServerPorts.Contains(info.ServerPort)) {
+	public Result<Ticket, LaunchInstanceResult> Reserve(InstanceConfiguration configuration) {
+		var memoryAllocation = configuration.MemoryAllocation;
+		var serverPort = configuration.ServerPort;
+		var rconPort = configuration.RconPort;
+		
+		if (!agentInfo.AllowedServerPorts.Contains(serverPort)) {
 			return LaunchInstanceResult.ServerPortNotAllowed;
 		}
 		
-		if (info.AdditionalPorts.Any(port => !agentInfo.AllowedAdditionalPorts.Contains(port))) {
+		if (!agentInfo.AllowedRconPorts.Contains(rconPort)) {
-			return LaunchInstanceResult.AdditionalPortNotAllowed;
+			return LaunchInstanceResult.RconPortNotAllowed;
 		}
 		
 		lock (this) {
@@ -39,23 +46,23 @@ sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection con
 				return LaunchInstanceResult.MemoryLimitExceeded;
 			}
 			
-			if (usedPorts.Contains(info.ServerPort)) {
+			if (usedPorts.Contains(serverPort)) {
 				return LaunchInstanceResult.ServerPortAlreadyInUse;
 			}
 			
-			if (info.AdditionalPorts.Any(port => usedPorts.Contains(port))) {
+			if (usedPorts.Contains(rconPort)) {
-				return LaunchInstanceResult.AdditionalPortAlreadyInUse;
+				return LaunchInstanceResult.RconPortAlreadyInUse;
 			}
 			
-			var ticket = new Ticket(Guid.NewGuid(), memoryAllocation, info.ServerPort, info.AdditionalPorts);
+			var ticket = new Ticket(Guid.NewGuid(), memoryAllocation, serverPort, rconPort);
 			
 			activeTicketGuids.Add(ticket.TicketGuid);
 			usedMemory += memoryAllocation;
-			usedPorts.Add(ticket.ServerPort);
+			usedPorts.Add(serverPort);
-			usedPorts.UnionWith(ticket.AdditionalPorts);
+			usedPorts.Add(rconPort);
 			
 			RefreshAgentStatus();
-			Logger.Debug("Reserved ticket {TicketGuid} (server port {ServerPort}, additional ports [{AdditionalPorts}], memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, string.Join(", ", ticket.AdditionalPorts), ticket.MemoryAllocation.InMegabytes);
+			Logger.Debug("Reserved ticket {TicketGuid} (server port {ServerPort}, rcon port {RconPort}, memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, ticket.RconPort, ticket.MemoryAllocation.InMegabytes);
 			
 			return ticket;
 		}
@@ -75,22 +82,18 @@ sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection con
 			
 			usedMemory -= ticket.MemoryAllocation;
 			usedPorts.Remove(ticket.ServerPort);
-			usedPorts.ExceptWith(ticket.AdditionalPorts);
+			usedPorts.Remove(ticket.RconPort);
 			
 			RefreshAgentStatus();
-			Logger.Debug("Released ticket {TicketGuid} (server port {ServerPort}, additional ports [{AdditionalPorts}], memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, string.Join(", ", ticket.AdditionalPorts), ticket.MemoryAllocation.InMegabytes);
+			Logger.Debug("Released ticket {TicketGuid} (server port {ServerPort}, rcon port {RconPort}, memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, ticket.RconPort, ticket.MemoryAllocation.InMegabytes);
 		}
 	}
 	
 	public void RefreshAgentStatus() {
 		lock (this) {
-			reportStatusQueue.Enqueue(new ReportAgentStatusMessage(activeTicketGuids.Count, usedMemory));
+			controllerConnection.TrySend(new ReportAgentStatusMessage(activeTicketGuids.Count, usedMemory));
 		}
 	}
 	
-	public async Task Shutdown() {
+	public sealed record Ticket(Guid TicketGuid, RamAllocationUnits MemoryAllocation, ushort ServerPort, ushort RconPort);
-		await reportStatusQueue.Shutdown(TimeSpan.FromSeconds(5));
-	}
-	
-	public sealed record Ticket(Guid TicketGuid, RamAllocationUnits MemoryAllocation, ushort ServerPort, ImmutableSortedSet<ushort> AdditionalPorts);
 }

Agent/Phantom.Agent.Services/Instances/InstanceValueResolver.cs

@@ -1,13 +0,0 @@
-using Phantom.Common.Data.Instance;
-
-namespace Phantom.Agent.Services.Instances;
-
-sealed class InstanceValueResolver(IInstancePathResolver pathResolver) : IInstanceValueResolver {
-	public string? Path(IInstancePath value) {
-		return value.Resolve(pathResolver);
-	}
-	
-	public string? Variable(InstanceVariable value) {
-		return null;
-	}
-}

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

@@ -1,13 +1,13 @@
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Minecraft.Server;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Instance.Launch;
 
 namespace Phantom.Agent.Services.Instances.State;
 
 static class InstanceLaunchProcedure {
-	public static async Task<InstanceRunningState?> Run(InstanceContext context, InstanceInfo info, InstanceLauncher launcher, InstanceTicketManager ticketManager, InstanceTicketManager.Ticket ticket, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) {
+	public static async Task<InstanceRunningState?> Run(InstanceContext context, InstanceConfiguration configuration, IServerLauncher launcher, InstanceTicketManager ticketManager, InstanceTicketManager.Ticket ticket, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
 		context.Logger.Information("Session starting...");
 		
 		Result<InstanceProcess, InstanceLaunchFailReason> result;
@@ -31,7 +31,7 @@ static class InstanceLaunchProcedure {
 		if (result) {
 			reportStatus(InstanceStatus.Running);
 			context.ReportEvent(InstanceEvent.LaunchSucceeded);
-			return new InstanceRunningState(context, info, launcher, ticket, result.Value, cancellationToken);
+			return new InstanceRunningState(context, configuration, launcher, ticket, result.Value, cancellationToken);
 		}
 		else {
 			reportStatus(InstanceStatus.Failed(result.Error));
@@ -40,24 +40,43 @@ static class InstanceLaunchProcedure {
 		}
 	}
 	
-	private static async Task<Result<InstanceProcess, InstanceLaunchFailReason>> LaunchInstance(InstanceContext context, InstanceLauncher launcher, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) {
+	private static async Task<Result<InstanceProcess, InstanceLaunchFailReason>> LaunchInstance(InstanceContext context, IServerLauncher launcher, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
 		cancellationToken.ThrowIfCancellationRequested();
 		
-		switch (await launcher.Launch(context.Logger, reportStatus, cancellationToken)) {
+		byte lastDownloadProgress = byte.MaxValue;
+		
+		void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
+			byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, 100);
+			
+			if (lastDownloadProgress != progress) {
+				lastDownloadProgress = progress;
+				reportStatus(InstanceStatus.Downloading(progress));
+			}
+		}
+		
+		switch (await launcher.Launch(context.Logger, context.Services.LaunchServices, OnDownloadProgress, cancellationToken)) {
 			case LaunchResult.Success launchSuccess:
 				return launchSuccess.Process;
 			
-			case LaunchResult.CouldNotPrepareServerInstance:
+			case LaunchResult.InvalidJavaRuntime:
-				context.Logger.Error("Session failed to launch, could not prepare server instance.");
+				context.Logger.Error("Session failed to launch, invalid Java runtime.");
-				return InstanceLaunchFailReason.CouldNotPrepareServerInstance;
+				return InstanceLaunchFailReason.JavaRuntimeNotFound;
 			
-			case LaunchResult.CouldNotFindServerExecutable:
+			case LaunchResult.CouldNotDownloadMinecraftServer:
-				context.Logger.Error("Session failed to launch, could not find server executable.");
+				context.Logger.Error("Session failed to launch, could not download Minecraft server.");
-				return InstanceLaunchFailReason.CouldNotFindServerExecutable;
+				return InstanceLaunchFailReason.CouldNotDownloadMinecraftServer;
 			
-			case LaunchResult.CouldNotStartServerExecutable:
+			case LaunchResult.CouldNotPrepareMinecraftServerLauncher:
-				context.Logger.Error("Session failed to launch, could not start server executable.");
+				context.Logger.Error("Session failed to launch, could not prepare Minecraft server launcher.");
-				return InstanceLaunchFailReason.CouldNotStartServerExecutable;
+				return InstanceLaunchFailReason.CouldNotPrepareMinecraftServerLauncher;
+			
+			case LaunchResult.CouldNotConfigureMinecraftServer:
+				context.Logger.Error("Session failed to launch, could not configure Minecraft server.");
+				return InstanceLaunchFailReason.CouldNotConfigureMinecraftServer;
+			
+			case LaunchResult.CouldNotStartMinecraftServer:
+				context.Logger.Error("Session failed to launch, could not start Minecraft server.");
+				return InstanceLaunchFailReason.CouldNotStartMinecraftServer;
 			
 			default:
 				context.Logger.Error("Session failed to launch.");

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

@@ -1,5 +1,4 @@
 using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
 using System.Threading.Channels;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Messages.Agent.ToController;
@@ -9,10 +8,10 @@ using Phantom.Utils.Tasks;
 namespace Phantom.Agent.Services.Instances.State;
 
 sealed class InstanceLogSender : CancellableBackgroundTask {
-	private static readonly BoundedChannelOptions BufferOptions = new (capacity: 200) {
+	private static readonly BoundedChannelOptions BufferOptions = new (capacity: 100) {
 		SingleReader = true,
 		SingleWriter = true,
-		FullMode = BoundedChannelFullMode.DropNewest,
+		FullMode = BoundedChannelFullMode.DropNewest
 	};
 	
 	private static readonly TimeSpan SendDelay = TimeSpan.FromMilliseconds(200);
@@ -34,29 +33,17 @@ sealed class InstanceLogSender : CancellableBackgroundTask {
 		var lineReader = outputChannel.Reader;
 		var lineBuilder = ImmutableArray.CreateBuilder<string>();
 		
-		using var sendOutputCancellationTokenSource = new CancellationTokenSource();
-		
-		await using var sendOutputCancellationRegistration = CancellationToken.Register([SuppressMessage("ReSharper", "AccessToDisposedClosure")]() => {
-			sendOutputCancellationTokenSource.CancelAfter(TimeSpan.FromSeconds(10));
-		});
-		
-		var sendOutputCancellationToken = sendOutputCancellationTokenSource.Token;
-		
 		try {
 			while (await lineReader.WaitToReadAsync(CancellationToken)) {
 				await Task.Delay(SendDelay, CancellationToken);
-				await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder), sendOutputCancellationToken);
+				SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
 			}
 		} catch (OperationCanceledException) {
 			// Ignore.
 		}
 		
 		// Flush remaining lines.
-		try {
+		SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
-			await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder), sendOutputCancellationToken);
-		} catch (OperationCanceledException) {
-			// Ignore.
-		}
 	}
 	
 	private ImmutableArray<string> ReadLinesFromChannel(ChannelReader<string> reader, ImmutableArray<string>.Builder builder) {
@@ -66,7 +53,7 @@ sealed class InstanceLogSender : CancellableBackgroundTask {
 			builder.Add(line);
 		}
 		
-		int droppedLines = Interlocked.Exchange(ref droppedLinesSinceLastSend, value: 0);
+		int droppedLines = Interlocked.Exchange(ref droppedLinesSinceLastSend, 0);
 		if (droppedLines > 0) {
 			builder.Add($"Dropped {droppedLines} {(droppedLines == 1 ? "line" : "lines")} due to buffer overflow.");
 		}
@@ -74,12 +61,9 @@ sealed class InstanceLogSender : CancellableBackgroundTask {
 		return builder.ToImmutable();
 	}
 	
-	private ValueTask SendOutputToServer(ImmutableArray<string> lines, CancellationToken cancellationToken) {
+	private void SendOutputToServer(ImmutableArray<string> lines) {
-		if (lines.IsEmpty) {
+		if (!lines.IsEmpty) {
-			return ValueTask.CompletedTask;
+			controllerConnection.TrySend(new InstanceOutputMessage(instanceGuid, lines));
-		}
-		else {
-			return controllerConnection.Send(new InstanceOutputMessage(instanceGuid, lines), cancellationToken);
 		}
 	}
 	

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

@@ -1,5 +1,4 @@
-using System.Net.Sockets;
+using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Server;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Instance;
@@ -19,9 +18,30 @@ sealed class InstancePlayerCountTracker : CancellableBackgroundTask {
 	private readonly TaskCompletionSource firstDetection = AsyncTasks.CreateCompletionSource();
 	private readonly ManualResetEventSlim serverOutputEvent = new ();
 	
-	private bool WaitingForFirstDetection => !firstDetection.Task.IsCompleted;
-	
 	private InstancePlayerCounts? playerCounts;
+	
+	public InstancePlayerCounts? PlayerCounts {
+		get {
+			lock (this) {
+				return playerCounts;
+			}
+		}
+		private set {
+			EventHandler<int?>? onlinePlayerCountChanged;
+			lock (this) {
+				if (playerCounts == value) {
+					return;
+				}
+				
+				playerCounts = value;
+				onlinePlayerCountChanged = OnlinePlayerCountChanged;
+			}
+			
+			onlinePlayerCountChanged?.Invoke(this, value?.Online);
+			controllerConnection.TrySend(new ReportInstancePlayerCountsMessage(instanceGuid, value));
+		}
+	}
+	
 	private event EventHandler<int?>? OnlinePlayerCountChanged;
 	
 	private bool isDisposed = false;
@@ -36,40 +56,33 @@ sealed class InstancePlayerCountTracker : CancellableBackgroundTask {
 	
 	protected override async Task RunTask() {
 		// Give the server time to start accepting connections.
-		await Task.Delay(TimeSpan.FromSeconds(5), CancellationToken);
+		await Task.Delay(TimeSpan.FromSeconds(10), CancellationToken);
 		
 		serverOutputEvent.Set();
 		process.AddOutputListener(OnOutput, maxLinesToReadFromHistory: 0);
 		
-		while (CancellationToken.Check()) {
+		while (!CancellationToken.IsCancellationRequested) {
 			serverOutputEvent.Reset();
 			
-			InstancePlayerCounts? latestPlayerCounts = await TryGetPlayerCounts();
+			PlayerCounts = await TryGetPlayerCounts();
-			UpdatePlayerCounts(latestPlayerCounts);
 			
-			if (latestPlayerCounts == null) {
+			if (!firstDetection.Task.IsCompleted) {
-				await Task.Delay(WaitingForFirstDetection ? TimeSpan.FromSeconds(5) : TimeSpan.FromSeconds(10), CancellationToken);
+				firstDetection.SetResult();
-			}
-			else {
-				await Task.Delay(TimeSpan.FromSeconds(10), CancellationToken);
-				await serverOutputEvent.WaitHandle.WaitOneAsync(CancellationToken);
-				await Task.Delay(TimeSpan.FromSeconds(1), CancellationToken);
 			}
+			
+			await Task.Delay(TimeSpan.FromSeconds(10), CancellationToken);
+			await serverOutputEvent.WaitHandle.WaitOneAsync(CancellationToken);
+			await Task.Delay(TimeSpan.FromSeconds(1), CancellationToken);
 		}
 	}
 	
 	private async Task<InstancePlayerCounts?> TryGetPlayerCounts() {
 		try {
-			return await ServerStatusProtocol.GetPlayerCounts(serverPort, CancellationToken);
+			var result = await ServerStatusProtocol.GetPlayerCounts(serverPort, CancellationToken);
+			Logger.Debug("Detected {OnlinePlayerCount} / {MaximumPlayerCount} online player(s).", result.Online, result.Maximum);
+			return result;
 		} catch (ServerStatusProtocol.ProtocolException e) {
-			Logger.Error("{Message}", e.Message);
+			Logger.Error(e.Message);
-			return null;
-		} catch (SocketException e) {
-			bool waitingForServerStart = e.SocketErrorCode == SocketError.ConnectionRefused && WaitingForFirstDetection;
-			if (!waitingForServerStart) {
-				Logger.Warning("Could not check online player count. Socket error {ErrorCode} ({ErrorCodeName}), reason: {ErrorMessage}", e.ErrorCode, e.SocketErrorCode, e.Message);
-			}
-			
 			return null;
 		} catch (Exception e) {
 			Logger.Error(e, "Caught exception while checking online player count.");
@@ -77,29 +90,6 @@ sealed class InstancePlayerCountTracker : CancellableBackgroundTask {
 		}
 	}
 	
-	private void UpdatePlayerCounts(InstancePlayerCounts? newPlayerCounts) {
-		if (newPlayerCounts is {} value) {
-			Logger.Debug("Detected {OnlinePlayerCount} / {MaximumPlayerCount} online player(s).", value.Online, value.Maximum);
-			firstDetection.TrySetResult();
-		}
-		
-		EventHandler<int?>? onlinePlayerCountChanged;
-		lock (this) {
-			if (playerCounts == newPlayerCounts) {
-				return;
-			}
-			
-			playerCounts = newPlayerCounts;
-			onlinePlayerCountChanged = OnlinePlayerCountChanged;
-		}
-		
-		onlinePlayerCountChanged?.Invoke(this, newPlayerCounts?.Online);
-		
-		if (!controllerConnection.TrySend(new ReportInstancePlayerCountsMessage(instanceGuid, newPlayerCounts))) {
-			Logger.Warning("Could not report online player count to Controller.");
-		}
-	}
-	
 	public async Task WaitForOnlinePlayers(CancellationToken cancellationToken) {
 		await firstDetection.Task.WaitAsync(cancellationToken);
 		

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

@@ -3,7 +3,6 @@ using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Agent.Services.Backups;
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Instance.Launch;
 using Phantom.Common.Data.Replies;
 
 namespace Phantom.Agent.Services.Instances.State;
@@ -15,8 +14,8 @@ sealed class InstanceRunningState : IDisposable {
 	internal bool IsStopping { get; set; }
 	
 	private readonly InstanceContext context;
-	private readonly InstanceInfo info;
+	private readonly InstanceConfiguration configuration;
-	private readonly InstanceLauncher launcher;
+	private readonly IServerLauncher launcher;
 	private readonly CancellationToken cancellationToken;
 	
 	private readonly InstanceLogSender logSender;
@@ -25,16 +24,16 @@ sealed class InstanceRunningState : IDisposable {
 	
 	private bool isDisposed;
 	
-	public InstanceRunningState(InstanceContext context, InstanceInfo info, InstanceLauncher launcher, InstanceTicketManager.Ticket ticket, InstanceProcess process, CancellationToken cancellationToken) {
+	public InstanceRunningState(InstanceContext context, InstanceConfiguration configuration, IServerLauncher launcher, InstanceTicketManager.Ticket ticket, InstanceProcess process, CancellationToken cancellationToken) {
 		this.context = context;
-		this.info = info;
+		this.configuration = configuration;
 		this.launcher = launcher;
 		this.Ticket = ticket;
 		this.Process = process;
 		this.cancellationToken = cancellationToken;
 		
 		this.logSender = new InstanceLogSender(context.Services.ControllerConnection, context.InstanceGuid, context.ShortName);
-		this.playerCountTracker = new InstancePlayerCountTracker(context, process, info.ServerPort);
+		this.playerCountTracker = new InstancePlayerCountTracker(context, process, configuration.ServerPort);
 		
 		this.backupScheduler = new BackupScheduler(context, playerCountTracker);
 		this.backupScheduler.BackupCompleted += OnScheduledBackupCompleted;
@@ -75,7 +74,7 @@ sealed class InstanceRunningState : IDisposable {
 		else {
 			context.Logger.Information("Session ended unexpectedly, restarting...");
 			context.ReportEvent(InstanceEvent.Crashed);
-			context.Actor.Tell(new InstanceActor.LaunchInstanceCommand(info, launcher, Ticket, IsRestarting: true));
+			context.Actor.Tell(new InstanceActor.LaunchInstanceCommand(configuration, launcher, Ticket, IsRestarting: true));
 		}
 	}
 	

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

@@ -7,7 +7,7 @@ using Phantom.Common.Data.Minecraft;
 namespace Phantom.Agent.Services.Instances.State;
 
 static class InstanceStopProcedure {
-	private static readonly ushort[] Stops = [60, 30, 10, 5, 4, 3, 2, 1, 0];
+	private static readonly ushort[] Stops = { 60, 30, 10, 5, 4, 3, 2, 1, 0 };
 	
 	public static async Task<bool> Run(InstanceContext context, MinecraftStopStrategy stopStrategy, InstanceRunningState runningState, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
 		var process = runningState.Process;

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

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

Agent/Phantom.Agent.Services/Rpc/ControllerHandshake.cs

@@ -1,50 +0,0 @@
-using System.Collections.Immutable;
-using Phantom.Common.Messages.Agent.Handshake;
-using Phantom.Common.Messages.Agent.ToAgent;
-using Phantom.Utils.Logging;
-using Phantom.Utils.Rpc.Message;
-using Phantom.Utils.Rpc.Runtime;
-using Phantom.Utils.Rpc.Runtime.Client;
-using Serilog;
-
-namespace Phantom.Agent.Services.Rpc;
-
-public sealed class ControllerHandshake(AgentRegistration registration, AgentRegistrationHandler registrationHandler) : IRpcClientHandshake {
-	private const int MaxInstances = 100_000;
-	private const int MaxMessageBytes = 1024 * 1024 * 8;
-	
-	private readonly ILogger logger = PhantomLogger.Create<ControllerHandshake>();
-	
-	public async Task Perform(RpcStream stream, CancellationToken cancellationToken) {
-		logger.Information("Registering with the controller...");
-		
-		ReadOnlyMemory<byte> serializedRegistration = MessageSerialization.Serialize(registration);
-		await stream.WriteSignedInt(serializedRegistration.Length, cancellationToken);
-		await stream.WriteBytes(serializedRegistration, cancellationToken);
-		await stream.Flush(cancellationToken);
-		
-		if (await stream.ReadByte(cancellationToken) == 0) {
-			return;
-		}
-		
-		uint configureInstanceMessageCount = await stream.ReadUnsignedInt(cancellationToken);
-		if (configureInstanceMessageCount > MaxInstances) {
-			throw new InvalidOperationException("Trying to configure too many instances (" + configureInstanceMessageCount + " > " + MaxInstances + ").");
-		}
-		
-		var configureInstanceMessages = ImmutableArray.CreateBuilder<ConfigureInstanceMessage>();
-		
-		for (int index = 0; index < configureInstanceMessageCount; index++) {
-			int serializedMessageLength = await stream.ReadSignedInt(cancellationToken);
-			if (serializedMessageLength is < 0 or > MaxMessageBytes) {
-				throw new InvalidOperationException("Message must be between 0 and " + MaxMessageBytes + " bytes.");
-			}
-			
-			var serializedMessage = await stream.ReadBytes(serializedMessageLength, cancellationToken);
-			configureInstanceMessages.Add(MessageSerialization.Deserialize<ConfigureInstanceMessage>(serializedMessage));
-		}
-		
-		registrationHandler.OnRegistrationComplete(configureInstanceMessages.ToImmutable());
-		logger.Information("Registration complete.");
-	}
-}

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

@@ -26,7 +26,7 @@ public sealed class ControllerMessageHandlerActor : ReceiveActor<IMessageToAgent
 	}
 	
 	private async Task<Result<ConfigureInstanceResult, InstanceActionFailure>> HandleConfigureInstance(ConfigureInstanceMessage message) {
-		return await agent.InstanceManager.Request(new InstanceManagerActor.ConfigureInstanceCommand(message.InstanceGuid, message.Info, message.LaunchRecipe, message.LaunchNow, AlwaysReportStatus: false));
+		return await agent.InstanceManager.Request(new InstanceManagerActor.ConfigureInstanceCommand(message.InstanceGuid, message.Configuration, message.LaunchProperties, message.LaunchNow, AlwaysReportStatus: false));
 	}
 	
 	private async Task<Result<LaunchInstanceResult, InstanceActionFailure>> HandleLaunchInstance(LaunchInstanceMessage message) {

Agent/Phantom.Agent.Services/Rpc/ControllerMessageReceiver.cs

@@ -1,11 +0,0 @@
-using Phantom.Common.Messages.Agent;
-using Phantom.Utils.Actor;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Agent.Services.Rpc;
-
-public sealed class ControllerMessageReceiver(ActorRef<IMessageToAgent> actor, AgentRegistrationHandler agentRegistrationHandler) : IMessageReceiver<IMessageToAgent>.Actor(actor) {
-	public override void OnSessionRestarted() {
-		agentRegistrationHandler.OnNewSession();
-	}
-}

Agent/Phantom.Agent.Services/Rpc/ControllerSendQueue.cs

@@ -1,53 +0,0 @@
-using System.Threading.Channels;
-using Phantom.Common.Messages.Agent;
-using Phantom.Utils.Logging;
-using Serilog;
-
-namespace Phantom.Agent.Services.Rpc;
-
-sealed class ControllerSendQueue<TMessage> where TMessage : IMessageToController {
-	private readonly ILogger logger;
-	private readonly Channel<TMessage> channel;
-	private readonly Task sendTask;
-	private readonly CancellationTokenSource shutdownTokenSource = new ();
-	
-	public ControllerSendQueue(ControllerConnection controllerConnection, string loggerName, int capacity, bool singleWriter) {
-		this.logger = PhantomLogger.Create<ControllerSendQueue<TMessage>>(loggerName);
-		
-		this.channel = Channel.CreateBounded<TMessage>(new BoundedChannelOptions(capacity) {
-			AllowSynchronousContinuations = false,
-			FullMode = BoundedChannelFullMode.DropOldest,
-			SingleReader = true,
-			SingleWriter = singleWriter,
-		});
-		
-		this.sendTask = Send(controllerConnection, shutdownTokenSource.Token);
-	}
-	
-	private async Task Send(ControllerConnection controllerConnection, CancellationToken cancellationToken) {
-		await foreach (var message in channel.Reader.ReadAllAsync(cancellationToken)) {
-			await controllerConnection.Send(message, cancellationToken);
-		}
-	}
-	
-	public void Enqueue(TMessage message) {
-		channel.Writer.TryWrite(message);
-	}
-	
-	public async Task Shutdown(TimeSpan gracefulTimeout) {
-		channel.Writer.TryComplete();
-		
-		try {
-			await sendTask.WaitAsync(gracefulTimeout);
-		} catch (TimeoutException) {
-			logger.Warning("Timed out waiting for queue to finish processing.");
-		} catch (Exception) {
-			// Ignore.
-		}
-		
-		await shutdownTokenSource.CancelAsync();
-		await sendTask.ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing);
-		
-		shutdownTokenSource.Dispose();
-	}
-}

Agent/Phantom.Agent/AgentKey.cs

@@ -29,12 +29,12 @@ static class AgentKey {
 		}
 		
 		try {
-			Files.RequireMaximumFileSize(agentKeyFilePath, maximumBytes: 128);
+			Files.RequireMaximumFileSize(agentKeyFilePath, maximumBytes: 64);
 			string[] lines = await File.ReadAllLinesAsync(agentKeyFilePath, Encoding.UTF8);
 			return LoadFromToken(lines[0]);
 		} catch (IOException e) {
 			Logger.Fatal("Error loading agent key from file: {AgentKeyFilePath}", agentKeyFilePath);
-			Logger.Fatal("{Message}", e.Message);
+			Logger.Fatal("{}", e.Message);
 			return null;
 		} catch (Exception) {
 			Logger.Fatal("File does not contain a valid agent key: {AgentKeyFilePath}", agentKeyFilePath);

Agent/Phantom.Agent/GuidFile.cs

@@ -0,0 +1,44 @@
+using System.Text;
+using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
+using Serilog;
+
+namespace Phantom.Agent;
+
+static class GuidFile {
+	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(GuidFile));
+	
+	private const string GuidFileName = "agent.guid";
+	
+	public static async Task<Guid?> CreateOrLoad(string folderPath) {
+		string filePath = Path.Combine(folderPath, GuidFileName);
+		
+		if (File.Exists(filePath)) {
+			try {
+				var guid = await LoadGuidFromFile(filePath);
+				Logger.Information("Loaded existing agent GUID file.");
+				return guid;
+			} catch (Exception e) {
+				Logger.Fatal("Error reading agent GUID file: {Message}", e.Message);
+				return null;
+			}
+		}
+		
+		Logger.Information("Creating agent GUID file: {FilePath}", filePath);
+		
+		try {
+			var guid = Guid.NewGuid();
+			await File.WriteAllTextAsync(filePath, guid.ToString(), Encoding.ASCII);
+			return guid;
+		} catch (Exception e) {
+			Logger.Fatal("Error creating agent GUID file: {Message}", e.Message);
+			return null;
+		}
+	}
+	
+	private static async Task<Guid> LoadGuidFromFile(string filePath) {
+		Files.RequireMaximumFileSize(filePath, 128);
+		string contents = await File.ReadAllTextAsync(filePath, Encoding.ASCII);
+		return Guid.Parse(contents.Trim());
+	}
+}

Agent/Phantom.Agent/Program.cs

@@ -1,14 +1,13 @@
 using System.Reflection;
 using Phantom.Agent;
-using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Services;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
 using Phantom.Common.Messages.Agent;
-using Phantom.Common.Messages.Agent.Handshake;
+using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Actor;
 using Phantom.Utils.Logging;
-using Phantom.Utils.Rpc.Runtime.Client;
+using Phantom.Utils.Rpc.Runtime;
 using Phantom.Utils.Runtime;
 using Phantom.Utils.Threading;
 
@@ -30,7 +29,7 @@ try {
 	PhantomLogger.Root.InformationHeading("Initializing Phantom Panel agent...");
 	PhantomLogger.Root.Information("Agent version: {Version}", fullVersion);
 	
-	var (controllerHost, controllerPort, javaSearchPath, agentKeyToken, agentKeyFilePath, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts, maxConcurrentBackupCompressionTasks) = Variables.LoadOrStop();
+	var (controllerHost, controllerPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts, maxConcurrentBackupCompressionTasks) = Variables.LoadOrStop();
 	
 	var agentKey = await AgentKey.Load(agentKeyToken, agentKeyFilePath);
 	if (agentKey == null) {
@@ -42,11 +41,10 @@ try {
 		return 1;
 	}
 	
-	var agentInfo = new AgentInfo(ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
+	var agentGuid = await GuidFile.CreateOrLoad(folders.DataFolderPath);
-	var javaRuntimeRepository = await JavaRuntimeDiscovery.Scan(folders.JavaSearchFolderPath, shutdownCancellationToken);
+	if (agentGuid == null) {
-	
+		return 1;
-	var agentRegistrationHandler = new AgentRegistrationHandler();
+	}
-	var controllerHandshake = new ControllerHandshake(new AgentRegistration(agentInfo, javaRuntimeRepository.All), agentRegistrationHandler);
 	
 	var rpcClientConnectionParameters = new RpcClientConnectionParameters(
 		Host: controllerHost,
@@ -54,36 +52,49 @@ try {
 		DistinguishedName: "phantom-controller",
 		CertificateThumbprint: agentKey.Value.CertificateThumbprint,
 		AuthToken: agentKey.Value.AuthToken,
-		Handshake: controllerHandshake,
+		SendQueueCapacity: 500,
-		MessageQueueCapacity: 250,
+		PingInterval: TimeSpan.FromSeconds(10)
-		FrameQueueCapacity: 500,
-		MaxConcurrentlyHandledMessages: 50
 	);
 	
-	using var rpcClient = await RpcClient<IMessageToController, IMessageToAgent>.Connect("Controller", rpcClientConnectionParameters, AgentMessageRegistries.Registries, shutdownCancellationToken);
+	using var rpcClient = await RpcClient<IMessageToController, IMessageToAgent>.Connect("Controller", rpcClientConnectionParameters, AgentMessageRegistries.Definitions, shutdownCancellationToken);
 	if (rpcClient == null) {
-		PhantomLogger.Root.Fatal("Could not connect to Phantom Controller, shutting down.");
 		return 1;
 	}
 	
+	var controllerConnection = new ControllerConnection(rpcClient.SendChannel);
+	
+	Task? rpcClientListener = null;
 	try {
 		PhantomLogger.Root.InformationHeading("Launching Phantom Panel agent...");
 		
-		var agentServices = new AgentServices(agentInfo, folders, new AgentServiceConfiguration(maxConcurrentBackupCompressionTasks), new ControllerConnection(rpcClient.MessageSender), javaRuntimeRepository);
+		var agentInfo = new AgentInfo(agentGuid.Value, agentName, ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
+		var agentServices = new AgentServices(agentInfo, folders, new AgentServiceConfiguration(maxConcurrentBackupCompressionTasks), controllerConnection);
+		await agentServices.Initialize();
 		
 		var rpcMessageHandlerInit = new ControllerMessageHandlerActor.Init(agentServices);
 		var rpcMessageHandlerActor = agentServices.ActorSystem.ActorOf(ControllerMessageHandlerActor.Factory(rpcMessageHandlerInit), "ControllerMessageHandler");
 		
-		rpcClient.StartListening(new ControllerMessageReceiver(rpcMessageHandlerActor, agentRegistrationHandler));
+		rpcClientListener = rpcClient.Listen(rpcMessageHandlerActor);
 		
-		if (await agentRegistrationHandler.Start(agentServices, shutdownCancellationToken)) {
+		if (await agentServices.Register(controllerConnection, shutdownCancellationToken)) {
 			PhantomLogger.Root.Information("Phantom Panel agent is ready.");
 			await shutdownCancellationToken.WaitHandle.WaitOneAsync();
 		}
 		
 		await agentServices.Shutdown();
 	} finally {
-		await rpcClient.Shutdown();
+		try {
+			await controllerConnection.Send(new UnregisterAgentMessage(), CancellationToken.None);
+			// TODO wait for acknowledgment
+		} catch (Exception e) {
+			PhantomLogger.Root.Warning(e, "Could not unregister agent after shutdown.");
+		} finally {
+			await rpcClient.Shutdown();
+			
+			if (rpcClientListener != null) {
+				await rpcClientListener;
+			}
+		}
 	}
 	
 	return 0;

Agent/Phantom.Agent/Variables.cs

@@ -11,10 +11,11 @@ sealed record Variables(
 	string JavaSearchPath,
 	string? AgentKeyToken,
 	string? AgentKeyFilePath,
+	string AgentName,
 	ushort MaxInstances,
 	RamAllocationUnits MaxMemory,
 	AllowedPorts AllowedServerPorts,
-	AllowedPorts AllowedAdditionalPorts,
+	AllowedPorts AllowedRconPorts,
 	ushort MaxConcurrentBackupCompressionTasks
 ) {
 	private static Variables LoadOrThrow() {
@@ -27,10 +28,11 @@ sealed record Variables(
 			javaSearchPath,
 			agentKeyToken,
 			agentKeyFilePath,
+			EnvironmentVariables.GetString("AGENT_NAME").Require,
 			(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_ADDITIONAL_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)
 		);
 	}
@@ -43,7 +45,7 @@ sealed record Variables(
 		try {
 			return LoadOrThrow();
 		} catch (Exception e) {
-			PhantomLogger.Root.Fatal("{}", e.Message);
+			PhantomLogger.Root.Fatal(e.Message);
 			throw StopProcedureException.Instance;
 		}
 	}

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

@@ -67,22 +67,22 @@ public sealed class RamAllocationUnitsTests {
 			Assert.That(CallFromString("123A5M"), Throws.Exception.TypeOf<ArgumentOutOfRangeException>().With.Message.StartsWith("Must begin with a number."));
 		}
 		
-		[TestCase("0m", arg2: 0)]
+		[TestCase("0m", 0)]
-		[TestCase("256m", arg2: 256)]
+		[TestCase("256m", 256)]
-		[TestCase("256M", arg2: 256)]
+		[TestCase("256M", 256)]
-		[TestCase("512M", arg2: 512)]
+		[TestCase("512M", 512)]
-		[TestCase("65536M", arg2: 65536)]
+		[TestCase("65536M", 65536)]
 		[TestCase("16776960M", 16777216 - 256)]
 		public void ValidDefinitionInMegabytesIsParsedCorrectly(string definition, int megabytes) {
 			Assert.That(RamAllocationUnits.FromString(definition).InMegabytes, Is.EqualTo(megabytes));
 		}
 		
-		[TestCase("0g", arg2: 0)]
+		[TestCase("0g", 0)]
-		[TestCase("1g", arg2: 1024)]
+		[TestCase("1g", 1024)]
-		[TestCase("1G", arg2: 1024)]
+		[TestCase("1G", 1024)]
-		[TestCase("8G", arg2: 8192)]
+		[TestCase("8G", 8192)]
-		[TestCase("64G", arg2: 65536)]
+		[TestCase("64G", 65536)]
-		[TestCase("16383G", arg2: 16776192)]
+		[TestCase("16383G", 16776192)]
 		public void ValidDefinitionInGigabytesIsParsedCorrectly(string definition, int megabytes) {
 			Assert.That(RamAllocationUnits.FromString(definition).InMegabytes, Is.EqualTo(megabytes));
 		}

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

@@ -1,5 +1,4 @@
-using System.Collections.Immutable;
+using MemoryPack;
-using MemoryPack;
 using Phantom.Common.Data.Agent;
 
 namespace Phantom.Common.Data.Web.Agent;
@@ -8,11 +7,9 @@ namespace Phantom.Common.Data.Web.Agent;
 public sealed partial record Agent(
 	[property: MemoryPackOrder(0)] Guid AgentGuid,
 	[property: MemoryPackOrder(1)] AgentConfiguration Configuration,
-	[property: MemoryPackOrder(2)] ImmutableArray<byte> ConnectionKey,
+	[property: MemoryPackOrder(2)] AgentStats? Stats,
-	[property: MemoryPackOrder(3)] AgentRuntimeInfo RuntimeInfo,
+	[property: MemoryPackOrder(3)] IAgentConnectionStatus ConnectionStatus
-	[property: MemoryPackOrder(4)] AgentStats? Stats,
-	[property: MemoryPackOrder(5)] IAgentConnectionStatus ConnectionStatus
 ) {
 	[MemoryPackIgnore]
-	public RamAllocationUnits? AvailableMemory => RuntimeInfo.MaxMemory - Stats?.RunningInstanceMemory;
+	public RamAllocationUnits? AvailableMemory => Configuration.MaxMemory - Stats?.RunningInstanceMemory;
 }

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

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

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

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

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

@@ -1,9 +0,0 @@
-using MemoryPack;
-
-namespace Phantom.Common.Data.Web.Agent;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public readonly partial record struct AgentVersionInfo(
-	[property: MemoryPackOrder(0)] ushort ProtocolVersion,
-	[property: MemoryPackOrder(1)] string BuildVersion
-);

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

@@ -1,17 +0,0 @@
-namespace Phantom.Common.Data.Web.Agent;
-
-public enum CreateOrUpdateAgentResult : byte {
-	UnknownError,
-	Success,
-	AgentNameMustNotBeEmpty,
-}
-
-public static class CreateOrUpdateAgentResultExtensions {
-	public static string ToSentence(this CreateOrUpdateAgentResult reason) {
-		return reason switch {
-			CreateOrUpdateAgentResult.Success                 => "Success.",
-			CreateOrUpdateAgentResult.AgentNameMustNotBeEmpty => "Agent name must not be empty.",
-			_                                                 => "Unknown error.",
-		};
-	}
-}

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

@@ -3,10 +3,10 @@
 namespace Phantom.Common.Data.Web.Agent;
 
 [MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(AgentIsOffline))]
+[MemoryPackUnion(0, typeof(AgentIsOffline))]
-[MemoryPackUnion(tag: 1, typeof(AgentIsDisconnected))]
+[MemoryPackUnion(1, typeof(AgentIsDisconnected))]
-[MemoryPackUnion(tag: 2, typeof(AgentIsOnline))]
+[MemoryPackUnion(2, typeof(AgentIsOnline))]
-public partial interface IAgentConnectionStatus;
+public partial interface IAgentConnectionStatus {}
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record AgentIsOffline : IAgentConnectionStatus;

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

@@ -9,13 +9,11 @@ public enum AuditLogEventType {
 	UserPasswordChanged,
 	UserRolesChanged,
 	UserDeleted,
-	AgentCreated,
-	AgentEdited,
 	InstanceCreated,
 	InstanceEdited,
 	InstanceLaunched,
 	InstanceStopped,
-	InstanceCommandExecuted,
+	InstanceCommandExecuted
 }
 
 public static class AuditLogEventTypeExtensions {
@@ -28,13 +26,11 @@ public static class AuditLogEventTypeExtensions {
 		{ AuditLogEventType.UserPasswordChanged,       AuditLogSubjectType.User },
 		{ AuditLogEventType.UserRolesChanged,          AuditLogSubjectType.User },
 		{ AuditLogEventType.UserDeleted,               AuditLogSubjectType.User },
-		{ AuditLogEventType.AgentCreated,              AuditLogSubjectType.Agent },
-		{ AuditLogEventType.AgentEdited,               AuditLogSubjectType.Agent },
 		{ AuditLogEventType.InstanceCreated,           AuditLogSubjectType.Instance },
 		{ AuditLogEventType.InstanceEdited,            AuditLogSubjectType.Instance },
 		{ AuditLogEventType.InstanceLaunched,          AuditLogSubjectType.Instance },
 		{ AuditLogEventType.InstanceStopped,           AuditLogSubjectType.Instance },
-		{ AuditLogEventType.InstanceCommandExecuted,   AuditLogSubjectType.Instance },
+		{ AuditLogEventType.InstanceCommandExecuted,   AuditLogSubjectType.Instance }
 	};
 	
 	static AuditLogEventTypeExtensions() {

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

@@ -2,6 +2,5 @@
 
 public enum AuditLogSubjectType {
 	User,
-	Agent,
+	Instance
-	Instance,
 }

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

@@ -7,7 +7,7 @@ public enum EventLogEventType {
 	InstanceStopped,
 	InstanceBackupSucceeded,
 	InstanceBackupSucceededWithWarnings,
-	InstanceBackupFailed,
+	InstanceBackupFailed
 }
 
 public static class EventLogEventTypeExtensions {
@@ -18,7 +18,7 @@ public static class EventLogEventTypeExtensions {
 		{ EventLogEventType.InstanceStopped, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceBackupSucceeded, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceBackupSucceededWithWarnings, EventLogSubjectType.Instance },
-		{ EventLogEventType.InstanceBackupFailed, EventLogSubjectType.Instance },
+		{ EventLogEventType.InstanceBackupFailed, EventLogSubjectType.Instance }
 	};
 	
 	static EventLogEventTypeExtensions() {

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

@@ -1,5 +1,5 @@
 namespace Phantom.Common.Data.Web.EventLog;
 
 public enum EventLogSubjectType {
-	Instance,
+	Instance
 }

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

@@ -6,7 +6,7 @@ public enum CreateOrUpdateInstanceResult : byte {
 	InstanceNameMustNotBeEmpty,
 	InstanceMemoryMustNotBeZero,
 	MinecraftVersionDownloadInfoNotFound,
-	AgentNotFound,
+	AgentNotFound
 }
 
 public static class CreateOrUpdateInstanceResultExtensions {
@@ -17,7 +17,7 @@ public static class CreateOrUpdateInstanceResultExtensions {
 			CreateOrUpdateInstanceResult.InstanceMemoryMustNotBeZero          => "Memory must not be 0 MB.",
 			CreateOrUpdateInstanceResult.MinecraftVersionDownloadInfoNotFound => "Could not find download information for the selected Minecraft version.",
 			CreateOrUpdateInstanceResult.AgentNotFound                        => "Agent not found.",
-			_                                                                 => "Unknown error.",
+			_                                                                 => "Unknown error."
 		};
 	}
 }

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

@@ -4,11 +4,11 @@ namespace Phantom.Common.Data.Web.Minecraft;
 
 public static class JvmArgumentsHelper {
 	public static ImmutableArray<string> Split(string arguments) {
-		return [..arguments.Split(separator: '\n', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)];
+		return arguments.Split('\n', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToImmutableArray();
 	}
 	
 	public static string Join(ImmutableArray<string> arguments) {
-		return string.Join(separator: '\n', arguments);
+		return string.Join('\n', arguments);
 	}
 	
 	public static ValidationError? Validate(string arguments) {
@@ -35,6 +35,6 @@ public static class JvmArgumentsHelper {
 	public enum ValidationError {
 		InvalidFormat,
 		XmxNotAllowed,
-		XmsNotAllowed,
+		XmsNotAllowed
 	}
 }

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

@@ -4,5 +4,5 @@ public enum AddRoleError : byte {
 	NameIsEmpty,
 	NameIsTooLong,
 	NameAlreadyExists,
-	UnknownError,
+	UnknownError
 }

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

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

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

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

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

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

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

@@ -3,5 +3,5 @@
 public enum DeleteUserResult : byte {
 	Deleted,
 	NotFound,
-	Failed,
+	Failed
 }

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

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

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

@@ -1,7 +1,7 @@
 namespace Phantom.Common.Data.Web.Users;
 
 public sealed record Permission(string Id, Permission? Parent) {
-	private static readonly List<Permission> AllPermissions = [];
+	private static readonly List<Permission> AllPermissions = new ();
 	public static IEnumerable<Permission> All => AllPermissions;
 	
 	private static Permission Register(string id, Permission? parent = null) {

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

@@ -1,15 +1,18 @@
 using System.Collections.Immutable;
 using MemoryPack;
+using Phantom.Common.Data.Web.Users.SetUserPasswordErrors;
 
-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users {
-
+	[MemoryPackable]
-[MemoryPackable]
+	[MemoryPackUnion(0, typeof(UserNotFound))]
-[MemoryPackUnion(tag: 0, typeof(UserNotFound))]
+	[MemoryPackUnion(1, typeof(PasswordIsInvalid))]
-[MemoryPackUnion(tag: 1, typeof(PasswordIsInvalid))]
+	[MemoryPackUnion(2, typeof(UnknownError))]
-[MemoryPackUnion(tag: 2, typeof(UnknownError))]
+	public abstract partial record SetUserPasswordError {
-public abstract partial record SetUserPasswordError {
+		internal SetUserPasswordError() {}
-	private SetUserPasswordError() {}
+	}
+}
 
+namespace Phantom.Common.Data.Web.Users.SetUserPasswordErrors {
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record UserNotFound : SetUserPasswordError;
 	

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

@@ -1,5 +1,5 @@
 namespace Phantom.Common.Data.Web.Users;
 
 public enum UserActionFailure {
-	NotAuthorized,
+	NotAuthorized
 }

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

@@ -4,22 +4,22 @@ using Phantom.Common.Data.Replies;
 namespace Phantom.Common.Data.Web.Users;
 
 [MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(User))]
+[MemoryPackUnion(0, typeof(OfUserActionFailure))]
-[MemoryPackUnion(tag: 1, typeof(Instance))]
+[MemoryPackUnion(1, typeof(OfInstanceActionFailure))]
 public abstract partial record UserInstanceActionFailure {
-	private UserInstanceActionFailure() {}
+	internal UserInstanceActionFailure() {}
-	
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record User([property: MemoryPackOrder(0)] UserActionFailure Failure) : UserInstanceActionFailure;
-	
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record Instance([property: MemoryPackOrder(0)] InstanceActionFailure Failure) : UserInstanceActionFailure;
 	
 	public static implicit operator UserInstanceActionFailure(UserActionFailure failure) {
-		return new User(failure);
+		return new OfUserActionFailure(failure);
 	}
 	
 	public static implicit operator UserInstanceActionFailure(InstanceActionFailure failure) {
-		return new Instance(failure);
+		return new OfInstanceActionFailure(failure);
 	}
 }
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record OfUserActionFailure([property: MemoryPackOrder(0)] UserActionFailure Failure) : UserInstanceActionFailure;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record OfInstanceActionFailure([property: MemoryPackOrder(0)] InstanceActionFailure Failure) : UserInstanceActionFailure;

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

@@ -1,13 +1,16 @@
 using MemoryPack;
+using Phantom.Common.Data.Web.Users.UsernameRequirementViolations;
 
-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users {
-
+	[MemoryPackable]
-[MemoryPackable]
+	[MemoryPackUnion(0, typeof(IsEmpty))]
-[MemoryPackUnion(tag: 0, typeof(IsEmpty))]
+	[MemoryPackUnion(1, typeof(TooLong))]
-[MemoryPackUnion(tag: 1, typeof(TooLong))]
+	public abstract partial record UsernameRequirementViolation {
-public abstract partial record UsernameRequirementViolation {
+		internal UsernameRequirementViolation() {}
-	private UsernameRequirementViolation() {}
+	}
+}
 
+namespace Phantom.Common.Data.Web.Users.UsernameRequirementViolations {
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record IsEmpty : UsernameRequirementViolation;
 	

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

@@ -4,10 +4,12 @@ namespace Phantom.Common.Data.Agent;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record AgentInfo(
-	[property: MemoryPackOrder(0)] ushort ProtocolVersion,
+	[property: MemoryPackOrder(0)] Guid AgentGuid,
-	[property: MemoryPackOrder(1)] string BuildVersion,
+	[property: MemoryPackOrder(1)] string AgentName,
-	[property: MemoryPackOrder(2)] ushort MaxInstances,
+	[property: MemoryPackOrder(2)] ushort ProtocolVersion,
-	[property: MemoryPackOrder(3)] RamAllocationUnits MaxMemory,
+	[property: MemoryPackOrder(3)] string BuildVersion,
-	[property: MemoryPackOrder(4)] AllowedPorts AllowedServerPorts,
+	[property: MemoryPackOrder(4)] ushort MaxInstances,
-	[property: MemoryPackOrder(5)] AllowedPorts AllowedAdditionalPorts
+	[property: MemoryPackOrder(5)] RamAllocationUnits MaxMemory,
+	[property: MemoryPackOrder(6)] AllowedPorts AllowedServerPorts,
+	[property: MemoryPackOrder(7)] AllowedPorts AllowedRconPorts
 );

Common/Phantom.Common.Data/AllowedPorts.cs

@@ -35,7 +35,7 @@ public sealed partial class AllowedPorts {
 	}
 	
 	private static AllowedPorts FromString(ReadOnlySpan<char> definitions) {
-		List<PortRange> parsedDefinitions = [];
+		List<PortRange> parsedDefinitions = new ();
 		
 		while (!definitions.IsEmpty) {
 			int separatorIndex = definitions.IndexOf(',');
@@ -49,7 +49,7 @@ public sealed partial class AllowedPorts {
 			}
 		}
 		
-		return new AllowedPorts([..parsedDefinitions]);
+		return new AllowedPorts(parsedDefinitions.ToImmutableArray());
 	}
 	
 	public static AllowedPorts FromString(string definitions) {

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

@@ -10,7 +10,7 @@ public enum BackupCreationResultKind : byte {
 	BackupFileAlreadyExists = 6,
 	CouldNotCreateBackupFolder = 7,
 	CouldNotCopyWorldToTemporaryFolder = 8,
-	CouldNotCreateWorldArchive = 9,
+	CouldNotCreateWorldArchive = 9
 }
 
 public static class BackupCreationResultSummaryExtensions {

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

@@ -7,7 +7,7 @@ public enum BackupCreationWarnings : byte {
 	None = 0,
 	CouldNotDeleteTemporaryFolder = 1 << 0,
 	CouldNotCompressWorldArchive = 1 << 1,
-	CouldNotRestoreAutomaticSaving = 1 << 2,
+	CouldNotRestoreAutomaticSaving = 1 << 2
 }
 
 public static class BackupCreationWarningsExtensions {

Common/Phantom.Common.Data/ConnectionKey.cs

@@ -1,5 +1,4 @@
-using System.Collections.Immutable;
+using Phantom.Utils.Rpc;
-using Phantom.Utils.Rpc;
 using Phantom.Utils.Rpc.Runtime.Tls;
 
 namespace Phantom.Common.Data;
@@ -7,15 +6,15 @@ namespace Phantom.Common.Data;
 public readonly record struct ConnectionKey(RpcCertificateThumbprint CertificateThumbprint, AuthToken AuthToken) {
 	private const byte TokenLength = AuthToken.Length;
 
-	public ImmutableArray<byte> ToBytes() {
+	public byte[] ToBytes() {
 		Span<byte> result = stackalloc byte[TokenLength + CertificateThumbprint.Bytes.Length];
-		AuthToken.ToBytes(result[..TokenLength]);
+		AuthToken.Bytes.CopyTo(result[..TokenLength]);
 		CertificateThumbprint.Bytes.CopyTo(result[TokenLength..]);
-		return [..result];
+		return result.ToArray();
 	}
 
 	public static ConnectionKey FromBytes(ReadOnlySpan<byte> data) {
-		var authToken = AuthToken.FromBytes(data[..TokenLength]);
+		var authToken = new AuthToken([..data[..TokenLength]]);
 		var certificateThumbprint = RpcCertificateThumbprint.From(data[TokenLength..]);
 		return new ConnectionKey(certificateThumbprint, authToken);
 	}

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

@@ -1,15 +1,14 @@
 using MemoryPack;
 using Phantom.Common.Data.Backups;
-using Phantom.Common.Data.Instance.Launch;
 
 namespace Phantom.Common.Data.Instance;
 
 [MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(InstanceLaunchSucceededEvent))]
+[MemoryPackUnion(0, typeof(InstanceLaunchSucceededEvent))]
-[MemoryPackUnion(tag: 1, typeof(InstanceLaunchFailedEvent))]
+[MemoryPackUnion(1, typeof(InstanceLaunchFailedEvent))]
-[MemoryPackUnion(tag: 2, typeof(InstanceCrashedEvent))]
+[MemoryPackUnion(2, typeof(InstanceCrashedEvent))]
-[MemoryPackUnion(tag: 3, typeof(InstanceStoppedEvent))]
+[MemoryPackUnion(3, typeof(InstanceStoppedEvent))]
-[MemoryPackUnion(tag: 4, typeof(InstanceBackupCompletedEvent))]
+[MemoryPackUnion(4, typeof(InstanceBackupCompletedEvent))]
 public partial interface IInstanceEvent {
 	void Accept(IInstanceEventVisitor visitor);
 }

Common/Phantom.Common.Data/Instance/IInstancePath.cs

@@ -1,41 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-
-namespace Phantom.Common.Data.Instance;
-
-[MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(InstancePath.Global))]
-[MemoryPackUnion(tag: 1, typeof(InstancePath.Local))]
-[MemoryPackUnion(tag: 2, typeof(InstancePath.Runtime))]
-public partial interface IInstancePath {
-	string? Resolve(IInstancePathResolver resolver);
-}
-
-public static partial class InstancePath {
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record Global(
-		[property: MemoryPackOrder(0)] ImmutableArray<string> Path
-	) : IInstancePath {
-		public string? Resolve(IInstancePathResolver resolver) {
-			return resolver.Global(Path);
-		}
-	}
-	
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record Local(
-		[property: MemoryPackOrder(0)] ImmutableArray<string> Path
-	) : IInstancePath {
-		public string? Resolve(IInstancePathResolver resolver) {
-			return resolver.Local(Path);
-		}
-	}
-	
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record Runtime(
-		[property: MemoryPackOrder(0)] Guid Guid
-	) : IInstancePath {
-		public string? Resolve(IInstancePathResolver resolver) {
-			return resolver.Runtime(Guid);
-		}
-	}
-}

Common/Phantom.Common.Data/Instance/IInstancePathResolver.cs

@@ -1,9 +0,0 @@
-using System.Collections.Immutable;
-
-namespace Phantom.Common.Data.Instance;
-
-public interface IInstancePathResolver {
-	string? Global(ImmutableArray<string> path);
-	string? Local(ImmutableArray<string> path);
-	string? Runtime(Guid guid);
-}

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

@@ -1,20 +1,19 @@
 using MemoryPack;
-using Phantom.Common.Data.Instance.Launch;
 
 namespace Phantom.Common.Data.Instance;
 
 [MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(InstanceIsOffline))]
+[MemoryPackUnion(0, typeof(InstanceIsOffline))]
-[MemoryPackUnion(tag: 1, typeof(InstanceIsInvalid))]
+[MemoryPackUnion(1, typeof(InstanceIsInvalid))]
-[MemoryPackUnion(tag: 2, typeof(InstanceIsNotRunning))]
+[MemoryPackUnion(2, typeof(InstanceIsNotRunning))]
-[MemoryPackUnion(tag: 3, typeof(InstanceIsDownloading))]
+[MemoryPackUnion(3, typeof(InstanceIsDownloading))]
-[MemoryPackUnion(tag: 4, typeof(InstanceIsLaunching))]
+[MemoryPackUnion(4, typeof(InstanceIsLaunching))]
-[MemoryPackUnion(tag: 5, typeof(InstanceIsRunning))]
+[MemoryPackUnion(5, typeof(InstanceIsRunning))]
-[MemoryPackUnion(tag: 6, typeof(InstanceIsBackingUp))]
+[MemoryPackUnion(6, typeof(InstanceIsBackingUp))]
-[MemoryPackUnion(tag: 7, typeof(InstanceIsRestarting))]
+[MemoryPackUnion(7, typeof(InstanceIsRestarting))]
-[MemoryPackUnion(tag: 8, typeof(InstanceIsStopping))]
+[MemoryPackUnion(8, typeof(InstanceIsStopping))]
-[MemoryPackUnion(tag: 9, typeof(InstanceIsFailed))]
+[MemoryPackUnion(9, typeof(InstanceIsFailed))]
-public partial interface IInstanceStatus;
+public partial interface IInstanceStatus {}
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsOffline : IInstanceStatus;
@@ -26,7 +25,7 @@ public sealed partial record InstanceIsInvalid([property: MemoryPackOrder(0)] st
 public sealed partial record InstanceIsNotRunning : IInstanceStatus;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record InstanceIsDownloading([property: MemoryPackOrder(0)] byte? Progress) : IInstanceStatus;
+public sealed partial record InstanceIsDownloading([property: MemoryPackOrder(0)] byte Progress) : IInstanceStatus;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsLaunching : IInstanceStatus;
@@ -56,7 +55,7 @@ public static class InstanceStatus {
 	public static readonly IInstanceStatus Stopping = new InstanceIsStopping();
 	
 	public static IInstanceStatus Invalid(string reason) => new InstanceIsInvalid(reason);
-	public static IInstanceStatus Downloading(byte? progress) => new InstanceIsDownloading(progress);
+	public static IInstanceStatus Downloading(byte progress) => new InstanceIsDownloading(progress);
 	public static IInstanceStatus Failed(InstanceLaunchFailReason reason) => new InstanceIsFailed(reason);
 	
 	public static bool IsLaunching(this IInstanceStatus status) {

Common/Phantom.Common.Data/Instance/IInstanceValue.cs

@@ -1,57 +0,0 @@
-using System.Collections.Immutable;
-using System.Text;
-using MemoryPack;
-
-namespace Phantom.Common.Data.Instance;
-
-[MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(InstanceValues.Concatenation))]
-[MemoryPackUnion(tag: 1, typeof(InstanceValues.Text))]
-[MemoryPackUnion(tag: 2, typeof(InstanceValues.Path))]
-[MemoryPackUnion(tag: 3, typeof(InstanceValues.Variable))]
-public partial interface IInstanceValue {
-	string? Resolve(IInstanceValueResolver resolver);
-}
-
-public static partial class InstanceValues {
-	[MemoryPackable]
-	public sealed partial record Concatenation(ImmutableArray<IInstanceValue> Values) : IInstanceValue {
-		public string? Resolve(IInstanceValueResolver resolver) {
-			var result = new StringBuilder();
-			
-			foreach (IInstanceValue value in Values) {
-				if (value.Resolve(resolver) is {} resolved) {
-					result.Append(resolved);
-				}
-				else {
-					return null;
-				}
-			}
-			
-			return result.ToString();
-		}
-	}
-	
-	[MemoryPackable]
-	public sealed partial record Text(string Value) : IInstanceValue {
-		public string Resolve(IInstanceValueResolver resolver) {
-			return Value;
-		}
-	}
-	
-	[MemoryPackable]
-	public sealed partial record Path(IInstancePath Value) : IInstanceValue {
-		public string? Resolve(IInstanceValueResolver resolver) {
-			return resolver.Path(Value);
-		}
-	}
-	
-	[MemoryPackable]
-	public sealed partial record Variable(InstanceVariable Value) : IInstanceValue {
-		public string? Resolve(IInstanceValueResolver resolver) {
-			return resolver.Variable(Value);
-		}
-	}
-}
-
-public enum InstanceVariable {}

Common/Phantom.Common.Data/Instance/IInstanceValueResolver.cs

@@ -1,6 +0,0 @@
-namespace Phantom.Common.Data.Instance;
-
-public interface IInstanceValueResolver {
-	string? Path(IInstancePath value);
-	string? Variable(InstanceVariable value);
-}

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

@@ -15,7 +15,4 @@ public sealed partial record InstanceConfiguration(
 	[property: MemoryPackOrder(6)] RamAllocationUnits MemoryAllocation,
 	[property: MemoryPackOrder(7)] Guid JavaRuntimeGuid,
 	[property: MemoryPackOrder(8)] ImmutableArray<string> JvmArguments
-) {
+);
-	[MemoryPackIgnore]
-	public InstanceInfo AsInfo => new (InstanceName, ServerPort, [RconPort], MemoryAllocation);
-}