WIP

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "8.0.3",
+      "version": "7.0.0-rc.1.22426.7",
       "commands": [
         "dotnet-ef"
       ]

.gitignore

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

.run/Agent 1.run.xml

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

.run/Agent 2.run.xml

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

.run/Agent 3.run.xml

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

.run/Controller.run.xml

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

.run/Web.run.xml

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

.workdir/Controller/secrets/agent.auth

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

.workdir/Controller/secrets/agent.secret

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

.workdir/Controller/secrets/web.auth

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

.workdir/Controller/secrets/web.key

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

.workdir/Controller/secrets/web.secret

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

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

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

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

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

Agent/Phantom.Agent.Minecraft/Command/MinecraftCommand.cs

@@ -8,7 +8,7 @@ public static class MinecraftCommand {
 	public static string Say(string message) {
 		return "say " + message;
 	}
-	
+
 	public static string SaveAll(bool flush) {
 		return flush ? "save-all flush" : "save-all";
 	}

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

@@ -1,6 +1,5 @@
 using Phantom.Utils.Collections;
 using Phantom.Utils.Processes;
-using Phantom.Utils.Tasks;
 
 namespace Phantom.Agent.Minecraft.Instance;
 
@@ -9,24 +8,23 @@ public sealed class InstanceProcess : IDisposable {
 	
 	private readonly RingBuffer<string> outputBuffer = new (100);
 	private event EventHandler<string>? OutputEvent;
-	
+
 	public event EventHandler? Ended;
 	public bool HasEnded { get; private set; }
-	
+
 	private readonly Process process;
-	private readonly TaskCompletionSource processExited = AsyncTasks.CreateCompletionSource();
+
-	
 	internal InstanceProcess(InstanceProperties instanceProperties, Process process) {
 		this.InstanceProperties = instanceProperties;
 		this.process = process;
 		this.process.Exited += ProcessOnExited;
 		this.process.OutputReceived += ProcessOutputReceived;
 	}
-	
+
 	public async Task SendCommand(string command, CancellationToken cancellationToken) {
 		await process.StandardInput.WriteLineAsync(command.AsMemory(), cancellationToken);
 	}
-	
+
 	public void AddOutputListener(EventHandler<string> listener, uint maxLinesToReadFromHistory = uint.MaxValue) {
 		OutputEvent += listener;
 		
@@ -34,31 +32,32 @@ public sealed class InstanceProcess : IDisposable {
 			listener(this, line);
 		}
 	}
-	
+
 	public void RemoveOutputListener(EventHandler<string> listener) {
 		OutputEvent -= listener;
 	}
-	
+
 	private void ProcessOutputReceived(object? sender, Process.Output output) {
 		outputBuffer.Add(output.Line);
 		OutputEvent?.Invoke(this, output.Line);
 	}
-	
+
 	private void ProcessOnExited(object? sender, EventArgs e) {
 		OutputEvent = null;
 		HasEnded = true;
 		Ended?.Invoke(this, EventArgs.Empty);
-		processExited.SetResult();
 	}
-	
+
 	public void Kill() {
 		process.Kill(true);
 	}
-	
+
-	public async Task WaitForExit(TimeSpan timeout) {
+	public async Task WaitForExit(CancellationToken cancellationToken) {
-		await processExited.Task.WaitAsync(timeout);
+		if (!HasEnded) {
+			await process.WaitForExitAsync(cancellationToken);
+		}
 	}
-	
+
 	public void Dispose() {
 		process.Dispose();
 		OutputEvent = null;

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) {
+	private async Task EditFromCopyOrCreate(string? sourceFilePath, string targetFilePath) {
-		await using var targetWriter = new JavaPropertiesStream.Writer(targetFilePath);
+		var properties = new JavaProperties();
-		
+
-		await targetWriter.WriteComment(comment, cancellationToken);
+		if (sourceFilePath != null) {
-		
+			// TODO replace with custom async parser
-		foreach ((string key, string value) in overriddenProperties) {
+			await using var sourceStream = new FileStream(sourceFilePath, FileMode.Open, FileAccess.Read, FileShare.Read);
-			await targetWriter.WriteProperty(key, value, cancellationToken);
+			properties.Load(sourceStream, Encoding);
+		}
+
+		foreach (var (key, value) in overriddenProperties) {
+			properties[key] = value;
+		}
+
+		await using var targetStream = new FileStream(targetFilePath, FileMode.Create, FileAccess.Write, FileShare.Read);
+		await using var targetWriter = new StreamWriter(targetStream, Encoding);
+
+		await targetWriter.WriteLineAsync("# Properties");
+
+		foreach (var (key, value) in properties) {
+			await WriteProperty(targetWriter, key, value);
 		}
 	}
-	
+
-	private async Task Edit(string sourceFilePath, string targetFilePath, string comment, CancellationToken cancellationToken) {
+	private static async Task WriteProperty(StreamWriter writer, string key, string value) {
-		using var sourceReader = new JavaPropertiesStream.Reader(sourceFilePath);
+		await WritePropertyComponent(writer, key, escapeSpaces: true);
-		await using var targetWriter = new JavaPropertiesStream.Writer(targetFilePath);
+		await writer.WriteAsync('=');
-		
+		await WritePropertyComponent(writer, value, escapeSpaces: false);
-		await targetWriter.WriteComment(comment, cancellationToken);
+		await writer.WriteLineAsync();
-		
+	}
-		var remainingOverriddenPropertyKeys = new HashSet<string>(overriddenProperties.Keys);
+
-		
+	private static async Task WritePropertyComponent(TextWriter writer, string component, bool escapeSpaces) {
-		await foreach ((string key, string value) in sourceReader.ReadProperties(cancellationToken)) {
+		for (int index = 0; index < component.Length; index++) {
-			if (remainingOverriddenPropertyKeys.Remove(key)) {
+			var c = component[index];
-				await targetWriter.WriteProperty(key, overriddenProperties[key], cancellationToken);
+			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;
 			}
-			else {
-				await targetWriter.WriteProperty(key, value, cancellationToken);
-			}
-		}
-		
-		foreach (string key in remainingOverriddenPropertyKeys) {
-			await targetWriter.WriteProperty(key, overriddenProperties[key], cancellationToken);
 		}
 	}
 }

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

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

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

@@ -1,47 +1,42 @@
 using System.Diagnostics;
-using System.Runtime.CompilerServices;
 using Phantom.Common.Data.Java;
-using Phantom.Utils.Collections;
+using Phantom.Common.Logging;
 using Phantom.Utils.IO;
-using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent.Minecraft.Java;
 
 public sealed class JavaRuntimeDiscovery {
 	private static readonly ILogger Logger = PhantomLogger.Create(nameof(JavaRuntimeDiscovery));
-	
+
 	public static string? GetSystemSearchPath() {
 		const string LinuxJavaPath = "/usr/lib/jvm";
-		
+
 		if (OperatingSystem.IsLinux() && Directory.Exists(LinuxJavaPath)) {
 			return LinuxJavaPath;
 		}
-		
+
 		return null;
 	}
-	
+
-	public static async Task<JavaRuntimeRepository> Scan(string folderPath, CancellationToken cancellationToken) {
+	public static IAsyncEnumerable<JavaRuntimeExecutable> Scan(string folderPath) {
-		var runtimes = await new JavaRuntimeDiscovery().ScanInternal(folderPath, cancellationToken).ToImmutableArrayAsync(cancellationToken);
+		return new JavaRuntimeDiscovery().ScanInternal(folderPath);
-		return new JavaRuntimeRepository(runtimes);
 	}
 	
 	private readonly Dictionary<string, int> duplicateDisplayNames = new ();
 	
-	private async IAsyncEnumerable<JavaRuntimeExecutable> ScanInternal(string folderPath, [EnumeratorCancellation] CancellationToken cancellationToken) {
+	private async IAsyncEnumerable<JavaRuntimeExecutable> ScanInternal(string folderPath) {
 		Logger.Information("Starting Java runtime scan in: {FolderPath}", folderPath);
-		
+
 		string javaExecutableName = OperatingSystem.IsWindows() ? "java.exe" : "java";
-		
+
 		foreach (var binFolderPath in Directory.EnumerateDirectories(Paths.ExpandTilde(folderPath), "bin", new EnumerationOptions {
 			MatchType = MatchType.Simple,
 			RecurseSubdirectories = true,
 			ReturnSpecialDirectories = false,
 			IgnoreInaccessible = true,
-			AttributesToSkip = FileAttributes.Hidden | FileAttributes.ReparsePoint | FileAttributes.System,
+			AttributesToSkip = FileAttributes.Hidden | FileAttributes.ReparsePoint | FileAttributes.System
 		}).Order()) {
-			cancellationToken.ThrowIfCancellationRequested();
-			
 			var javaExecutablePath = Paths.NormalizeSlashes(Path.Combine(binFolderPath, javaExecutableName));
 			
 			FileAttributes javaExecutableAttributes;
@@ -50,16 +45,16 @@ public sealed class JavaRuntimeDiscovery {
 			} catch (Exception) {
 				continue;
 			}
-			
+
 			if (javaExecutableAttributes.HasFlag(FileAttributes.ReparsePoint)) {
 				continue;
 			}
-			
+
 			Logger.Information("Found candidate Java executable: {JavaExecutablePath}", javaExecutablePath);
-			
+
 			JavaRuntime? foundRuntime;
 			try {
-				foundRuntime = await TryReadJavaRuntimeInformationFromProcess(javaExecutablePath, cancellationToken);
+				foundRuntime = await TryReadJavaRuntimeInformationFromProcess(javaExecutablePath);
 			} catch (OperationCanceledException) {
 				Logger.Error("Java process did not exit in time.");
 				continue;
@@ -67,18 +62,18 @@ public sealed class JavaRuntimeDiscovery {
 				Logger.Error(e, "Caught exception while reading Java version information.");
 				continue;
 			}
-			
+
 			if (foundRuntime == null) {
 				Logger.Error("Java executable did not output version information.");
 				continue;
 			}
-			
+
 			Logger.Information("Found Java {DisplayName} at: {Path}", foundRuntime.DisplayName, javaExecutablePath);
 			yield return new JavaRuntimeExecutable(javaExecutablePath, foundRuntime);
 		}
 	}
-	
+
-	private async Task<JavaRuntime?> TryReadJavaRuntimeInformationFromProcess(string javaExecutablePath, CancellationToken cancellationToken) {
+	private async Task<JavaRuntime?> TryReadJavaRuntimeInformationFromProcess(string javaExecutablePath) {
 		var startInfo = new ProcessStartInfo {
 			FileName = javaExecutablePath,
 			WorkingDirectory = Path.GetDirectoryName(javaExecutablePath),
@@ -86,39 +81,42 @@ public sealed class JavaRuntimeDiscovery {
 			RedirectStandardInput = false,
 			RedirectStandardOutput = false,
 			RedirectStandardError = true,
-			UseShellExecute = false,
+			UseShellExecute = false
 		};
-		
+
-		using var timeoutCancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
+		var process = new Process { StartInfo = startInfo };
-		using var combinedCancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(timeoutCancellationTokenSource.Token, cancellationToken);
+		var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-		
+
-		using var process = new Process();
+		try {
-		process.StartInfo = startInfo;
+			process.Start();
-		process.Start();
+
-		
+			JavaRuntimeBuilder runtimeBuilder = new ();
-		JavaRuntimeBuilder runtimeBuilder = new ();
+
-		
+			while (await process.StandardError.ReadLineAsync(cancellationTokenSource.Token) is {} line) {
-		while (await process.StandardError.ReadLineAsync(combinedCancellationTokenSource.Token) is {} line) {
+				ExtractJavaVersionPropertiesFromLine(line, runtimeBuilder);
-			ExtractJavaVersionPropertiesFromLine(line, runtimeBuilder);
+				
-			
+				JavaRuntime? runtime = runtimeBuilder.TryBuild(duplicateDisplayNames);
-			JavaRuntime? runtime = runtimeBuilder.TryBuild(duplicateDisplayNames);
+				if (runtime != null) {
-			if (runtime != null) {
+					return runtime;
-				return runtime;
+				}
 			}
+
+			await process.WaitForExitAsync(cancellationTokenSource.Token);
+			return null;
+		} finally {
+			process.Dispose();
+			cancellationTokenSource.Dispose();
 		}
-		
-		await process.WaitForExitAsync(combinedCancellationTokenSource.Token);
-		return null;
 	}
-	
+
 	private static void ExtractJavaVersionPropertiesFromLine(ReadOnlySpan<char> line, JavaRuntimeBuilder runtimeBuilder) {
 		line = line.TrimStart();
-		
+
 		int separatorIndex = line.IndexOf('=');
 		if (separatorIndex == -1) {
 			return;
 		}
-		
+
 		var propertyName = line[..separatorIndex].TrimEnd();
 		if (propertyName.Equals("java.specification.version", StringComparison.Ordinal)) {
 			runtimeBuilder.MainVersion = ExtractValue(line, separatorIndex);
@@ -130,16 +128,16 @@ public sealed class JavaRuntimeDiscovery {
 			runtimeBuilder.Vendor = ExtractValue(line, separatorIndex);
 		}
 	}
-	
+
 	private static string ExtractValue(ReadOnlySpan<char> line, int separatorIndex) {
 		return line[(separatorIndex + 1)..].Trim().ToString();
 	}
-	
+
 	private sealed class JavaRuntimeBuilder {
 		public string? MainVersion { get; set; } = null;
 		public string? FullVersion { get; set; } = null;
 		public string? Vendor { get; set; } = null;
-		
+
 		public JavaRuntime? TryBuild(Dictionary<string, int> duplicateDisplayNames) {
 			if (MainVersion == null || FullVersion == null || Vendor == null) {
 				return null;

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

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

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

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

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

@@ -2,22 +2,27 @@
 
 namespace Phantom.Agent.Minecraft.Java;
 
-sealed class JvmArgumentBuilder(JvmProperties basicProperties) {
+sealed class JvmArgumentBuilder {
-	private readonly List<string> customArguments = [];
+	private readonly JvmProperties basicProperties;
-	
+	private readonly List<string> customArguments = new ();
+
+	public JvmArgumentBuilder(JvmProperties basicProperties) {
+		this.basicProperties = basicProperties;
+	}
+
 	public void Add(string argument) {
 		customArguments.Add(argument);
 	}
-	
+
 	public void AddProperty(string key, string value) {
 		customArguments.Add("-D" + key + "=\"" + value + "\""); // TODO test quoting?
 	}
-	
+
 	public void Build(Collection<string> target) {
 		foreach (var property in customArguments) {
 			target.Add(property);
 		}
-		
+
 		// In case of duplicate JVM arguments, typically the last one wins.
 		target.Add("-Xms" + basicProperties.InitialHeapMegabytes + "M");
 		target.Add("-Xmx" + basicProperties.MaximumHeapMegabytes + "M");

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

@@ -9,23 +9,23 @@ namespace Phantom.Agent.Minecraft.Launcher;
 
 public abstract class BaseLauncher : IServerLauncher {
 	private readonly InstanceProperties instanceProperties;
-	
+
 	protected string MinecraftVersion => instanceProperties.ServerVersion;
-	
+
 	private protected BaseLauncher(InstanceProperties instanceProperties) {
 		this.instanceProperties = instanceProperties;
 	}
-	
+
 	public async Task<LaunchResult> Launch(ILogger logger, LaunchServices services, EventHandler<DownloadProgressEventArgs> downloadProgressEventHandler, CancellationToken cancellationToken) {
 		if (!services.JavaRuntimeRepository.TryGetByGuid(instanceProperties.JavaRuntimeGuid, out var javaRuntimeExecutable)) {
 			return new LaunchResult.InvalidJavaRuntime();
 		}
-		
+
 		var vanillaServerJarPath = await services.ServerExecutables.DownloadAndGetPath(instanceProperties.LaunchProperties.ServerDownloadInfo, MinecraftVersion, downloadProgressEventHandler, cancellationToken);
 		if (vanillaServerJarPath == null) {
 			return new LaunchResult.CouldNotDownloadMinecraftServer();
 		}
-		
+
 		ServerJarInfo? serverJar;
 		try {
 			serverJar = await PrepareServerJar(logger, vanillaServerJarPath, cancellationToken);
@@ -35,15 +35,15 @@ public abstract class BaseLauncher : IServerLauncher {
 			logger.Error(e, "Caught exception while preparing the server jar.");
 			return new LaunchResult.CouldNotPrepareMinecraftServerLauncher();
 		}
-		
+
 		if (!File.Exists(serverJar.FilePath)) {
 			logger.Error("Missing prepared server or launcher jar: {FilePath}", serverJar.FilePath);
 			return new LaunchResult.CouldNotPrepareMinecraftServerLauncher();
 		}
-		
+
 		try {
 			await AcceptEula(instanceProperties);
-			await UpdateServerProperties(instanceProperties, 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;
@@ -61,10 +61,10 @@ public abstract class BaseLauncher : IServerLauncher {
 		processArguments.Add("-jar");
 		processArguments.Add(serverJar.FilePath);
 		processArguments.Add("nogui");
-		
+
 		var process = processConfigurator.CreateProcess();
 		var instanceProcess = new InstanceProcess(instanceProperties, process);
-		
+
 		try {
 			process.Start();
 		} catch (Exception launchException) {
@@ -75,42 +75,42 @@ public abstract class BaseLauncher : IServerLauncher {
 			} catch (Exception killException) {
 				logger.Error(killException, "Caught exception trying to kill the server process after a failed launch.");
 			}
-			
+
 			return new LaunchResult.CouldNotStartMinecraftServer();
 		}
-		
+
 		return new LaunchResult.Success(instanceProcess);
 	}
-	
+
 	private JvmArgumentBuilder PrepareJvmArguments(ServerJarInfo serverJar) {
 		var builder = new JvmArgumentBuilder(instanceProperties.JvmProperties);
-		
+
 		foreach (string argument in instanceProperties.JvmArguments) {
 			builder.Add(argument);
 		}
-		
+
 		foreach (var argument in serverJar.ExtraArgs) {
 			builder.Add(argument);
 		}
-		
+
 		CustomizeJvmArguments(builder);
 		return builder;
 	}
-	
+
 	private protected virtual void CustomizeJvmArguments(JvmArgumentBuilder arguments) {}
-	
+
 	private protected virtual Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
 		return Task.FromResult(new ServerJarInfo(serverJarPath));
 	}
-	
+
 	private static async Task AcceptEula(InstanceProperties instanceProperties) {
 		var eulaFilePath = Path.Combine(instanceProperties.InstanceFolder, "eula.txt");
-		await File.WriteAllLinesAsync(eulaFilePath, ["# 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/LaunchResult.cs

@@ -4,11 +4,11 @@ namespace Phantom.Agent.Minecraft.Launcher;
 
 public abstract record LaunchResult {
 	private LaunchResult() {}
-	
+
 	public sealed record Success(InstanceProcess Process) : LaunchResult;
-	
+
 	public sealed record InvalidJavaRuntime : LaunchResult;
-	
+
 	public sealed record CouldNotDownloadMinecraftServer : LaunchResult;
 	
 	public sealed record CouldNotPrepareMinecraftServerLauncher : LaunchResult;

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;
 
@@ -18,10 +19,10 @@ public sealed class FabricLauncher : BaseLauncher {
 		if (!File.Exists(launcherJarPath)) {
 			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) {
 		// TODO customizable loader version, probably with a dedicated temporary folder
 		string installerUrl = $"https://meta.fabricmc.net/v2/versions/loader/{MinecraftVersion}/stable/stable/server/jar";
@@ -41,7 +42,7 @@ public sealed class FabricLauncher : BaseLauncher {
 			throw;
 		}
 	}
-	
+
 	private static void TryDeleteLauncherAfterFailure(ILogger logger, string filePath) {
 		if (File.Exists(filePath)) {
 			try {

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

@@ -6,13 +6,13 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <InternalsVisibleTo Include="Phantom.Agent.Minecraft.Tests" />
+    <PackageReference Include="Kajabity.Tools.Java" />
   </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" />
+    <ProjectReference Include="..\..\Common\Phantom.Common.Logging\Phantom.Common.Logging.csproj" />
     <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -14,9 +14,8 @@ static class MinecraftServerProperties {
 		protected override ushort Read(string value) => ushort.Parse(value);
 		protected override string Write(ushort value) => value.ToString();
 	}
-	
+
 	public static readonly MinecraftServerProperty<ushort> ServerPort = new UnsignedShort("server-port");
 	public static readonly MinecraftServerProperty<ushort> RconPort = new UnsignedShort("rcon.port");
 	public static readonly MinecraftServerProperty<bool> EnableRcon = new Boolean("enable-rcon");
-	public static readonly MinecraftServerProperty<bool> SyncChunkWrites = new Boolean("sync-chunk-writes");
 }

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

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

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

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

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

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

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

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

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

@@ -3,12 +3,28 @@ using System.Buffers.Binary;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using Phantom.Common.Data.Instance;
+using Phantom.Common.Logging;
+using Serilog;
 
 namespace Phantom.Agent.Minecraft.Server;
 
-public static class ServerStatusProtocol {
+public sealed class ServerStatusProtocol {
-	public static async Task<InstancePlayerCounts> GetPlayerCounts(ushort serverPort, CancellationToken cancellationToken) {
+	private readonly ILogger logger;
+
+	public ServerStatusProtocol(string loggerName) {
+		this.logger = PhantomLogger.Create<ServerStatusProtocol>(loggerName);
+	}
+
+	public async Task<int?> GetOnlinePlayerCount(int serverPort, CancellationToken cancellationToken) {
+		try {
+			return await GetOnlinePlayerCountOrThrow(serverPort, cancellationToken);
+		} catch (Exception e) {
+			logger.Error(e, "Caught exception while checking if players are online.");
+			return null;
+		}
+	}
+
+	private async Task<int?> GetOnlinePlayerCountOrThrow(int serverPort, CancellationToken cancellationToken) {
 		using var tcpClient = new TcpClient();
 		await tcpClient.ConnectAsync(IPAddress.Loopback, serverPort, cancellationToken);
 		var tcpStream = tcpClient.GetStream();
@@ -16,23 +32,25 @@ public static class ServerStatusProtocol {
 		// https://wiki.vg/Server_List_Ping
 		tcpStream.WriteByte(0xFE);
 		await tcpStream.FlushAsync(cancellationToken);
-		
+
-		short messageLength = await ReadStreamHeader(tcpStream, cancellationToken);
+		short? messageLength = await ReadStreamHeader(tcpStream, cancellationToken);
-		return await ReadPlayerCounts(tcpStream, messageLength * 2, cancellationToken);
+		return messageLength == null ? null : await ReadOnlinePlayerCount(tcpStream, messageLength.Value * 2, cancellationToken);
 	}
-	
+
-	private static async Task<short> ReadStreamHeader(NetworkStream tcpStream, CancellationToken cancellationToken) {
+	private 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]);
+				logger.Error("Unexpected first byte in response from server: {FirstByte}.", headerBuffer[0]);
+				return null;
 			}
-			
+
 			short messageLength = BinaryPrimitives.ReadInt16BigEndian(headerBuffer.AsSpan(1));
 			if (messageLength <= 0) {
-				throw new ProtocolException("Unexpected message length in response from server: " + messageLength);
+				logger.Error("Unexpected message length in response from server: {MessageLength}.", messageLength);
+				return null;
 			}
 			
 			return messageLength;
@@ -40,55 +58,36 @@ public static class ServerStatusProtocol {
 			ArrayPool<byte>.Shared.Return(headerBuffer);
 		}
 	}
-	
+
-	private static async Task<InstancePlayerCounts> ReadPlayerCounts(NetworkStream tcpStream, int messageLength, CancellationToken cancellationToken) {
+	private async Task<int?> ReadOnlinePlayerCount(NetworkStream tcpStream, int messageLength, CancellationToken cancellationToken) {
 		var messageBuffer = ArrayPool<byte>.Shared.Rent(messageLength);
 		try {
-			await tcpStream.ReadExactlyAsync(messageBuffer, offset: 0, messageLength, cancellationToken);
+			await tcpStream.ReadExactlyAsync(messageBuffer, 0, messageLength, cancellationToken);
-			return ReadPlayerCountsFromResponse(messageBuffer.AsSpan(start: 0, messageLength));
+
+			// Valid response separator encoded in UTF-16BE is 0x00 0xA7 (§).
+			const byte SeparatorSecondByte = 0xA7;
+			
+			static bool IsValidSeparator(ReadOnlySpan<byte> buffer, int index) {
+				return index > 0 && buffer[index - 1] == 0x00;
+			}
+			
+			int separator2 = Array.LastIndexOf(messageBuffer, SeparatorSecondByte);
+			int separator1 = separator2 == -1 ? -1 : Array.LastIndexOf(messageBuffer, SeparatorSecondByte, separator2 - 1);
+			if (!IsValidSeparator(messageBuffer, separator1) || !IsValidSeparator(messageBuffer, separator2)) {
+				logger.Error("Could not find message separators in response from server.");
+				return null;
+			}
+
+			string onlinePlayerCountStr = Encoding.BigEndianUnicode.GetString(messageBuffer.AsSpan((separator1 + 1)..(separator2 - 1)));
+			if (!int.TryParse(onlinePlayerCountStr, out int onlinePlayerCount)) {
+				logger.Error("Could not parse online player count in response from server: {OnlinePlayerCount}.", onlinePlayerCountStr);
+				return null;
+			}
+			
+			logger.Debug("Detected {OnlinePlayerCount} online player(s).", onlinePlayerCount);
+			return onlinePlayerCount;
 		} finally {
 			ArrayPool<byte>.Shared.Return(messageBuffer);
 		}
 	}
-	
-	/// <summary>
-	/// Legacy query protocol uses the paragraph symbol (§) as separator encoded in UTF-16BE.
-	/// </summary>
-	private static readonly byte[] Separator = [0x00, 0xA7];
-	
-	private static InstancePlayerCounts ReadPlayerCountsFromResponse(ReadOnlySpan<byte> messageBuffer) {
-		int lastSeparator = messageBuffer.LastIndexOf(Separator);
-		int middleSeparator = messageBuffer[..lastSeparator].LastIndexOf(Separator);
-		
-		if (lastSeparator == -1 || middleSeparator == -1) {
-			throw new ProtocolException("Could not find message separators in response from server.");
-		}
-		
-		var onlinePlayerCountBuffer = messageBuffer[(middleSeparator + Separator.Length)..lastSeparator];
-		var maximumPlayerCountBuffer = messageBuffer[(lastSeparator + Separator.Length)..];
-		
-		// Player counts are integers, whose maximum string length is 10 characters.
-		Span<char> integerStringBuffer = stackalloc char[10];
-		
-		return new InstancePlayerCounts(
-			DecodeAndParsePlayerCount(onlinePlayerCountBuffer, integerStringBuffer, "online"),
-			DecodeAndParsePlayerCount(maximumPlayerCountBuffer, integerStringBuffer, "maximum")
-		);
-	}
-	
-	private static int DecodeAndParsePlayerCount(ReadOnlySpan<byte> inputBuffer, Span<char> tempCharBuffer, string countType) {
-		if (!Encoding.BigEndianUnicode.TryGetChars(inputBuffer, tempCharBuffer, out int charCount)) {
-			throw new ProtocolException("Could not decode " + countType + " player count in response from server.");
-		}
-		
-		if (!int.TryParse(tempCharBuffer, out int playerCount)) {
-			throw new ProtocolException("Could not parse " + countType + " player count in response from server: " + tempCharBuffer[..charCount].ToString());
-		}
-		
-		return playerCount;
-	}
-	
-	public sealed class ProtocolException : Exception {
-		internal ProtocolException(string message) : base(message) {}
-	}
 }

Agent/Phantom.Agent.Rpc/ControllerConnection.cs

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

Agent/Phantom.Agent.Rpc/KeepAliveLoop.cs

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

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

@@ -6,11 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Akka" />
+    <ProjectReference Include="..\..\Common\Phantom.Common.Messages.Agent\Phantom.Common.Messages.Agent.csproj" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" />
   </ItemGroup>
 
 </Project>

Agent/Phantom.Agent.Rpc/RpcClientRuntime.cs

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

Agent/Phantom.Agent.Services/AgentFolders.cs

@@ -1,21 +1,21 @@
-using Phantom.Utils.IO;
+using Phantom.Common.Logging;
-using Phantom.Utils.Logging;
+using Phantom.Utils.IO;
 using Serilog;
 
 namespace Phantom.Agent.Services;
 
 public sealed class AgentFolders {
 	private static readonly ILogger Logger = PhantomLogger.Create<AgentFolders>();
-	
+
 	public string DataFolderPath { get; }
 	public string InstancesFolderPath { get; }
 	public string BackupsFolderPath { get; }
-	
+
 	public string TemporaryFolderPath { get; }
 	public string ServerExecutableFolderPath { get; }
-	
+
 	public string JavaSearchFolderPath { get; }
-	
+
 	public AgentFolders(string dataFolderPath, string temporaryFolderPath, string javaSearchFolderPath) {
 		this.DataFolderPath = Path.GetFullPath(dataFolderPath);
 		this.InstancesFolderPath = Path.Combine(DataFolderPath, "instances");
@@ -26,7 +26,7 @@ public sealed class AgentFolders {
 		
 		this.JavaSearchFolderPath = javaSearchFolderPath;
 	}
-	
+
 	public bool TryCreate() {
 		return TryCreateFolder(DataFolderPath) &&
 		       TryCreateFolder(InstancesFolderPath) &&
@@ -34,12 +34,12 @@ public sealed class AgentFolders {
 		       TryCreateFolder(TemporaryFolderPath) &&
 		       TryCreateFolder(ServerExecutableFolderPath);
 	}
-	
+
 	private static bool TryCreateFolder(string folderPath) {
 		if (Directory.Exists(folderPath)) {
 			return true;
 		}
-		
+
 		try {
 			Directories.Create(folderPath, Chmod.URWX_GRX);
 			return true;

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,11 +1,10 @@
-using Akka.Actor;
+using Phantom.Agent.Minecraft.Java;
-using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Rpc;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances;
-using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
-using Phantom.Utils.Actor;
+using Phantom.Common.Logging;
-using Phantom.Utils.Logging;
+using Phantom.Utils.Tasks;
 using Serilog;
 
 namespace Phantom.Agent.Services;
@@ -13,39 +12,35 @@ namespace Phantom.Agent.Services;
 public sealed class AgentServices {
 	private static readonly ILogger Logger = PhantomLogger.Create<AgentServices>();
 	
-	public ActorSystem ActorSystem { get; }
+	private AgentFolders AgentFolders { get; }
-	
+	private TaskManager TaskManager { get; }
-	private AgentState AgentState { get; }
 	private BackupManager BackupManager { get; }
-	
+
 	internal JavaRuntimeRepository JavaRuntimeRepository { get; }
-	internal InstanceTicketManager InstanceTicketManager { get; }
+	internal InstanceSessionManager InstanceSessionManager { get; }
-	internal ActorRef<InstanceManagerActor.ICommand> InstanceManager { get; }
+
-	
+	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders, AgentServiceConfiguration serviceConfiguration, ControllerConnection controllerConnection) {
-	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders, AgentServiceConfiguration serviceConfiguration, ControllerConnection controllerConnection, JavaRuntimeRepository javaRuntimeRepository) {
+		this.AgentFolders = agentFolders;
-		this.ActorSystem = ActorSystemFactory.Create("Agent");
+		this.TaskManager = new TaskManager(PhantomLogger.Create<TaskManager, AgentServices>());
-		
-		this.AgentState = new AgentState();
 		this.BackupManager = new BackupManager(agentFolders, serviceConfiguration.MaxConcurrentCompressionTasks);
-		
+		this.JavaRuntimeRepository = new JavaRuntimeRepository();
-		this.JavaRuntimeRepository = javaRuntimeRepository;
+		this.InstanceSessionManager = new InstanceSessionManager(controllerConnection, agentInfo, agentFolders, JavaRuntimeRepository, TaskManager, BackupManager);
-		this.InstanceTicketManager = new InstanceTicketManager(agentInfo, controllerConnection);
-		
-		var instanceManagerInit = new InstanceManagerActor.Init(controllerConnection, agentFolders, AgentState, JavaRuntimeRepository, InstanceTicketManager, BackupManager);
-		this.InstanceManager = ActorSystem.ActorOf(InstanceManagerActor.Factory(instanceManagerInit), "InstanceManager");
 	}
-	
+
+	public async Task Initialize() {
+		await foreach (var runtime in JavaRuntimeDiscovery.Scan(AgentFolders.JavaSearchFolderPath)) {
+			JavaRuntimeRepository.Include(runtime);
+		}
+	}
+
 	public async Task Shutdown() {
 		Logger.Information("Stopping services...");
 		
-		await InstanceManager.Stop(new InstanceManagerActor.ShutdownCommand());
+		await InstanceSessionManager.DisposeAsync();
-		await InstanceTicketManager.Shutdown();
+		await TaskManager.Stop();
 		
 		BackupManager.Dispose();
 		
-		await ActorSystem.Terminate();
-		ActorSystem.Dispose();
-		
 		Logger.Information("Services stopped.");
 	}
 }

Agent/Phantom.Agent.Services/AgentState.cs

@@ -1,15 +0,0 @@
-using System.Collections.Immutable;
-using Phantom.Agent.Services.Instances;
-using Phantom.Utils.Actor.Event;
-
-namespace Phantom.Agent.Services;
-
-sealed class AgentState {
-	private readonly ObservableState<ImmutableDictionary<Guid, Instance>> instancesByGuid = new (ImmutableDictionary<Guid, Instance>.Empty);
-	
-	public ImmutableDictionary<Guid, Instance> InstancesByGuid => instancesByGuid.State;
-	
-	public void UpdateInstance(Instance instance) {
-		instancesByGuid.PublisherSide.Publish(static (instancesByGuid, instance) => instancesByGuid.SetItem(instance.InstanceGuid, instance), instance);
-	}
-}

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

@@ -3,8 +3,8 @@ using System.Diagnostics.CodeAnalysis;
 using System.Formats.Tar;
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Common.Data.Backups;
+using Phantom.Common.Logging;
 using Phantom.Utils.IO;
-using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent.Services.Backups;
@@ -23,7 +23,7 @@ sealed class BackupArchiver {
 		this.instanceProperties = instanceProperties;
 		this.cancellationToken = cancellationToken;
 	}
-	
+
 	private bool IsFolderSkipped(ImmutableList<string> relativePath) {
 		return relativePath is ["cache" or "crash-reports" or "debug" or "libraries" or "logs" or "mods" or "versions"];
 	}
@@ -35,7 +35,7 @@ sealed class BackupArchiver {
 		if (relativePath.Count == 2 && name == "session.lock") {
 			return true;
 		}
-		
+
 		var extension = Path.GetExtension(name);
 		if (extension is ".jar" or ".zip") {
 			return true;
@@ -43,7 +43,7 @@ sealed class BackupArchiver {
 		
 		return false;
 	}
-	
+
 	public async Task<string?> ArchiveWorld(BackupCreationResult.Builder resultBuilder) {
 		string guid = instanceProperties.InstanceGuid.ToString();
 		string currentDateTime = DateTime.Now.ToString("yyyyMMdd-HHmmss");
@@ -63,7 +63,7 @@ sealed class BackupArchiver {
 			logger.Error(e, "Could not create backup folder: {Folder}", backupFolderPath);
 			return null;
 		}
-		
+
 		string temporaryFolderPath = Path.Combine(temporaryBasePath, guid + "_" + currentDateTime);
 		if (!await CopyWorldAndCreateTarArchive(temporaryFolderPath, backupFilePath, resultBuilder)) {
 			return null;
@@ -72,19 +72,19 @@ sealed class BackupArchiver {
 		logger.Debug("Created world backup: {FilePath}", backupFilePath);
 		return backupFilePath;
 	}
-	
+
 	private async Task<bool> CopyWorldAndCreateTarArchive(string temporaryFolderPath, string backupFilePath, BackupCreationResult.Builder resultBuilder) {
 		try {
 			if (!await CopyWorldToTemporaryFolder(temporaryFolderPath)) {
 				resultBuilder.Kind = BackupCreationResultKind.CouldNotCopyWorldToTemporaryFolder;
 				return false;
 			}
-			
+
 			if (!await CreateTarArchive(temporaryFolderPath, backupFilePath)) {
 				resultBuilder.Kind = BackupCreationResultKind.CouldNotCreateWorldArchive;
 				return false;
 			}
-			
+
 			return true;
 		} finally {
 			try {
@@ -95,7 +95,7 @@ sealed class BackupArchiver {
 			}
 		}
 	}
-	
+
 	private async Task<bool> CopyWorldToTemporaryFolder(string temporaryFolderPath) {
 		try {
 			await CopyDirectory(new DirectoryInfo(instanceProperties.InstanceFolder), temporaryFolderPath, ImmutableList<string>.Empty);
@@ -105,10 +105,10 @@ sealed class BackupArchiver {
 			return false;
 		}
 	}
-	
+
 	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.");
@@ -116,7 +116,7 @@ sealed class BackupArchiver {
 			return false;
 		}
 	}
-	
+
 	private void DeleteBrokenArchiveFile(string filePath) {
 		if (File.Exists(filePath)) {
 			try {
@@ -126,38 +126,38 @@ sealed class BackupArchiver {
 			}
 		}
 	}
-	
+
 	private async Task CopyDirectory(DirectoryInfo sourceFolder, string destinationFolderPath, ImmutableList<string> relativePath) {
 		cancellationToken.ThrowIfCancellationRequested();
-		
+
 		bool needsToCreateFolder = true;
 		
 		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;
 			}
-			
+
 			if (needsToCreateFolder) {
 				needsToCreateFolder = false;
 				Directories.Create(destinationFolderPath, Chmod.URWX);
 			}
-			
+
 			await CopyFileWithRetries(file, destinationFolderPath);
 		}
-		
+
 		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;
 			}
 			
 			await CopyDirectory(directory, Path.Join(destinationFolderPath, directory.Name), folderPath);
 		}
 	}
-	
+
 	private async Task CopyFileWithRetries(FileInfo sourceFile, string destinationFolderPath) {
 		var destinationFilePath = Path.Combine(destinationFolderPath, sourceFile.Name);
 		
@@ -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

@@ -1,4 +1,4 @@
-using Phantom.Utils.Logging;
+using Phantom.Common.Logging;
 using Phantom.Utils.Processes;
 using Serilog;
 
@@ -19,27 +19,27 @@ static class BackupCompressor {
 		}
 		
 		var destinationFilePath = sourceFilePath + ".zst";
-		
+
 		if (!await TryCompressFile(sourceFilePath, destinationFilePath, cancellationToken)) {
 			try {
 				File.Delete(destinationFilePath);
 			} catch (Exception e) {
 				Logger.Error(e, "Could not delete compresed archive after unsuccessful compression: {Path}", destinationFilePath);
 			}
-			
+
 			return null;
 		}
-		
+
 		return destinationFilePath;
 	}
-	
+
 	private static async Task<bool> TryCompressFile(string sourceFilePath, string destinationFilePath, CancellationToken cancellationToken) {
 		var workingDirectory = Path.GetDirectoryName(sourceFilePath);
 		if (string.IsNullOrEmpty(workingDirectory)) {
 			Logger.Error("Invalid destination path: {Path}", destinationFilePath);
 			return false;
 		}
-		
+
 		var launcher = new ProcessConfigurator {
 			FileName = "zstd",
 			WorkingDirectory = workingDirectory,
@@ -50,16 +50,16 @@ static class BackupCompressor {
 				"--rm",
 				"--no-progress",
 				"-o", destinationFilePath,
-				"--", sourceFilePath,
+				"--", sourceFilePath
-			},
+			}
 		};
-		
+
 		static void OnZstdOutput(object? sender, Process.Output output) {
 			if (!string.IsNullOrWhiteSpace(output.Line)) {
 				ZstdLogger.Debug("[Output] {Line}", output.Line);
 			}
 		}
-		
+
 		var process = new OneShotProcess(ZstdLogger, launcher);
 		process.OutputReceived += OnZstdOutput;
 		return await process.Run(cancellationToken);

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

@@ -1,6 +1,6 @@
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Common.Data.Backups;
-using Phantom.Utils.Logging;
+using Phantom.Common.Logging;
 using Serilog;
 
 namespace Phantom.Agent.Services.Backups;
@@ -9,28 +9,28 @@ sealed class BackupManager : IDisposable {
 	private readonly string destinationBasePath;
 	private readonly string temporaryBasePath;
 	private readonly SemaphoreSlim compressionSemaphore;
-	
+
 	public BackupManager(AgentFolders agentFolders, int maxConcurrentCompressionTasks) {
 		this.destinationBasePath = agentFolders.BackupsFolderPath;
 		this.temporaryBasePath = Path.Combine(agentFolders.TemporaryFolderPath, "backups");
 		this.compressionSemaphore = new SemaphoreSlim(maxConcurrentCompressionTasks, maxConcurrentCompressionTasks);
 	}
-	
+
 	public Task<BackupCreationResult> CreateBackup(string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
 		return new BackupCreator(this, loggerName, process, cancellationToken).CreateBackup();
 	}
-	
+
 	public void Dispose() {
 		compressionSemaphore.Dispose();
 	}
-	
+
 	private sealed class BackupCreator {
 		private readonly BackupManager manager;
 		private readonly string loggerName;
 		private readonly ILogger logger;
 		private readonly InstanceProcess process;
 		private readonly CancellationToken cancellationToken;
-		
+
 		public BackupCreator(BackupManager manager, string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
 			this.manager = manager;
 			this.loggerName = loggerName;
@@ -38,7 +38,7 @@ sealed class BackupManager : IDisposable {
 			this.process = process;
 			this.cancellationToken = cancellationToken;
 		}
-		
+
 		public async Task<BackupCreationResult> CreateBackup() {
 			logger.Information("Backup started.");
 			
@@ -57,7 +57,7 @@ sealed class BackupManager : IDisposable {
 			LogBackupResult(result);
 			return result;
 		}
-		
+
 		private async Task<string?> CreateWorldArchive(BackupServerCommandDispatcher dispatcher, BackupCreationResult.Builder resultBuilder) {
 			try {
 				await dispatcher.DisableAutomaticSaving();
@@ -67,10 +67,6 @@ sealed class BackupManager : IDisposable {
 				resultBuilder.Kind = BackupCreationResultKind.BackupCancelled;
 				logger.Warning("Backup creation was cancelled.");
 				return null;
-			} catch (TimeoutException) {
-				resultBuilder.Kind = BackupCreationResultKind.BackupTimedOut;
-				logger.Warning("Backup creation timed out.");
-				return null;
 			} catch (Exception e) {
 				resultBuilder.Kind = BackupCreationResultKind.UnknownError;
 				logger.Error(e, "Caught exception while creating an instance backup.");
@@ -80,9 +76,6 @@ sealed class BackupManager : IDisposable {
 					await dispatcher.EnableAutomaticSaving();
 				} catch (OperationCanceledException) {
 					// Ignore.
-				} catch (TimeoutException) {
-					resultBuilder.Warnings |= BackupCreationWarnings.CouldNotRestoreAutomaticSaving;
-					logger.Warning("Timed out waiting for automatic saving to be re-enabled.");
 				} catch (Exception e) {
 					resultBuilder.Warnings |= BackupCreationWarnings.CouldNotRestoreAutomaticSaving;
 					logger.Error(e, "Caught exception while enabling automatic saving after creating an instance backup.");
@@ -95,7 +88,7 @@ sealed class BackupManager : IDisposable {
 				logger.Information("Too many compression tasks running, waiting for one of them to complete...");
 				await manager.compressionSemaphore.WaitAsync(cancellationToken);
 			}
-			
+
 			logger.Information("Compressing backup...");
 			try {
 				var compressedFilePath = await BackupCompressor.Compress(filePath, cancellationToken);
@@ -106,7 +99,7 @@ sealed class BackupManager : IDisposable {
 				manager.compressionSemaphore.Release();
 			}
 		}
-		
+
 		private void LogBackupResult(BackupCreationResult result) {
 			if (result.Kind != BackupCreationResultKind.Success) {
 				logger.Warning("Backup failed: {Reason}", DescribeResult(result.Kind));
@@ -121,19 +114,18 @@ sealed class BackupManager : IDisposable {
 				logger.Information("Backup finished successfully.");
 			}
 		}
-		
+
 		private static string DescribeResult(BackupCreationResultKind kind) {
 			return kind switch {
 				BackupCreationResultKind.Success                            => "Backup created successfully.",
 				BackupCreationResultKind.InstanceNotRunning                 => "Instance is not running.",
 				BackupCreationResultKind.BackupCancelled                    => "Backup cancelled.",
-				BackupCreationResultKind.BackupTimedOut                     => "Backup timed out.",
 				BackupCreationResultKind.BackupAlreadyRunning               => "A backup is already being created.",
 				BackupCreationResultKind.BackupFileAlreadyExists            => "Backup with the same name already exists.",
 				BackupCreationResultKind.CouldNotCreateBackupFolder         => "Could not create backup folder.",
 				BackupCreationResultKind.CouldNotCopyWorldToTemporaryFolder => "Could not copy world to temporary folder.",
 				BackupCreationResultKind.CouldNotCreateWorldArchive         => "Could not create world archive.",
-				_                                                           => "Unknown error.",
+				_                                                           => "Unknown error."
 			};
 		}
 	}

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

@@ -1,8 +1,11 @@
-using Phantom.Agent.Services.Instances;
+using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Services.Instances.State;
+using Phantom.Agent.Minecraft.Server;
+using Phantom.Agent.Services.Instances;
+using Phantom.Agent.Services.Instances.Procedures;
 using Phantom.Common.Data.Backups;
-using Phantom.Utils.Logging;
+using Phantom.Common.Logging;
 using Phantom.Utils.Tasks;
+using Phantom.Utils.Threading;
 
 namespace Phantom.Agent.Services.Backups;
 
@@ -11,26 +14,30 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 	private static readonly TimeSpan InitialDelay = TimeSpan.FromMinutes(2);
 	private static readonly TimeSpan BackupInterval = TimeSpan.FromMinutes(30);
 	private static readonly TimeSpan BackupFailureRetryDelay = TimeSpan.FromMinutes(5);
-	
+
 	private readonly BackupManager backupManager;
-	private readonly InstanceContext context;
+	private readonly InstanceProcess process;
-	private readonly SemaphoreSlim backupSemaphore = new (initialCount: 1, maxCount: 1);
+	private readonly IInstanceContext context;
+	private readonly SemaphoreSlim backupSemaphore = new (1, 1);
+	private readonly int serverPort;
+	private readonly ServerStatusProtocol serverStatusProtocol;
 	private readonly ManualResetEventSlim serverOutputWhileWaitingForOnlinePlayers = new ();
-	private readonly InstancePlayerCountTracker playerCountTracker;
 	
 	public event EventHandler<BackupCreationResult>? BackupCompleted;
-	
+
-	public BackupScheduler(InstanceContext context, InstancePlayerCountTracker playerCountTracker) : base(PhantomLogger.Create<BackupScheduler>(context.ShortName)) {
+	public BackupScheduler(TaskManager taskManager, BackupManager backupManager, InstanceProcess process, IInstanceContext context, int serverPort) : base(PhantomLogger.Create<BackupScheduler>(context.ShortName), taskManager, "Backup scheduler for " + context.ShortName) {
-		this.backupManager = context.Services.BackupManager;
+		this.backupManager = backupManager;
+		this.process = process;
 		this.context = context;
-		this.playerCountTracker = playerCountTracker;
+		this.serverPort = serverPort;
+		this.serverStatusProtocol = new ServerStatusProtocol(context.ShortName);
 		Start();
 	}
-	
+
 	protected override async Task RunTask() {
 		await Task.Delay(InitialDelay, CancellationToken);
 		Logger.Information("Starting a new backup after server launched.");
-		
+			
 		while (!CancellationToken.IsCancellationRequested) {
 			var result = await CreateBackup();
 			BackupCompleted?.Invoke(this, result);
@@ -46,38 +53,62 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 			}
 		}
 	}
-	
+
 	private async Task<BackupCreationResult> CreateBackup() {
 		if (!await backupSemaphore.WaitAsync(TimeSpan.FromSeconds(1))) {
 			return new BackupCreationResult(BackupCreationResultKind.BackupAlreadyRunning);
 		}
 		
 		try {
-			context.ActorCancellationToken.ThrowIfCancellationRequested();
+			var procedure = new BackupInstanceProcedure(backupManager);
-			return await context.Actor.Request(new InstanceActor.BackupInstanceCommand(backupManager), context.ActorCancellationToken);
+			context.EnqueueProcedure(procedure);
-		} catch (OperationCanceledException) {
+			return await procedure.Result;
-			return new BackupCreationResult(BackupCreationResultKind.InstanceNotRunning);
 		} finally {
 			backupSemaphore.Release();
 		}
 	}
-	
+
 	private async Task WaitForOnlinePlayers() {
-		var task = playerCountTracker.WaitForOnlinePlayers(CancellationToken);
+		bool needsToLogOfflinePlayersMessage = true;
-		if (!task.IsCompleted) {
-			Logger.Information("Waiting for someone to join before starting a new backup.");
-		}
 		
+		process.AddOutputListener(ServerOutputListener, maxLinesToReadFromHistory: 0);
 		try {
-			await task;
+			while (!CancellationToken.IsCancellationRequested) {
-			Logger.Information("Players are online, starting a new backup.");
+				serverOutputWhileWaitingForOnlinePlayers.Reset();
-		} catch (OperationCanceledException) {
+				
-			throw;
+				var onlinePlayerCount = await serverStatusProtocol.GetOnlinePlayerCount(serverPort, CancellationToken);
-		} catch (Exception) {
+				if (onlinePlayerCount == null) {
-			Logger.Warning("Could not detect whether any players are online, starting a new backup.");
+					Logger.Warning("Could not detect whether any players are online, starting a new backup.");
+					break;
+				}
+
+				if (onlinePlayerCount > 0) {
+					Logger.Information("Players are online, starting a new backup.");
+					break;
+				}
+
+				if (needsToLogOfflinePlayersMessage) {
+					needsToLogOfflinePlayersMessage = false;
+					Logger.Information("No players are online, waiting for someone to join before starting a new backup.");
+				}
+
+				await Task.Delay(TimeSpan.FromSeconds(10), CancellationToken);
+				
+				Logger.Debug("Waiting for server output before checking for online players again...");
+				await serverOutputWhileWaitingForOnlinePlayers.WaitHandle.WaitOneAsync(CancellationToken);
+			}
+		} finally {
+			process.RemoveOutputListener(ServerOutputListener);
 		}
 	}
-	
+
+	private void ServerOutputListener(object? sender, string line) {
+		if (!serverOutputWhileWaitingForOnlinePlayers.IsSet) {
+			serverOutputWhileWaitingForOnlinePlayers.Set();
+			Logger.Debug("Detected server output, signalling to check for online players again.");
+		}
+	}
+
 	protected override void Dispose() {
 		backupSemaphore.Dispose();
 		serverOutputWhileWaitingForOnlinePlayers.Dispose();

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

@@ -1,5 +1,4 @@
-using System.Collections.Immutable;
+using System.Text.RegularExpressions;
-using System.Text.RegularExpressions;
 using Phantom.Agent.Minecraft.Command;
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Utils.Tasks;
@@ -8,88 +7,71 @@ using Serilog;
 namespace Phantom.Agent.Services.Backups;
 
 sealed partial class BackupServerCommandDispatcher : IDisposable {
-	[GeneratedRegex(@"^(?:(?:\[.*?\] \[Server thread/INFO\].*?:)|(?:[\d-]+? [\d:]+? \[INFO\])) (.*?)$", RegexOptions.NonBacktracking)]
+	[GeneratedRegex(@"^\[(?:.*?)\] \[Server thread/INFO\]: (.*?)$", RegexOptions.NonBacktracking)]
 	private static partial Regex ServerThreadInfoRegex();
-	
+
-	private static readonly ImmutableHashSet<string> AutomaticSavingDisabledMessages = ImmutableHashSet.Create(
-		"Automatic saving is now disabled",
-		"Turned off world auto-saving",
-		"CONSOLE: Disabling level saving.."
-	);
-	
-	private static readonly ImmutableHashSet<string> SavedTheGameMessages = ImmutableHashSet.Create(
-		"Saved the game",
-		"Saved the world",
-		"CONSOLE: Save complete."
-	);
-	
-	private static readonly ImmutableHashSet<string> AutomaticSavingEnabledMessages = ImmutableHashSet.Create(
-		"Automatic saving is now enabled",
-		"Turned on world auto-saving",
-		"CONSOLE: Enabling level saving.."
-	);
-	
 	private readonly ILogger logger;
 	private readonly InstanceProcess process;
 	private readonly CancellationToken cancellationToken;
-	
+
 	private readonly TaskCompletionSource automaticSavingDisabled = AsyncTasks.CreateCompletionSource();
 	private readonly TaskCompletionSource savedTheGame = AsyncTasks.CreateCompletionSource();
 	private readonly TaskCompletionSource automaticSavingEnabled = AsyncTasks.CreateCompletionSource();
-	
+
 	public BackupServerCommandDispatcher(ILogger logger, InstanceProcess process, CancellationToken cancellationToken) {
 		this.logger = logger;
 		this.process = process;
 		this.cancellationToken = cancellationToken;
-		
+
 		this.process.AddOutputListener(OnOutput, maxLinesToReadFromHistory: 0);
 	}
-	
+
 	void IDisposable.Dispose() {
 		process.RemoveOutputListener(OnOutput);
 	}
-	
+
 	public async Task DisableAutomaticSaving() {
 		await process.SendCommand(MinecraftCommand.SaveOff, cancellationToken);
-		await automaticSavingDisabled.Task.WaitAsync(TimeSpan.FromSeconds(30), cancellationToken);
+		await automaticSavingDisabled.Task.WaitAsync(cancellationToken);
 	}
-	
+
 	public async Task SaveAllChunks() {
+		// TODO Try if not flushing and waiting a few seconds before flushing reduces lag.
 		await process.SendCommand(MinecraftCommand.SaveAll(flush: true), cancellationToken);
-		await savedTheGame.Task.WaitAsync(TimeSpan.FromMinutes(1), cancellationToken);
+		await savedTheGame.Task.WaitAsync(cancellationToken);
 	}
-	
+
 	public async Task EnableAutomaticSaving() {
 		await process.SendCommand(MinecraftCommand.SaveOn, cancellationToken);
-		await automaticSavingEnabled.Task.WaitAsync(TimeSpan.FromMinutes(1), cancellationToken);
+		await automaticSavingEnabled.Task.WaitAsync(cancellationToken);
 	}
-	
+
 	private void OnOutput(object? sender, string? line) {
 		if (line == null) {
 			return;
 		}
-		
+
 		var match = ServerThreadInfoRegex().Match(line);
 		if (!match.Success) {
 			return;
 		}
-		
+
 		string info = match.Groups[1].Value;
-		
+
 		if (!automaticSavingDisabled.Task.IsCompleted) {
-			if (AutomaticSavingDisabledMessages.Contains(info)) {
+			if (info == "Automatic saving is now disabled") {
 				logger.Debug("Detected that automatic saving is disabled.");
 				automaticSavingDisabled.SetResult();
 			}
 		}
 		else if (!savedTheGame.Task.IsCompleted) {
-			if (SavedTheGameMessages.Contains(info)) {
+			if (info == "Saved the game") {
 				logger.Debug("Detected that the game is saved.");
 				savedTheGame.SetResult();
 			}
 		}
 		else if (!automaticSavingEnabled.Task.IsCompleted) {
-			if (AutomaticSavingEnabledMessages.Contains(info)) {
+			if (info == "Automatic saving is now enabled") {
 				logger.Debug("Detected that automatic saving is enabled.");
 				automaticSavingEnabled.SetResult();
 			}

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

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

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

@@ -1,5 +1,187 @@
-using Phantom.Common.Data.Instance;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Services.Instances.Procedures;
+using Phantom.Agent.Services.Instances.States;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Minecraft;
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Logging;
+using Phantom.Common.Messages.Agent.ToController;
+using Serilog;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed record Instance(Guid InstanceGuid, IInstanceStatus Status);
+sealed class Instance : IAsyncDisposable {
+	private InstanceServices Services { get; }
+	
+	public InstanceConfiguration Configuration { get; private set; }
+	private IServerLauncher Launcher { get; set; }
+	private readonly SemaphoreSlim configurationSemaphore = new (1, 1);
+
+	private readonly string shortName;
+	private readonly ILogger logger;
+
+	private IInstanceStatus currentStatus;
+	private int statusUpdateCounter;
+	
+	private IInstanceState currentState;
+	public bool IsRunning => currentState is not InstanceNotRunningState;
+	
+	public event EventHandler? IsRunningChanged;
+	
+	private readonly InstanceProcedureManager procedureManager;
+
+	public Instance(string shortName, InstanceServices services, InstanceConfiguration configuration, IServerLauncher launcher) {
+		this.shortName = shortName;
+		this.logger = PhantomLogger.Create<Instance>(shortName);
+
+		this.Services = services;
+		this.Configuration = configuration;
+		this.Launcher = launcher;
+		
+		this.currentState = new InstanceNotRunningState();
+		this.currentStatus = InstanceStatus.NotRunning;
+		
+		this.procedureManager = new InstanceProcedureManager(this, new Context(this), services.TaskManager);
+	}
+
+	private void TryUpdateStatus(string taskName, Func<Task> getUpdateTask) {
+		int myStatusUpdateCounter = Interlocked.Increment(ref statusUpdateCounter);
+		
+		Services.TaskManager.Run(taskName, async () => {
+			if (myStatusUpdateCounter == statusUpdateCounter) {
+				await getUpdateTask();
+			}
+		});
+	}
+
+	public void ReportLastStatus() {
+		TryUpdateStatus("Report last status of instance " + shortName, async () => {
+			await Services.ControllerConnection.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, currentStatus));
+		});
+	}
+
+	private void ReportAndSetStatus(IInstanceStatus status) {
+		TryUpdateStatus("Report status of instance " + shortName + " as " + status.GetType().Name, async () => {
+			if (status != currentStatus) {
+				currentStatus = status;
+				await Services.ControllerConnection.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, status));
+			}
+		});
+	}
+
+	private void ReportEvent(IInstanceEvent instanceEvent) {
+		var message = new ReportInstanceEventMessage(Guid.NewGuid(), DateTime.UtcNow, Configuration.InstanceGuid, instanceEvent);
+		Services.TaskManager.Run("Report event for instance " + shortName, async () => await Services.ControllerConnection.Send(message));
+	}
+	
+	internal void TransitionState(IInstanceState newState) {
+		if (currentState == newState) {
+			return;
+		}
+
+		if (currentState is IDisposable disposable) {
+			disposable.Dispose();
+		}
+
+		logger.Debug("Transitioning instance state to: {NewState}", newState.GetType().Name);
+		
+		var wasRunning = IsRunning;
+		currentState = newState;
+		currentState.Initialize();
+
+		if (IsRunning != wasRunning) {
+			IsRunningChanged?.Invoke(this, EventArgs.Empty);
+		}
+	}
+
+	public async Task Reconfigure(InstanceConfiguration configuration, IServerLauncher launcher, CancellationToken cancellationToken) {
+		await configurationSemaphore.WaitAsync(cancellationToken);
+		try {
+			Configuration = configuration;
+			Launcher = launcher;
+		} finally {
+			configurationSemaphore.Release();
+		}
+	}
+
+	public async Task<LaunchInstanceResult> Launch(CancellationToken cancellationToken) {
+		if (IsRunning) {
+			return LaunchInstanceResult.InstanceAlreadyRunning;
+		}
+
+		if (await procedureManager.GetCurrentProcedure(cancellationToken) is LaunchInstanceProcedure) {
+			return LaunchInstanceResult.InstanceAlreadyLaunching;
+		}
+		
+		LaunchInstanceProcedure procedure;
+		
+		await configurationSemaphore.WaitAsync(cancellationToken);
+		try {
+			procedure = new LaunchInstanceProcedure(Configuration, Launcher);
+		} finally {
+			configurationSemaphore.Release();
+		}
+		
+		ReportAndSetStatus(InstanceStatus.Launching);
+		await procedureManager.Enqueue(procedure);
+		return LaunchInstanceResult.LaunchInitiated;
+	}
+
+	public async Task<StopInstanceResult> Stop(MinecraftStopStrategy stopStrategy, CancellationToken cancellationToken) {
+		if (!IsRunning) {
+			return StopInstanceResult.InstanceAlreadyStopped;
+		}
+		
+		if (await procedureManager.GetCurrentProcedure(cancellationToken) is StopInstanceProcedure) {
+			return StopInstanceResult.InstanceAlreadyStopping;
+		}
+		
+		ReportAndSetStatus(InstanceStatus.Stopping);
+		await procedureManager.Enqueue(new StopInstanceProcedure(stopStrategy));
+		return StopInstanceResult.StopInitiated;
+	}
+
+	public async Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
+		return await currentState.SendCommand(command, cancellationToken);
+	}
+
+	public async ValueTask DisposeAsync() {
+		await procedureManager.DisposeAsync();
+
+		while (currentState is not InstanceNotRunningState) {
+			await Task.Delay(TimeSpan.FromMilliseconds(250), CancellationToken.None);
+		}
+
+		if (currentState is IDisposable disposable) {
+			disposable.Dispose();
+		}
+		
+		configurationSemaphore.Dispose();
+	}
+
+	private sealed class Context : IInstanceContext {
+		public string ShortName => instance.shortName;
+		public ILogger Logger => instance.logger;
+		
+		public InstanceServices Services => instance.Services;
+		public IInstanceState CurrentState => instance.currentState;
+
+		private readonly Instance instance;
+		
+		public Context(Instance instance) {
+			this.instance = instance;
+		}
+
+		public void SetStatus(IInstanceStatus newStatus) {
+			instance.ReportAndSetStatus(newStatus);
+		}
+
+		public void ReportEvent(IInstanceEvent instanceEvent) {
+			instance.ReportEvent(instanceEvent);
+		}
+
+		public void EnqueueProcedure(IInstanceProcedure procedure, bool immediate) {
+			Services.TaskManager.Run("Enqueue procedure for instance " + instance.shortName, () => instance.procedureManager.Enqueue(procedure, immediate));
+		}
+	}
+}

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

@@ -1,174 +0,0 @@
-using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Instances.State;
-using Phantom.Agent.Services.Rpc;
-using Phantom.Common.Data.Backups;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-using Phantom.Common.Messages.Agent.ToController;
-using Phantom.Utils.Actor;
-using Phantom.Utils.Actor.Mailbox;
-using Phantom.Utils.Logging;
-
-namespace Phantom.Agent.Services.Instances;
-
-sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
-	public readonly record struct Init(AgentState AgentState, Guid InstanceGuid, string ShortName, InstanceServices InstanceServices, InstanceTicketManager InstanceTicketManager, CancellationToken ShutdownCancellationToken);
-	
-	public static Props<ICommand> Factory(Init init) {
-		return Props<ICommand>.Create(() => new InstanceActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume, MailboxType = UnboundedJumpAheadMailbox.Name });
-	}
-	
-	private readonly AgentState agentState;
-	private readonly CancellationToken shutdownCancellationToken;
-	
-	private readonly Guid instanceGuid;
-	private readonly InstanceTicketManager instanceTicketManager;
-	private readonly InstanceContext context;
-	
-	private readonly ControllerSendQueue<ReportInstanceStatusMessage> reportStatusQueue;
-	private readonly ControllerSendQueue<ReportInstanceEventMessage> reportEventsQueue;
-	
-	private readonly CancellationTokenSource actorCancellationTokenSource = new ();
-	
-	private IInstanceStatus currentStatus = InstanceStatus.NotRunning;
-	private InstanceRunningState? runningState = null;
-	
-	private InstanceActor(Init init) {
-		InstanceServices services = init.InstanceServices;
-		
-		this.agentState = init.AgentState;
-		this.instanceGuid = init.InstanceGuid;
-		this.instanceTicketManager = init.InstanceTicketManager;
-		this.shutdownCancellationToken = init.ShutdownCancellationToken;
-		
-		this.reportStatusQueue = new ControllerSendQueue<ReportInstanceStatusMessage>(services.ControllerConnection, init.ShortName + "-Status", capacity: 1, singleWriter: true);
-		this.reportEventsQueue = new ControllerSendQueue<ReportInstanceEventMessage>(services.ControllerConnection, init.ShortName + "-Events", capacity: 1000, singleWriter: true);
-		
-		var logger = PhantomLogger.Create<InstanceActor>(init.ShortName);
-		this.context = new InstanceContext(instanceGuid, init.ShortName, logger, services, reportEventsQueue, SelfTyped, actorCancellationTokenSource.Token);
-		
-		Receive<ReportInstanceStatusCommand>(ReportInstanceStatus);
-		ReceiveAsync<LaunchInstanceCommand>(LaunchInstance);
-		ReceiveAsync<StopInstanceCommand>(StopInstance);
-		ReceiveAsyncAndReply<SendCommandToInstanceCommand, SendCommandToInstanceResult>(SendCommandToInstance);
-		ReceiveAsyncAndReply<BackupInstanceCommand, BackupCreationResult>(BackupInstance);
-		Receive<HandleProcessEndedCommand>(HandleProcessEnded);
-		ReceiveAsync<ShutdownCommand>(Shutdown);
-	}
-	
-	private void SetAndReportStatus(IInstanceStatus status) {
-		currentStatus = status;
-		ReportCurrentStatus();
-	}
-	
-	private void ReportCurrentStatus() {
-		agentState.UpdateInstance(new Instance(instanceGuid, currentStatus));
-		reportStatusQueue.Enqueue(new ReportInstanceStatusMessage(instanceGuid, currentStatus));
-	}
-	
-	private void TransitionState(InstanceRunningState? newState) {
-		if (runningState == newState) {
-			return;
-		}
-		
-		runningState?.Dispose();
-		runningState = newState;
-		runningState?.Initialize();
-	}
-	
-	public interface ICommand;
-	
-	public sealed record ReportInstanceStatusCommand : ICommand;
-	
-	public sealed record LaunchInstanceCommand(InstanceConfiguration Configuration, IServerLauncher Launcher, InstanceTicketManager.Ticket Ticket, bool IsRestarting) : ICommand;
-	
-	public sealed record StopInstanceCommand(MinecraftStopStrategy StopStrategy) : ICommand;
-	
-	public sealed record SendCommandToInstanceCommand(string Command) : ICommand, ICanReply<SendCommandToInstanceResult>;
-	
-	public sealed record BackupInstanceCommand(BackupManager BackupManager) : ICommand, ICanReply<BackupCreationResult>;
-	
-	public sealed record HandleProcessEndedCommand(IInstanceStatus Status) : ICommand, IJumpAhead;
-	
-	public sealed record ShutdownCommand : ICommand;
-	
-	private void ReportInstanceStatus(ReportInstanceStatusCommand command) {
-		ReportCurrentStatus();
-	}
-	
-	private async Task LaunchInstance(LaunchInstanceCommand command) {
-		if (command.IsRestarting || runningState is null) {
-			SetAndReportStatus(command.IsRestarting ? InstanceStatus.Restarting : InstanceStatus.Launching);
-			
-			var newState = await InstanceLaunchProcedure.Run(context, command.Configuration, command.Launcher, instanceTicketManager, command.Ticket, SetAndReportStatus, shutdownCancellationToken);
-			if (newState is null) {
-				instanceTicketManager.Release(command.Ticket);
-			}
-			
-			TransitionState(newState);
-		}
-	}
-	
-	private async Task StopInstance(StopInstanceCommand command) {
-		if (runningState is null) {
-			return;
-		}
-		
-		IInstanceStatus oldStatus = currentStatus;
-		SetAndReportStatus(InstanceStatus.Stopping);
-		
-		if (await InstanceStopProcedure.Run(context, command.StopStrategy, runningState, SetAndReportStatus, shutdownCancellationToken)) {
-			instanceTicketManager.Release(runningState.Ticket);
-			TransitionState(null);
-		}
-		else {
-			SetAndReportStatus(oldStatus);
-		}
-	}
-	
-	private async Task<SendCommandToInstanceResult> SendCommandToInstance(SendCommandToInstanceCommand command) {
-		if (runningState is null) {
-			return SendCommandToInstanceResult.InstanceNotRunning;
-		}
-		else {
-			return await runningState.SendCommand(command.Command, shutdownCancellationToken);
-		}
-	}
-	
-	private async Task<BackupCreationResult> BackupInstance(BackupInstanceCommand command) {
-		if (runningState is null || runningState.Process.HasEnded) {
-			return new BackupCreationResult(BackupCreationResultKind.InstanceNotRunning);
-		}
-		else {
-			SetAndReportStatus(InstanceStatus.BackingUp);
-			try {
-				return await command.BackupManager.CreateBackup(context.ShortName, runningState.Process, shutdownCancellationToken);
-			} finally {
-				SetAndReportStatus(InstanceStatus.Running);
-			}
-		}
-	}
-	
-	private void HandleProcessEnded(HandleProcessEndedCommand command) {
-		if (runningState is { Process.HasEnded: true }) {
-			SetAndReportStatus(command.Status);
-			context.ReportEvent(InstanceEvent.Stopped);
-			instanceTicketManager.Release(runningState.Ticket);
-			TransitionState(null);
-		}
-	}
-	
-	private async Task Shutdown(ShutdownCommand command) {
-		await StopInstance(new StopInstanceCommand(MinecraftStopStrategy.Instant));
-		await actorCancellationTokenSource.CancelAsync();
-		
-		await Task.WhenAll(
-			reportStatusQueue.Shutdown(TimeSpan.FromSeconds(5)),
-			reportEventsQueue.Shutdown(TimeSpan.FromSeconds(5))
-		);
-		
-		Context.Stop(Self);
-	}
-}

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

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

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

@@ -1,29 +1,28 @@
 using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
 using System.Threading.Channels;
-using Phantom.Agent.Services.Rpc;
+using Phantom.Agent.Rpc;
+using Phantom.Common.Logging;
 using Phantom.Common.Messages.Agent.ToController;
-using Phantom.Utils.Logging;
 using Phantom.Utils.Tasks;
 
-namespace Phantom.Agent.Services.Instances.State;
+namespace Phantom.Agent.Services.Instances;
 
 sealed class InstanceLogSender : CancellableBackgroundTask {
-	private static readonly BoundedChannelOptions BufferOptions = new (capacity: 200) {
+	private static readonly BoundedChannelOptions BufferOptions = new (capacity: 64) {
 		SingleReader = true,
 		SingleWriter = true,
-		FullMode = BoundedChannelFullMode.DropNewest,
+		FullMode = BoundedChannelFullMode.DropNewest
 	};
 	
 	private static readonly TimeSpan SendDelay = TimeSpan.FromMilliseconds(200);
-	
+
 	private readonly ControllerConnection controllerConnection;
 	private readonly Guid instanceGuid;
 	private readonly Channel<string> outputChannel;
 	
 	private int droppedLinesSinceLastSend;
-	
+
-	public InstanceLogSender(ControllerConnection controllerConnection, Guid instanceGuid, string loggerName) : base(PhantomLogger.Create<InstanceLogSender>(loggerName)) {
+	public InstanceLogSender(ControllerConnection controllerConnection, TaskManager taskManager, Guid instanceGuid, string loggerName) : base(PhantomLogger.Create<InstanceLogSender>(loggerName), taskManager, "Instance log sender for " + loggerName) {
 		this.controllerConnection = controllerConnection;
 		this.instanceGuid = instanceGuid;
 		this.outputChannel = Channel.CreateBounded<string>(BufferOptions, OnLineDropped);
@@ -34,31 +33,19 @@ sealed class InstanceLogSender : CancellableBackgroundTask {
 		var lineReader = outputChannel.Reader;
 		var lineBuilder = ImmutableArray.CreateBuilder<string>();
 		
-		using var sendOutputCancellationTokenSource = new CancellationTokenSource();
-		
-		await using var sendOutputCancellationRegistration = CancellationToken.Register([SuppressMessage("ReSharper", "AccessToDisposedClosure")]() => {
-			sendOutputCancellationTokenSource.CancelAfter(TimeSpan.FromSeconds(10));
-		});
-		
-		var sendOutputCancellationToken = sendOutputCancellationTokenSource.Token;
-		
 		try {
 			while (await lineReader.WaitToReadAsync(CancellationToken)) {
 				await Task.Delay(SendDelay, CancellationToken);
-				await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder), sendOutputCancellationToken);
+				await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
 			}
 		} catch (OperationCanceledException) {
 			// Ignore.
 		}
-		
+
 		// Flush remaining lines.
-		try {
+		await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
-			await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder), sendOutputCancellationToken);
-		} catch (OperationCanceledException) {
-			// Ignore.
-		}
 	}
-	
+
 	private ImmutableArray<string> ReadLinesFromChannel(ChannelReader<string> reader, ImmutableArray<string>.Builder builder) {
 		builder.Clear();
 		
@@ -66,32 +53,29 @@ sealed class InstanceLogSender : CancellableBackgroundTask {
 			builder.Add(line);
 		}
 		
-		int droppedLines = Interlocked.Exchange(ref droppedLinesSinceLastSend, value: 0);
+		int droppedLines = Interlocked.Exchange(ref droppedLinesSinceLastSend, 0);
 		if (droppedLines > 0) {
 			builder.Add($"Dropped {droppedLines} {(droppedLines == 1 ? "line" : "lines")} due to buffer overflow.");
 		}
 		
 		return builder.ToImmutable();
 	}
-	
+
-	private ValueTask SendOutputToServer(ImmutableArray<string> lines, CancellationToken cancellationToken) {
+	private async Task SendOutputToServer(ImmutableArray<string> lines) {
-		if (lines.IsEmpty) {
+		if (!lines.IsEmpty) {
-			return ValueTask.CompletedTask;
+			await controllerConnection.Send(new InstanceOutputMessage(instanceGuid, lines));
-		}
-		else {
-			return controllerConnection.Send(new InstanceOutputMessage(instanceGuid, lines), cancellationToken);
 		}
 	}
-	
+
 	private void OnLineDropped(string line) {
 		Logger.Warning("Buffer is full, dropped line: {Line}", line);
 		Interlocked.Increment(ref droppedLinesSinceLastSend);
 	}
-	
+
 	public void Enqueue(string line) {
 		outputChannel.Writer.TryWrite(line);
 	}
-	
+
 	protected override void Dispose() {
 		if (!outputChannel.Writer.TryComplete()) {
 			Logger.Error("Could not mark channel as completed.");

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

@@ -1,204 +0,0 @@
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Java;
-using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Minecraft.Launcher.Types;
-using Phantom.Agent.Minecraft.Properties;
-using Phantom.Agent.Minecraft.Server;
-using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Rpc;
-using Phantom.Common.Data;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-using Phantom.Utils.Actor;
-using Phantom.Utils.IO;
-using Phantom.Utils.Logging;
-using Serilog;
-
-namespace Phantom.Agent.Services.Instances;
-
-sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand> {
-	private static readonly ILogger Logger = PhantomLogger.Create<InstanceManagerActor>();
-	
-	public readonly record struct Init(ControllerConnection ControllerConnection, AgentFolders AgentFolders, AgentState AgentState, JavaRuntimeRepository JavaRuntimeRepository, InstanceTicketManager InstanceTicketManager, BackupManager BackupManager);
-	
-	public static Props<ICommand> Factory(Init init) {
-		return Props<ICommand>.Create(() => new InstanceManagerActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume });
-	}
-	
-	private readonly AgentState agentState;
-	private readonly string basePath;
-	
-	private readonly InstanceServices instanceServices;
-	private readonly InstanceTicketManager instanceTicketManager;
-	private readonly Dictionary<Guid, InstanceInfo> instances = new ();
-	
-	private readonly CancellationTokenSource shutdownCancellationTokenSource = new ();
-	private readonly CancellationToken shutdownCancellationToken;
-	
-	private uint instanceLoggerSequenceId = 0;
-	
-	private InstanceManagerActor(Init init) {
-		this.agentState = init.AgentState;
-		this.basePath = init.AgentFolders.InstancesFolderPath;
-		this.instanceTicketManager = init.InstanceTicketManager;
-		this.shutdownCancellationToken = shutdownCancellationTokenSource.Token;
-		
-		var minecraftServerExecutables = new MinecraftServerExecutables(init.AgentFolders.ServerExecutableFolderPath);
-		var launchServices = new LaunchServices(minecraftServerExecutables, init.JavaRuntimeRepository);
-		
-		this.instanceServices = new InstanceServices(init.ControllerConnection, init.BackupManager, launchServices);
-		
-		ReceiveAndReply<ConfigureInstanceCommand, Result<ConfigureInstanceResult, InstanceActionFailure>>(ConfigureInstance);
-		ReceiveAndReply<LaunchInstanceCommand, Result<LaunchInstanceResult, InstanceActionFailure>>(LaunchInstance);
-		ReceiveAndReply<StopInstanceCommand, Result<StopInstanceResult, InstanceActionFailure>>(StopInstance);
-		ReceiveAsyncAndReply<SendCommandToInstanceCommand, Result<SendCommandToInstanceResult, InstanceActionFailure>>(SendCommandToInstance);
-		ReceiveAsync<ShutdownCommand>(Shutdown);
-	}
-	
-	private sealed record InstanceInfo(ActorRef<InstanceActor.ICommand> Actor, InstanceConfiguration Configuration, IServerLauncher Launcher);
-	
-	public interface ICommand;
-	
-	public sealed record ConfigureInstanceCommand(Guid InstanceGuid, InstanceConfiguration Configuration, InstanceLaunchProperties LaunchProperties, bool LaunchNow, bool AlwaysReportStatus) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
-	
-	public sealed record LaunchInstanceCommand(Guid InstanceGuid) : ICommand, ICanReply<Result<LaunchInstanceResult, InstanceActionFailure>>;
-	
-	public sealed record StopInstanceCommand(Guid InstanceGuid, MinecraftStopStrategy StopStrategy) : ICommand, ICanReply<Result<StopInstanceResult, InstanceActionFailure>>;
-	
-	public sealed record SendCommandToInstanceCommand(Guid InstanceGuid, string Command) : ICommand, ICanReply<Result<SendCommandToInstanceResult, InstanceActionFailure>>;
-	
-	public sealed record ShutdownCommand : ICommand;
-	
-	private Result<ConfigureInstanceResult, InstanceActionFailure> ConfigureInstance(ConfigureInstanceCommand command) {
-		var instanceGuid = command.InstanceGuid;
-		var configuration = command.Configuration;
-		
-		var instanceFolder = Path.Combine(basePath, instanceGuid.ToString());
-		Directories.Create(instanceFolder, Chmod.URWX_GRX);
-		
-		var heapMegabytes = configuration.MemoryAllocation.InMegabytes;
-		var jvmProperties = new JvmProperties(
-			InitialHeapMegabytes: heapMegabytes / 2,
-			MaximumHeapMegabytes: heapMegabytes
-		);
-		
-		var properties = new InstanceProperties(
-			instanceGuid,
-			configuration.JavaRuntimeGuid,
-			jvmProperties,
-			configuration.JvmArguments,
-			instanceFolder,
-			configuration.MinecraftVersion,
-			new ServerProperties(configuration.ServerPort, configuration.RconPort),
-			command.LaunchProperties
-		);
-		
-		IServerLauncher launcher = configuration.MinecraftServerKind switch {
-			MinecraftServerKind.Vanilla => new VanillaLauncher(properties),
-			MinecraftServerKind.Fabric  => new FabricLauncher(properties),
-			_                           => InvalidLauncher.Instance,
-		};
-		
-		if (instances.TryGetValue(instanceGuid, out var instance)) {
-			instances[instanceGuid] = instance with {
-				Configuration = configuration,
-				Launcher = launcher,
-			};
-			
-			Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);
-			
-			if (command.AlwaysReportStatus) {
-				instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
-			}
-		}
-		else {
-			var instanceLoggerName = PhantomLogger.ShortenGuid(instanceGuid) + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
-			var instanceInit = new InstanceActor.Init(agentState, instanceGuid, instanceLoggerName, instanceServices, instanceTicketManager, shutdownCancellationToken);
-			instances[instanceGuid] = instance = new InstanceInfo(Context.ActorOf(InstanceActor.Factory(instanceInit), "Instance-" + instanceGuid), configuration, launcher);
-			
-			Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);
-			
-			instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
-		}
-		
-		if (command.LaunchNow) {
-			LaunchInstance(new LaunchInstanceCommand(instanceGuid));
-		}
-		
-		return ConfigureInstanceResult.Success;
-	}
-	
-	private Result<LaunchInstanceResult, InstanceActionFailure> LaunchInstance(LaunchInstanceCommand command) {
-		var instanceGuid = command.InstanceGuid;
-		if (!instances.TryGetValue(instanceGuid, out var instanceInfo)) {
-			return InstanceActionFailure.InstanceDoesNotExist;
-		}
-		
-		var ticket = instanceTicketManager.Reserve(instanceInfo.Configuration);
-		if (!ticket) {
-			return ticket.Error;
-		}
-		
-		if (agentState.InstancesByGuid.TryGetValue(instanceGuid, out var instance)) {
-			var status = instance.Status;
-			if (status.IsRunning()) {
-				return LaunchInstanceResult.InstanceAlreadyRunning;
-			}
-			else if (status.IsLaunching()) {
-				return LaunchInstanceResult.InstanceAlreadyLaunching;
-			}
-		}
-		
-		instanceInfo.Actor.Tell(new InstanceActor.LaunchInstanceCommand(instanceInfo.Configuration, instanceInfo.Launcher, ticket.Value, IsRestarting: false));
-		return LaunchInstanceResult.LaunchInitiated;
-	}
-	
-	private Result<StopInstanceResult, InstanceActionFailure> StopInstance(StopInstanceCommand command) {
-		var instanceGuid = command.InstanceGuid;
-		if (!instances.TryGetValue(instanceGuid, out var instanceInfo)) {
-			return InstanceActionFailure.InstanceDoesNotExist;
-		}
-		
-		if (agentState.InstancesByGuid.TryGetValue(instanceGuid, out var instance)) {
-			var status = instance.Status;
-			if (status.IsStopping()) {
-				return StopInstanceResult.InstanceAlreadyStopping;
-			}
-			else if (!status.CanStop()) {
-				return StopInstanceResult.InstanceAlreadyStopped;
-			}
-		}
-		
-		instanceInfo.Actor.Tell(new InstanceActor.StopInstanceCommand(command.StopStrategy));
-		return StopInstanceResult.StopInitiated;
-	}
-	
-	private async Task<Result<SendCommandToInstanceResult, InstanceActionFailure>> SendCommandToInstance(SendCommandToInstanceCommand command) {
-		var instanceGuid = command.InstanceGuid;
-		if (!instances.TryGetValue(instanceGuid, out var instanceInfo)) {
-			return InstanceActionFailure.InstanceDoesNotExist;
-		}
-		
-		try {
-			return await instanceInfo.Actor.Request(new InstanceActor.SendCommandToInstanceCommand(command.Command), shutdownCancellationToken);
-		} catch (OperationCanceledException) {
-			return InstanceActionFailure.AgentShuttingDown;
-		}
-	}
-	
-	private async Task Shutdown(ShutdownCommand command) {
-		Logger.Information("Stopping all instances...");
-		
-		await shutdownCancellationTokenSource.CancelAsync();
-		
-		await Task.WhenAll(instances.Values.Select(static instance => instance.Actor.Stop(new InstanceActor.ShutdownCommand())));
-		instances.Clear();
-		
-		shutdownCancellationTokenSource.Dispose();
-		
-		Logger.Information("All instances stopped.");
-		
-		Context.Stop(Self);
-	}
-}

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

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

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

@@ -1,7 +1,8 @@
 using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Rpc;
 using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Rpc;
+using Phantom.Utils.Tasks;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed record InstanceServices(ControllerConnection ControllerConnection, BackupManager BackupManager, LaunchServices LaunchServices);
+sealed record InstanceServices(ControllerConnection ControllerConnection, TaskManager TaskManager, PortManager PortManager, BackupManager BackupManager, LaunchServices LaunchServices);

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

@@ -0,0 +1,198 @@
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Minecraft.Launcher.Types;
+using Phantom.Agent.Minecraft.Properties;
+using Phantom.Agent.Minecraft.Server;
+using Phantom.Agent.Rpc;
+using Phantom.Agent.Services.Backups;
+using Phantom.Common.Data;
+using Phantom.Common.Data.Agent;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Minecraft;
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Logging;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.IO;
+using Phantom.Utils.Tasks;
+using Serilog;
+
+namespace Phantom.Agent.Services.Instances;
+
+sealed class InstanceSessionManager : IAsyncDisposable {
+	private static readonly ILogger Logger = PhantomLogger.Create<InstanceSessionManager>();
+
+	private readonly ControllerConnection controllerConnection;
+	private readonly AgentInfo agentInfo;
+	private readonly string basePath;
+
+	private readonly InstanceServices instanceServices;
+	private readonly Dictionary<Guid, Instance> instances = new ();
+
+	private readonly CancellationTokenSource shutdownCancellationTokenSource = new ();
+	private readonly CancellationToken shutdownCancellationToken;
+	private readonly SemaphoreSlim semaphore = new (1, 1);
+
+	private uint instanceLoggerSequenceId = 0;
+
+	public InstanceSessionManager(ControllerConnection controllerConnection, AgentInfo agentInfo, AgentFolders agentFolders, JavaRuntimeRepository javaRuntimeRepository, TaskManager taskManager, BackupManager backupManager) {
+		this.controllerConnection = controllerConnection;
+		this.agentInfo = agentInfo;
+		this.basePath = agentFolders.InstancesFolderPath;
+		this.shutdownCancellationToken = shutdownCancellationTokenSource.Token;
+
+		var minecraftServerExecutables = new MinecraftServerExecutables(agentFolders.ServerExecutableFolderPath);
+		var launchServices = new LaunchServices(minecraftServerExecutables, javaRuntimeRepository);
+		var portManager = new PortManager(agentInfo.AllowedServerPorts, agentInfo.AllowedRconPorts);
+
+		this.instanceServices = new InstanceServices(controllerConnection, taskManager, portManager, backupManager, launchServices);
+	}
+
+	private async Task<InstanceActionResult<T>> AcquireSemaphoreAndRun<T>(Func<Task<InstanceActionResult<T>>> func) {
+		try {
+			await semaphore.WaitAsync(shutdownCancellationToken);
+			try {
+				return await func();
+			} finally {
+				semaphore.Release();
+			}
+		} catch (OperationCanceledException) {
+			return InstanceActionResult.General<T>(InstanceActionGeneralResult.AgentShuttingDown);
+		}
+	}
+
+	[SuppressMessage("ReSharper", "ConvertIfStatementToReturnStatement")]
+	private Task<InstanceActionResult<T>> AcquireSemaphoreAndRunWithInstance<T>(Guid instanceGuid, Func<Instance, Task<T>> func) {
+		return AcquireSemaphoreAndRun(async () => {
+			if (instances.TryGetValue(instanceGuid, out var instance)) {
+				return InstanceActionResult.Concrete(await func(instance));
+			}
+			else {
+				return InstanceActionResult.General<T>(InstanceActionGeneralResult.InstanceDoesNotExist);
+			}
+		});
+	}
+
+	public async Task<InstanceActionResult<ConfigureInstanceResult>> Configure(InstanceConfiguration configuration, InstanceLaunchProperties launchProperties, bool launchNow, bool alwaysReportStatus) {
+		return await AcquireSemaphoreAndRun(async () => {
+			var instanceGuid = configuration.InstanceGuid;
+			var instanceFolder = Path.Combine(basePath, instanceGuid.ToString());
+			Directories.Create(instanceFolder, Chmod.URWX_GRX);
+
+			var heapMegabytes = configuration.MemoryAllocation.InMegabytes;
+			var jvmProperties = new JvmProperties(
+				InitialHeapMegabytes: heapMegabytes / 2,
+				MaximumHeapMegabytes: heapMegabytes
+			);
+
+			var properties = new InstanceProperties(
+				instanceGuid,
+				configuration.JavaRuntimeGuid,
+				jvmProperties,
+				configuration.JvmArguments,
+				instanceFolder,
+				configuration.MinecraftVersion,
+				new ServerProperties(configuration.ServerPort, configuration.RconPort),
+				launchProperties
+			);
+
+			IServerLauncher launcher = configuration.MinecraftServerKind switch {
+				MinecraftServerKind.Vanilla => new VanillaLauncher(properties),
+				MinecraftServerKind.Fabric  => new FabricLauncher(properties),
+				_                           => InvalidLauncher.Instance
+			};
+
+			if (instances.TryGetValue(instanceGuid, out var instance)) {
+				await instance.Reconfigure(configuration, launcher, shutdownCancellationToken);
+				Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, configuration.InstanceGuid);
+
+				if (alwaysReportStatus) {
+					instance.ReportLastStatus();
+				}
+			}
+			else {
+				instances[instanceGuid] = instance = new Instance(GetInstanceLoggerName(instanceGuid), instanceServices, configuration, launcher);
+				Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, configuration.InstanceGuid);
+
+				instance.ReportLastStatus();
+				instance.IsRunningChanged += OnInstanceIsRunningChanged;
+			}
+
+			if (launchNow) {
+				await LaunchInternal(instance);
+			}
+
+			return InstanceActionResult.Concrete(ConfigureInstanceResult.Success);
+		});
+	}
+
+	private string GetInstanceLoggerName(Guid guid) {
+		var prefix = guid.ToString();
+		return prefix[..prefix.IndexOf('-')] + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
+	}
+
+	private ImmutableArray<Instance> GetRunningInstancesInternal() {
+		return instances.Values.Where(static instance => instance.IsRunning).ToImmutableArray();
+	}
+
+	private void OnInstanceIsRunningChanged(object? sender, EventArgs e) {
+		instanceServices.TaskManager.Run("Handle instance running state changed event", RefreshAgentStatus);
+	}
+
+	public async Task RefreshAgentStatus() {
+		try {
+			await semaphore.WaitAsync(shutdownCancellationToken);
+			try {
+				var runningInstances = GetRunningInstancesInternal();
+				var runningInstanceCount = runningInstances.Length;
+				var runningInstanceMemory = runningInstances.Aggregate(RamAllocationUnits.Zero, static (total, instance) => total + instance.Configuration.MemoryAllocation);
+				await controllerConnection.Send(new ReportAgentStatusMessage(runningInstanceCount, runningInstanceMemory));
+			} finally {
+				semaphore.Release();
+			}
+		} catch (OperationCanceledException) {
+			// ignore
+		}
+	}
+
+	public Task<InstanceActionResult<LaunchInstanceResult>> Launch(Guid instanceGuid) {
+		return AcquireSemaphoreAndRunWithInstance(instanceGuid, LaunchInternal);
+	}
+
+	private async Task<LaunchInstanceResult> LaunchInternal(Instance instance) {
+		var runningInstances = GetRunningInstancesInternal();
+		if (runningInstances.Length + 1 > agentInfo.MaxInstances) {
+			return LaunchInstanceResult.InstanceLimitExceeded;
+		}
+
+		var availableMemory = agentInfo.MaxMemory - runningInstances.Aggregate(RamAllocationUnits.Zero, static (total, instance) => total + instance.Configuration.MemoryAllocation);
+		if (availableMemory < instance.Configuration.MemoryAllocation) {
+			return LaunchInstanceResult.MemoryLimitExceeded;
+		}
+
+		return await instance.Launch(shutdownCancellationToken);
+	}
+
+	public Task<InstanceActionResult<StopInstanceResult>> Stop(Guid instanceGuid, MinecraftStopStrategy stopStrategy) {
+		return AcquireSemaphoreAndRunWithInstance(instanceGuid, instance => instance.Stop(stopStrategy, shutdownCancellationToken));
+	}
+
+	public Task<InstanceActionResult<SendCommandToInstanceResult>> SendCommand(Guid instanceGuid, string command) {
+		return AcquireSemaphoreAndRunWithInstance(instanceGuid, async instance => await instance.SendCommand(command, shutdownCancellationToken) ? SendCommandToInstanceResult.Success : SendCommandToInstanceResult.UnknownError);
+	}
+
+	public async ValueTask DisposeAsync() {
+		Logger.Information("Stopping all instances...");
+		
+		shutdownCancellationTokenSource.Cancel();
+
+		await semaphore.WaitAsync(CancellationToken.None);
+		await Task.WhenAll(instances.Values.Select(static instance => instance.DisposeAsync().AsTask()));
+		instances.Clear();
+		
+		shutdownCancellationTokenSource.Dispose();
+		semaphore.Dispose();
+	}
+}

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

@@ -1,97 +0,0 @@
-using Phantom.Agent.Services.Rpc;
-using Phantom.Common.Data;
-using Phantom.Common.Data.Agent;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Replies;
-using Phantom.Common.Messages.Agent.ToController;
-using Phantom.Utils.Logging;
-using Serilog;
-
-namespace Phantom.Agent.Services.Instances;
-
-sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection controllerConnection) {
-	private static readonly ILogger Logger = PhantomLogger.Create<InstanceTicketManager>();
-	
-	private readonly ControllerSendQueue<ReportAgentStatusMessage> reportStatusQueue = new (controllerConnection, nameof(InstanceTicketManager), capacity: 1, singleWriter: true);
-	
-	private readonly HashSet<Guid> activeTicketGuids = [];
-	private readonly HashSet<ushort> usedPorts = [];
-	private RamAllocationUnits usedMemory = new ();
-	
-	public Result<Ticket, LaunchInstanceResult> Reserve(InstanceConfiguration configuration) {
-		var memoryAllocation = configuration.MemoryAllocation;
-		var serverPort = configuration.ServerPort;
-		var rconPort = configuration.RconPort;
-		
-		if (!agentInfo.AllowedServerPorts.Contains(serverPort)) {
-			return LaunchInstanceResult.ServerPortNotAllowed;
-		}
-		
-		if (!agentInfo.AllowedRconPorts.Contains(rconPort)) {
-			return LaunchInstanceResult.RconPortNotAllowed;
-		}
-		
-		lock (this) {
-			if (activeTicketGuids.Count + 1 > agentInfo.MaxInstances) {
-				return LaunchInstanceResult.InstanceLimitExceeded;
-			}
-			
-			if (usedMemory + memoryAllocation > agentInfo.MaxMemory) {
-				return LaunchInstanceResult.MemoryLimitExceeded;
-			}
-			
-			if (usedPorts.Contains(serverPort)) {
-				return LaunchInstanceResult.ServerPortAlreadyInUse;
-			}
-			
-			if (usedPorts.Contains(rconPort)) {
-				return LaunchInstanceResult.RconPortAlreadyInUse;
-			}
-			
-			var ticket = new Ticket(Guid.NewGuid(), memoryAllocation, serverPort, rconPort);
-			
-			activeTicketGuids.Add(ticket.TicketGuid);
-			usedMemory += memoryAllocation;
-			usedPorts.Add(serverPort);
-			usedPorts.Add(rconPort);
-			
-			RefreshAgentStatus();
-			Logger.Debug("Reserved ticket {TicketGuid} (server port {ServerPort}, rcon port {RconPort}, memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, ticket.RconPort, ticket.MemoryAllocation.InMegabytes);
-			
-			return ticket;
-		}
-	}
-	
-	public bool IsValid(Ticket ticket) {
-		lock (this) {
-			return activeTicketGuids.Contains(ticket.TicketGuid);
-		}
-	}
-	
-	public void Release(Ticket ticket) {
-		lock (this) {
-			if (!activeTicketGuids.Remove(ticket.TicketGuid)) {
-				return;
-			}
-			
-			usedMemory -= ticket.MemoryAllocation;
-			usedPorts.Remove(ticket.ServerPort);
-			usedPorts.Remove(ticket.RconPort);
-			
-			RefreshAgentStatus();
-			Logger.Debug("Released ticket {TicketGuid} (server port {ServerPort}, rcon port {RconPort}, memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, ticket.RconPort, ticket.MemoryAllocation.InMegabytes);
-		}
-	}
-	
-	public void RefreshAgentStatus() {
-		lock (this) {
-			reportStatusQueue.Enqueue(new ReportAgentStatusMessage(activeTicketGuids.Count, usedMemory));
-		}
-	}
-	
-	public async Task Shutdown() {
-		await reportStatusQueue.Shutdown(TimeSpan.FromSeconds(5));
-	}
-	
-	public sealed record Ticket(Guid TicketGuid, RamAllocationUnits MemoryAllocation, ushort ServerPort, ushort RconPort);
-}

Agent/Phantom.Agent.Services/Instances/PortManager.cs

@@ -0,0 +1,58 @@
+using Phantom.Common.Data;
+using Phantom.Common.Data.Instance;
+
+namespace Phantom.Agent.Services.Instances;
+
+sealed class PortManager {
+	private readonly AllowedPorts allowedServerPorts;
+	private readonly AllowedPorts allowedRconPorts;
+	private readonly HashSet<ushort> usedPorts = new ();
+
+	public PortManager(AllowedPorts allowedServerPorts, AllowedPorts allowedRconPorts) {
+		this.allowedServerPorts = allowedServerPorts;
+		this.allowedRconPorts = allowedRconPorts;
+	}
+
+	public Result Reserve(InstanceConfiguration configuration) {
+		var serverPort = configuration.ServerPort;
+		var rconPort = configuration.RconPort;
+		
+		if (!allowedServerPorts.Contains(serverPort)) {
+			return Result.ServerPortNotAllowed;
+		}
+
+		if (!allowedRconPorts.Contains(rconPort)) {
+			return Result.RconPortNotAllowed;
+		}
+		
+		lock (usedPorts) {
+			if (usedPorts.Contains(serverPort)) {
+				return Result.ServerPortAlreadyInUse;
+			}
+
+			if (usedPorts.Contains(rconPort)) {
+				return Result.RconPortAlreadyInUse;
+			}
+
+			usedPorts.Add(serverPort);
+			usedPorts.Add(rconPort);
+		}
+
+		return Result.Success;
+	}
+	
+	public void Release(InstanceConfiguration configuration) {
+		lock (usedPorts) {
+			usedPorts.Remove(configuration.ServerPort);
+			usedPorts.Remove(configuration.RconPort);
+		}
+	}
+
+	public enum Result {
+		Success,
+		ServerPortNotAllowed,
+		ServerPortAlreadyInUse,
+		RconPortNotAllowed,
+		RconPortAlreadyInUse
+	}
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,86 +0,0 @@
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Minecraft.Server;
-using Phantom.Common.Data;
-using Phantom.Common.Data.Instance;
-
-namespace Phantom.Agent.Services.Instances.State;
-
-static class InstanceLaunchProcedure {
-	public static async Task<InstanceRunningState?> Run(InstanceContext context, InstanceConfiguration configuration, IServerLauncher launcher, InstanceTicketManager ticketManager, InstanceTicketManager.Ticket ticket, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
-		context.Logger.Information("Session starting...");
-		
-		Result<InstanceProcess, InstanceLaunchFailReason> result;
-		
-		if (ticketManager.IsValid(ticket)) {
-			try {
-				result = await LaunchInstance(context, launcher, reportStatus, cancellationToken);
-			} catch (OperationCanceledException) {
-				reportStatus(InstanceStatus.NotRunning);
-				return null;
-			} catch (Exception e) {
-				context.Logger.Error(e, "Caught exception while launching instance.");
-				result = InstanceLaunchFailReason.UnknownError;
-			}
-		}
-		else {
-			context.Logger.Error("Attempted to launch instance with an invalid ticket!");
-			result = InstanceLaunchFailReason.UnknownError;
-		}
-		
-		if (result) {
-			reportStatus(InstanceStatus.Running);
-			context.ReportEvent(InstanceEvent.LaunchSucceeded);
-			return new InstanceRunningState(context, configuration, launcher, ticket, result.Value, cancellationToken);
-		}
-		else {
-			reportStatus(InstanceStatus.Failed(result.Error));
-			context.ReportEvent(new InstanceLaunchFailedEvent(result.Error));
-			return null;
-		}
-	}
-	
-	private static async Task<Result<InstanceProcess, InstanceLaunchFailReason>> LaunchInstance(InstanceContext context, IServerLauncher launcher, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
-		cancellationToken.ThrowIfCancellationRequested();
-		
-		byte lastDownloadProgress = byte.MaxValue;
-		
-		void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
-			byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, val2: 100);
-			
-			if (lastDownloadProgress != progress) {
-				lastDownloadProgress = progress;
-				reportStatus(InstanceStatus.Downloading(progress));
-			}
-		}
-		
-		switch (await launcher.Launch(context.Logger, context.Services.LaunchServices, OnDownloadProgress, cancellationToken)) {
-			case LaunchResult.Success launchSuccess:
-				return launchSuccess.Process;
-			
-			case LaunchResult.InvalidJavaRuntime:
-				context.Logger.Error("Session failed to launch, invalid Java runtime.");
-				return InstanceLaunchFailReason.JavaRuntimeNotFound;
-			
-			case LaunchResult.CouldNotDownloadMinecraftServer:
-				context.Logger.Error("Session failed to launch, could not download Minecraft server.");
-				return InstanceLaunchFailReason.CouldNotDownloadMinecraftServer;
-			
-			case LaunchResult.CouldNotPrepareMinecraftServerLauncher:
-				context.Logger.Error("Session failed to launch, could not prepare Minecraft server launcher.");
-				return InstanceLaunchFailReason.CouldNotPrepareMinecraftServerLauncher;
-			
-			case LaunchResult.CouldNotConfigureMinecraftServer:
-				context.Logger.Error("Session failed to launch, could not configure Minecraft server.");
-				return InstanceLaunchFailReason.CouldNotConfigureMinecraftServer;
-			
-			case LaunchResult.CouldNotStartMinecraftServer:
-				context.Logger.Error("Session failed to launch, could not start Minecraft server.");
-				return InstanceLaunchFailReason.CouldNotStartMinecraftServer;
-			
-			default:
-				context.Logger.Error("Session failed to launch.");
-				return InstanceLaunchFailReason.UnknownError;
-		}
-	}
-}

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

@@ -1,150 +0,0 @@
-using System.Net.Sockets;
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Server;
-using Phantom.Agent.Services.Rpc;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Messages.Agent.ToController;
-using Phantom.Utils.Logging;
-using Phantom.Utils.Tasks;
-using Phantom.Utils.Threading;
-
-namespace Phantom.Agent.Services.Instances.State;
-
-sealed class InstancePlayerCountTracker : CancellableBackgroundTask {
-	private readonly ControllerConnection controllerConnection;
-	private readonly Guid instanceGuid;
-	private readonly ushort serverPort;
-	private readonly InstanceProcess process;
-	
-	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;
-	
-	private bool isDisposed = false;
-	
-	public InstancePlayerCountTracker(InstanceContext context, InstanceProcess process, ushort serverPort) : base(PhantomLogger.Create<InstancePlayerCountTracker>(context.ShortName)) {
-		this.controllerConnection = context.Services.ControllerConnection;
-		this.instanceGuid = context.InstanceGuid;
-		this.process = process;
-		this.serverPort = serverPort;
-		Start();
-	}
-	
-	protected override async Task RunTask() {
-		// Give the server time to start accepting connections.
-		await Task.Delay(TimeSpan.FromSeconds(5), CancellationToken);
-		
-		serverOutputEvent.Set();
-		process.AddOutputListener(OnOutput, maxLinesToReadFromHistory: 0);
-		
-		while (CancellationToken.Check()) {
-			serverOutputEvent.Reset();
-			
-			InstancePlayerCounts? latestPlayerCounts = await TryGetPlayerCounts();
-			UpdatePlayerCounts(latestPlayerCounts);
-			
-			if (latestPlayerCounts == null) {
-				await Task.Delay(WaitingForFirstDetection ? TimeSpan.FromSeconds(5) : TimeSpan.FromSeconds(10), CancellationToken);
-			}
-			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);
-		} 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.");
-			return null;
-		}
-	}
-	
-	private void UpdatePlayerCounts(InstancePlayerCounts? newPlayerCounts) {
-		if (newPlayerCounts is {} value) {
-			Logger.Debug("Detected {OnlinePlayerCount} / {MaximumPlayerCount} online player(s).", value.Online, value.Maximum);
-			firstDetection.TrySetResult();
-		}
-		
-		EventHandler<int?>? onlinePlayerCountChanged;
-		lock (this) {
-			if (playerCounts == newPlayerCounts) {
-				return;
-			}
-			
-			playerCounts = newPlayerCounts;
-			onlinePlayerCountChanged = OnlinePlayerCountChanged;
-		}
-		
-		onlinePlayerCountChanged?.Invoke(this, newPlayerCounts?.Online);
-		
-		if (!controllerConnection.TrySend(new ReportInstancePlayerCountsMessage(instanceGuid, newPlayerCounts))) {
-			Logger.Warning("Could not report online player count to Controller.");
-		}
-	}
-	
-	public async Task WaitForOnlinePlayers(CancellationToken cancellationToken) {
-		await firstDetection.Task.WaitAsync(cancellationToken);
-		
-		var onlinePlayersDetected = AsyncTasks.CreateCompletionSource();
-		
-		lock (this) {
-			if (playerCounts is { Online: > 0 }) {
-				return;
-			}
-			else if (playerCounts == null) {
-				throw new InvalidOperationException();
-			}
-			
-			OnlinePlayerCountChanged += OnOnlinePlayerCountChanged;
-			
-			void OnOnlinePlayerCountChanged(object? sender, int? newPlayerCount) {
-				if (newPlayerCount == null) {
-					onlinePlayersDetected.TrySetException(new InvalidOperationException());
-					OnlinePlayerCountChanged -= OnOnlinePlayerCountChanged;
-				}
-				else if (newPlayerCount > 0) {
-					onlinePlayersDetected.TrySetResult();
-					OnlinePlayerCountChanged -= OnOnlinePlayerCountChanged;
-				}
-			}
-		}
-		
-		await onlinePlayersDetected.Task;
-	}
-	
-	private void OnOutput(object? sender, string? line) {
-		lock (this) {
-			if (!isDisposed) {
-				serverOutputEvent.Set();
-			}
-		}
-	}
-	
-	protected override void Dispose() {
-		lock (this) {
-			isDisposed = true;
-			playerCounts = null;
-		}
-		
-		process.RemoveOutputListener(OnOutput);
-		serverOutputEvent.Dispose();
-	}
-}

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

@@ -0,0 +1,6 @@
+namespace Phantom.Agent.Services.Instances.States;
+
+interface IInstanceState {
+	void Initialize();
+	Task<bool> SendCommand(string command, CancellationToken cancellationToken);
+}

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

@@ -0,0 +1,9 @@
+namespace Phantom.Agent.Services.Instances.States;
+
+sealed class InstanceNotRunningState : IInstanceState {
+	public void Initialize() {}
+
+	public Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
+		return Task.FromResult(false);
+	}
+}

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

@@ -1,51 +1,45 @@
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Agent.Services.Backups;
+using Phantom.Agent.Services.Instances.Procedures;
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Replies;
 
-namespace Phantom.Agent.Services.Instances.State;
+namespace Phantom.Agent.Services.Instances.States;
 
-sealed class InstanceRunningState : IDisposable {
+sealed class InstanceRunningState : IInstanceState, IDisposable {
-	public InstanceTicketManager.Ticket Ticket { get; }
 	public InstanceProcess Process { get; }
-	
+
 	internal bool IsStopping { get; set; }
-	
+
-	private readonly InstanceContext context;
 	private readonly InstanceConfiguration configuration;
 	private readonly IServerLauncher launcher;
-	private readonly CancellationToken cancellationToken;
+	private readonly IInstanceContext context;
-	
+
 	private readonly InstanceLogSender logSender;
-	private readonly InstancePlayerCountTracker playerCountTracker;
 	private readonly BackupScheduler backupScheduler;
-	
+
 	private bool isDisposed;
-	
+
-	public InstanceRunningState(InstanceContext context, InstanceConfiguration configuration, IServerLauncher launcher, InstanceTicketManager.Ticket ticket, InstanceProcess process, CancellationToken cancellationToken) {
+	public InstanceRunningState(InstanceConfiguration configuration, IServerLauncher launcher, InstanceProcess process, IInstanceContext context) {
-		this.context = context;
 		this.configuration = configuration;
 		this.launcher = launcher;
-		this.Ticket = ticket;
+		this.context = context;
 		this.Process = process;
-		this.cancellationToken = cancellationToken;
+
-		
+		this.logSender = new InstanceLogSender(context.Services.ControllerConnection, context.Services.TaskManager, configuration.InstanceGuid, context.ShortName);
-		this.logSender = new InstanceLogSender(context.Services.ControllerConnection, context.InstanceGuid, context.ShortName);
+
-		this.playerCountTracker = new InstancePlayerCountTracker(context, process, configuration.ServerPort);
+		this.backupScheduler = new BackupScheduler(context.Services.TaskManager, context.Services.BackupManager, process, context, configuration.ServerPort);
-		
-		this.backupScheduler = new BackupScheduler(context, playerCountTracker);
 		this.backupScheduler.BackupCompleted += OnScheduledBackupCompleted;
 	}
-	
+
 	public void Initialize() {
 		Process.Ended += ProcessEnded;
-		
+
 		if (Process.HasEnded) {
 			if (TryDispose()) {
 				context.Logger.Warning("Session ended immediately after it was started.");
-				context.Actor.Tell(new InstanceActor.HandleProcessEndedCommand(InstanceStatus.Failed(InstanceLaunchFailReason.UnknownError)));
+				context.EnqueueProcedure(new SetInstanceToNotRunningStateProcedure(InstanceStatus.Failed(InstanceLaunchFailReason.UnknownError)), immediate: true);
 			}
 		}
 		else {
@@ -53,70 +47,62 @@ sealed class InstanceRunningState : IDisposable {
 			Process.AddOutputListener(SessionOutput);
 		}
 	}
-	
+
 	private void SessionOutput(object? sender, string line) {
 		context.Logger.Debug("[Server] {Line}", line);
 		logSender.Enqueue(line);
 	}
-	
+
 	private void ProcessEnded(object? sender, EventArgs e) {
 		if (!TryDispose()) {
 			return;
 		}
-		
+
-		if (cancellationToken.IsCancellationRequested) {
-			return;
-		}
-		
 		if (IsStopping) {
-			context.Actor.Tell(new InstanceActor.HandleProcessEndedCommand(InstanceStatus.NotRunning));
+			context.EnqueueProcedure(new SetInstanceToNotRunningStateProcedure(InstanceStatus.NotRunning), immediate: true);
 		}
 		else {
 			context.Logger.Information("Session ended unexpectedly, restarting...");
 			context.ReportEvent(InstanceEvent.Crashed);
-			context.Actor.Tell(new InstanceActor.LaunchInstanceCommand(configuration, launcher, Ticket, IsRestarting: true));
+			context.EnqueueProcedure(new LaunchInstanceProcedure(configuration, launcher, IsRestarting: true));
 		}
 	}
-	
+
 	private void OnScheduledBackupCompleted(object? sender, BackupCreationResult e) {
 		context.ReportEvent(new InstanceBackupCompletedEvent(e.Kind, e.Warnings));
 	}
-	
+
-	public async Task<SendCommandToInstanceResult> SendCommand(string command, CancellationToken cancellationToken) {
+	public async Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
 		try {
 			context.Logger.Information("Sending command: {Command}", command);
 			await Process.SendCommand(command, cancellationToken);
-			return SendCommandToInstanceResult.Success;
+			return true;
 		} catch (OperationCanceledException) {
-			return SendCommandToInstanceResult.UnknownError;
+			return false;
 		} catch (Exception e) {
 			context.Logger.Warning(e, "Caught exception while sending command.");
-			return SendCommandToInstanceResult.UnknownError;
+			return false;
 		}
 	}
-	
+
-	public void OnStopInitiated() {
-		backupScheduler.Stop();
-		playerCountTracker.Stop();
-	}
-	
 	private bool TryDispose() {
 		lock (this) {
 			if (isDisposed) {
 				return false;
 			}
-			
+
 			isDisposed = true;
 		}
-		
+
-		OnStopInitiated();
 		logSender.Stop();
+		backupScheduler.Stop();
 		
 		Process.Dispose();
+		context.Services.PortManager.Release(configuration);
 		
 		return true;
 	}
-	
+
 	public void Dispose() {
 		TryDispose();
 	}

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

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

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

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

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

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

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

@@ -1,43 +0,0 @@
-using Phantom.Agent.Services.Instances;
-using Phantom.Common.Data;
-using Phantom.Common.Data.Replies;
-using Phantom.Common.Messages.Agent;
-using Phantom.Common.Messages.Agent.ToAgent;
-using Phantom.Utils.Actor;
-
-namespace Phantom.Agent.Services.Rpc;
-
-public sealed class ControllerMessageHandlerActor : ReceiveActor<IMessageToAgent> {
-	public readonly record struct Init(AgentServices Agent);
-	
-	public static Props<IMessageToAgent> Factory(Init init) {
-		return Props<IMessageToAgent>.Create(() => new ControllerMessageHandlerActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume });
-	}
-	
-	private readonly AgentServices agent;
-	
-	private ControllerMessageHandlerActor(Init init) {
-		this.agent = init.Agent;
-		
-		ReceiveAndReplyLater<ConfigureInstanceMessage, Result<ConfigureInstanceResult, InstanceActionFailure>>(HandleConfigureInstance);
-		ReceiveAndReplyLater<LaunchInstanceMessage, Result<LaunchInstanceResult, InstanceActionFailure>>(HandleLaunchInstance);
-		ReceiveAndReplyLater<StopInstanceMessage, Result<StopInstanceResult, InstanceActionFailure>>(HandleStopInstance);
-		ReceiveAndReplyLater<SendCommandToInstanceMessage, Result<SendCommandToInstanceResult, InstanceActionFailure>>(HandleSendCommandToInstance);
-	}
-	
-	private async Task<Result<ConfigureInstanceResult, InstanceActionFailure>> HandleConfigureInstance(ConfigureInstanceMessage message) {
-		return await agent.InstanceManager.Request(new InstanceManagerActor.ConfigureInstanceCommand(message.InstanceGuid, message.Configuration, message.LaunchProperties, message.LaunchNow, AlwaysReportStatus: false));
-	}
-	
-	private async Task<Result<LaunchInstanceResult, InstanceActionFailure>> HandleLaunchInstance(LaunchInstanceMessage message) {
-		return await agent.InstanceManager.Request(new InstanceManagerActor.LaunchInstanceCommand(message.InstanceGuid));
-	}
-	
-	private async Task<Result<StopInstanceResult, InstanceActionFailure>> HandleStopInstance(StopInstanceMessage message) {
-		return await agent.InstanceManager.Request(new InstanceManagerActor.StopInstanceCommand(message.InstanceGuid, message.StopStrategy));
-	}
-	
-	private async Task<Result<SendCommandToInstanceResult, InstanceActionFailure>> HandleSendCommandToInstance(SendCommandToInstanceMessage message) {
-		return await agent.InstanceManager.Request(new InstanceManagerActor.SendCommandToInstanceCommand(message.InstanceGuid, message.Command));
-	}
-}

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

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

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

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

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

@@ -0,0 +1,88 @@
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Logging;
+using Phantom.Common.Messages.Agent;
+using Phantom.Common.Messages.Agent.BiDirectional;
+using Phantom.Common.Messages.Agent.ToAgent;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Rpc;
+using Phantom.Utils.Rpc.Message;
+using Serilog;
+
+namespace Phantom.Agent.Services.Rpc;
+
+public sealed class MessageListener : IMessageToAgentListener {
+	private static ILogger Logger { get; } = PhantomLogger.Create<MessageListener>();
+
+	private readonly RpcConnectionToServer<IMessageToControllerListener> connection;
+	private readonly AgentServices agent;
+	private readonly CancellationTokenSource shutdownTokenSource;
+
+	public MessageListener(RpcConnectionToServer<IMessageToControllerListener> connection, AgentServices agent, CancellationTokenSource shutdownTokenSource) {
+		this.connection = connection;
+		this.agent = agent;
+		this.shutdownTokenSource = shutdownTokenSource;
+	}
+
+	public async Task<NoReply> HandleRegisterAgentSuccess(RegisterAgentSuccessMessage message) {
+		Logger.Information("Agent authentication successful.");
+
+		void ShutdownAfterConfigurationFailed(InstanceConfiguration configuration) {
+			Logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configuration.InstanceName, configuration.InstanceGuid);
+			shutdownTokenSource.Cancel();
+		}
+		
+		foreach (var configureInstanceMessage in message.InitialInstanceConfigurations) {
+			var result = await HandleConfigureInstance(configureInstanceMessage, alwaysReportStatus: true);
+			if (!result.Is(ConfigureInstanceResult.Success)) {
+				ShutdownAfterConfigurationFailed(configureInstanceMessage.Configuration);
+				return NoReply.Instance;
+			}
+		}
+
+		await connection.Send(new AdvertiseJavaRuntimesMessage(agent.JavaRuntimeRepository.All));
+		await agent.InstanceSessionManager.RefreshAgentStatus();
+		
+		return NoReply.Instance;
+	}
+
+	public Task<NoReply> HandleRegisterAgentFailure(RegisterAgentFailureMessage message) {
+		string errorMessage = message.FailureKind switch {
+			RegisterAgentFailure.ConnectionAlreadyHasAnAgent => "This connection already has an associated agent.",
+			RegisterAgentFailure.InvalidToken                => "Invalid token.",
+			_                                                => "Unknown error " + (byte) message.FailureKind + "."
+		};
+
+		Logger.Fatal("Agent authentication failed: {Error}", errorMessage);
+		
+		PhantomLogger.Dispose();
+		Environment.Exit(1);
+
+		return Task.FromResult(NoReply.Instance);
+	}
+	
+	private Task<InstanceActionResult<ConfigureInstanceResult>> HandleConfigureInstance(ConfigureInstanceMessage message, bool alwaysReportStatus) {
+		return agent.InstanceSessionManager.Configure(message.Configuration, message.LaunchProperties, message.LaunchNow, alwaysReportStatus);
+	}
+	
+	public async Task<InstanceActionResult<ConfigureInstanceResult>> HandleConfigureInstance(ConfigureInstanceMessage message) {
+		return await HandleConfigureInstance(message, alwaysReportStatus: false);
+	}
+
+	public async Task<InstanceActionResult<LaunchInstanceResult>> HandleLaunchInstance(LaunchInstanceMessage message) {
+		return await agent.InstanceSessionManager.Launch(message.InstanceGuid);
+	}
+
+	public async Task<InstanceActionResult<StopInstanceResult>> HandleStopInstance(StopInstanceMessage message) {
+		return await agent.InstanceSessionManager.Stop(message.InstanceGuid, message.StopStrategy);
+	}
+
+	public async Task<InstanceActionResult<SendCommandToInstanceResult>> HandleSendCommandToInstance(SendCommandToInstanceMessage message) {
+		return await agent.InstanceSessionManager.SendCommand(message.InstanceGuid, message.Command);
+	}
+
+	public Task<NoReply> HandleReply(ReplyMessage message) {
+		connection.Receive(message);
+		return Task.FromResult(NoReply.Instance);
+	}
+}

Agent/Phantom.Agent/AgentKey.cs

@@ -1,16 +1,16 @@
-using System.Text;
+using NetMQ;
 using Phantom.Common.Data;
+using Phantom.Common.Logging;
 using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
-using Phantom.Utils.Logging;
 using Serilog;
 
 namespace Phantom.Agent;
 
 static class AgentKey {
 	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(AgentKey));
-	
+
-	public static Task<ConnectionKey?> Load(string? agentKeyToken, string? agentKeyFilePath) {
+	public static Task<(NetMQCertificate, AuthToken)?> Load(string? agentKeyToken, string? agentKeyFilePath) {
 		if (agentKeyFilePath != null) {
 			return LoadFromFile(agentKeyFilePath);
 		}
@@ -21,28 +21,27 @@ static class AgentKey {
 			throw new InvalidOperationException();
 		}
 	}
-	
+
-	private static async Task<ConnectionKey?> LoadFromFile(string agentKeyFilePath) {
+	private static async Task<(NetMQCertificate, AuthToken)?> LoadFromFile(string agentKeyFilePath) {
 		if (!File.Exists(agentKeyFilePath)) {
 			Logger.Fatal("Missing agent key file: {AgentKeyFilePath}", agentKeyFilePath);
 			return null;
 		}
-		
+
 		try {
-			Files.RequireMaximumFileSize(agentKeyFilePath, maximumBytes: 64);
+			Files.RequireMaximumFileSize(agentKeyFilePath, 64);
-			string[] lines = await File.ReadAllLinesAsync(agentKeyFilePath, Encoding.UTF8);
+			return LoadFromBytes(await File.ReadAllBytesAsync(agentKeyFilePath));
-			return LoadFromToken(lines[0]);
 		} catch (IOException e) {
 			Logger.Fatal("Error loading agent key from file: {AgentKeyFilePath}", agentKeyFilePath);
-			Logger.Fatal("{Message}", e.Message);
+			Logger.Fatal(e.Message);
 			return null;
 		} catch (Exception) {
 			Logger.Fatal("File does not contain a valid agent key: {AgentKeyFilePath}", agentKeyFilePath);
 			return null;
 		}
 	}
-	
+
-	private static ConnectionKey? LoadFromToken(string agentKey) {
+	private static (NetMQCertificate, AuthToken)? LoadFromToken(string agentKey) {
 		try {
 			return LoadFromBytes(TokenGenerator.DecodeBytes(agentKey));
 		} catch (Exception) {
@@ -50,10 +49,12 @@ static class AgentKey {
 			return null;
 		}
 	}
-	
+
-	private static ConnectionKey? LoadFromBytes(byte[] agentKey) {
+	private static (NetMQCertificate, AuthToken)? LoadFromBytes(byte[] agentKey) {
-		var connectionKey = ConnectionKey.FromBytes(agentKey);
+		var (publicKey, agentToken) = ConnectionCommonKey.FromBytes(agentKey);
+		var controllerCertificate = NetMQCertificate.FromPublicKey(publicKey);
+		
 		Logger.Information("Loaded agent key.");
-		return connectionKey;
+		return (controllerCertificate, agentToken);
 	}
 }

Agent/Phantom.Agent/GuidFile.cs

@@ -1,18 +1,18 @@
 using System.Text;
+using Phantom.Common.Logging;
 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);
@@ -25,7 +25,7 @@ static class GuidFile {
 		}
 		
 		Logger.Information("Creating agent GUID file: {FilePath}", filePath);
-		
+
 		try {
 			var guid = Guid.NewGuid();
 			await File.WriteAllTextAsync(filePath, guid.ToString(), Encoding.ASCII);
@@ -37,7 +37,7 @@ static class GuidFile {
 	}
 	
 	private static async Task<Guid> LoadGuidFromFile(string filePath) {
-		Files.RequireMaximumFileSize(filePath, maximumBytes: 128);
+		Files.RequireMaximumFileSize(filePath, 128);
 		string contents = await File.ReadAllTextAsync(filePath, Encoding.ASCII);
 		return Guid.Parse(contents.Trim());
 	}

Agent/Phantom.Agent/Program.cs

@@ -1,96 +1,79 @@
 using System.Reflection;
+using NetMQ;
 using Phantom.Agent;
-using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Rpc;
 using Phantom.Agent.Services;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
+using Phantom.Common.Logging;
 using Phantom.Common.Messages.Agent;
-using Phantom.Common.Messages.Agent.Handshake;
+using Phantom.Common.Messages.Agent.ToController;
-using Phantom.Utils.Actor;
+using Phantom.Utils.Rpc;
-using Phantom.Utils.Logging;
+using Phantom.Utils.Rpc.Sockets;
-using Phantom.Utils.Rpc.Runtime.Client;
 using Phantom.Utils.Runtime;
-using Phantom.Utils.Threading;
+using Phantom.Utils.Tasks;
 
 const int ProtocolVersion = 1;
 
 var shutdownCancellationTokenSource = new CancellationTokenSource();
 var shutdownCancellationToken = shutdownCancellationTokenSource.Token;
 
-ProgramCulture.UseInvariantCulture();
-ThreadPool.SetMinThreads(workerThreads: 2, completionPortThreads: 1);
-
 PosixSignals.RegisterCancellation(shutdownCancellationTokenSource, static () => {
 	PhantomLogger.Root.InformationHeading("Stopping Phantom Panel agent...");
 });
 
+ThreadPool.SetMinThreads(workerThreads: 2, completionPortThreads: 1);
+
 try {
 	var fullVersion = AssemblyAttributes.GetFullVersion(Assembly.GetExecutingAssembly());
-	
+
 	PhantomLogger.Root.InformationHeading("Initializing Phantom Panel agent...");
 	PhantomLogger.Root.Information("Agent version: {Version}", fullVersion);
-	
+
 	var (controllerHost, controllerPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts, maxConcurrentBackupCompressionTasks) = Variables.LoadOrStop();
-	
+
 	var agentKey = await AgentKey.Load(agentKeyToken, agentKeyFilePath);
 	if (agentKey == null) {
 		return 1;
 	}
-	
+
 	var folders = new AgentFolders("./data", "./temp", javaSearchPath);
 	if (!folders.TryCreate()) {
 		return 1;
 	}
-	
+
 	var agentGuid = await GuidFile.CreateOrLoad(folders.DataFolderPath);
 	if (agentGuid == null) {
 		return 1;
 	}
-	
+
+	var (controllerCertificate, agentToken) = agentKey.Value;
 	var agentInfo = new AgentInfo(agentGuid.Value, agentName, ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
-	var javaRuntimeRepository = await JavaRuntimeDiscovery.Scan(folders.JavaSearchFolderPath, shutdownCancellationToken);
 	
-	var agentRegistrationHandler = new AgentRegistrationHandler();
+	PhantomLogger.Root.InformationHeading("Launching Phantom Panel agent...");
-	var controllerHandshake = new ControllerHandshake(new AgentRegistration(agentInfo, javaRuntimeRepository.All), agentRegistrationHandler);
-	
-	var rpcClientConnectionParameters = new RpcClientConnectionParameters(
-		Host: controllerHost,
-		Port: controllerPort,
-		DistinguishedName: "phantom-controller",
-		CertificateThumbprint: agentKey.Value.CertificateThumbprint,
-		AuthToken: agentKey.Value.AuthToken,
-		Handshake: controllerHandshake,
-		MessageQueueCapacity: 250,
-		FrameQueueCapacity: 500,
-		MaxConcurrentlyHandledMessages: 50
-	);
-	
-	using var rpcClient = await RpcClient<IMessageToController, IMessageToAgent>.Connect("Controller", rpcClientConnectionParameters, AgentMessageRegistries.Registries, shutdownCancellationToken);
-	if (rpcClient == null) {
-		PhantomLogger.Root.Fatal("Could not connect to Phantom Controller, shutting down.");
-		return 1;
-	}
 	
+	var rpcConfiguration = new RpcConfiguration(PhantomLogger.Create("Rpc"), PhantomLogger.Create<TaskManager>("Rpc"), controllerHost, controllerPort, controllerCertificate);
+	var rpcSocket = RpcClientSocket.Connect(rpcConfiguration, AgentMessageRegistries.Definitions, new RegisterAgentMessage(agentToken, agentInfo));
+
+	var agentServices = new AgentServices(agentInfo, folders, new AgentServiceConfiguration(maxConcurrentBackupCompressionTasks), new ControllerConnection(rpcSocket.Connection));
+	await agentServices.Initialize();
+
+	var rpcDisconnectSemaphore = new SemaphoreSlim(0, 1);
+	var rpcMessageListener = new MessageListener(rpcSocket.Connection, agentServices, shutdownCancellationTokenSource);
+	var rpcTask = RpcClientRuntime.Launch(rpcSocket, agentInfo, rpcMessageListener, rpcDisconnectSemaphore, shutdownCancellationToken);
 	try {
-		PhantomLogger.Root.InformationHeading("Launching Phantom Panel agent...");
+		await rpcTask.WaitAsync(shutdownCancellationToken);
-		
-		var agentServices = new AgentServices(agentInfo, folders, new AgentServiceConfiguration(maxConcurrentBackupCompressionTasks), new ControllerConnection(rpcClient.MessageSender), javaRuntimeRepository);
-		
-		var rpcMessageHandlerInit = new ControllerMessageHandlerActor.Init(agentServices);
-		var rpcMessageHandlerActor = agentServices.ActorSystem.ActorOf(ControllerMessageHandlerActor.Factory(rpcMessageHandlerInit), "ControllerMessageHandler");
-		
-		rpcClient.StartListening(new ControllerMessageReceiver(rpcMessageHandlerActor, agentRegistrationHandler));
-		
-		if (await agentRegistrationHandler.Start(agentServices, shutdownCancellationToken)) {
-			PhantomLogger.Root.Information("Phantom Panel agent is ready.");
-			await shutdownCancellationToken.WaitHandle.WaitOneAsync();
-		}
-		
-		await agentServices.Shutdown();
 	} finally {
-		await rpcClient.Shutdown();
+		shutdownCancellationTokenSource.Cancel();
+		await agentServices.Shutdown();
+
+		rpcDisconnectSemaphore.Release();
+		await rpcTask;
+		rpcDisconnectSemaphore.Dispose();
+		
+		NetMQConfig.Cleanup();
 	}
-	
+
 	return 0;
 } catch (OperationCanceledException) {
 	return 0;
@@ -101,7 +84,7 @@ try {
 	return 1;
 } finally {
 	shutdownCancellationTokenSource.Dispose();
-	
+
 	PhantomLogger.Root.Information("Bye!");
 	PhantomLogger.Dispose();
 }

Agent/Phantom.Agent/Variables.cs

@@ -1,6 +1,6 @@
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Common.Data;
-using Phantom.Utils.Logging;
+using Phantom.Common.Logging;
 using Phantom.Utils.Runtime;
 
 namespace Phantom.Agent;
@@ -21,7 +21,7 @@ sealed record Variables(
 	private static Variables LoadOrThrow() {
 		var (agentKeyToken, agentKeyFilePath) = EnvironmentVariables.GetEitherString("AGENT_KEY", "AGENT_KEY_FILE").Require;
 		var javaSearchPath = EnvironmentVariables.GetString("JAVA_SEARCH_PATH").WithDefaultGetter(GetDefaultJavaSearchPath);
-		
+
 		return new Variables(
 			EnvironmentVariables.GetString("CONTROLLER_HOST").Require,
 			EnvironmentVariables.GetPortNumber("CONTROLLER_PORT").WithDefault(9401),
@@ -36,11 +36,11 @@ sealed record Variables(
 			(ushort) EnvironmentVariables.GetInteger("MAX_CONCURRENT_BACKUP_COMPRESSION_TASKS", min: 1, max: 10000).WithDefault(1)
 		);
 	}
-	
+
 	private static string GetDefaultJavaSearchPath() {
 		return JavaRuntimeDiscovery.GetSystemSearchPath() ?? throw new Exception("Could not automatically determine the path to Java installations on this system. Please set the JAVA_SEARCH_PATH environment variable to the folder containing Java installations.");
 	}
-	
+
 	public static Variables LoadOrStop() {
 		try {
 			return LoadOrThrow();

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

@@ -8,7 +8,7 @@ public sealed class RamAllocationUnitsTests {
 		private Action CallFromMegabytes(int value) {
 			return () => RamAllocationUnits.FromMegabytes(value);
 		}
-		
+
 		[TestCase(1)]
 		[TestCase(-1)]
 		[TestCase(255)]
@@ -24,13 +24,13 @@ public sealed class RamAllocationUnitsTests {
 		public void LessThan256MegabytesThrows(int value) {
 			Assert.That(CallFromMegabytes(value), Throws.Exception.TypeOf<ArgumentOutOfRangeException>().With.Message.StartsWith("Must be at least 0 MB."));
 		}
-		
+
 		[TestCase(16777216)]
 		[TestCase(int.MaxValue - 255)]
 		public void MoreThan16TerabytesThrows(int value) {
 			Assert.That(CallFromMegabytes(value), Throws.Exception.TypeOf<ArgumentOutOfRangeException>().With.Message.StartsWith("Must be at most " + (256 * 65535) + " MB."));
 		}
-		
+
 		[TestCase(0)]
 		[TestCase(256)]
 		[TestCase(512)]
@@ -41,17 +41,17 @@ public sealed class RamAllocationUnitsTests {
 			Assert.That(RamAllocationUnits.FromMegabytes(value).InMegabytes, Is.EqualTo(value));
 		}
 	}
-	
+
 	public sealed class FromString {
 		private Action CallFromString(string definition) {
 			return () => RamAllocationUnits.FromString(definition);
 		}
-		
+
 		[Test]
 		public void EmptyThrows() {
 			Assert.That(CallFromString(""), Throws.Exception.TypeOf<ArgumentOutOfRangeException>().With.Message.StartsWith("Must not be empty."));
 		}
-		
+
 		[Test]
 		public void MissingUnitThrows() {
 			Assert.That(CallFromString("256"), Throws.Exception.TypeOf<ArgumentOutOfRangeException>().With.Message.StartsWith("Must end with "));
@@ -66,23 +66,23 @@ public sealed class RamAllocationUnitsTests {
 		public void UnparseableValueThrows() {
 			Assert.That(CallFromString("123A5M"), Throws.Exception.TypeOf<ArgumentOutOfRangeException>().With.Message.StartsWith("Must begin with a number."));
 		}
-		
+
-		[TestCase("0m", arg2: 0)]
+		[TestCase("0m", 0)]
-		[TestCase("256m", arg2: 256)]
+		[TestCase("256m", 256)]
-		[TestCase("256M", arg2: 256)]
+		[TestCase("256M", 256)]
-		[TestCase("512M", arg2: 512)]
+		[TestCase("512M", 512)]
-		[TestCase("65536M", arg2: 65536)]
+		[TestCase("65536M", 65536)]
 		[TestCase("16776960M", 16777216 - 256)]
 		public void ValidDefinitionInMegabytesIsParsedCorrectly(string definition, int megabytes) {
 			Assert.That(RamAllocationUnits.FromString(definition).InMegabytes, Is.EqualTo(megabytes));
 		}
-		
+
-		[TestCase("0g", arg2: 0)]
+		[TestCase("0g", 0)]
-		[TestCase("1g", arg2: 1024)]
+		[TestCase("1g", 1024)]
-		[TestCase("1G", arg2: 1024)]
+		[TestCase("1G", 1024)]
-		[TestCase("8G", arg2: 8192)]
+		[TestCase("8G", 8192)]
-		[TestCase("64G", arg2: 65536)]
+		[TestCase("64G", 65536)]
-		[TestCase("16383G", arg2: 16776192)]
+		[TestCase("16383G", 16776192)]
 		public void ValidDefinitionInGigabytesIsParsedCorrectly(string definition, int megabytes) {
 			Assert.That(RamAllocationUnits.FromString(definition).InMegabytes, Is.EqualTo(megabytes));
 		}

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

@@ -1,15 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Agent;
-
-namespace Phantom.Common.Data.Web.Agent;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record Agent(
-	[property: MemoryPackOrder(0)] Guid AgentGuid,
-	[property: MemoryPackOrder(1)] AgentConfiguration Configuration,
-	[property: MemoryPackOrder(2)] AgentStats? Stats,
-	[property: MemoryPackOrder(3)] IAgentConnectionStatus ConnectionStatus
-) {
-	[MemoryPackIgnore]
-	public RamAllocationUnits? AvailableMemory => Configuration.MaxMemory - Stats?.RunningInstanceMemory;
-}

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

@@ -1,19 +0,0 @@
-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(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/IAgentConnectionStatus.cs

@@ -1,27 +0,0 @@
-using MemoryPack;
-
-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;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record AgentIsOffline : IAgentConnectionStatus;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record AgentIsDisconnected([property: MemoryPackOrder(0)] DateTimeOffset LastPingTime) : IAgentConnectionStatus;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record AgentIsOnline : IAgentConnectionStatus;
-
-public static class AgentConnectionStatus {
-	public static readonly IAgentConnectionStatus Offline = new AgentIsOffline();
-	public static readonly IAgentConnectionStatus Online = new AgentIsOnline();
-	
-	public static IAgentConnectionStatus Disconnected(DateTimeOffset lastPingTime) {
-		return new AgentIsDisconnected(lastPingTime);
-	}
-}

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

@@ -13,7 +13,7 @@ public enum AuditLogEventType {
 	InstanceEdited,
 	InstanceLaunched,
 	InstanceStopped,
-	InstanceCommandExecuted,
+	InstanceCommandExecuted
 }
 
 public static class AuditLogEventTypeExtensions {
@@ -30,9 +30,9 @@ public static class AuditLogEventTypeExtensions {
 		{ AuditLogEventType.InstanceEdited,            AuditLogSubjectType.Instance },
 		{ AuditLogEventType.InstanceLaunched,          AuditLogSubjectType.Instance },
 		{ AuditLogEventType.InstanceStopped,           AuditLogSubjectType.Instance },
-		{ AuditLogEventType.InstanceCommandExecuted,   AuditLogSubjectType.Instance },
+		{ AuditLogEventType.InstanceCommandExecuted,   AuditLogSubjectType.Instance }
 	};
-	
+
 	static AuditLogEventTypeExtensions() {
 		foreach (var eventType in Enum.GetValues<AuditLogEventType>()) {
 			if (!SubjectTypes.ContainsKey(eventType)) {
@@ -40,7 +40,7 @@ public static class AuditLogEventTypeExtensions {
 			}
 		}
 	}
-	
+
 	public static AuditLogSubjectType GetSubjectType(this AuditLogEventType type) {
 		return SubjectTypes[type];
 	}

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

@@ -1,14 +1,5 @@
-using MemoryPack;
+using System.Text.Json;
 
 namespace Phantom.Common.Data.Web.AuditLog;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed record AuditLogItem(DateTime UtcTime, Guid? UserGuid, string? UserName, AuditLogEventType EventType, AuditLogSubjectType SubjectType, string? SubjectId, JsonDocument? Data);
-public sealed partial record AuditLogItem(
-	[property: MemoryPackOrder(0)] DateTime UtcTime,
-	[property: MemoryPackOrder(1)] Guid? UserGuid,
-	[property: MemoryPackOrder(2)] string? UserName,
-	[property: MemoryPackOrder(3)] AuditLogEventType EventType,
-	[property: MemoryPackOrder(4)] AuditLogSubjectType SubjectType,
-	[property: MemoryPackOrder(5)] string? SubjectId,
-	[property: MemoryPackOrder(6)] string? JsonData
-);

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

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

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

@@ -1,7 +1,7 @@
 namespace Phantom.Common.Data.Web.EventLog;
 
 public enum EventLogEventType {
-	InstanceLaunchSucceeded,
+	InstanceLaunchSucceded,
 	InstanceLaunchFailed,
 	InstanceCrashed,
 	InstanceStopped,
@@ -12,7 +12,7 @@ public enum EventLogEventType {
 
 public static class EventLogEventTypeExtensions {
 	private static readonly Dictionary<EventLogEventType, EventLogSubjectType> SubjectTypes = new () {
-		{ EventLogEventType.InstanceLaunchSucceeded, EventLogSubjectType.Instance },
+		{ EventLogEventType.InstanceLaunchSucceded, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceLaunchFailed, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceCrashed, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceStopped, EventLogSubjectType.Instance },
@@ -20,7 +20,7 @@ public static class EventLogEventTypeExtensions {
 		{ EventLogEventType.InstanceBackupSucceededWithWarnings, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceBackupFailed, EventLogSubjectType.Instance },
 	};
-	
+
 	static EventLogEventTypeExtensions() {
 		foreach (var eventType in Enum.GetValues<EventLogEventType>()) {
 			if (!SubjectTypes.ContainsKey(eventType)) {
@@ -28,7 +28,7 @@ public static class EventLogEventTypeExtensions {
 			}
 		}
 	}
-	
+
 	public static EventLogSubjectType GetSubjectType(this EventLogEventType type) {
 		return SubjectTypes[type];
 	}

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

@@ -1,13 +1,5 @@
-using MemoryPack;
+using System.Text.Json;
 
 namespace Phantom.Common.Data.Web.EventLog;
 
-[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed record EventLogItem(DateTime UtcTime, Guid? AgentGuid, EventLogEventType EventType, EventLogSubjectType SubjectType, string SubjectId, JsonDocument? Data);
-public sealed partial record EventLogItem(
-	[property: MemoryPackOrder(0)] DateTime UtcTime,
-	[property: MemoryPackOrder(1)] Guid? AgentGuid,
-	[property: MemoryPackOrder(2)] EventLogEventType EventType,
-	[property: MemoryPackOrder(3)] EventLogSubjectType SubjectType,
-	[property: MemoryPackOrder(4)] string SubjectId,
-	[property: MemoryPackOrder(5)] string? JsonData
-);

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

@@ -1,23 +0,0 @@
-namespace Phantom.Common.Data.Web.Instance;
-
-public enum CreateOrUpdateInstanceResult : byte {
-	UnknownError,
-	Success,
-	InstanceNameMustNotBeEmpty,
-	InstanceMemoryMustNotBeZero,
-	MinecraftVersionDownloadInfoNotFound,
-	AgentNotFound,
-}
-
-public static class CreateOrUpdateInstanceResultExtensions {
-	public static string ToSentence(this CreateOrUpdateInstanceResult reason) {
-		return reason switch {
-			CreateOrUpdateInstanceResult.Success                              => "Success.",
-			CreateOrUpdateInstanceResult.InstanceNameMustNotBeEmpty           => "Instance name must not be empty.",
-			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.",
-		};
-	}
-}

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

@@ -1,17 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Instance;
-
-namespace Phantom.Common.Data.Web.Instance;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record Instance(
-	[property: MemoryPackOrder(0)] Guid InstanceGuid,
-	[property: MemoryPackOrder(1)] InstanceConfiguration Configuration,
-	[property: MemoryPackOrder(2)] IInstanceStatus Status,
-	[property: MemoryPackOrder(3)] InstancePlayerCounts? PlayerCounts,
-	[property: MemoryPackOrder(4)] bool LaunchAutomatically
-) {
-	public static Instance Offline(Guid instanceGuid, InstanceConfiguration configuration, bool launchAutomatically = false) {
-		return new Instance(instanceGuid, configuration, InstanceStatus.Offline, PlayerCounts: null, launchAutomatically);
-	}
-}

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

@@ -4,22 +4,22 @@ 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) {
 		return Validate(Split(arguments));
 	}
-	
+
 	private static ValidationError? Validate(ImmutableArray<string> arguments) {
 		if (!arguments.All(static argument => argument.StartsWith('-'))) {
 			return ValidationError.InvalidFormat;
 		}
-		
+
 		// TODO not perfect, but good enough
 		if (arguments.Any(static argument => argument.Contains("-Xmx"))) {
 			return ValidationError.XmxNotAllowed;
@@ -31,10 +31,10 @@ public static class JvmArgumentsHelper {
 		
 		return null;
 	}
-	
+
 	public enum ValidationError {
 		InvalidFormat,
 		XmxNotAllowed,
-		XmsNotAllowed,
+		XmsNotAllowed
 	}
 }

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

@@ -10,8 +10,4 @@
     <PackageReference Include="MemoryPack" />
   </ItemGroup>
   
-  <ItemGroup>
-    <ProjectReference Include="..\Phantom.Common.Data\Phantom.Common.Data.csproj" />
-  </ItemGroup>
-
 </Project>

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,25 +1,28 @@
 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(0, typeof(NameIsInvalid))]
+	[MemoryPackUnion(1, typeof(PasswordIsInvalid))]
+	[MemoryPackUnion(2, typeof(NameAlreadyExists))]
+	[MemoryPackUnion(3, typeof(UnknownError))]
+	public abstract partial record AddUserError {
+		internal AddUserError() {}
+	}
+}
 
-[MemoryPackable]
+namespace Phantom.Common.Data.Web.Users.AddUserErrors {
-[MemoryPackUnion(tag: 0, typeof(NameIsInvalid))]
-[MemoryPackUnion(tag: 1, typeof(PasswordIsInvalid))]
-[MemoryPackUnion(tag: 2, typeof(NameAlreadyExists))]
-[MemoryPackUnion(tag: 3, typeof(UnknownError))]
-public abstract partial record AddUserError {
-	private AddUserError() {}
-	
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record NameIsInvalid([property: MemoryPackOrder(0)] UsernameRequirementViolation Violation) : AddUserError;
-	
+
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record PasswordIsInvalid([property: MemoryPackOrder(0)] ImmutableArray<PasswordRequirementViolation> Violations) : AddUserError;
-	
+
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record NameAlreadyExists : AddUserError;
-	
+
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record UnknownError : AddUserError;
 }

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

@@ -1,24 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-
-namespace Phantom.Common.Data.Web.Users;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record AuthenticatedUserInfo(
-	[property: MemoryPackOrder(0)] Guid Guid,
-	[property: MemoryPackOrder(1)] string Name,
-	[property: MemoryPackOrder(2)] PermissionSet Permissions,
-	[property: MemoryPackOrder(3)] ImmutableHashSet<Guid> ManagedAgentGuids
-) {
-	public bool CheckPermission(Permission permission) {
-		return Permissions.Check(permission);
-	}
-	
-	public bool HasAccessToAgent(Guid agentGuid) {
-		return ManagedAgentGuids.Contains(agentGuid) || Permissions.Check(Permission.ManageAllAgents);
-	}
-	
-	public ImmutableHashSet<Guid> FilterAccessibleAgentGuids(ImmutableHashSet<Guid> agentGuids) {
-		return Permissions.Check(Permission.ManageAllAgents) ? agentGuids : agentGuids.Intersect(ManagedAgentGuids);
-	}
-}

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

@@ -1,10 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-
-namespace Phantom.Common.Data.Web.Users;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record ChangeUserRolesResult(
-	[property: MemoryPackOrder(0)] ImmutableHashSet<Guid> AddedToRoleGuids,
-	[property: MemoryPackOrder(1)] ImmutableHashSet<Guid> RemovedFromRoleGuids
-);

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

@@ -1,28 +1,31 @@
 using MemoryPack;
+using Phantom.Common.Data.Web.Users.CreateOrUpdateAdministratorUserResults;
 
-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users {
+	[MemoryPackable]
+	[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 {
+		internal CreateOrUpdateAdministratorUserResult() {}
+	}
+}
 
-[MemoryPackable]
+namespace Phantom.Common.Data.Web.Users.CreateOrUpdateAdministratorUserResults {
-[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))]
-public abstract partial record CreateOrUpdateAdministratorUserResult {
-	private CreateOrUpdateAdministratorUserResult() {}
-	
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record Success([property: MemoryPackOrder(0)] UserInfo User) : CreateOrUpdateAdministratorUserResult;
-	
+
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record CreationFailed([property: MemoryPackOrder(0)] AddUserError Error) : CreateOrUpdateAdministratorUserResult;
-	
+
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record UpdatingFailed([property: MemoryPackOrder(0)] SetUserPasswordError Error) : CreateOrUpdateAdministratorUserResult;
-	
+
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record AddingToRoleFailed : CreateOrUpdateAdministratorUserResult;
-	
+
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record UnknownError : CreateOrUpdateAdministratorUserResult;
 }

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

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