Replace NetMQ with custom TCP networking

.config/dotnet-tools.json

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

.run/Agent 1.run.xml

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

.run/Agent 2.run.xml

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

.run/Agent 3.run.xml

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

.run/Web.run.xml

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

.workdir/Controller/secrets/agent.auth

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

.workdir/Controller/secrets/web.auth

@@ -1,2 +1 @@
-q<EFBFBD><EFBFBD>h4<EFBFBD><EFBFBD>H<EFBFBD><18>7<EFBFBD><37><EFBFBD><EFBFBD>H`<60><>W
-<EFBFBD>4u`G
+<07>U<EFBFBD>/<2F><04><><EFBFBD>q

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

@@ -38,7 +38,7 @@ 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();
 			

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

@@ -19,11 +19,12 @@ public sealed class JavaRuntimeRepository {
 	}
 	
 	public ImmutableArray<TaggedJavaRuntime> All {
-		[SuppressMessage("ReSharper", "UseCollectionExpression")]
-		get => runtimesByGuid.Select(static kvp => new TaggedJavaRuntime(kvp.Key, kvp.Value.Runtime))
+		get {
+			return runtimesByGuid.Select(static kvp => new TaggedJavaRuntime(kvp.Key, kvp.Value.Runtime))
 			                     .OrderBy(static taggedRuntime => taggedRuntime.Runtime)
 			                     .ToImmutableArray();
 		}
+	}
 	
 	internal bool TryGetByGuid(Guid guid, [MaybeNullWhen(false)] out JavaRuntimeExecutable runtime) {
 		return runtimesByGuid.TryGetValue(guid, out runtime);

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

@@ -43,7 +43,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();
@@ -53,7 +53,7 @@ public abstract class BaseLauncher : IServerLauncher {
 			FileName = javaRuntimeExecutable.ExecutablePath,
 			WorkingDirectory = instanceProperties.InstanceFolder,
 			RedirectInput = true,
-			UseShellExecute = false,
+			UseShellExecute = false
 		};
 		
 		var processArguments = processConfigurator.ArgumentList;
@@ -105,12 +105,12 @@ public abstract class BaseLauncher : IServerLauncher {
 	
 	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/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.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,9 +1,12 @@
-using Akka.Actor;
+using System.Collections.Immutable;
+using Akka.Actor;
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Messages.Agent.ToAgent;
 using Phantom.Utils.Actor;
 using Phantom.Utils.Logging;
 using Serilog;
@@ -35,6 +38,33 @@ public sealed class AgentServices {
 		this.InstanceManager = ActorSystem.ActorOf(InstanceManagerActor.Factory(instanceManagerInit), "InstanceManager");
 	}
 	
+	public async Task<bool> Register(ControllerHandshake handshake, CancellationToken cancellationToken) {
+		ImmutableArray<ConfigureInstanceMessage> configureInstanceMessages = handshake.Response;
+		if (configureInstanceMessages.IsDefault) {
+			Logger.Fatal("Handshake failed.");
+			return false;
+		}
+		
+		foreach (var configureInstanceMessage in configureInstanceMessages) {
+			var configureInstanceCommand = new InstanceManagerActor.ConfigureInstanceCommand(
+				configureInstanceMessage.InstanceGuid,
+				configureInstanceMessage.Configuration,
+				configureInstanceMessage.LaunchProperties,
+				configureInstanceMessage.LaunchNow,
+				AlwaysReportStatus: true
+			);
+			
+			var configureInstanceResult = await InstanceManager.Request(configureInstanceCommand, cancellationToken);
+			if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
+				Logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configureInstanceMessage.Configuration.InstanceName, configureInstanceMessage.InstanceGuid);
+				return false;
+			}
+		}
+		
+		InstanceTicketManager.RefreshAgentStatus();
+		return true;
+	}
+	
 	public async Task Shutdown() {
 		Logger.Information("Stopping services...");
 		

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

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

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

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

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

@@ -133,7 +133,7 @@ sealed class BackupManager : IDisposable {
 				BackupCreationResultKind.CouldNotCreateBackupFolder         => "Could not create backup folder.",
 				BackupCreationResultKind.CouldNotCopyWorldToTemporaryFolder => "Could not copy world to temporary folder.",
 				BackupCreationResultKind.CouldNotCreateWorldArchive         => "Could not create world archive.",
-				_                                                           => "Unknown error.",
+				_                                                           => "Unknown error."
 			};
 		}
 	}

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

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

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

@@ -58,7 +58,7 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 	
 	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 +97,13 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 		IServerLauncher launcher = configuration.MinecraftServerKind switch {
 			MinecraftServerKind.Vanilla => new VanillaLauncher(properties),
 			MinecraftServerKind.Fabric  => new FabricLauncher(properties),
-			_                           => InvalidLauncher.Instance,
+			_                           => 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);

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

@@ -1,5 +1,4 @@
-using System.Net.Sockets;
-using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Server;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Instance;
@@ -19,8 +18,6 @@ sealed class InstancePlayerCountTracker : CancellableBackgroundTask {
 	private readonly TaskCompletionSource firstDetection = AsyncTasks.CreateCompletionSource();
 	private readonly ManualResetEventSlim serverOutputEvent = new ();
 	
-	private bool WaitingForFirstDetection => !firstDetection.Task.IsCompleted;
-	
 	private InstancePlayerCounts? playerCounts;
 	private event EventHandler<int?>? OnlinePlayerCountChanged;
 	
@@ -36,40 +33,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);
+			await UpdatePlayerCounts(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);
-			}
-			
 			return null;
 		} catch (Exception e) {
 			Logger.Error(e, "Caught exception while checking online player count.");
@@ -77,27 +67,19 @@ 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();
-		}
-		
+	private async Task UpdatePlayerCounts(InstancePlayerCounts? value) {
 		EventHandler<int?>? onlinePlayerCountChanged;
 		lock (this) {
-			if (playerCounts == newPlayerCounts) {
+			if (playerCounts == value) {
 				return;
 			}
 			
-			playerCounts = newPlayerCounts;
+			playerCounts = value;
 			onlinePlayerCountChanged = OnlinePlayerCountChanged;
 		}
 		
-		onlinePlayerCountChanged?.Invoke(this, newPlayerCounts?.Online);
-		
-		if (!controllerConnection.TrySend(new ReportInstancePlayerCountsMessage(instanceGuid, newPlayerCounts))) {
-			Logger.Warning("Could not report online player count to Controller.");
-		}
+		onlinePlayerCountChanged?.Invoke(this, value?.Online);
+		await controllerConnection.Send(new ReportInstancePlayerCountsMessage(instanceGuid, value), CancellationToken);
 	}
 	
 	public async Task WaitForOnlinePlayers(CancellationToken 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/Rpc/ControllerHandshake.cs

@@ -2,32 +2,46 @@
 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 {
+public sealed class ControllerHandshake(AgentRegistration registration) : 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) {
+	private readonly Lock responseLock = new ();
+	private ImmutableArray<ConfigureInstanceMessage> response;
+	
+	internal ImmutableArray<ConfigureInstanceMessage> Response {
+		get {
+			lock (responseLock) {
+				return response;
+			}
+		}
+		private set {
+			lock (responseLock) {
+				response = value;
+			}
+		}
+	}
+	
+	public async Task Perform(Stream 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);
+		ReadOnlyMemory<byte> serializedRegistration = RpcSerialization.Serialize(registration);
+		await RpcSerialization.WriteSignedInt(serializedRegistration.Length, stream, cancellationToken);
+		await stream.WriteAsync(serializedRegistration, cancellationToken);
 		
-		if (await stream.ReadByte(cancellationToken) == 0) {
+		if (await RpcSerialization.ReadByte(stream, cancellationToken) == 0) {
 			return;
 		}
 		
-		uint configureInstanceMessageCount = await stream.ReadUnsignedInt(cancellationToken);
+		uint configureInstanceMessageCount = await RpcSerialization.ReadUnsignedInt(stream, cancellationToken);
 		if (configureInstanceMessageCount > MaxInstances) {
 			throw new InvalidOperationException("Trying to configure too many instances (" + configureInstanceMessageCount + " > " + MaxInstances + ").");
 		}
@@ -35,16 +49,17 @@ public sealed class ControllerHandshake(AgentRegistration registration, AgentReg
 		var configureInstanceMessages = ImmutableArray.CreateBuilder<ConfigureInstanceMessage>();
 		
 		for (int index = 0; index < configureInstanceMessageCount; index++) {
-			int serializedMessageLength = await stream.ReadSignedInt(cancellationToken);
+			int serializedMessageLength = await RpcSerialization.ReadSignedInt(stream, 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));
+			var serializedMessage = await RpcSerialization.ReadBytes(serializedMessageLength, stream, cancellationToken);
+			configureInstanceMessages.Add(RpcSerialization.Deserialize<ConfigureInstanceMessage>(serializedMessage));
 		}
 		
-		registrationHandler.OnRegistrationComplete(configureInstanceMessages.ToImmutable());
+		// TODO handle response, only if new session
+		Response = configureInstanceMessages.ToImmutable();
 		logger.Information("Registration complete.");
 	}
 }

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

@@ -29,7 +29,7 @@ static class AgentKey {
 		}
 		
 		try {
-			Files.RequireMaximumFileSize(agentKeyFilePath, maximumBytes: 128);
+			Files.RequireMaximumFileSize(agentKeyFilePath, maximumBytes: 64);
 			string[] lines = await File.ReadAllLinesAsync(agentKeyFilePath, Encoding.UTF8);
 			return LoadFromToken(lines[0]);
 		} catch (IOException e) {

Agent/Phantom.Agent/GuidFile.cs

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

Agent/Phantom.Agent/Program.cs

@@ -6,8 +6,11 @@ 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.Message;
+using Phantom.Utils.Rpc.Runtime;
 using Phantom.Utils.Rpc.Runtime.Client;
 using Phantom.Utils.Runtime;
 using Phantom.Utils.Threading;
@@ -30,7 +33,7 @@ try {
 	PhantomLogger.Root.InformationHeading("Initializing Phantom Panel agent...");
 	PhantomLogger.Root.Information("Agent version: {Version}", fullVersion);
 	
-	var (controllerHost, controllerPort, javaSearchPath, agentKeyToken, agentKeyFilePath, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts, maxConcurrentBackupCompressionTasks) = Variables.LoadOrStop();
+	var (controllerHost, controllerPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts, maxConcurrentBackupCompressionTasks) = Variables.LoadOrStop();
 	
 	var agentKey = await AgentKey.Load(agentKeyToken, agentKeyFilePath);
 	if (agentKey == null) {
@@ -42,11 +45,14 @@ try {
 		return 1;
 	}
 	
-	var agentInfo = new AgentInfo(ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
-	var javaRuntimeRepository = await JavaRuntimeDiscovery.Scan(folders.JavaSearchFolderPath, shutdownCancellationToken);
+	var agentGuid = await GuidFile.CreateOrLoad(folders.DataFolderPath);
+	if (agentGuid == null) {
+		return 1;
+	}
 	
-	var agentRegistrationHandler = new AgentRegistrationHandler();
-	var controllerHandshake = new ControllerHandshake(new AgentRegistration(agentInfo, javaRuntimeRepository.All), agentRegistrationHandler);
+	var agentInfo = new AgentInfo(agentGuid.Value, agentName, ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
+	var javaRuntimeRepository = await JavaRuntimeDiscovery.Scan(folders.JavaSearchFolderPath, shutdownCancellationToken);
+	var controllerHandshake = new ControllerHandshake(new AgentRegistration(agentInfo, javaRuntimeRepository.All));
 	
 	var rpcClientConnectionParameters = new RpcClientConnectionParameters(
 		Host: controllerHost,
@@ -55,17 +61,21 @@ try {
 		CertificateThumbprint: agentKey.Value.CertificateThumbprint,
 		AuthToken: agentKey.Value.AuthToken,
 		Handshake: controllerHandshake,
+		CommonParameters: new RpcCommonConnectionParameters(
 			MessageQueueCapacity: 250,
 			FrameQueueCapacity: 500,
-		MaxConcurrentlyHandledMessages: 50
+			MaxConcurrentlyHandledMessages: 50,
+			PingInterval: TimeSpan.FromSeconds(10)
+		)
 	);
 	
-	using var rpcClient = await RpcClient<IMessageToController, IMessageToAgent>.Connect("Controller", rpcClientConnectionParameters, AgentMessageRegistries.Registries, shutdownCancellationToken);
+	using var rpcClient = await RpcClient<IMessageToController, IMessageToAgent>.Connect("Controller", rpcClientConnectionParameters, AgentMessageRegistries.Definitions, shutdownCancellationToken);
 	if (rpcClient == null) {
 		PhantomLogger.Root.Fatal("Could not connect to Phantom Controller, shutting down.");
 		return 1;
 	}
 	
+	Task? rpcClientListener = null;
 	try {
 		PhantomLogger.Root.InformationHeading("Launching Phantom Panel agent...");
 		
@@ -74,16 +84,30 @@ try {
 		var rpcMessageHandlerInit = new ControllerMessageHandlerActor.Init(agentServices);
 		var rpcMessageHandlerActor = agentServices.ActorSystem.ActorOf(ControllerMessageHandlerActor.Factory(rpcMessageHandlerInit), "ControllerMessageHandler");
 		
-		rpcClient.StartListening(new ControllerMessageReceiver(rpcMessageHandlerActor, agentRegistrationHandler));
+		rpcClientListener = rpcClient.Listen(new IMessageReceiver<IMessageToAgent>.Actor(rpcMessageHandlerActor));
 		
-		if (await agentRegistrationHandler.Start(agentServices, shutdownCancellationToken)) {
+		if (await agentServices.Register(controllerHandshake, shutdownCancellationToken)) {
 			PhantomLogger.Root.Information("Phantom Panel agent is ready.");
 			await shutdownCancellationToken.WaitHandle.WaitOneAsync();
 		}
 		
 		await agentServices.Shutdown();
+	} finally {
+		PhantomLogger.Root.Information("Unregistering agent...");
+		try {
+			using var unregisterCancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+			await rpcClient.MessageSender.Send(new UnregisterAgentMessage(), unregisterCancellationTokenSource.Token);
+		} catch (OperationCanceledException) {
+			PhantomLogger.Root.Warning("Could not unregister agent after shutdown.");
+		} catch (Exception e) {
+			PhantomLogger.Root.Warning(e, "Could not unregister agent during shutdown.");
 		} finally {
 			await rpcClient.Shutdown();
+			
+			if (rpcClientListener != null) {
+				await rpcClientListener;
+			}
+		}
 	}
 	
 	return 0;

Agent/Phantom.Agent/Variables.cs

@@ -11,6 +11,7 @@ sealed record Variables(
 	string JavaSearchPath,
 	string? AgentKeyToken,
 	string? AgentKeyFilePath,
+	string AgentName,
 	ushort MaxInstances,
 	RamAllocationUnits MaxMemory,
 	AllowedPorts AllowedServerPorts,
@@ -27,6 +28,7 @@ sealed record Variables(
 			javaSearchPath,
 			agentKeyToken,
 			agentKeyFilePath,
+			EnvironmentVariables.GetString("AGENT_NAME").Require,
 			(ushort) EnvironmentVariables.GetInteger("MAX_INSTANCES", min: 1, max: 10000).Require,
 			EnvironmentVariables.GetString("MAX_MEMORY").MapParse(RamAllocationUnits.FromString).Require,
 			EnvironmentVariables.GetString("ALLOWED_SERVER_PORTS").MapParse(AllowedPorts.FromString).Require,

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

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

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

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

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

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

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

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

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

@@ -3,10 +3,10 @@
 namespace Phantom.Common.Data.Web.Agent;
 
 [MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(AgentIsOffline))]
-[MemoryPackUnion(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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,16 +1,19 @@
 using System.Collections.Immutable;
 using MemoryPack;
+using Phantom.Common.Data.Web.Users.AddUserErrors;
 
-namespace Phantom.Common.Data.Web.Users;
-
+namespace Phantom.Common.Data.Web.Users {
 	[MemoryPackable]
-[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/Agent/AgentInfo.cs

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

Common/Phantom.Common.Data/AllowedPorts.cs

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

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

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

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

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

Common/Phantom.Common.Data/ConnectionKey.cs

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

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

@@ -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

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

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

@@ -51,11 +51,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 +93,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

@@ -2,26 +2,33 @@
 using Phantom.Common.Data.Replies;
 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<IMessageToController, IMessageToAgent> 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<ConfigureInstanceMessage, Result<ConfigureInstanceResult, InstanceActionFailure>>(1);
+		ToAgent.Add<LaunchInstanceMessage, Result<LaunchInstanceResult, InstanceActionFailure>>(2);
+		ToAgent.Add<StopInstanceMessage, Result<StopInstanceResult, InstanceActionFailure>>(3);
+		ToAgent.Add<SendCommandToInstanceMessage, Result<SendCommandToInstanceResult, InstanceActionFailure>>(4);
 		
-		ToController.Add<ReportAgentStatusMessage>();
-		ToController.Add<ReportInstanceStatusMessage>();
-		ToController.Add<ReportInstancePlayerCountsMessage>();
-		ToController.Add<ReportInstanceEventMessage>();
-		ToController.Add<InstanceOutputMessage>();
+		ToController.Add<UnregisterAgentMessage>(1);
+		ToController.Add<ReportInstanceStatusMessage>(2);
+		ToController.Add<InstanceOutputMessage>(3);
+		ToController.Add<ReportAgentStatusMessage>(4);
+		ToController.Add<ReportInstanceEventMessage>(5);
+		ToController.Add<ReportInstancePlayerCountsMessage>(6);
+	}
+	
+	private sealed class MessageDefinitions : IMessageDefinitions<IMessageToController, IMessageToAgent> {
+		public MessageRegistry<IMessageToAgent> ToClient => ToAgent;
+		public MessageRegistry<IMessageToController> ToServer => ToController;
 	}
 }

Common/Phantom.Common.Messages.Agent/IMessageToAgent.cs

@@ -1,3 +1,3 @@
 namespace Phantom.Common.Messages.Agent;
 
-public interface IMessageToAgent;
+public interface IMessageToAgent {}

Common/Phantom.Common.Messages.Agent/IMessageToController.cs

@@ -1,3 +1,3 @@
 namespace Phantom.Common.Messages.Agent;
 
-public interface IMessageToController;
+public interface IMessageToController {}

Common/Phantom.Common.Messages.Agent/ToController/UnregisterAgentMessage.cs

@@ -0,0 +1,6 @@
+using MemoryPack;
+
+namespace Phantom.Common.Messages.Agent.ToController;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record UnregisterAgentMessage : IMessageToController;

Common/Phantom.Common.Messages.Web/IMessageToController.cs

@@ -1,3 +1,3 @@
 namespace Phantom.Common.Messages.Web;
 
-public interface IMessageToController;
+public interface IMessageToController {}

Common/Phantom.Common.Messages.Web/IMessageToWeb.cs

@@ -1,3 +1,3 @@
 namespace Phantom.Common.Messages.Web;
 
-public interface IMessageToWeb;
+public interface IMessageToWeb {}

Common/Phantom.Common.Messages.Web/ToController/CreateOrUpdateAgentMessage.cs

@@ -1,15 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Common.Data;
-using Phantom.Common.Data.Web.Agent;
-using Phantom.Common.Data.Web.Users;
-using Phantom.Utils.Actor;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record CreateOrUpdateAgentMessage(
-	[property: MemoryPackOrder(0)] ImmutableArray<byte> AuthToken,
-	[property: MemoryPackOrder(1)] Guid AgentGuid,
-	[property: MemoryPackOrder(2)] AgentConfiguration Configuration
-) : IMessageToController, ICanReply<Result<CreateOrUpdateAgentResult, UserActionFailure>>;

Common/Phantom.Common.Messages.Web/ToController/UnregisterWebMessage.cs

@@ -0,0 +1,6 @@
+using MemoryPack;
+
+namespace Phantom.Common.Messages.Web.ToController;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record UnregisterWebMessage : IMessageToController;

Common/Phantom.Common.Messages.Web/WebMessageRegistries.cs

@@ -3,47 +3,52 @@ using Phantom.Common.Data;
 using Phantom.Common.Data.Java;
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
-using Phantom.Common.Data.Web.Agent;
 using Phantom.Common.Data.Web.AuditLog;
 using Phantom.Common.Data.Web.EventLog;
 using Phantom.Common.Data.Web.Instance;
 using Phantom.Common.Data.Web.Users;
 using Phantom.Common.Messages.Web.ToController;
 using Phantom.Common.Messages.Web.ToWeb;
+using Phantom.Utils.Logging;
 using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Common.Messages.Web;
 
 public static class WebMessageRegistries {
-	public static MessageRegistry<IMessageToController> ToController { get; } = new (nameof(ToController));
-	public static MessageRegistry<IMessageToWeb> ToWeb { get; } = new (nameof(ToWeb));
+	public static MessageRegistry<IMessageToController> ToController { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToController)));
+	public static MessageRegistry<IMessageToWeb> ToWeb { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToWeb)));
 	
-	public static MessageRegistries<IMessageToController, IMessageToWeb> Registries => new (ToWeb, ToController);
+	public static IMessageDefinitions<IMessageToController, IMessageToWeb> Definitions { get; } = new MessageDefinitions();
 	
 	static WebMessageRegistries() {
-		ToController.Add<LogInMessage, Optional<LogInSuccess>>();
-		ToController.Add<LogOutMessage>();
-		ToController.Add<GetAuthenticatedUser, Optional<AuthenticatedUserInfo>>();
-		ToController.Add<CreateOrUpdateAdministratorUserMessage, CreateOrUpdateAdministratorUserResult>();
-		ToController.Add<CreateUserMessage, Result<CreateUserResult, UserActionFailure>>();
-		ToController.Add<GetUsersMessage, ImmutableArray<UserInfo>>();
-		ToController.Add<GetRolesMessage, ImmutableArray<RoleInfo>>();
-		ToController.Add<GetUserRolesMessage, ImmutableDictionary<Guid, ImmutableArray<Guid>>>();
-		ToController.Add<ChangeUserRolesMessage, Result<ChangeUserRolesResult, UserActionFailure>>();
-		ToController.Add<DeleteUserMessage, Result<DeleteUserResult, UserActionFailure>>();
-		ToController.Add<CreateOrUpdateAgentMessage, Result<CreateOrUpdateAgentResult, UserActionFailure>>();
-		ToController.Add<GetAgentJavaRuntimesMessage, ImmutableDictionary<Guid, ImmutableArray<TaggedJavaRuntime>>>();
-		ToController.Add<CreateOrUpdateInstanceMessage, Result<CreateOrUpdateInstanceResult, UserInstanceActionFailure>>();
-		ToController.Add<LaunchInstanceMessage, Result<LaunchInstanceResult, UserInstanceActionFailure>>();
-		ToController.Add<StopInstanceMessage, Result<StopInstanceResult, UserInstanceActionFailure>>();
-		ToController.Add<SendCommandToInstanceMessage, Result<SendCommandToInstanceResult, UserInstanceActionFailure>>();
-		ToController.Add<GetMinecraftVersionsMessage, ImmutableArray<MinecraftVersion>>();
-		ToController.Add<GetAuditLogMessage, Result<ImmutableArray<AuditLogItem>, UserActionFailure>>();
-		ToController.Add<GetEventLogMessage, Result<ImmutableArray<EventLogItem>, UserActionFailure>>();
+		ToController.Add<UnregisterWebMessage>(1);
+		ToController.Add<LogInMessage, Optional<LogInSuccess>>(2);
+		ToController.Add<LogOutMessage>(3);
+		ToController.Add<GetAuthenticatedUser, Optional<AuthenticatedUserInfo>>(4);
+		ToController.Add<CreateOrUpdateAdministratorUserMessage, CreateOrUpdateAdministratorUserResult>(5);
+		ToController.Add<CreateUserMessage, Result<CreateUserResult, UserActionFailure>>(6);
+		ToController.Add<DeleteUserMessage, Result<DeleteUserResult, UserActionFailure>>(7);
+		ToController.Add<GetUsersMessage, ImmutableArray<UserInfo>>(8);
+		ToController.Add<GetRolesMessage, ImmutableArray<RoleInfo>>(9);
+		ToController.Add<GetUserRolesMessage, ImmutableDictionary<Guid, ImmutableArray<Guid>>>(10);
+		ToController.Add<ChangeUserRolesMessage, Result<ChangeUserRolesResult, UserActionFailure>>(11);
+		ToController.Add<CreateOrUpdateInstanceMessage, Result<CreateOrUpdateInstanceResult, UserInstanceActionFailure>>(12);
+		ToController.Add<LaunchInstanceMessage, Result<LaunchInstanceResult, UserInstanceActionFailure>>(13);
+		ToController.Add<StopInstanceMessage, Result<StopInstanceResult, UserInstanceActionFailure>>(14);
+		ToController.Add<SendCommandToInstanceMessage, Result<SendCommandToInstanceResult, UserInstanceActionFailure>>(15);
+		ToController.Add<GetMinecraftVersionsMessage, ImmutableArray<MinecraftVersion>>(16);
+		ToController.Add<GetAgentJavaRuntimesMessage, ImmutableDictionary<Guid, ImmutableArray<TaggedJavaRuntime>>>(17);
+		ToController.Add<GetAuditLogMessage, Result<ImmutableArray<AuditLogItem>, UserActionFailure>>(18);
+		ToController.Add<GetEventLogMessage, Result<ImmutableArray<EventLogItem>, UserActionFailure>>(19);
 		
-		ToWeb.Add<RefreshAgentsMessage>();
-		ToWeb.Add<RefreshInstancesMessage>();
-		ToWeb.Add<InstanceOutputMessage>();
-		ToWeb.Add<RefreshUserSessionMessage>();
+		ToWeb.Add<RefreshAgentsMessage>(1);
+		ToWeb.Add<RefreshInstancesMessage>(2);
+		ToWeb.Add<InstanceOutputMessage>(3);
+		ToWeb.Add<RefreshUserSessionMessage>(4);
+	}
+	
+	private sealed class MessageDefinitions : IMessageDefinitions<IMessageToController, IMessageToWeb> {
+		public MessageRegistry<IMessageToWeb> ToClient => ToWeb;
+		public MessageRegistry<IMessageToController> ToServer => ToController;
 	}
 }

Controller/Phantom.Controller.Database.Postgres/Migrations/20251225053921_AgentAuthSecret.Designer.cs

@@ -1,357 +0,0 @@
-// <auto-generated />
-using System;
-using System.Text.Json;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Controller.Database;
-
-#nullable disable
-
-namespace Phantom.Controller.Database.Postgres.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20251225053921_AgentAuthSecret")]
-    partial class AgentAuthSecret
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "9.0.9")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
-                {
-                    b.Property<Guid>("AgentGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<byte[]>("AuthSecret")
-                        .HasMaxLength(12)
-                        .HasColumnType("bytea");
-
-                    b.Property<string>("BuildVersion")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("MaxInstances")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("MaxMemory")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("ProtocolVersion")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AgentGuid");
-
-                    b.ToTable("Agents", "agents");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
-
-                    b.Property<JsonDocument>("Data")
-                        .HasColumnType("jsonb");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("SubjectId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("SubjectType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<Guid?>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<DateTime>("UtcTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserGuid");
-
-                    b.ToTable("AuditLog", "system");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
-                {
-                    b.Property<Guid>("EventGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid?>("AgentGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<JsonDocument>("Data")
-                        .HasColumnType("jsonb");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("SubjectId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("SubjectType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("UtcTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("EventGuid");
-
-                    b.ToTable("EventLog", "system");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
-                {
-                    b.Property<Guid>("InstanceGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("AgentGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("InstanceName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<Guid>("JavaRuntimeGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("JvmArguments")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<bool>("LaunchAutomatically")
-                        .HasColumnType("boolean");
-
-                    b.Property<int>("MemoryAllocation")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("MinecraftServerKind")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("MinecraftVersion")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("RconPort")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ServerPort")
-                        .HasColumnType("integer");
-
-                    b.HasKey("InstanceGuid");
-
-                    b.ToTable("Instances", "agents");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Permissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RoleEntity", b =>
-                {
-                    b.Property<Guid>("RoleGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("RoleGuid");
-
-                    b.ToTable("Roles", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
-                {
-                    b.Property<Guid>("RoleGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("PermissionId")
-                        .HasColumnType("text");
-
-                    b.HasKey("RoleGuid", "PermissionId");
-
-                    b.HasIndex("PermissionId");
-
-                    b.ToTable("RolePermissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserAgentAccessEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("AgentGuid")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("UserGuid", "AgentGuid");
-
-                    b.HasIndex("AgentGuid");
-
-                    b.ToTable("UserAgentAccess", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("PasswordHash")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("UserGuid");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.ToTable("Users", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("PermissionId")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserGuid", "PermissionId");
-
-                    b.HasIndex("PermissionId");
-
-                    b.ToTable("UserPermissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("RoleGuid")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("UserGuid", "RoleGuid");
-
-                    b.HasIndex("RoleGuid");
-
-                    b.ToTable("UserRoles", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
-                        .WithMany()
-                        .HasForeignKey("PermissionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", null)
-                        .WithMany()
-                        .HasForeignKey("RoleGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserAgentAccessEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.AgentEntity", null)
-                        .WithMany()
-                        .HasForeignKey("AgentGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
-                        .WithMany()
-                        .HasForeignKey("PermissionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", "Role")
-                        .WithMany()
-                        .HasForeignKey("RoleGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Role");
-
-                    b.Navigation("User");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Controller/Phantom.Controller.Database.Postgres/Migrations/20251225053921_AgentAuthSecret.cs

@@ -1,31 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Phantom.Controller.Database.Postgres.Migrations
-{
-    /// <inheritdoc />
-    public partial class AgentAuthSecret : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<byte[]>(
-                name: "AuthSecret",
-                schema: "agents",
-                table: "Agents",
-                type: "bytea",
-                maxLength: 12,
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "AuthSecret",
-                schema: "agents",
-                table: "Agents");
-        }
-    }
-}

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

@@ -18,7 +18,7 @@ namespace Phantom.Controller.Database.Postgres.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "9.0.9")
+                .HasAnnotation("ProductVersion", "8.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -29,10 +29,6 @@ namespace Phantom.Controller.Database.Postgres.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid");
 
-                    b.Property<byte[]>("AuthSecret")
-                        .HasMaxLength(12)
-                        .HasColumnType("bytea");
-
                     b.Property<string>("BuildVersion")
                         .IsRequired()
                         .HasColumnType("text");
@@ -40,7 +36,7 @@ namespace Phantom.Controller.Database.Postgres.Migrations
                     b.Property<int>("MaxInstances")
                         .HasColumnType("integer");
 
-                    b.Property<int>("MaxMemory")
+                    b.Property<ushort>("MaxMemory")
                         .HasColumnType("integer");
 
                     b.Property<string>("Name")
@@ -146,7 +142,7 @@ namespace Phantom.Controller.Database.Postgres.Migrations
                     b.Property<bool>("LaunchAutomatically")
                         .HasColumnType("boolean");
 
-                    b.Property<int>("MemoryAllocation")
+                    b.Property<ushort>("MemoryAllocation")
                         .HasColumnType("integer");
 
                     b.Property<string>("MinecraftServerKind")

Controller/Phantom.Controller.Database/ApplicationDbContext.cs

@@ -8,7 +8,6 @@ using Phantom.Common.Data.Web.EventLog;
 using Phantom.Controller.Database.Converters;
 using Phantom.Controller.Database.Entities;
 using Phantom.Controller.Database.Factories;
-using Phantom.Utils.Rpc;
 
 namespace Phantom.Controller.Database;
 
@@ -80,8 +79,6 @@ public class ApplicationDbContext : DbContext {
 		builder.Properties<EventLogEventType>().HaveConversion<EnumToStringConverter<EventLogEventType>>();
 		builder.Properties<EventLogSubjectType>().HaveConversion<EnumToStringConverter<EventLogSubjectType>>();
 		builder.Properties<MinecraftServerKind>().HaveConversion<EnumToStringConverter<MinecraftServerKind>>();
-		
-		builder.Properties<AuthSecret>().HaveConversion<AuthSecretConverter>();
 		builder.Properties<RamAllocationUnits>().HaveConversion<RamAllocationUnitsConverter>();
 	}
 }

Controller/Phantom.Controller.Database/Converters/AuthSecretConverter.cs

@@ -1,12 +0,0 @@
-using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Phantom.Utils.Rpc;
-
-namespace Phantom.Controller.Database.Converters;
-
-[SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
-sealed class AuthSecretConverter() : ValueConverter<AuthSecret, byte[]>(
-	static units => units.Bytes.ToArray(),
-	static value => new AuthSecret(ImmutableArray.Create(value))
-);

Controller/Phantom.Controller.Database/Converters/RamAllocationUnitsConverter.cs

@@ -5,7 +5,9 @@ using Phantom.Common.Data;
 namespace Phantom.Controller.Database.Converters;
 
 [SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
-sealed class RamAllocationUnitsConverter() : ValueConverter<RamAllocationUnits, ushort>(
+sealed class RamAllocationUnitsConverter : ValueConverter<RamAllocationUnits, ushort> {
+	public RamAllocationUnitsConverter() : base(
 		static units => units.RawValue,
 		static value => new RamAllocationUnits(value)
-);
+	) {}
+}

Controller/Phantom.Controller.Database/Entities/AgentEntity.cs

@@ -2,7 +2,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics.CodeAnalysis;
 using Phantom.Common.Data;
-using Phantom.Utils.Rpc;
 
 namespace Phantom.Controller.Database.Entities;
 
@@ -18,9 +17,6 @@ public sealed class AgentEntity {
 	public ushort MaxInstances { get; set; }
 	public RamAllocationUnits MaxMemory { get; set; }
 	
-	[MaxLength(AuthSecret.Length)]
-	public AuthSecret? AuthSecret { get; set; }
-	
 	internal AgentEntity(Guid agentGuid) {
 		AgentGuid = agentGuid;
 		Name = null!;

Controller/Phantom.Controller.Database/Repositories/AuditLogRepository.Writer.cs

@@ -57,18 +57,10 @@ sealed partial class AuditLogRepository {
 		
 		public void UserDeleted(UserEntity user) {
 			AddItem(AuditLogEventType.UserDeleted, user.UserGuid.ToString(), new Dictionary<string, object?> {
-				{ "username", user.Name },
+				{ "username", user.Name }
 			});
 		}
 		
-		public void AgentCreated(Guid agentGuid) {
-			AddItem(AuditLogEventType.AgentCreated, agentGuid.ToString());
-		}
-		
-		public void AgentEdited(Guid agentGuid) {
-			AddItem(AuditLogEventType.AgentEdited, agentGuid.ToString());
-		}
-		
 		public void InstanceCreated(Guid instanceGuid) {
 			AddItem(AuditLogEventType.InstanceCreated, instanceGuid.ToString());
 		}
@@ -83,13 +75,13 @@ sealed partial class AuditLogRepository {
 		
 		public void InstanceCommandExecuted(Guid instanceGuid, string command) {
 			AddItem(AuditLogEventType.InstanceCommandExecuted, instanceGuid.ToString(), new Dictionary<string, object?> {
-				{ "command", command },
+				{ "command", command }
 			});
 		}
 		
 		public void InstanceStopped(Guid instanceGuid, int stopInSeconds) {
 			AddItem(AuditLogEventType.InstanceStopped, instanceGuid.ToString(), new Dictionary<string, object?> {
-				{ "stop_in_seconds", stopInSeconds.ToString() },
+				{ "stop_in_seconds", stopInSeconds.ToString() }
 			});
 		}
 	}

Controller/Phantom.Controller.Database/Repositories/UserRepository.cs

@@ -2,6 +2,9 @@
 using Microsoft.EntityFrameworkCore;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Web.Users;
+using Phantom.Common.Data.Web.Users.AddUserErrors;
+using Phantom.Common.Data.Web.Users.PasswordRequirementViolations;
+using Phantom.Common.Data.Web.Users.UsernameRequirementViolations;
 using Phantom.Controller.Database.Entities;
 using Phantom.Utils.Collections;
 
@@ -13,10 +16,10 @@ public sealed class UserRepository {
 	
 	private static UsernameRequirementViolation? CheckUsernameRequirements(string username) {
 		if (string.IsNullOrWhiteSpace(username)) {
-			return new UsernameRequirementViolation.IsEmpty();
+			return new IsEmpty();
 		}
 		else if (username.Length > MaxUserNameLength) {
-			return new UsernameRequirementViolation.TooLong(MaxUserNameLength);
+			return new TooLong(MaxUserNameLength);
 		}
 		else {
 			return null;
@@ -27,19 +30,19 @@ public sealed class UserRepository {
 		var violations = ImmutableArray.CreateBuilder<PasswordRequirementViolation>();
 		
 		if (password.Length < MinimumPasswordLength) {
-			violations.Add(new PasswordRequirementViolation.TooShort(MinimumPasswordLength));
+			violations.Add(new TooShort(MinimumPasswordLength));
 		}
 		
 		if (!password.Any(char.IsLower)) {
-			violations.Add(new PasswordRequirementViolation.MustContainLowercaseLetter());
+			violations.Add(new MustContainLowercaseLetter());
 		}
 		
 		if (!password.Any(char.IsUpper)) {
-			violations.Add(new PasswordRequirementViolation.MustContainUppercaseLetter());
+			violations.Add(new MustContainUppercaseLetter());
 		}
 		
 		if (!password.Any(char.IsDigit)) {
-			violations.Add(new PasswordRequirementViolation.MustContainDigit());
+			violations.Add(new MustContainDigit());
 		}
 		
 		return violations.ToImmutable();
@@ -70,16 +73,16 @@ public sealed class UserRepository {
 	public async Task<Result<UserEntity, AddUserError>> CreateUser(string username, string password) {
 		var usernameRequirementViolation = CheckUsernameRequirements(username);
 		if (usernameRequirementViolation != null) {
-			return new AddUserError.NameIsInvalid(usernameRequirementViolation);
+			return new NameIsInvalid(usernameRequirementViolation);
 		}
 		
 		var passwordRequirementViolations = CheckPasswordRequirements(password);
 		if (!passwordRequirementViolations.IsEmpty) {
-			return new AddUserError.PasswordIsInvalid(passwordRequirementViolations);
+			return new PasswordIsInvalid(passwordRequirementViolations);
 		}
 		
 		if (await db.Ctx.Users.AnyAsync(user => user.Name == username)) {
-			return new AddUserError.NameAlreadyExists();
+			return new NameAlreadyExists();
 		}
 		
 		var user = new UserEntity(Guid.NewGuid(), username, UserPasswords.Hash(password));
@@ -92,7 +95,7 @@ public sealed class UserRepository {
 	public Result<SetUserPasswordError> SetUserPassword(UserEntity user, string password) {
 		var requirementViolations = CheckPasswordRequirements(password);
 		if (!requirementViolations.IsEmpty) {
-			return new SetUserPasswordError.PasswordIsInvalid(requirementViolations);
+			return new Common.Data.Web.Users.SetUserPasswordErrors.PasswordIsInvalid(requirementViolations);
 		}
 		
 		user.PasswordHash = UserPasswords.Hash(password);

Controller/Phantom.Controller.Minecraft/MinecraftVersions.cs

@@ -12,7 +12,7 @@ public sealed class MinecraftVersions : IDisposable {
 	
 	private readonly MinecraftVersionApi api = new ();
 	private readonly Stopwatch cacheTimer = new ();
-	private readonly SemaphoreSlim cacheSemaphore = new (initialCount: 1, maxCount: 1);
+	private readonly SemaphoreSlim cacheSemaphore = new (1, 1);
 	
 	private bool IsCacheNotExpired => cacheTimer.IsRunning && cacheTimer.Elapsed < CacheRetentionTime;
 	

Controller/Phantom.Controller.Services/Agents/AgentActor.cs

@@ -21,52 +21,34 @@ using Phantom.Utils.Actor.Mailbox;
 using Phantom.Utils.Actor.Tasks;
 using Phantom.Utils.Collections;
 using Phantom.Utils.Logging;
-using Phantom.Utils.Rpc;
 using Phantom.Utils.Rpc.Runtime.Server;
 using Serilog;
 
 namespace Phantom.Controller.Services.Agents;
 
-sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
+sealed class AgentActor : ReceiveActor<AgentActor.ICommand> {
 	private static readonly ILogger Logger = PhantomLogger.Create<AgentActor>();
 	
 	private static readonly TimeSpan DisconnectionRecheckInterval = TimeSpan.FromSeconds(5);
 	private static readonly TimeSpan DisconnectionThreshold = TimeSpan.FromSeconds(12);
 	
-	public readonly record struct Init(
-		Guid AgentGuid,
-		AgentConfiguration AgentConfiguration,
-		AuthSecret AuthSecret,
-		AgentRuntimeInfo AgentRuntimeInfo,
-		AgentConnectionKeys AgentConnectionKeys,
-		ControllerState ControllerState,
-		MinecraftVersions MinecraftVersions,
-		IDbContextProvider DbProvider,
-		CancellationToken CancellationToken
-	);
+	public readonly record struct Init(Guid AgentGuid, AgentConfiguration AgentConfiguration, ControllerState ControllerState, MinecraftVersions MinecraftVersions, IDbContextProvider DbProvider, CancellationToken CancellationToken);
 	
 	public static Props<ICommand> Factory(Init init) {
 		return Props<ICommand>.Create(() => new AgentActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume, MailboxType = UnboundedJumpAheadMailbox.Name });
 	}
 	
-	public ITimerScheduler Timers { get; set; } = null!;
-	
-	private readonly AgentConnectionKeys agentConnectionKeys;
 	private readonly ControllerState controllerState;
 	private readonly MinecraftVersions minecraftVersions;
 	private readonly IDbContextProvider dbProvider;
 	private readonly CancellationToken cancellationToken;
 	
 	private readonly Guid agentGuid;
-	private readonly AuthInfo authInfo;
 	
 	private AgentConfiguration configuration;
-	private AgentRuntimeInfo runtimeInfo;
 	private AgentStats? stats;
 	private ImmutableArray<TaggedJavaRuntime> javaRuntimes = ImmutableArray<TaggedJavaRuntime>.Empty;
 	
-	private string AgentName => configuration.AgentName;
-	
 	private readonly AgentConnection connection;
 	
 	private DateTimeOffset? lastPingTime;
@@ -92,17 +74,13 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 	private readonly Dictionary<Guid, Instance> instanceDataByGuid = new ();
 	
 	private AgentActor(Init init) {
-		this.agentConnectionKeys = init.AgentConnectionKeys;
 		this.controllerState = init.ControllerState;
 		this.minecraftVersions = init.MinecraftVersions;
 		this.dbProvider = init.DbProvider;
 		this.cancellationToken = init.CancellationToken;
 		
 		this.agentGuid = init.AgentGuid;
-		this.authInfo = new AuthInfo(this, init.AuthSecret);
-		
 		this.configuration = init.AgentConfiguration;
-		this.runtimeInfo = init.AgentRuntimeInfo;
 		this.connection = new AgentConnection(agentGuid, configuration.AgentName);
 		
 		this.databaseStorageActor = Context.ActorOf(AgentDatabaseStorageActor.Factory(new AgentDatabaseStorageActor.Init(agentGuid, init.DbProvider, init.CancellationToken)), "DatabaseStorage");
@@ -110,11 +88,9 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 		NotifyAgentUpdated();
 		
 		ReceiveAsync<InitializeCommand>(Initialize);
-		Receive<ConfigureAgentCommand>(ConfigureAgent);
 		ReceiveAsyncAndReply<RegisterCommand, ImmutableArray<ConfigureInstanceMessage>>(Register);
 		Receive<SetConnectionCommand>(SetConnection);
 		Receive<UnregisterCommand>(Unregister);
-		ReceiveAndReply<GetAuthSecretCommand, AuthSecret>(GetAuthSecret);
 		Receive<RefreshConnectionStatusCommand>(RefreshConnectionStatus);
 		Receive<NotifyIsAliveCommand>(NotifyIsAlive);
 		Receive<UpdateStatsCommand>(UpdateStats);
@@ -128,13 +104,13 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 	}
 	
 	private void NotifyAgentUpdated() {
-		controllerState.UpdateAgent(new Agent(agentGuid, configuration, authInfo.ConnectionKey, runtimeInfo, stats, ConnectionStatus));
+		controllerState.UpdateAgent(new Agent(agentGuid, configuration, stats, ConnectionStatus));
 	}
 	
 	protected override void PreStart() {
 		Self.Tell(new InitializeCommand());
 		
-		Timers.StartPeriodicTimer("RefreshConnectionStatus", new RefreshConnectionStatusCommand(), DisconnectionRecheckInterval, Self);
+		Context.System.Scheduler.ScheduleTellRepeatedly(DisconnectionRecheckInterval, DisconnectionRecheckInterval, Self, new RefreshConnectionStatusCommand(), Self);
 	}
 	
 	private ActorRef<InstanceActor.ICommand> CreateNewInstance(Instance instance) {
@@ -196,15 +172,11 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 	
 	private sealed record InitializeCommand : ICommand;
 	
-	public sealed record ConfigureAgentCommand(Guid LoggedInUserGuid, AgentConfiguration Configuration) : ICommand;
-	
-	public sealed record RegisterCommand(AgentRuntimeInfo RuntimeInfo, ImmutableArray<TaggedJavaRuntime> JavaRuntimes) : ICommand, ICanReply<ImmutableArray<ConfigureInstanceMessage>>;
+	public sealed record RegisterCommand(AgentConfiguration Configuration, ImmutableArray<TaggedJavaRuntime> JavaRuntimes) : ICommand, ICanReply<ImmutableArray<ConfigureInstanceMessage>>;
 	
 	public sealed record SetConnectionCommand(RpcServerToClientConnection<IMessageToController, IMessageToAgent> Connection) : ICommand;
 	
-	public sealed record UnregisterCommand : ICommand;
-	
-	public sealed record GetAuthSecretCommand : ICommand, ICanReply<AuthSecret>;
+	public sealed record UnregisterCommand(RpcServerToClientConnection<IMessageToController, IMessageToAgent> Connection) : ICommand;
 	
 	private sealed record RefreshConnectionStatusCommand : ICommand;
 	
@@ -253,24 +225,19 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 		}
 	}
 	
-	private void ConfigureAgent(ConfigureAgentCommand message) {
-		configuration = message.Configuration;
-		NotifyAgentUpdated();
-		
-		databaseStorageActor.Tell(new AgentDatabaseStorageActor.StoreAgentConfigurationCommand(message.LoggedInUserGuid, configuration));
-	}
-	
 	private async Task<ImmutableArray<ConfigureInstanceMessage>> Register(RegisterCommand command) {
 		var configurationMessages = await PrepareInitialConfigurationMessages();
 		
-		runtimeInfo = command.RuntimeInfo;
+		configuration = command.Configuration;
+		connection.SetAgentName(configuration.AgentName);
+		
 		lastPingTime = DateTimeOffset.Now;
 		isOnline = true;
 		NotifyAgentUpdated();
 		
-		Logger.Information("Registered agent \"{AgentName}\" (GUID {AgentGuid}).", AgentName, agentGuid);
+		Logger.Information("Registered agent \"{Name}\" (GUID {Guid}).", configuration.AgentName, agentGuid);
 		
-		databaseStorageActor.Tell(new AgentDatabaseStorageActor.StoreAgentDataCommand(configuration, authInfo.Secret, runtimeInfo));
+		databaseStorageActor.Tell(new AgentDatabaseStorageActor.StoreAgentConfigurationCommand(configuration));
 		
 		javaRuntimes = command.JavaRuntimes;
 		controllerState.UpdateAgentJavaRuntimes(agentGuid, javaRuntimes);
@@ -283,8 +250,7 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 	}
 	
 	private void Unregister(UnregisterCommand command) {
-		connection.Close();
-		
+		if (connection.CloseIfSame(command.Connection)) {
 			stats = null;
 			lastPingTime = null;
 			isOnline = false;
@@ -292,11 +258,8 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 			
 			TellAllInstances(new InstanceActor.SetStatusCommand(InstanceStatus.Offline));
 			
-		Logger.Information("Unregistered agent \"{AgentName}\" (GUID {AgentGuid}).", AgentName, agentGuid);
+			Logger.Information("Unregistered agent \"{Name}\" (GUID {Guid}).", configuration.AgentName, agentGuid);
 		}
-	
-	private AuthSecret GetAuthSecret(GetAuthSecretCommand command) {
-		return authInfo.Secret;
 	}
 	
 	private void RefreshConnectionStatus(RefreshConnectionStatusCommand command) {
@@ -304,7 +267,7 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 			isOnline = false;
 			NotifyAgentUpdated();
 			
-			Logger.Warning("Lost connection to agent \"{AgentName}\" (GUID {AgentGuid}).", AgentName, agentGuid);
+			Logger.Warning("Lost connection to agent \"{Name}\" (GUID {Guid}).", configuration.AgentName, agentGuid);
 		}
 	}
 	
@@ -314,8 +277,6 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 		if (!isOnline) {
 			isOnline = true;
 			NotifyAgentUpdated();
-			
-			Logger.Warning("Restored connection to agent \"{AgentName}\" (GUID {AgentGuid}).", AgentName, agentGuid);
 		}
 	}
 	
@@ -367,7 +328,7 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 			string action = isCreating ? "Added" : "Edited";
 			string relation = isCreating ? "to agent" : "in agent";
 			
-			Logger.Information(action + " instance \"{InstanceName}\" (GUID {InstanceGuid}) " + relation + " \"{AgentName}\".", instanceName, instanceGuid, AgentName);
+			Logger.Information(action + " instance \"{InstanceName}\" (GUID {InstanceGuid}) " + relation + " \"{AgentName}\".", instanceName, instanceGuid, configuration.AgentName);
 			
 			return CreateOrUpdateInstanceResult.Success;
 		}
@@ -376,7 +337,7 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 			string relation = isCreating ? "to agent" : "in agent";
 			string reason = result.Into(ConfigureInstanceResultExtensions.ToSentence, InstanceActionFailureExtensions.ToSentence);
 			
-			Logger.Information("Failed " + action + " instance \"{InstanceName}\" (GUID {InstanceGuid}) " + relation + " \"{AgentName}\". {ErrorMessage}", instanceName, instanceGuid, AgentName, reason);
+			Logger.Information("Failed " + action + " instance \"{InstanceName}\" (GUID {InstanceGuid}) " + relation + " \"{AgentName}\". {ErrorMessage}", instanceName, instanceGuid, configuration.AgentName, reason);
 			
 			return CreateOrUpdateInstanceResult.UnknownError;
 		}
@@ -405,26 +366,4 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 	private void ReceiveInstanceData(ReceiveInstanceDataCommand command) {
 		UpdateInstanceData(command.Instance);
 	}
-	
-	private sealed class AuthInfo {
-		private readonly AgentActor actor;
-		
-		public AuthSecret Secret { get; private set; }
-		public ImmutableArray<byte> ConnectionKey { get; private set; }
-		
-		public AuthInfo(AgentActor actor, AuthSecret authSecret) {
-			this.actor = actor;
-			this.Secret = authSecret;
-			this.ConnectionKey = CreateConnectionKey(authSecret);
-		}
-		
-		public void UpdateSecret(AuthSecret newSecret) {
-			this.Secret = newSecret;
-			this.ConnectionKey = CreateConnectionKey(newSecret);
-		}
-		
-		private ImmutableArray<byte> CreateConnectionKey(AuthSecret authSecret) {
-			return actor.agentConnectionKeys.Get(new AuthToken(actor.agentGuid, authSecret)).ToBytes();
-		}
-	}
 }