Add "servermods" folder to ignored folders in backups

.gitignore

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

.run/Agent 1.run.xml

@@ -5,7 +5,7 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
-      <env name="AGENT_KEY" value="K5ZRZYYJ9GWM2FS6XH5N5QQ7WZRPNDGHYMN5QP7RP6PPY27KRPMSYGCN" />
+      <env name="AGENT_KEY" value="JXBQQYG5T267RQS75MXWBTCJZY5CKTCCGQY22MCZPHSQQSJYCHH2NG2TCNXQY6TBSXM9NQDRS2CMX" />
       <env name="AGENT_NAME" value="Agent 1" />
       <env name="ALLOWED_RCON_PORTS" value="25575,27000,27001" />
       <env name="ALLOWED_SERVER_PORTS" value="25565,26000,26001" />
@@ -15,19 +15,14 @@
       <env name="MAX_MEMORY" value="12G" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="ENV_FILE_PATHS" value="" />
-    <option name="REDIRECT_INPUT_PATH" value="" />
-    <option name="PTY_MODE" value="Auto" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="AUTO_ATTACH_CHILDREN" value="0" />
-    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/Phantom.Agent.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net9.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 2.run.xml

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

.run/Agent 3.run.xml

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

.run/Controller.run.xml

@@ -14,19 +14,14 @@
       <env name="WEB_RPC_SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="ENV_FILE_PATHS" value="" />
-    <option name="REDIRECT_INPUT_PATH" value="" />
-    <option name="PTY_MODE" value="Auto" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="AUTO_ATTACH_CHILDREN" value="0" />
-    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Controller/Phantom.Controller/Phantom.Controller.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net9.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Web.run.xml

@@ -7,23 +7,18 @@
     <envs>
       <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
       <env name="CONTROLLER_HOST" value="localhost" />
-      <env name="WEB_KEY" value="T5Y722D2GZBXT2H27QS95P2YQRFB2GCTKHSWT5CZFDTFKW52TCM9GDRW" />
+      <env name="WEB_KEY" value="BMNHM9RRPMCBBY29D9XHS6KBKZSRY7F5XFN27YZX96XXWJC2NM2D6YRHM9PZN9JGQGCSJ6FMB2GGZ" />
       <env name="WEB_SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="ENV_FILE_PATHS" value="" />
-    <option name="REDIRECT_INPUT_PATH" value="" />
-    <option name="PTY_MODE" value="Auto" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="AUTO_ATTACH_CHILDREN" value="0" />
-    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Web/Phantom.Web/Phantom.Web.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net9.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>

.workdir/Controller/secrets/agent.auth

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

.workdir/Controller/secrets/agent.secret

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

.workdir/Controller/secrets/web.auth

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

.workdir/Controller/secrets/web.key

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

.workdir/Controller/secrets/web.secret

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

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/Java/JavaPropertiesFileEditor.cs

@@ -1,52 +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 async Task EditOrCreate(string filePath, string comment, CancellationToken cancellationToken) {
+	public async Task EditOrCreate(string filePath) {
 		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) {
-		await using var targetWriter = new JavaPropertiesStream.Writer(targetFilePath);
+	private async Task EditFromCopyOrCreate(string? sourceFilePath, string 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) {
-			await targetWriter.WriteProperty(key, value, cancellationToken);
+		foreach (var (key, value) in overriddenProperties) {
+			properties[key] = value;
+		}
+
+		await using var targetStream = new FileStream(targetFilePath, FileMode.Create, FileAccess.Write, FileShare.Read);
+		await using var targetWriter = new StreamWriter(targetStream, Encoding);
+
+		await targetWriter.WriteLineAsync("# Properties");
+
+		foreach (var (key, value) in properties) {
+			await WriteProperty(targetWriter, key, value);
 		}
 	}
 
-	private async Task Edit(string sourceFilePath, string targetFilePath, string comment, CancellationToken cancellationToken) {
-		using var sourceReader = new JavaPropertiesStream.Reader(sourceFilePath);
-		await using var targetWriter = new JavaPropertiesStream.Writer(targetFilePath);
-		
-		await targetWriter.WriteComment(comment, cancellationToken);
-		
-		var remainingOverriddenPropertyKeys = new HashSet<string>(overriddenProperties.Keys);
-		
-		await foreach ((string key, string value) in sourceReader.ReadProperties(cancellationToken)) {
-			if (remainingOverriddenPropertyKeys.Remove(key)) {
-				await targetWriter.WriteProperty(key, overriddenProperties[key], cancellationToken);
-			}
-			else {
-				await targetWriter.WriteProperty(key, value, cancellationToken);
-			}
+	private static async Task WriteProperty(StreamWriter writer, string key, string value) {
+		await WritePropertyComponent(writer, key, escapeSpaces: true);
+		await writer.WriteAsync('=');
+		await WritePropertyComponent(writer, value, escapeSpaces: false);
+		await writer.WriteLineAsync();
 	}
 
-		foreach (string key in remainingOverriddenPropertyKeys) {
-			await targetWriter.WriteProperty(key, overriddenProperties[key], cancellationToken);
+	private static async Task WritePropertyComponent(TextWriter writer, string component, bool escapeSpaces) {
+		for (int index = 0; index < component.Length; index++) {
+			var c = component[index];
+			switch (c) {
+				case '\\':
+				case '#':
+				case '!':
+				case '=':
+				case ':':
+				case ' ' when escapeSpaces || index == 0:
+					await writer.WriteAsync('\\');
+					await writer.WriteAsync(c);
+					break;
+				case var _ when c > 31 && c < 127:
+					await writer.WriteAsync(c);
+					break;
+				case '\t':
+					await writer.WriteAsync("\\t");
+					break;
+				case '\n':
+					await writer.WriteAsync("\\n");
+					break;
+				case '\r':
+					await writer.WriteAsync("\\r");
+					break;
+				case '\f':
+					await writer.WriteAsync("\\f");
+					break;
+				default:
+					await writer.WriteAsync("\\u");
+					await writer.WriteAsync(((int) c).ToString("X4"));
+					break;
+			}
 		}
 	}
 }

Agent/Phantom.Agent.Minecraft/Java/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) {
-		var runtimes = await new JavaRuntimeDiscovery().ScanInternal(folderPath, cancellationToken).ToImmutableArrayAsync(cancellationToken);
-		return new JavaRuntimeRepository(runtimes);
+	public static IAsyncEnumerable<JavaRuntimeExecutable> Scan(string folderPath) {
+		return new JavaRuntimeDiscovery().ScanInternal(folderPath);
 	}
 	
 	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,19 +81,18 @@ public sealed class JavaRuntimeDiscovery {
 			RedirectStandardInput = false,
 			RedirectStandardOutput = false,
 			RedirectStandardError = true,
-			UseShellExecute = false,
+			UseShellExecute = false
 		};
 
-		using var timeoutCancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-		using var combinedCancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(timeoutCancellationTokenSource.Token, cancellationToken);
+		var process = new Process { StartInfo = startInfo };
+		var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
 
-		using var process = new Process();
-		process.StartInfo = startInfo;
+		try {
 			process.Start();
 
 			JavaRuntimeBuilder runtimeBuilder = new ();
 
-		while (await process.StandardError.ReadLineAsync(combinedCancellationTokenSource.Token) is {} line) {
+			while (await process.StandardError.ReadLineAsync(cancellationTokenSource.Token) is {} line) {
 				ExtractJavaVersionPropertiesFromLine(line, runtimeBuilder);
 				
 				JavaRuntime? runtime = runtimeBuilder.TryBuild(duplicateDisplayNames);
@@ -107,8 +101,12 @@ public sealed class JavaRuntimeDiscovery {
 				}
 			}
 
-		await process.WaitForExitAsync(combinedCancellationTokenSource.Token);
+			await process.WaitForExitAsync(cancellationTokenSource.Token);
 			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;
 
-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;
-	
-	internal JavaRuntimeRepository(ImmutableArray<JavaRuntimeExecutable> runtimes) {
-		var runtimesByGuidBuilder = ImmutableDictionary.CreateBuilder<Guid, JavaRuntimeExecutable>();
-		
-		foreach (JavaRuntimeExecutable runtime in runtimes) {
-			runtimesByGuidBuilder.Add(GenerateStableGuid(runtime.ExecutablePath), runtime);
-		}
-		
-		runtimesByGuid = runtimesByGuidBuilder.ToImmutable();
-	}
+	private readonly Dictionary<string, Guid> guidsByPath = new ();
+	private readonly Dictionary<Guid, JavaRuntimeExecutable> runtimesByGuid = new ();
+	private readonly ReaderWriterLockSlim rwLock = new (LockRecursionPolicy.NoRecursion);
 
 	public ImmutableArray<TaggedJavaRuntime> All {
-		[SuppressMessage("ReSharper", "UseCollectionExpression")]
-		get => runtimesByGuid.Select(static kvp => new TaggedJavaRuntime(kvp.Key, kvp.Value.Runtime))
-		                     .OrderBy(static taggedRuntime => taggedRuntime.Runtime)
-		                     .ToImmutableArray();
+		get {
+			rwLock.EnterReadLock();
+			try {
+				return runtimesByGuid.Select(static kvp => new TaggedJavaRuntime(kvp.Key, kvp.Value.Runtime)).OrderBy(static taggedRuntime => taggedRuntime.Runtime).ToImmutableArray();
+			} finally {
+				rwLock.ExitReadLock();
+			}
+		}
 	}
 
-	internal bool TryGetByGuid(Guid guid, [MaybeNullWhen(false)] out JavaRuntimeExecutable runtime) {
+	public void Include(JavaRuntimeExecutable runtime) {
+		rwLock.EnterWriteLock();
+		try {
+			if (!guidsByPath.TryGetValue(runtime.ExecutablePath, out var guid)) {
+				guidsByPath[runtime.ExecutablePath] = guid = GenerateStableGuid(runtime.ExecutablePath);
+			}
+
+			runtimesByGuid[guid] = runtime;
+		} finally {
+			rwLock.ExitWriteLock();
+		}
+	}
+
+	public bool TryGetByGuid(Guid guid, [MaybeNullWhen(false)] out JavaRuntimeExecutable runtime) {
+		rwLock.EnterReadLock();
+		try {
 			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) {
-	private readonly List<string> customArguments = [];
+sealed class JvmArgumentBuilder {
+	private readonly JvmProperties basicProperties;
+	private readonly List<string> customArguments = new ();
+
+	public JvmArgumentBuilder(JvmProperties basicProperties) {
+		this.basicProperties = basicProperties;
+	}
 
 	public void Add(string argument) {
 		customArguments.Add(argument);

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

@@ -1,4 +1,5 @@
-using System.Text;
+using System.Collections.ObjectModel;
+using System.Text;
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Minecraft.Server;
@@ -11,6 +12,7 @@ public abstract class BaseLauncher : IServerLauncher {
 	private readonly InstanceProperties instanceProperties;
 
 	protected string MinecraftVersion => instanceProperties.ServerVersion;
+	protected string InstanceFolder => instanceProperties.InstanceFolder;
 
 	private protected BaseLauncher(InstanceProperties instanceProperties) {
 		this.instanceProperties = instanceProperties;
@@ -43,7 +45,7 @@ public abstract class BaseLauncher : IServerLauncher {
 
 		try {
 			await AcceptEula(instanceProperties);
-			await UpdateServerProperties(instanceProperties, cancellationToken);
+			await UpdateServerProperties(instanceProperties);
 		} catch (Exception e) {
 			logger.Error(e, "Caught exception while configuring the server.");
 			return new LaunchResult.CouldNotConfigureMinecraftServer();
@@ -51,16 +53,14 @@ public abstract class BaseLauncher : IServerLauncher {
 		
 		var processConfigurator = new ProcessConfigurator {
 			FileName = javaRuntimeExecutable.ExecutablePath,
-			WorkingDirectory = instanceProperties.InstanceFolder,
+			WorkingDirectory = InstanceFolder,
 			RedirectInput = true,
-			UseShellExecute = false,
+			UseShellExecute = false
 		};
 		
 		var processArguments = processConfigurator.ArgumentList;
 		PrepareJvmArguments(serverJar).Build(processArguments);
-		processArguments.Add("-jar");
-		processArguments.Add(serverJar.FilePath);
-		processArguments.Add("nogui");
+		PrepareJavaProcessArguments(processArguments, serverJar.FilePath);
 
 		var process = processConfigurator.CreateProcess();
 		var instanceProcess = new InstanceProcess(instanceProperties, process);
@@ -99,18 +99,24 @@ public abstract class BaseLauncher : IServerLauncher {
 
 	private protected virtual void CustomizeJvmArguments(JvmArgumentBuilder arguments) {}
 
+	protected virtual void PrepareJavaProcessArguments(Collection<string> processArguments, string serverJarFilePath) {
+		processArguments.Add("-jar");
+		processArguments.Add(serverJarFilePath);
+		processArguments.Add("nogui");
+	}
+
 	private protected virtual Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
 		return Task.FromResult(new ServerJarInfo(serverJarPath));
 	}
 
 	private static async Task AcceptEula(InstanceProperties instanceProperties) {
 		var eulaFilePath = Path.Combine(instanceProperties.InstanceFolder, "eula.txt");
-		await File.WriteAllLinesAsync(eulaFilePath, ["# EULA", "eula=true"], Encoding.UTF8);
+		await File.WriteAllLinesAsync(eulaFilePath, new [] { "# EULA", "eula=true" }, Encoding.UTF8);
 	}
 
-	private static async Task UpdateServerProperties(InstanceProperties instanceProperties, CancellationToken cancellationToken) {
+	private static async Task UpdateServerProperties(InstanceProperties instanceProperties) {
 		var serverPropertiesEditor = new JavaPropertiesFileEditor();
 		instanceProperties.ServerProperties.SetTo(serverPropertiesEditor);
-		await serverPropertiesEditor.EditOrCreate(Path.Combine(instanceProperties.InstanceFolder, "server.properties"), comment: "server.properties", cancellationToken);
+		await serverPropertiesEditor.EditOrCreate(Path.Combine(instanceProperties.InstanceFolder, "server.properties"));
 	}
 }

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

@@ -1,4 +1,5 @@
-using Phantom.Agent.Minecraft.Instance;
+using System.Collections.Immutable;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Utils.IO;
 using Serilog;
 
@@ -19,7 +20,7 @@ public sealed class FabricLauncher : BaseLauncher {
 			await DownloadLauncher(logger, launcherJarPath, cancellationToken);
 		}
 
-		return new ServerJarInfo(launcherJarPath, ["-Dfabric.installer.server.gameJar=" + Paths.NormalizeSlashes(serverJarPath)]);
+		return new ServerJarInfo(launcherJarPath, ImmutableArray.Create("-Dfabric.installer.server.gameJar=" + Paths.NormalizeSlashes(serverJarPath)));
 	}
 
 	private async Task DownloadLauncher(ILogger logger, string targetFilePath, CancellationToken cancellationToken) {

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

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

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

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

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

@@ -17,7 +17,7 @@ sealed class MinecraftServerExecutableDownloader {
 	
 	private readonly CancellationTokenSource cancellationTokenSource = new ();
 	
-	private readonly List<CancellationTokenRegistration> listenerCancellationRegistrations = [];
+	private readonly List<CancellationTokenRegistration> listenerCancellationRegistrations = new ();
 	private int listenerCount = 0;
 
 	public MinecraftServerExecutableDownloader(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath, MinecraftServerExecutableDownloadListener listener) {
@@ -106,7 +106,7 @@ sealed class MinecraftServerExecutableDownloader {
 				throw;
 			}
 
-			File.Move(tmpFilePath, filePath, overwrite: true);
+			File.Move(tmpFilePath, filePath, true);
 			Logger.Information("Server version {Version} downloaded.", minecraftVersion);
 
 			return filePath;

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);
-			return ReadPlayerCountsFromResponse(messageBuffer.AsSpan(start: 0, messageLength));
+			await tcpStream.ReadExactlyAsync(messageBuffer, 0, messageLength, cancellationToken);
+			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.Rpc/ControllerConnection.cs

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

Agent/Phantom.Agent.Rpc/KeepAliveLoop.cs

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

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

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

Agent/Phantom.Agent.Rpc/RpcClientRuntime.cs

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

Agent/Phantom.Agent.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.Configuration.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.Configuration.InstanceName, configureInstanceMessage.InstanceGuid);
-			}
-		}
-		
-		agentServices.InstanceTicketManager.RefreshAgentStatus();
-	}
-	
-	private static InstanceManagerActor.ConfigureInstanceCommand GetCommand(ConfigureInstanceMessage configureInstanceMessage) {
-		return new InstanceManagerActor.ConfigureInstanceCommand(
-			configureInstanceMessage.InstanceGuid,
-			configureInstanceMessage.Configuration,
-			configureInstanceMessage.LaunchProperties,
-			configureInstanceMessage.LaunchNow,
-			AlwaysReportStatus: true
-		);
-	}
-}

Agent/Phantom.Agent.Services/AgentServices.cs

@@ -1,8 +1,8 @@
 using Akka.Actor;
 using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Rpc;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances;
-using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
 using Phantom.Utils.Actor;
 using Phantom.Utils.Logging;
@@ -15,6 +15,7 @@ public sealed class AgentServices {
 	
 	public ActorSystem ActorSystem { get; }
 
+	private AgentFolders AgentFolders { get; }
 	private AgentState AgentState { get; }
 	private BackupManager BackupManager { get; }
 
@@ -22,24 +23,30 @@ 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.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 Shutdown() {
 		Logger.Information("Stopping services...");
 		
 		await InstanceManager.Stop(new InstanceManagerActor.ShutdownCommand());
-		await InstanceTicketManager.Shutdown();
 		
 		BackupManager.Dispose();
 		

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

@@ -25,7 +25,7 @@ sealed class BackupArchiver {
 	}
 
 	private bool IsFolderSkipped(ImmutableList<string> relativePath) {
-		return relativePath is ["cache" or "crash-reports" or "debug" or "libraries" or "logs" or "mods" or "versions"];
+		return relativePath is ["cache" or "crash-reports" or "debug" or "libraries" or "logs" or "mods" or "servermods" or "versions"];
 	}
 	
 	[SuppressMessage("ReSharper", "ConvertIfStatementToReturnStatement")]
@@ -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.Send(new ReportInstanceStatusMessage(instanceGuid, currentStatus));
 	}
 
 	private void TransitionState(InstanceRunningState? newState) {
@@ -78,7 +71,7 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
 		runningState?.Initialize();
 	}
 	
-	public interface ICommand;
+	public interface ICommand {}
 
 	public sealed record ReportInstanceStatusCommand : ICommand;
 	
@@ -163,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(
-	Guid InstanceGuid,
-	string ShortName,
-	ILogger Logger,
-	InstanceServices Services,
-	ControllerSendQueue<ReportInstanceEventMessage> ReportEventQueue,
-	ActorRef<InstanceActor.ICommand> Actor,
-	CancellationToken ActorCancellationToken
-) {
+sealed record InstanceContext(Guid InstanceGuid, string ShortName, ILogger Logger, InstanceServices Services, ActorRef<InstanceActor.ICommand> Actor, CancellationToken ActorCancellationToken) {
 	public void ReportEvent(IInstanceEvent instanceEvent) {
-		ReportEventQueue.Enqueue(new ReportInstanceEventMessage(Guid.NewGuid(), DateTime.UtcNow, InstanceGuid, instanceEvent));
+		Services.ControllerConnection.Send(new ReportInstanceEventMessage(Guid.NewGuid(), DateTime.UtcNow, InstanceGuid, instanceEvent));
 	}
 }

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

@@ -4,8 +4,8 @@ using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Agent.Minecraft.Launcher.Types;
 using Phantom.Agent.Minecraft.Properties;
 using Phantom.Agent.Minecraft.Server;
+using Phantom.Agent.Rpc;
 using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
@@ -56,9 +56,14 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 		ReceiveAsync<ShutdownCommand>(Shutdown);
 	}
 
+	private string GetInstanceLoggerName(Guid guid) {
+		var prefix = guid.ToString();
+		return prefix[..prefix.IndexOf('-')] + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
+	}
+
 	private sealed record InstanceInfo(ActorRef<InstanceActor.ICommand> Actor, InstanceConfiguration Configuration, IServerLauncher Launcher);
 	
-	public interface ICommand;
+	public interface ICommand {}
 	
 	public sealed record ConfigureInstanceCommand(Guid InstanceGuid, InstanceConfiguration Configuration, InstanceLaunchProperties LaunchProperties, bool LaunchNow, bool AlwaysReportStatus) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
 	
@@ -97,13 +102,14 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 		IServerLauncher launcher = configuration.MinecraftServerKind switch {
 			MinecraftServerKind.Vanilla => new VanillaLauncher(properties),
 			MinecraftServerKind.Fabric  => new FabricLauncher(properties),
-			_                           => InvalidLauncher.Instance,
+			MinecraftServerKind.Forge   => new ForgeLauncher(properties),
+			_                           => InvalidLauncher.Instance
 		};
 
 		if (instances.TryGetValue(instanceGuid, out var instance)) {
 			instances[instanceGuid] = instance with {
 				Configuration = configuration,
-				Launcher = launcher,
+				Launcher = launcher
 			};
 				
 			Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);
@@ -113,8 +119,7 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 			}
 		}
 		else {
-			var instanceLoggerName = PhantomLogger.ShortenGuid(instanceGuid) + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
-			var instanceInit = new InstanceActor.Init(agentState, instanceGuid, instanceLoggerName, instanceServices, instanceTicketManager, shutdownCancellationToken);
+			var instanceInit = new InstanceActor.Init(agentState, instanceGuid, GetInstanceLoggerName(instanceGuid), instanceServices, instanceTicketManager, shutdownCancellationToken);
 			instances[instanceGuid] = instance = new InstanceInfo(Context.ActorOf(InstanceActor.Factory(instanceInit), "Instance-" + instanceGuid), configuration, launcher);
 				
 			Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);

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

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

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

@@ -1,23 +1,30 @@
-using Phantom.Agent.Services.Rpc;
+using Phantom.Agent.Rpc;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Agent;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Logging;
+using Phantom.Utils.Tasks;
 using Serilog;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed class InstanceTicketManager(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<ushort> usedPorts = [];
+	private readonly HashSet<Guid> activeTicketGuids = new ();
+	private readonly HashSet<ushort> usedPorts = new ();
 	private RamAllocationUnits usedMemory = new ();
 
+	public InstanceTicketManager(AgentInfo agentInfo, ControllerConnection controllerConnection) {
+		this.agentInfo = agentInfo;
+		this.controllerConnection = controllerConnection;
+	}
+
 	public Result<Ticket, LaunchInstanceResult> Reserve(InstanceConfiguration configuration) {
 		var memoryAllocation = configuration.MemoryAllocation;
 		var serverPort = configuration.ServerPort;
@@ -85,13 +92,9 @@ sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection con
 	
 	public void RefreshAgentStatus() {
 		lock (this) {
-			reportStatusQueue.Enqueue(new ReportAgentStatusMessage(activeTicketGuids.Count, usedMemory));
+			controllerConnection.Send(new ReportAgentStatusMessage(activeTicketGuids.Count, usedMemory));
 		}
 	}
 	
-	public async Task Shutdown() {
-		await reportStatusQueue.Shutdown(TimeSpan.FromSeconds(5));
-	}
-	
 	public sealed record Ticket(Guid TicketGuid, RamAllocationUnits MemoryAllocation, ushort ServerPort, ushort RconPort);
 }

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

@@ -46,7 +46,7 @@ static class InstanceLaunchProcedure {
 		byte lastDownloadProgress = byte.MaxValue;
 
 		void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
-			byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, val2: 100);
+			byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, 100);
 
 			if (lastDownloadProgress != progress) {
 				lastDownloadProgress = progress;

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

@@ -1,7 +1,6 @@
 using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
 using System.Threading.Channels;
-using Phantom.Agent.Services.Rpc;
+using Phantom.Agent.Rpc;
 using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Logging;
 using Phantom.Utils.Tasks;
@@ -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 {
-			await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder), sendOutputCancellationToken);
-		} catch (OperationCanceledException) {
-			// Ignore.
-		}
+		SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
 	}
 
 	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) {
-		if (lines.IsEmpty) {
-			return ValueTask.CompletedTask;
-		}
-		else {
-			return controllerConnection.Send(new InstanceOutputMessage(instanceGuid, lines), cancellationToken);
+	private void SendOutputToServer(ImmutableArray<string> lines) {
+		if (!lines.IsEmpty) {
+			controllerConnection.Send(new InstanceOutputMessage(instanceGuid, lines));
 		}
 	}
 

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

@@ -1,7 +1,6 @@
-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.Agent.Rpc;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Logging;
@@ -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.Send(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();
-			UpdatePlayerCounts(latestPlayerCounts);
+			PlayerCounts = await TryGetPlayerCounts();
 			
-			if (latestPlayerCounts == null) {
-				await Task.Delay(WaitingForFirstDetection ? TimeSpan.FromSeconds(5) : TimeSpan.FromSeconds(10), CancellationToken);
+			if (!firstDetection.Task.IsCompleted) {
+				firstDetection.SetResult();
 			}
-			else {
+
 			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);
-			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);
-			}
-			
+			Logger.Error(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/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/Phantom.Agent.Services.csproj

@@ -8,6 +8,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Common\Phantom.Common.Messages.Agent\Phantom.Common.Messages.Agent.csproj" />
     <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
+    <ProjectReference Include="..\Phantom.Agent.Rpc\Phantom.Agent.Rpc.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -1,19 +0,0 @@
-using Phantom.Common.Messages.Agent;
-using Phantom.Utils.Actor;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Agent.Services.Rpc;
-
-public sealed class ControllerConnection(MessageSender<IMessageToController> sender) {
-	internal bool TrySend<TMessage>(TMessage message) where TMessage : IMessageToController {
-		return sender.TrySend(message);
-	}
-	
-	internal ValueTask Send<TMessage>(TMessage message, CancellationToken cancellationToken) where TMessage : IMessageToController {
-		return sender.Send(message, cancellationToken);
-	}
-	
-	internal Task<TReply> Send<TMessage, TReply>(TMessage message, TimeSpan waitForReplyTime, CancellationToken cancellationToken) where TMessage : IMessageToController, ICanReply<TReply> {
-		return sender.Send<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

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

Agent/Phantom.Agent.Services/Rpc/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

@@ -1,4 +1,4 @@
-using System.Text;
+using NetMQ;
 using Phantom.Common.Data;
 using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
@@ -10,7 +10,7 @@ namespace Phantom.Agent;
 static class AgentKey {
 	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(AgentKey));
 
-	public static Task<ConnectionKey?> Load(string? agentKeyToken, string? agentKeyFilePath) {
+	public static Task<(NetMQCertificate, AuthToken)?> Load(string? agentKeyToken, string? agentKeyFilePath) {
 		if (agentKeyFilePath != null) {
 			return LoadFromFile(agentKeyFilePath);
 		}
@@ -22,19 +22,18 @@ static class AgentKey {
 		}
 	}
 
-	private static async Task<ConnectionKey?> LoadFromFile(string agentKeyFilePath) {
+	private static async Task<(NetMQCertificate, AuthToken)?> LoadFromFile(string agentKeyFilePath) {
 		if (!File.Exists(agentKeyFilePath)) {
 			Logger.Fatal("Missing agent key file: {AgentKeyFilePath}", agentKeyFilePath);
 			return null;
 		}
 
 		try {
-			Files.RequireMaximumFileSize(agentKeyFilePath, maximumBytes: 64);
-			string[] lines = await File.ReadAllLinesAsync(agentKeyFilePath, Encoding.UTF8);
-			return LoadFromToken(lines[0]);
+			Files.RequireMaximumFileSize(agentKeyFilePath, 64);
+			return LoadFromBytes(await File.ReadAllBytesAsync(agentKeyFilePath));
 		} 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);
@@ -42,7 +41,7 @@ static class AgentKey {
 		}
 	}
 
-	private static ConnectionKey? LoadFromToken(string agentKey) {
+	private static (NetMQCertificate, AuthToken)? LoadFromToken(string agentKey) {
 		try {
 			return LoadFromBytes(TokenGenerator.DecodeBytes(agentKey));
 		} catch (Exception) {
@@ -51,9 +50,11 @@ static class AgentKey {
 		}
 	}
 
-	private static ConnectionKey? LoadFromBytes(byte[] agentKey) {
-		var connectionKey = ConnectionKey.FromBytes(agentKey);
+	private static (NetMQCertificate, AuthToken)? LoadFromBytes(byte[] agentKey) {
+		var (publicKey, agentToken) = ConnectionCommonKey.FromBytes(agentKey);
+		var controllerCertificate = NetMQCertificate.FromPublicKey(publicKey);
+		
 		Logger.Information("Loaded agent key.");
-		return connectionKey;
+		return (controllerCertificate, agentToken);
 	}
 }

Agent/Phantom.Agent/GuidFile.cs

@@ -37,7 +37,7 @@ static class GuidFile {
 	}
 	
 	private static async Task<Guid> LoadGuidFromFile(string filePath) {
-		Files.RequireMaximumFileSize(filePath, maximumBytes: 128);
+		Files.RequireMaximumFileSize(filePath, 128);
 		string contents = await File.ReadAllTextAsync(filePath, Encoding.ASCII);
 		return Guid.Parse(contents.Trim());
 	}

Agent/Phantom.Agent/Program.cs

@@ -1,16 +1,17 @@
 using System.Reflection;
+using NetMQ;
 using Phantom.Agent;
-using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Rpc;
 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;
+using Phantom.Utils.Rpc.Sockets;
 using Phantom.Utils.Runtime;
-using Phantom.Utils.Threading;
 
 const int ProtocolVersion = 1;
 
@@ -47,48 +48,33 @@ try {
 		return 1;
 	}
 
+	var (controllerCertificate, agentToken) = agentKey.Value;
 	var agentInfo = new AgentInfo(agentGuid.Value, agentName, ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
-	var javaRuntimeRepository = await JavaRuntimeDiscovery.Scan(folders.JavaSearchFolderPath, shutdownCancellationToken);
 	
-	var agentRegistrationHandler = new AgentRegistrationHandler();
-	var controllerHandshake = new ControllerHandshake(new AgentRegistration(agentInfo, javaRuntimeRepository.All), agentRegistrationHandler);
-	
-	var rpcClientConnectionParameters = new RpcClientConnectionParameters(
-		Host: controllerHost,
-		Port: controllerPort,
-		DistinguishedName: "phantom-controller",
-		CertificateThumbprint: agentKey.Value.CertificateThumbprint,
-		AuthToken: agentKey.Value.AuthToken,
-		Handshake: controllerHandshake,
-		MessageQueueCapacity: 250,
-		FrameQueueCapacity: 500,
-		MaxConcurrentlyHandledMessages: 50
-	);
-	
-	using var rpcClient = await RpcClient<IMessageToController, IMessageToAgent>.Connect("Controller", rpcClientConnectionParameters, AgentMessageRegistries.Registries, shutdownCancellationToken);
-	if (rpcClient == null) {
-		PhantomLogger.Root.Fatal("Could not connect to Phantom Controller, shutting down.");
-		return 1;
-	}
-	
-	try {
 	PhantomLogger.Root.InformationHeading("Launching Phantom Panel agent...");
 	
-		var agentServices = new AgentServices(agentInfo, folders, new AgentServiceConfiguration(maxConcurrentBackupCompressionTasks), new ControllerConnection(rpcClient.MessageSender), javaRuntimeRepository);
+	var rpcConfiguration = new RpcConfiguration("Agent", controllerHost, controllerPort, controllerCertificate);
+	var rpcSocket = RpcClientSocket.Connect(rpcConfiguration, AgentMessageRegistries.Definitions, new RegisterAgentMessage(agentToken, agentInfo));
 
-		var rpcMessageHandlerInit = new ControllerMessageHandlerActor.Init(agentServices);
+	var agentServices = new AgentServices(agentInfo, folders, new AgentServiceConfiguration(maxConcurrentBackupCompressionTasks), new ControllerConnection(rpcSocket.Connection));
+	await agentServices.Initialize();
+
+	var rpcMessageHandlerInit = new ControllerMessageHandlerActor.Init(rpcSocket.Connection, agentServices, shutdownCancellationTokenSource);
 	var rpcMessageHandlerActor = agentServices.ActorSystem.ActorOf(ControllerMessageHandlerActor.Factory(rpcMessageHandlerInit), "ControllerMessageHandler");
 	
-		rpcClient.StartListening(new ControllerMessageReceiver(rpcMessageHandlerActor, agentRegistrationHandler));
-		
-		if (await agentRegistrationHandler.Start(agentServices, shutdownCancellationToken)) {
-			PhantomLogger.Root.Information("Phantom Panel agent is ready.");
-			await shutdownCancellationToken.WaitHandle.WaitOneAsync();
-		}
-		
-		await agentServices.Shutdown();
+	var rpcDisconnectSemaphore = new SemaphoreSlim(0, 1);
+	var rpcTask = RpcClientRuntime.Launch(rpcSocket, rpcMessageHandlerActor, rpcDisconnectSemaphore, shutdownCancellationToken);
+	try {
+		await rpcTask.WaitAsync(shutdownCancellationToken);
 	} finally {
-		await rpcClient.Shutdown();
+		shutdownCancellationTokenSource.Cancel();
+		await agentServices.Shutdown();
+
+		rpcDisconnectSemaphore.Release();
+		await rpcTask;
+		rpcDisconnectSemaphore.Dispose();
+		
+		NetMQConfig.Cleanup();
 	}
 
 	return 0;

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("256m", arg2: 256)]
-		[TestCase("256M", arg2: 256)]
-		[TestCase("512M", arg2: 512)]
-		[TestCase("65536M", arg2: 65536)]
+		[TestCase("0m", 0)]
+		[TestCase("256m", 256)]
+		[TestCase("256M", 256)]
+		[TestCase("512M", 512)]
+		[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("1g", arg2: 1024)]
-		[TestCase("1G", arg2: 1024)]
-		[TestCase("8G", arg2: 8192)]
-		[TestCase("64G", arg2: 65536)]
-		[TestCase("16383G", arg2: 16776192)]
+		[TestCase("0g", 0)]
+		[TestCase("1g", 1024)]
+		[TestCase("1G", 1024)]
+		[TestCase("8G", 8192)]
+		[TestCase("64G", 65536)]
+		[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/IAgentConnectionStatus.cs

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

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

@@ -13,7 +13,7 @@ public enum AuditLogEventType {
 	InstanceEdited,
 	InstanceLaunched,
 	InstanceStopped,
-	InstanceCommandExecuted,
+	InstanceCommandExecuted
 }
 
 public static class AuditLogEventTypeExtensions {
@@ -30,7 +30,7 @@ public static class AuditLogEventTypeExtensions {
 		{ 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,5 +2,5 @@
 
 public enum AuditLogSubjectType {
 	User,
-	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]
-[MemoryPackUnion(tag: 0, typeof(NameIsInvalid))]
-[MemoryPackUnion(tag: 1, typeof(PasswordIsInvalid))]
-[MemoryPackUnion(tag: 2, typeof(NameAlreadyExists))]
-[MemoryPackUnion(tag: 3, typeof(UnknownError))]
+	[MemoryPackUnion(0, typeof(NameIsInvalid))]
+	[MemoryPackUnion(1, typeof(PasswordIsInvalid))]
+	[MemoryPackUnion(2, typeof(NameAlreadyExists))]
+	[MemoryPackUnion(3, typeof(UnknownError))]
 	public abstract partial record AddUserError {
-	private AddUserError() {}
+		internal 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]
-[MemoryPackUnion(tag: 0, typeof(Success))]
-[MemoryPackUnion(tag: 1, typeof(CreationFailed))]
-[MemoryPackUnion(tag: 2, typeof(UpdatingFailed))]
-[MemoryPackUnion(tag: 3, typeof(AddingToRoleFailed))]
-[MemoryPackUnion(tag: 4, typeof(UnknownError))]
+	[MemoryPackUnion(0, typeof(Success))]
+	[MemoryPackUnion(1, typeof(CreationFailed))]
+	[MemoryPackUnion(2, typeof(UpdatingFailed))]
+	[MemoryPackUnion(3, typeof(AddingToRoleFailed))]
+	[MemoryPackUnion(4, typeof(UnknownError))]
 	public abstract partial record CreateOrUpdateAdministratorUserResult {
-	private CreateOrUpdateAdministratorUserResult() {}
+		internal 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]
-[MemoryPackUnion(tag: 0, typeof(Success))]
-[MemoryPackUnion(tag: 1, typeof(CreationFailed))]
-[MemoryPackUnion(tag: 2, typeof(UnknownError))]
+	[MemoryPackUnion(0, typeof(Success))]
+	[MemoryPackUnion(1, typeof(CreationFailed))]
+	[MemoryPackUnion(2, typeof(UnknownError))]
 	public abstract partial record CreateUserResult {
-	private CreateUserResult() {}
+		internal 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]
-[MemoryPackUnion(tag: 0, typeof(TooShort))]
-[MemoryPackUnion(tag: 1, typeof(MustContainLowercaseLetter))]
-[MemoryPackUnion(tag: 2, typeof(MustContainUppercaseLetter))]
-[MemoryPackUnion(tag: 3, typeof(MustContainDigit))]
+	[MemoryPackUnion(0, typeof(TooShort))]
+	[MemoryPackUnion(1, typeof(MustContainLowercaseLetter))]
+	[MemoryPackUnion(2, typeof(MustContainUppercaseLetter))]
+	[MemoryPackUnion(3, typeof(MustContainDigit))]
 	public abstract partial record PasswordRequirementViolation {
-	private PasswordRequirementViolation() {}
+		internal 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]
-[MemoryPackUnion(tag: 0, typeof(UserNotFound))]
-[MemoryPackUnion(tag: 1, typeof(PasswordIsInvalid))]
-[MemoryPackUnion(tag: 2, typeof(UnknownError))]
+	[MemoryPackUnion(0, typeof(UserNotFound))]
+	[MemoryPackUnion(1, typeof(PasswordIsInvalid))]
+	[MemoryPackUnion(2, typeof(UnknownError))]
 	public abstract partial record SetUserPasswordError {
-	private SetUserPasswordError() {}
+		internal 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(tag: 1, typeof(Instance))]
+[MemoryPackUnion(0, typeof(OfUserActionFailure))]
+[MemoryPackUnion(1, typeof(OfInstanceActionFailure))]
 public abstract partial record UserInstanceActionFailure {
-	private 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;
+	internal 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]
-[MemoryPackUnion(tag: 0, typeof(IsEmpty))]
-[MemoryPackUnion(tag: 1, typeof(TooLong))]
+	[MemoryPackUnion(0, typeof(IsEmpty))]
+	[MemoryPackUnion(1, typeof(TooLong))]
 	public abstract partial record UsernameRequirementViolation {
-	private UsernameRequirementViolation() {}
+		internal UsernameRequirementViolation() {}
+	}
+}
 
+namespace Phantom.Common.Data.Web.Users.UsernameRequirementViolations {
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record IsEmpty : UsernameRequirementViolation;
 

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

@@ -0,0 +1,37 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Security.Cryptography;
+using MemoryPack;
+
+namespace Phantom.Common.Data;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+public sealed partial class AuthToken {
+	internal const int Length = 12;
+
+	[MemoryPackOrder(0)]
+	[MemoryPackInclude]
+	private readonly byte[] bytes;
+
+	internal AuthToken(byte[]? bytes) {
+		ArgumentNullException.ThrowIfNull(bytes);
+
+		if (bytes.Length != Length) {
+			throw new ArgumentOutOfRangeException(nameof(bytes), "Invalid token length: " + bytes.Length + ". Token length must be exactly " + Length + " bytes.");
+		}
+
+		this.bytes = bytes;
+	}
+
+	public bool FixedTimeEquals(AuthToken providedAuthToken) {
+		return CryptographicOperations.FixedTimeEquals(bytes, providedAuthToken.bytes);
+	}
+
+	internal void WriteTo(Span<byte> span) {
+		bytes.CopyTo(span);
+	}
+
+	public static AuthToken Generate() {
+		return new AuthToken(RandomNumberGenerator.GetBytes(Length));
+	}
+}

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

@@ -0,0 +1,18 @@
+namespace Phantom.Common.Data;
+
+public readonly record struct ConnectionCommonKey(byte[] CertificatePublicKey, AuthToken AuthToken) {
+	private const byte TokenLength = AuthToken.Length;
+
+	public byte[] ToBytes() {
+		Span<byte> result = stackalloc byte[TokenLength + CertificatePublicKey.Length];
+		AuthToken.WriteTo(result[..TokenLength]);
+		CertificatePublicKey.CopyTo(result[TokenLength..]);
+		return result.ToArray();
+	}
+
+	public static ConnectionCommonKey FromBytes(byte[] agentKey) {
+		var authToken = new AuthToken(agentKey[..TokenLength]);
+		var certificatePublicKey = agentKey[TokenLength..];
+		return new ConnectionCommonKey(certificatePublicKey, authToken);
+	}
+}

Common/Phantom.Common.Data/ConnectionKey.cs

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

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

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

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

@@ -3,17 +3,17 @@
 namespace Phantom.Common.Data.Instance;
 
 [MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(InstanceIsOffline))]
-[MemoryPackUnion(tag: 1, typeof(InstanceIsInvalid))]
-[MemoryPackUnion(tag: 2, typeof(InstanceIsNotRunning))]
-[MemoryPackUnion(tag: 3, typeof(InstanceIsDownloading))]
-[MemoryPackUnion(tag: 4, typeof(InstanceIsLaunching))]
-[MemoryPackUnion(tag: 5, typeof(InstanceIsRunning))]
-[MemoryPackUnion(tag: 6, typeof(InstanceIsBackingUp))]
-[MemoryPackUnion(tag: 7, typeof(InstanceIsRestarting))]
-[MemoryPackUnion(tag: 8, typeof(InstanceIsStopping))]
-[MemoryPackUnion(tag: 9, typeof(InstanceIsFailed))]
-public partial interface IInstanceStatus;
+[MemoryPackUnion(0, typeof(InstanceIsOffline))]
+[MemoryPackUnion(1, typeof(InstanceIsInvalid))]
+[MemoryPackUnion(2, typeof(InstanceIsNotRunning))]
+[MemoryPackUnion(3, typeof(InstanceIsDownloading))]
+[MemoryPackUnion(4, typeof(InstanceIsLaunching))]
+[MemoryPackUnion(5, typeof(InstanceIsRunning))]
+[MemoryPackUnion(6, typeof(InstanceIsBackingUp))]
+[MemoryPackUnion(7, typeof(InstanceIsRestarting))]
+[MemoryPackUnion(8, typeof(InstanceIsStopping))]
+[MemoryPackUnion(9, typeof(InstanceIsFailed))]
+public partial interface IInstanceStatus {}
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsOffline : IInstanceStatus;

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

@@ -6,5 +6,5 @@ public enum InstanceLaunchFailReason : byte {
 	CouldNotDownloadMinecraftServer        = 6,
 	CouldNotConfigureMinecraftServer       = 7,
 	CouldNotPrepareMinecraftServerLauncher = 8,
-	CouldNotStartMinecraftServer           = 9,
+	CouldNotStartMinecraftServer           = 9
 }

Common/Phantom.Common.Data/Instance/InstancePlayerCounts.cs

@@ -3,7 +3,7 @@
 namespace Phantom.Common.Data.Instance;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record InstancePlayerCounts(
+public readonly partial record struct InstancePlayerCounts(
 	[property: MemoryPackOrder(0)] int Online,
 	[property: MemoryPackOrder(1)] int Maximum
 );

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

@@ -14,7 +14,7 @@ public sealed partial record JavaRuntime(
 			return 0;
 		}
 
-		if (other is null) {
+		if (ReferenceEquals(null, other)) {
 			return 1;
 		}
 
@@ -30,9 +30,9 @@ public sealed partial record JavaRuntime(
 
 	private static bool TryParseFullVersion(string versionString, [NotNullWhen(true)] out Version? version) {
 		int dashIndex = versionString.IndexOf('-');
-		var versionSpan = dashIndex != -1 ? versionString.AsSpan(start: 0, dashIndex) : versionString;
+		var versionSpan = dashIndex != -1 ? versionString.AsSpan(0, dashIndex) : versionString;
 		if (versionSpan.Contains('_')) {
-			versionSpan = versionSpan.ToString().Replace(oldChar: '_', newChar: '.');
+			versionSpan = versionSpan.ToString().Replace('_', '.');
 		}
 
 		return Version.TryParse(versionSpan, out version);

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

@@ -3,4 +3,5 @@
 public enum MinecraftServerKind : ushort {
 	Vanilla = 1,
 	Fabric = 2,
+	Forge = 3
 }

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

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

Common/Phantom.Common.Data/Minecraft/MinecraftVersionType.cs

@@ -7,14 +7,14 @@ public enum MinecraftVersionType : ushort {
 	Release = 1,
 	Snapshot = 2,
 	OldBeta = 3,
-	OldAlpha = 4,
+	OldAlpha = 4
 }
 
 public static class MinecraftVersionTypes {
-	public static readonly ImmutableArray<MinecraftVersionType> WithServerJars = [
+	public static readonly ImmutableArray<MinecraftVersionType> WithServerJars = ImmutableArray.Create(
 		MinecraftVersionType.Release,
-		MinecraftVersionType.Snapshot,
-	];
+		MinecraftVersionType.Snapshot
+	);
 
 	public static MinecraftVersionType FromString(string? type) {
 		return type switch {
@@ -22,7 +22,7 @@ public static class MinecraftVersionTypes {
 			"snapshot"  => MinecraftVersionType.Snapshot,
 			"old_beta"  => MinecraftVersionType.OldBeta,
 			"old_alpha" => MinecraftVersionType.OldAlpha,
-			_           => MinecraftVersionType.Other,
+			_           => MinecraftVersionType.Other
 		};
 	}
 
@@ -32,7 +32,7 @@ public static class MinecraftVersionTypes {
 			MinecraftVersionType.Snapshot => "Snapshots",
 			MinecraftVersionType.OldBeta  => "Beta",
 			MinecraftVersionType.OldAlpha => "Alpha",
-			_                             => "Unknown",
+			_                             => "Unknown"
 		};
 	}
 }

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

@@ -11,7 +11,6 @@
   
   <ItemGroup>
     <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Rpc\Phantom.Utils.Rpc.csproj" />
   </ItemGroup>
 
 </Project>

Common/Phantom.Common.Data/PortRange.cs

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

Common/Phantom.Common.Data/RamAllocationUnits.cs

@@ -6,7 +6,7 @@ namespace Phantom.Common.Data;
 /// <summary>
 /// Represents a number of RAM allocation units, using the conversion factor of 256 MB per unit. Supports allocations up to 16 TB minus 256 MB (65535 units).
 /// </summary>
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
 public readonly partial record struct RamAllocationUnits(
 	[property: MemoryPackOrder(0)] ushort RawValue
@@ -24,7 +24,7 @@ public readonly partial record struct RamAllocationUnits(
 	}
 	
 	public static RamAllocationUnits operator -(RamAllocationUnits left, RamAllocationUnits right) {
-		ushort units = (ushort) Math.Max(left.RawValue - right.RawValue, val2: 0);
+		ushort units = (ushort) Math.Max(left.RawValue - right.RawValue, 0);
 		return new RamAllocationUnits(units);
 	}
 
@@ -68,7 +68,7 @@ public readonly partial record struct RamAllocationUnits(
 			throw new ArgumentOutOfRangeException(nameof(megabytes), "Must be at most " + MaximumMegabytes + " MB.");
 		}
 		
-		return new RamAllocationUnits((ushort) Math.Clamp(units, min: 0, MaximumUnits));
+		return new RamAllocationUnits((ushort) Math.Clamp(units, 0, MaximumUnits));
 	}
 
 	/// <summary>
@@ -83,7 +83,7 @@ public readonly partial record struct RamAllocationUnits(
 		int unitMultiplier = char.ToUpperInvariant(definition[^1]) switch {
 			'M' => 1,
 			'G' => 1024,
-			_   => throw new ArgumentOutOfRangeException(nameof(definition), "Must end with 'M' or 'G'."),
+			_ => throw new ArgumentOutOfRangeException(nameof(definition), "Must end with 'M' or 'G'.")
 		};
 
 		if (!int.TryParse(definition[..^1], out int size)) {

Common/Phantom.Common.Data/Replies/ConfigureInstanceResult.cs

@@ -1,14 +1,14 @@
 namespace Phantom.Common.Data.Replies;
 
 public enum ConfigureInstanceResult : byte {
-	Success,
+	Success
 }
 
 public static class ConfigureInstanceResultExtensions {
 	public static string ToSentence(this ConfigureInstanceResult reason) {
 		return reason switch {
 			ConfigureInstanceResult.Success => "Success.",
-			_                               => "Unknown error.",
+			_                               => "Unknown error."
 		};
 	}
 }

Common/Phantom.Common.Data/Replies/InstanceActionFailure.cs

@@ -4,7 +4,7 @@ public enum InstanceActionFailure : byte {
 	AgentDoesNotExist,
 	AgentShuttingDown,
 	AgentIsNotResponding,
-	InstanceDoesNotExist,
+	InstanceDoesNotExist
 }
 
 public static class InstanceActionFailureExtensions {
@@ -14,7 +14,7 @@ public static class InstanceActionFailureExtensions {
 			InstanceActionFailure.AgentShuttingDown    => "Agent is shutting down.",
 			InstanceActionFailure.AgentIsNotResponding => "Agent is not responding.",
 			InstanceActionFailure.InstanceDoesNotExist => "Instance does not exist.",
-			_                                          => "Unknown error.",
+			_                                          => "Unknown error."
 		};
 	}
 }

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

@@ -9,5 +9,5 @@ public enum LaunchInstanceResult : byte {
 	ServerPortNotAllowed     = 6,
 	ServerPortAlreadyInUse   = 7,
 	RconPortNotAllowed       = 8,
-	RconPortAlreadyInUse     = 9,
+	RconPortAlreadyInUse     = 9
 }

Common/Phantom.Common.Data/Replies/RegisterAgentFailure.cs

@@ -0,0 +1,6 @@
+namespace Phantom.Common.Data.Replies;
+
+public enum RegisterAgentFailure : byte {
+	ConnectionAlreadyHasAnAgent,
+	InvalidToken
+}

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

@@ -3,5 +3,5 @@
 public enum SendCommandToInstanceResult : byte {
 	UnknownError = 0,
 	Success = 1,
-	InstanceNotRunning = 2,
+	InstanceNotRunning = 2
 }

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

@@ -3,5 +3,5 @@
 public enum StopInstanceResult : byte {
 	StopInitiated           = 1,
 	InstanceAlreadyStopping = 2,
-	InstanceAlreadyStopped  = 3,
+	InstanceAlreadyStopped  = 3
 }

Common/Phantom.Common.Data/Result.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using MemoryPack;
-using Phantom.Utils.Monads;
 using Phantom.Utils.Result;
 
 namespace Phantom.Common.Data;
@@ -25,9 +24,6 @@ public sealed partial class Result<TValue, TError> {
 	[MemoryPackIgnore]
 	public TError Error => !hasValue ? error! : throw new InvalidOperationException("Attempted to get error from a success result.");
 	
-	[MemoryPackIgnore]
-	public Either<TValue, TError> AsEither => hasValue ? Either.Left(value!) : Either.Right(error!);
-	
 	private Result(bool hasValue, TValue? value, TError? error) {
 		this.hasValue = hasValue;
 		this.value = value;
@@ -51,11 +47,11 @@ public sealed partial class Result<TValue, TError> {
 	}
 
 	public static implicit operator Result<TValue, TError>(TValue value) {
-		return new Result<TValue, TError>(hasValue: true, value, error: default);
+		return new Result<TValue, TError>(hasValue: true, value, default);
 	}
 	
 	public static implicit operator Result<TValue, TError>(TError error) {
-		return new Result<TValue, TError>(hasValue: false, value: default, error);
+		return new Result<TValue, TError>(hasValue: false, default, error);
 	}
 
 	public static implicit operator bool(Result<TValue, TError> result) {
@@ -93,7 +89,7 @@ public sealed partial class Result<TError> {
 	}
 
 	public static implicit operator Result<TError>([SuppressMessage("ReSharper", "UnusedParameter.Global")] Result.OkType _) {
-		return new Result<TError>(hasValue: true, error: default);
+		return new Result<TError>(hasValue: true, default);
 	}
 
 	public static implicit operator Result<TError>(TError error) {

Common/Phantom.Common.Messages.Agent/AgentMessageRegistries.cs

@@ -1,27 +1,46 @@
 using Phantom.Common.Data;
 using Phantom.Common.Data.Replies;
+using Phantom.Common.Messages.Agent.BiDirectional;
 using Phantom.Common.Messages.Agent.ToAgent;
 using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Logging;
 using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.Agent;
 
 public static class AgentMessageRegistries {
-	public static MessageRegistry<IMessageToAgent> ToAgent { get; } = new (nameof(ToAgent));
-	public static MessageRegistry<IMessageToController> ToController { get; } = new (nameof(ToController));
+	public static MessageRegistry<IMessageToAgent> ToAgent { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToAgent)));
+	public static MessageRegistry<IMessageToController> ToController { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToController)));
 	
-	public static MessageRegistries<IMessageToController, IMessageToAgent> Registries => new (ToAgent, ToController);
+	public static IMessageDefinitions<IMessageToAgent, IMessageToController, ReplyMessage> Definitions { get; } = new MessageDefinitions();
 
 	static AgentMessageRegistries() {
-		ToAgent.Add<ConfigureInstanceMessage, Result<ConfigureInstanceResult, InstanceActionFailure>>();
-		ToAgent.Add<LaunchInstanceMessage, Result<LaunchInstanceResult, InstanceActionFailure>>();
-		ToAgent.Add<StopInstanceMessage, Result<StopInstanceResult, InstanceActionFailure>>();
-		ToAgent.Add<SendCommandToInstanceMessage, Result<SendCommandToInstanceResult, InstanceActionFailure>>();
+		ToAgent.Add<RegisterAgentSuccessMessage>(0);
+		ToAgent.Add<RegisterAgentFailureMessage>(1);
+		ToAgent.Add<ConfigureInstanceMessage, Result<ConfigureInstanceResult, InstanceActionFailure>>(2);
+		ToAgent.Add<LaunchInstanceMessage, Result<LaunchInstanceResult, InstanceActionFailure>>(3);
+		ToAgent.Add<StopInstanceMessage, Result<StopInstanceResult, InstanceActionFailure>>(4);
+		ToAgent.Add<SendCommandToInstanceMessage, Result<SendCommandToInstanceResult, InstanceActionFailure>>(5);
+		ToAgent.Add<ReplyMessage>(127);
 		
-		ToController.Add<ReportInstanceStatusMessage>();
-		ToController.Add<InstanceOutputMessage>();
-		ToController.Add<ReportAgentStatusMessage>();
-		ToController.Add<ReportInstanceEventMessage>();
-		ToController.Add<ReportInstancePlayerCountsMessage>();
+		ToController.Add<RegisterAgentMessage>(0);
+		ToController.Add<UnregisterAgentMessage>(1);
+		ToController.Add<AgentIsAliveMessage>(2);
+		ToController.Add<AdvertiseJavaRuntimesMessage>(3);
+		ToController.Add<ReportInstanceStatusMessage>(4);
+		ToController.Add<InstanceOutputMessage>(5);
+		ToController.Add<ReportAgentStatusMessage>(6);
+		ToController.Add<ReportInstanceEventMessage>(7);
+		ToController.Add<ReportInstancePlayerCountsMessage>(8);
+		ToController.Add<ReplyMessage>(127);
+	}
+
+	private sealed class MessageDefinitions : IMessageDefinitions<IMessageToAgent, IMessageToController, ReplyMessage> {
+		public MessageRegistry<IMessageToAgent> ToClient => ToAgent;
+		public MessageRegistry<IMessageToController> ToServer => ToController;
+
+		public ReplyMessage CreateReplyMessage(uint sequenceId, byte[] serializedReply) {
+			return new ReplyMessage(sequenceId, serializedReply);
+		}
 	}
 }