WIP

.run/Agent 1.run.xml

@@ -6,7 +6,7 @@
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
       <env name="AGENT_KEY_FILE" value="./key" />
-      <env name="ALLOWED_ADDITIONAL_PORTS" value="25575,27000,27001" />
+      <env name="ALLOWED_RCON_PORTS" value="25575,27000,27001" />
       <env name="ALLOWED_SERVER_PORTS" value="25565,26000,26001" />
       <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
@@ -24,7 +24,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net10.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 2.run.xml

@@ -6,7 +6,7 @@
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
       <env name="AGENT_KEY_FILE" value="./key" />
-      <env name="ALLOWED_ADDITIONAL_PORTS" value="27002-27006" />
+      <env name="ALLOWED_RCON_PORTS" value="27002-27006" />
       <env name="ALLOWED_SERVER_PORTS" value="26002-26006" />
       <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
@@ -24,7 +24,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net10.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 3.run.xml

@@ -6,7 +6,7 @@
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
       <env name="AGENT_KEY_FILE" value="./key" />
-      <env name="ALLOWED_ADDITIONAL_PORTS" value="27007" />
+      <env name="ALLOWED_RCON_PORTS" value="27007" />
       <env name="ALLOWED_SERVER_PORTS" value="26007" />
       <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
@@ -24,7 +24,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net10.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>

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

@@ -1,9 +1,9 @@
 using System.Collections.Immutable;
 using NUnit.Framework;
-using Phantom.Agent.Services.Java;
+using Phantom.Agent.Minecraft.Java;
 using Phantom.Utils.Collections;
 
-namespace Phantom.Agent.Services.Tests.Java;
+namespace Phantom.Agent.Minecraft.Tests.Java;
 
 [TestFixture]
 public sealed class JavaPropertiesStreamTests {

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

@@ -17,7 +17,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\Phantom.Agent.Services\Phantom.Agent.Services.csproj" />
+    <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -1,6 +1,6 @@
-namespace Phantom.Agent.Services.Games;
+namespace Phantom.Agent.Minecraft.Command;
 
-static class MinecraftCommand {
+public static class MinecraftCommand {
 	public const string SaveOn = "save-on";
 	public const string SaveOff = "save-off";
 	public const string Stop = "stop";

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

@@ -2,9 +2,9 @@
 using Phantom.Utils.Processes;
 using Phantom.Utils.Tasks;
 
-namespace Phantom.Agent.Services.Instances.State;
+namespace Phantom.Agent.Minecraft.Instance;
 
-sealed class InstanceProcess : IDisposable {
+public sealed class InstanceProcess : IDisposable {
 	public InstanceProperties InstanceProperties { get; }
 	
 	private readonly RingBuffer<string> outputBuffer = new (100);

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

@@ -0,0 +1,6 @@
+namespace Phantom.Agent.Minecraft.Instance;
+
+public sealed record InstanceProperties(
+	Guid InstanceGuid,
+	string InstanceFolder
+);

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

@@ -1,4 +1,4 @@
-namespace Phantom.Agent.Services.Java;
+namespace Phantom.Agent.Minecraft.Java;
 
 sealed class JavaPropertiesFileEditor {
 	private readonly Dictionary<string, string> overriddenProperties = new ();

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

@@ -4,7 +4,7 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using Phantom.Utils.Collections;
 
-namespace Phantom.Agent.Services.Java;
+namespace Phantom.Agent.Minecraft.Java;
 
 static class JavaPropertiesStream {
 	internal static readonly Encoding Encoding = Encoding.GetEncoding("ISO-8859-1");
@@ -30,7 +30,7 @@ static class JavaPropertiesStream {
 		}
 		
 		public Reader(string path) {
-			this.reader = new StreamReader(path, Encoding, detectEncodingFromByteOrderMarks: true, CreateFileStreamOptions(FileMode.Open, FileAccess.Read));
+			this.reader = new StreamReader(path, Encoding, detectEncodingFromByteOrderMarks: false, CreateFileStreamOptions(FileMode.Open, FileAccess.Read));
 		}
 		
 		public async IAsyncEnumerable<KeyValuePair<string, string>> ReadProperties([EnumeratorCancellation] CancellationToken cancellationToken) {

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

@@ -6,7 +6,7 @@ using Phantom.Utils.IO;
 using Phantom.Utils.Logging;
 using Serilog;
 
-namespace Phantom.Agent.Services.Java;
+namespace Phantom.Agent.Minecraft.Java;
 
 public sealed class JavaRuntimeDiscovery {
 	private static readonly ILogger Logger = PhantomLogger.Create(nameof(JavaRuntimeDiscovery));

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

@@ -0,0 +1,5 @@
+using Phantom.Common.Data.Java;
+
+namespace Phantom.Agent.Minecraft.Java;
+
+public sealed record JavaRuntimeExecutable(string ExecutablePath, JavaRuntime Runtime);

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

@@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis;
 using Phantom.Common.Data.Java;
 using Phantom.Utils.Cryptography;
 
-namespace Phantom.Agent.Services.Java;
+namespace Phantom.Agent.Minecraft.Java;
 
 public sealed class JavaRuntimeRepository {
 	private readonly ImmutableDictionary<Guid, JavaRuntimeExecutable> runtimesByGuid;
@@ -25,7 +25,7 @@ public sealed class JavaRuntimeRepository {
 		                     .ToImmutableArray();
 	}
 	
-	internal bool TryGetByGuid(Guid guid, [MaybeNullWhen(false)] out JavaRuntimeExecutable runtime) {
+	public bool TryGetByGuid(Guid guid, [MaybeNullWhen(false)] out JavaRuntimeExecutable runtime) {
 		return runtimesByGuid.TryGetValue(guid, out runtime);
 	}
 	

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

@@ -0,0 +1,25 @@
+using System.Collections.ObjectModel;
+
+namespace Phantom.Agent.Minecraft.Java;
+
+sealed class JvmArgumentBuilder(JvmProperties basicProperties) {
+	private readonly List<string> customArguments = [];
+	
+	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/Java/JvmProperties.cs

@@ -0,0 +1,6 @@
+namespace Phantom.Agent.Minecraft.Java;
+
+public sealed record JvmProperties(
+	uint InitialHeapMegabytes,
+	uint MaximumHeapMegabytes
+);

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

@@ -1,44 +1,40 @@
 using System.Collections.Immutable;
-using Phantom.Agent.Services.Downloads;
-using Phantom.Agent.Services.Instances.State;
-using Phantom.Agent.Services.Java;
-using Phantom.Common.Data.Agent;
-using Phantom.Common.Data.Agent.Instance;
-using Phantom.Common.Data.Agent.Instance.Launch;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Minecraft.Server;
 using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Instance.Launch;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Utils.Processes;
 using Serilog;
 
-namespace Phantom.Agent.Services.Instances.Launch;
+namespace Phantom.Agent.Minecraft.Launcher;
 
-sealed class InstanceLauncher(
+public sealed class InstanceLauncher(
 	FileDownloadManager downloadManager,
 	IInstancePathResolver pathResolver,
 	IInstanceValueResolver valueResolver,
 	InstanceProperties instanceProperties,
 	InstanceLaunchRecipe launchRecipe
 ) {
-	public async Task<InstanceLaunchResult> Launch(ILogger logger, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) {
+	public async Task<LaunchResult> Launch(ILogger logger, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) {
 		string? executablePath = launchRecipe.Executable.Resolve(pathResolver);
 		if (executablePath == null) {
-			logger.Error("Could not resolve server executable path: {Path}", launchRecipe.Executable);
-			return new InstanceLaunchResult.CouldNotFindServerExecutable();
+			logger.Error("Could not resolve server executable: {Path}", launchRecipe.Executable);
+			return new LaunchResult.CouldNotFindServerExecutable();
 		}
 		
-		var stepExecutor = new StepExecutor(logger, downloadManager, pathResolver, reportStatus, cancellationToken);
+		var stepVisitor = new StepExecutor(downloadManager, pathResolver, reportStatus, cancellationToken);
 		var steps = launchRecipe.Preparation;
 		
 		for (int stepIndex = 0; stepIndex < steps.Length; stepIndex++) {
 			var step = steps[stepIndex];
 			try {
-				if (await step.Run(stepExecutor)) {
-					continue;
-				}
+				await step.Run(stepVisitor);
 			} catch (Exception e) {
-				logger.Error(e, "Failed preparation step {StepIndex} out of {StepCount}: {StepName}", stepIndex, steps.Length, step.GetType().Name);
+				logger.Error(e, "Failed preparation step {StepIndex} out of {StepCount}: {Step}", stepIndex, steps.Length, step);
+				return new LaunchResult.CouldNotPrepareServerInstance();
 			}
-			
-			return new InstanceLaunchResult.CouldNotPrepareServerInstance();
 		}
 		
 		var processConfigurator = new ProcessConfigurator {
@@ -50,13 +46,13 @@ sealed class InstanceLauncher(
 		
 		var processArguments = processConfigurator.ArgumentList;
 		
-		foreach (IInstanceValue value in launchRecipe.Arguments) {
+		foreach (var value in launchRecipe.Arguments) {
 			if (value.Resolve(valueResolver) is {} resolved) {
 				processArguments.Add(resolved);
 			}
 			else {
 				logger.Error("Could not resolve server executable argument: {Value}", value);
-				return new InstanceLaunchResult.CouldNotPrepareServerInstance();
+				return new LaunchResult.CouldNotPrepareServerInstance();
 			}
 		}
 		
@@ -74,18 +70,17 @@ sealed class InstanceLauncher(
 				logger.Error(killException, "Caught exception trying to kill the server process after a failed launch.");
 			}
 			
-			return new InstanceLaunchResult.CouldNotStartServerExecutable();
+			return new LaunchResult.CouldNotStartServerExecutable();
 		}
 		
-		return new InstanceLaunchResult.Success(instanceProcess);
+		return new LaunchResult.Success(instanceProcess);
 	}
 	
-	private sealed class StepExecutor(ILogger logger, FileDownloadManager downloadManager, IInstancePathResolver pathResolver, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) : IInstanceLaunchStepExecutor<bool> {
-		public async Task<bool> DownloadFile(FileDownloadInfo downloadInfo, IInstancePath path) {
+	private sealed class StepExecutor(FileDownloadManager downloadManager, IInstancePathResolver pathResolver, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) : IInstanceLaunchStepExecutor {
+		public async Task DownloadFile(FileDownloadInfo downloadInfo, IInstancePath path) {
 			string? filePath = path.Resolve(pathResolver);
 			if (filePath == null) {
-				logger.Error("Could not resolve download file path: {Path}", path);
-				return false;
+				throw new FileNotFoundException("Could not resolve path");
 			}
 			
 			byte? lastDownloadProgress = null;
@@ -100,32 +95,21 @@ sealed class InstanceLauncher(
 			}
 			
 			if (await downloadManager.DownloadAndGetPath(downloadInfo, filePath, OnDownloadProgress, cancellationToken) == null) {
-				logger.Error("Could not download file: {Url}", downloadInfo.Url);
-				return false;
+				throw new FileNotFoundException("Could not download file");
 			}
 			
 			reportStatus(null);
-			return true;
 		}
 		
-		public async Task<bool> EditPropertiesFile(InstancePath.Local path, string comment, ImmutableDictionary<string, string> newValues) {
+		public async Task EditPropertiesFile(InstancePath.Local path, string comment, ImmutableDictionary<string, string> newValues) {
 			string? filePath = path.Resolve(pathResolver);
 			if (filePath == null) {
-				logger.Error("Could not resolve properties file path: {Path}", path);
-				return false;
+				throw new FileNotFoundException("Could not resolve path");
 			}
 			
 			var editor = new JavaPropertiesFileEditor();
 			editor.SetAll(newValues);
-			
-			try {
-				await editor.EditOrCreate(filePath, comment, cancellationToken);
-			} catch (Exception e) {
-				logger.Error(e, "Could not edit properties file: {Path}", filePath);
-				return false;
-			}
-			
-			return true;
+			await editor.EditOrCreate(filePath, comment, cancellationToken);
 		}
 	}
 }

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

@@ -0,0 +1,15 @@
+using Phantom.Agent.Minecraft.Instance;
+
+namespace Phantom.Agent.Minecraft.Launcher;
+
+public abstract record LaunchResult {
+	private LaunchResult() {}
+	
+	public sealed record Success(InstanceProcess Process) : LaunchResult;
+	
+	public sealed record CouldNotPrepareServerInstance : LaunchResult;
+	
+	public sealed record CouldNotFindServerExecutable : LaunchResult;
+	
+	public sealed record CouldNotStartServerExecutable : LaunchResult;
+}

Agent/Phantom.Agent.Minecraft/Launcher/ServerJarInfo.cs

@@ -0,0 +1,7 @@
+using System.Collections.Immutable;
+
+namespace Phantom.Agent.Minecraft.Launcher;
+
+sealed record ServerJarInfo(string FilePath, ImmutableArray<string> ExtraArgs) {
+	public ServerJarInfo(string filePath) : this(filePath, ImmutableArray<string>.Empty) {}
+}

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

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <InternalsVisibleTo Include="Phantom.Agent.Minecraft.Tests" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.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/Server/DownloadProgressEventArgs.cs

@@ -1,6 +1,6 @@
-namespace Phantom.Agent.Services.Downloads;
+namespace Phantom.Agent.Minecraft.Server;
 
-sealed class DownloadProgressEventArgs : EventArgs {
+public sealed class DownloadProgressEventArgs : EventArgs {
 	public ulong DownloadedBytes { get; }
 	public ulong? TotalBytes { get; }
 	

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

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

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

@@ -1,16 +1,16 @@
-using Phantom.Common.Data.Agent;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Utils.IO;
 using Phantom.Utils.Logging;
 using Serilog;
 
-namespace Phantom.Agent.Services.Downloads;
+namespace Phantom.Agent.Minecraft.Server;
 
-sealed class FileDownloadManager {
+public sealed class FileDownloadManager {
 	private static readonly ILogger Logger = PhantomLogger.Create<FileDownloadManager>();
 	
 	private readonly Dictionary<string, FileDownloader> runningDownloadersByPath = new ();
 	
-	public async Task<string?> DownloadAndGetPath(FileDownloadInfo fileDownloadInfo, string filePath, EventHandler<DownloadProgressEventArgs> progressEventHandler, CancellationToken cancellationToken) {
+	internal async Task<string?> DownloadAndGetPath(FileDownloadInfo fileDownloadInfo, string filePath, EventHandler<DownloadProgressEventArgs> progressEventHandler, CancellationToken cancellationToken) {
 		var fileInfo = new FileInfo(filePath);
 		if (fileInfo.Exists) {
 			return filePath;

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

@@ -1,5 +1,5 @@
 using System.Security.Cryptography;
-using Phantom.Common.Data.Agent;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
 using Phantom.Utils.Logging;
@@ -7,7 +7,7 @@ using Phantom.Utils.Net;
 using Phantom.Utils.Runtime;
 using Serilog;
 
-namespace Phantom.Agent.Services.Downloads;
+namespace Phantom.Agent.Minecraft.Server;
 
 sealed class FileDownloader {
 	private static readonly ILogger Logger = PhantomLogger.Create<FileDownloader>();
@@ -103,7 +103,7 @@ sealed class FileDownloader {
 	}
 	
 	private static async Task DownloadFile(string filePath, FileDownloadInfo fileDownloadInfo, DownloadProgressCallback progressCallback, CancellationToken cancellationToken) {
-		string downloadUrl = fileDownloadInfo.Url;
+		string downloadUrl = fileDownloadInfo.DownloadUrl;
 		
 		DownloadResult result;
 		try {

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

@@ -5,15 +5,15 @@ using System.Net.Sockets;
 using System.Text;
 using Phantom.Common.Data.Instance;
 
-namespace Phantom.Agent.Services.Games;
+namespace Phantom.Agent.Minecraft.Server;
 
-static class MinecraftServerStatusProtocol {
+public static class ServerStatusProtocol {
 	public static async Task<InstancePlayerCounts> GetPlayerCounts(ushort serverPort, CancellationToken cancellationToken) {
 		using var tcpClient = new TcpClient();
 		await tcpClient.ConnectAsync(IPAddress.Loopback, serverPort, cancellationToken);
 		var tcpStream = tcpClient.GetStream();
 		
-		// https://minecraft.wiki/w/Java_Edition_protocol/Server_List_Ping
+		// https://wiki.vg/Server_List_Ping
 		tcpStream.WriteByte(0xFE);
 		await tcpStream.FlushAsync(cancellationToken);
 		

Agent/Phantom.Agent.Services/AgentServices.cs

@@ -1,7 +1,7 @@
 using Akka.Actor;
+using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances;
-using Phantom.Agent.Services.Java;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
 using Phantom.Utils.Actor;

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

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Formats.Tar;
-using Phantom.Agent.Services.Instances;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Common.Data.Backups;
 using Phantom.Utils.IO;
 using Phantom.Utils.Logging;

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

@@ -1,4 +1,4 @@
-using Phantom.Agent.Services.Instances.State;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Common.Data.Backups;
 using Phantom.Utils.Logging;
 using Serilog;

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

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using System.Text.RegularExpressions;
-using Phantom.Agent.Services.Games;
-using Phantom.Agent.Services.Instances.State;
+using Phantom.Agent.Minecraft.Command;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Utils.Tasks;
 using Serilog;
 

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

@@ -1,8 +1,7 @@
-using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Instances.Launch;
+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.Agent.Instance;
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;

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

@@ -1,12 +1,12 @@
-using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Downloads;
-using Phantom.Agent.Services.Instances.Launch;
-using Phantom.Agent.Services.Java;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Minecraft.Server;
+using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data;
-using Phantom.Common.Data.Agent.Instance;
-using Phantom.Common.Data.Agent.Instance.Launch;
 using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Instance.Launch;
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
 using Phantom.Utils.Actor;
@@ -56,7 +56,7 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 	
 	public interface ICommand;
 	
-	public sealed record ConfigureInstanceCommand(Guid InstanceGuid, InstanceInfo InstanceInfo, InstanceLaunchRecipe? LaunchRecipe, bool LaunchNow, bool AlwaysReportStatus) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
+	public sealed record ConfigureInstanceCommand(Guid InstanceGuid, InstanceInfo Info, InstanceLaunchRecipe? LaunchRecipe, bool LaunchNow, bool AlwaysReportStatus) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
 	
 	public sealed record LaunchInstanceCommand(Guid InstanceGuid) : ICommand, ICanReply<Result<LaunchInstanceResult, InstanceActionFailure>>;
 	
@@ -68,7 +68,7 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 	
 	private Result<ConfigureInstanceResult, InstanceActionFailure> ConfigureInstance(ConfigureInstanceCommand command) {
 		var instanceGuid = command.InstanceGuid;
-		var instanceInfo = command.InstanceInfo;
+		var instanceInfo = command.Info;
 		var launchRecipe = command.LaunchRecipe;
 		
 		if (instances.TryGetValue(instanceGuid, out var instance)) {
@@ -85,8 +85,7 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 		}
 		else {
 			var instanceLoggerName = PhantomLogger.ShortenGuid(instanceGuid) + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
-			var instanceFolder = Path.Combine(agentFolders.InstancesFolderPath, instanceGuid.ToString());
-			var instanceProperties = new InstanceProperties(instanceGuid, instanceFolder);
+			var instanceProperties = new InstanceProperties(instanceGuid, Path.Combine(agentFolders.InstancesFolderPath, instanceGuid.ToString()));
 			var instanceInit = new InstanceActor.Init(agentState, instanceGuid, instanceLoggerName, instanceServices, instanceTicketManager, shutdownCancellationToken);
 			instances[instanceGuid] = instance = new Instance(Context.ActorOf(InstanceActor.Factory(instanceInit), "Instance-" + instanceGuid), instanceInfo, instanceProperties, launchRecipe);
 			
@@ -95,10 +94,11 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 			instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
 		}
 		
+		string instanceFolder = instance.Properties.InstanceFolder;
 		try {
-			Directories.Create(instance.Properties.InstanceFolder, Chmod.URWX_GRX);
+			Directories.Create(instanceFolder, Chmod.URWX_GRX);
 		} catch (Exception e) {
-			Logger.Error(e, "Could not create instance folder: {Path}", instance.Properties.InstanceFolder);
+			Logger.Error(e, "Could not create instance folder: {Path}", instanceFolder);
 			return ConfigureInstanceResult.CouldNotCreateInstanceFolder;
 		}
 		

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

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

Agent/Phantom.Agent.Services/Instances/InstanceProperties.cs

@@ -1,6 +0,0 @@
-namespace Phantom.Agent.Services.Instances;
-
-sealed record InstanceProperties(
-	Guid InstanceGuid,
-	string InstanceFolder
-);

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

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

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

@@ -2,7 +2,7 @@
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Agent;
-using Phantom.Common.Data.Agent.Instance;
+using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Logging;

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

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

Agent/Phantom.Agent.Services/Instances/Launch/InstanceLaunchResult.cs

@@ -1,15 +0,0 @@
-using Phantom.Agent.Services.Instances.State;
-
-namespace Phantom.Agent.Services.Instances.Launch;
-
-abstract record InstanceLaunchResult {
-	private InstanceLaunchResult() {}
-	
-	public sealed record Success(InstanceProcess Process) : InstanceLaunchResult;
-	
-	public sealed record CouldNotPrepareServerInstance : InstanceLaunchResult;
-	
-	public sealed record CouldNotFindServerExecutable : InstanceLaunchResult;
-	
-	public sealed record CouldNotStartServerExecutable : InstanceLaunchResult;
-}

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

@@ -1,40 +0,0 @@
-using System.Buffers;
-using System.Collections.Immutable;
-using Phantom.Agent.Services.Java;
-using Phantom.Common.Data.Agent.Instance;
-
-namespace Phantom.Agent.Services.Instances.Launch;
-
-sealed class InstancePathResolver(AgentFolders agentFolders, JavaRuntimeRepository javaRuntimeRepository, InstanceProperties instanceProperties) : IInstancePathResolver {
-	public string? Global(ImmutableArray<string> segments) {
-		return ValidateAndCombinePath(agentFolders.ServerExecutableFolderPath, segments);
-	}
-	
-	public string? Local(ImmutableArray<string> segments) {
-		return ValidateAndCombinePath(instanceProperties.InstanceFolder, segments);
-	}
-	
-	public string? Runtime(Guid guid) {
-		return javaRuntimeRepository.TryGetByGuid(guid, out var runtime) ? runtime.ExecutablePath : null;
-	}
-	
-	private static readonly SearchValues<char> InvalidPathPartChars = SearchValues.Create([
-		Path.DirectorySeparatorChar,
-		Path.AltDirectorySeparatorChar,
-		..Path.GetInvalidPathChars(),
-	]);
-	
-	private string? ValidateAndCombinePath(string basePath, ImmutableArray<string> pathSegments) {
-		string path = basePath;
-		
-		foreach (string segment in pathSegments) {
-			if (segment == "." || segment == ".." || segment.ContainsAny(InvalidPathPartChars) || Path.IsPathRooted(segment)) {
-				return null;
-			}
-			
-			path = Path.Combine(path, segment);
-		}
-		
-		return Path.GetFullPath(path);
-	}
-}

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

@@ -1,9 +1,10 @@
-using Phantom.Agent.Services.Instances.State;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Common.Data;
-using Phantom.Common.Data.Agent.Instance;
 using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Instance.Launch;
 
-namespace Phantom.Agent.Services.Instances.Launch;
+namespace Phantom.Agent.Services.Instances.State;
 
 static class InstanceLaunchProcedure {
 	public static async Task<InstanceRunningState?> Run(InstanceContext context, InstanceInfo info, InstanceLauncher launcher, InstanceTicketManager ticketManager, InstanceTicketManager.Ticket ticket, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) {
@@ -43,18 +44,18 @@ static class InstanceLaunchProcedure {
 		cancellationToken.ThrowIfCancellationRequested();
 		
 		switch (await launcher.Launch(context.Logger, reportStatus, cancellationToken)) {
-			case InstanceLaunchResult.Success launchSuccess:
+			case LaunchResult.Success launchSuccess:
 				return launchSuccess.Process;
 			
-			case InstanceLaunchResult.CouldNotPrepareServerInstance:
+			case LaunchResult.CouldNotPrepareServerInstance:
 				context.Logger.Error("Session failed to launch, could not prepare server instance.");
 				return InstanceLaunchFailReason.CouldNotPrepareServerInstance;
 			
-			case InstanceLaunchResult.CouldNotFindServerExecutable:
+			case LaunchResult.CouldNotFindServerExecutable:
 				context.Logger.Error("Session failed to launch, could not find server executable.");
 				return InstanceLaunchFailReason.CouldNotFindServerExecutable;
 			
-			case InstanceLaunchResult.CouldNotStartServerExecutable:
+			case LaunchResult.CouldNotStartServerExecutable:
 				context.Logger.Error("Session failed to launch, could not start server executable.");
 				return InstanceLaunchFailReason.CouldNotStartServerExecutable;
 			

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

@@ -1,5 +1,6 @@
 using System.Net.Sockets;
-using Phantom.Agent.Services.Games;
+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;
@@ -59,9 +60,9 @@ sealed class InstancePlayerCountTracker : CancellableBackgroundTask {
 	
 	private async Task<InstancePlayerCounts?> TryGetPlayerCounts() {
 		try {
-			return await MinecraftServerStatusProtocol.GetPlayerCounts(serverPort, CancellationToken);
-		} catch (MinecraftServerStatusProtocol.ProtocolException e) {
-			Logger.Error("Could not check online player count due to protocol error: {Message}", e.Message);
+			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;

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

@@ -1,8 +1,9 @@
-using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Instances.Launch;
-using Phantom.Common.Data.Agent.Instance;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Services.Backups;
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Instance.Launch;
 using Phantom.Common.Data.Replies;
 
 namespace Phantom.Agent.Services.Instances.State;

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

@@ -1,5 +1,6 @@
 using System.Diagnostics;
-using Phantom.Agent.Services.Games;
+using Phantom.Agent.Minecraft.Command;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
 

Agent/Phantom.Agent.Services/Java/JavaRuntimeExecutable.cs

@@ -1,5 +0,0 @@
-using Phantom.Common.Data.Java;
-
-namespace Phantom.Agent.Services.Java;
-
-sealed record JavaRuntimeExecutable(string ExecutablePath, JavaRuntime Runtime);

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

@@ -5,12 +5,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
-  <ItemGroup>
-    <InternalsVisibleTo Include="Phantom.Agent.Services.Tests" />
-  </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\..\Common\Phantom.Common.Messages.Agent\Phantom.Common.Messages.Agent.csproj" />
+    <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
   </ItemGroup>
 
 </Project>

Agent/Phantom.Agent/Phantom.Agent.csproj

@@ -12,6 +12,7 @@
   
   <ItemGroup>
     <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" />
+    <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
     <ProjectReference Include="..\Phantom.Agent.Services\Phantom.Agent.Services.csproj" />
   </ItemGroup>
 

Agent/Phantom.Agent/Program.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using Phantom.Agent;
+using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Services;
-using Phantom.Agent.Services.Java;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
 using Phantom.Common.Messages.Agent;

Agent/Phantom.Agent/Variables.cs

@@ -1,4 +1,4 @@
-using Phantom.Agent.Services.Java;
+using Phantom.Agent.Minecraft.Java;
 using Phantom.Common.Data;
 using Phantom.Utils.Logging;
 using Phantom.Utils.Runtime;
@@ -43,7 +43,7 @@ sealed record Variables(
 		try {
 			return LoadOrThrow();
 		} catch (Exception e) {
-			PhantomLogger.Root.Fatal("{Error}", e.Message);
+			PhantomLogger.Root.Fatal("{}", e.Message);
 			throw StopProcedureException.Instance;
 		}
 	}

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

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

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

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

Common/Phantom.Common.Data.Agent/Instance/Launch/IInstanceLaunchStepExecutor.cs

@@ -1,8 +0,0 @@
-using System.Collections.Immutable;
-
-namespace Phantom.Common.Data.Agent.Instance.Launch;
-
-public interface IInstanceLaunchStepExecutor<TResult> {
-	Task<TResult> DownloadFile(FileDownloadInfo downloadInfo, IInstancePath path);
-	Task<TResult> EditPropertiesFile(InstancePath.Local path, string comment, ImmutableDictionary<string, string> newValues);
-}

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

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="MemoryPack" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\Phantom.Common.Data\Phantom.Common.Data.csproj" />
-  </ItemGroup>
-
-</Project>

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

@@ -1,5 +1,6 @@
 using System.Collections.Immutable;
 using MemoryPack;
+using Phantom.Common.Data.Agent;
 
 namespace Phantom.Common.Data.Web.Agent;
 

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

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

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

@@ -5,19 +5,19 @@ public enum CreateOrUpdateInstanceResult : byte {
 	Success,
 	InstanceNameMustNotBeEmpty,
 	InstanceMemoryMustNotBeZero,
-	MinecraftVersionNotFound,
+	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.MinecraftVersionNotFound    => "Minecraft version not found.",
-			CreateOrUpdateInstanceResult.AgentNotFound               => "Agent not found.",
-			_                                                        => "Unknown error.",
+			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/Agent/AgentStats.cs

@@ -1,6 +1,6 @@
 using MemoryPack;
 
-namespace Phantom.Common.Data.Web.Agent;
+namespace Phantom.Common.Data.Agent;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record AgentStats(

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

@@ -1,5 +1,6 @@
 using MemoryPack;
 using Phantom.Common.Data.Backups;
+using Phantom.Common.Data.Instance.Launch;
 
 namespace Phantom.Common.Data.Instance;
 

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

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using MemoryPack;
 
-namespace Phantom.Common.Data.Agent.Instance;
+namespace Phantom.Common.Data.Instance;
 
 [MemoryPackable]
 [MemoryPackUnion(tag: 0, typeof(InstancePath.Global))]
@@ -14,27 +14,19 @@ public partial interface IInstancePath {
 public static partial class InstancePath {
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record Global(
-		[property: MemoryPackOrder(0)] ImmutableArray<string> Segments
+		[property: MemoryPackOrder(0)] ImmutableArray<string> Path
 	) : IInstancePath {
 		public string? Resolve(IInstancePathResolver resolver) {
-			return resolver.Global(Segments);
-		}
-		
-		public override string ToString() {
-			return "Global[" + string.Join(separator: '/', Segments) + "]";
+			return resolver.Global(Path);
 		}
 	}
 	
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record Local(
-		[property: MemoryPackOrder(0)] ImmutableArray<string> Segments
+		[property: MemoryPackOrder(0)] ImmutableArray<string> Path
 	) : IInstancePath {
 		public string? Resolve(IInstancePathResolver resolver) {
-			return resolver.Local(Segments);
-		}
-		
-		public override string ToString() {
-			return "Local[" + string.Join(separator: '/', Segments) + "]";
+			return resolver.Local(Path);
 		}
 	}
 	
@@ -45,9 +37,5 @@ public static partial class InstancePath {
 		public string? Resolve(IInstancePathResolver resolver) {
 			return resolver.Runtime(Guid);
 		}
-		
-		public override string ToString() {
-			return "Runtime[" + Guid + "]";
-		}
 	}
 }

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

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

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

@@ -1,4 +1,5 @@
 using MemoryPack;
+using Phantom.Common.Data.Instance.Launch;
 
 namespace Phantom.Common.Data.Instance;
 

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

@@ -2,12 +2,13 @@
 using System.Text;
 using MemoryPack;
 
-namespace Phantom.Common.Data.Agent.Instance;
+namespace Phantom.Common.Data.Instance;
 
 [MemoryPackable]
 [MemoryPackUnion(tag: 0, typeof(InstanceValues.Concatenation))]
 [MemoryPackUnion(tag: 1, typeof(InstanceValues.Text))]
 [MemoryPackUnion(tag: 2, typeof(InstanceValues.Path))]
+[MemoryPackUnion(tag: 3, typeof(InstanceValues.Variable))]
 public partial interface IInstanceValue {
 	string? Resolve(IInstanceValueResolver resolver);
 }
@@ -29,10 +30,6 @@ public static partial class InstanceValues {
 			
 			return result.ToString();
 		}
-		
-		public override string ToString() {
-			return "Concatenation[" + string.Join(",", Values) + "]";
-		}
 	}
 	
 	[MemoryPackable]
@@ -40,10 +37,6 @@ public static partial class InstanceValues {
 		public string Resolve(IInstanceValueResolver resolver) {
 			return Value;
 		}
-		
-		public override string ToString() {
-			return "Text[" + Value + "]";
-		}
 	}
 	
 	[MemoryPackable]
@@ -51,9 +44,14 @@ public static partial class InstanceValues {
 		public string? Resolve(IInstanceValueResolver resolver) {
 			return resolver.Path(Value);
 		}
+	}
 	
-		public override string ToString() {
-			return "Path[" + Value + "]";
+	[MemoryPackable]
+	public sealed partial record Variable(InstanceVariable Value) : IInstanceValue {
+		public string? Resolve(IInstanceValueResolver resolver) {
+			return resolver.Variable(Value);
 		}
 	}
 }
+
+public enum InstanceVariable {}

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

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

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

@@ -1,8 +1,8 @@
 using System.Collections.Immutable;
 using MemoryPack;
-using Phantom.Common.Data.Web.Minecraft;
+using Phantom.Common.Data.Minecraft;
 
-namespace Phantom.Common.Data.Web.Instance;
+namespace Phantom.Common.Data.Instance;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceConfiguration(
@@ -15,4 +15,7 @@ public sealed partial record InstanceConfiguration(
 	[property: MemoryPackOrder(6)] RamAllocationUnits MemoryAllocation,
 	[property: MemoryPackOrder(7)] Guid JavaRuntimeGuid,
 	[property: MemoryPackOrder(8)] ImmutableArray<string> JvmArguments
-);
+) {
+	[MemoryPackIgnore]
+	public InstanceInfo AsInfo => new (InstanceName, ServerPort, [RconPort], MemoryAllocation);
+}

Common/Phantom.Common.Data/Instance/InstanceInfo.cs

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using MemoryPack;
 
-namespace Phantom.Common.Data.Agent.Instance;
+namespace Phantom.Common.Data.Instance;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceInfo(

Common/Phantom.Common.Data/Instance/Launch/IInstanceLaunchStep.cs

@@ -1,13 +1,14 @@
 using System.Collections.Immutable;
 using MemoryPack;
+using Phantom.Common.Data.Minecraft;
 
-namespace Phantom.Common.Data.Agent.Instance.Launch;
+namespace Phantom.Common.Data.Instance.Launch;
 
 [MemoryPackable]
 [MemoryPackUnion(tag: 0, typeof(InstanceLaunchStep.DownloadFile))]
 [MemoryPackUnion(tag: 1, typeof(InstanceLaunchStep.EditPropertiesFile))]
 public partial interface IInstanceLaunchStep {
-	Task<TResult> Run<TResult>(IInstanceLaunchStepExecutor<TResult> executor);
+	Task Run(IInstanceLaunchStepExecutor executor);
 }
 
 public static partial class InstanceLaunchStep {
@@ -16,7 +17,7 @@ public static partial class InstanceLaunchStep {
 		[property: MemoryPackOrder(0)] FileDownloadInfo DownloadInfo,
 		[property: MemoryPackOrder(1)] IInstancePath Path
 	) : IInstanceLaunchStep {
-		public Task<TResult> Run<TResult>(IInstanceLaunchStepExecutor<TResult> executor) {
+		public Task Run(IInstanceLaunchStepExecutor executor) {
 			return executor.DownloadFile(DownloadInfo, Path);
 		}
 	}
@@ -27,7 +28,7 @@ public static partial class InstanceLaunchStep {
 		[property: MemoryPackOrder(1)] string Comment,
 		[property: MemoryPackOrder(2)] ImmutableDictionary<string, string> NewValues
 	) : IInstanceLaunchStep {
-		public Task<TResult> Run<TResult>(IInstanceLaunchStepExecutor<TResult> executor) {
+		public Task Run(IInstanceLaunchStepExecutor executor) {
 			return executor.EditPropertiesFile(Path, Comment, NewValues);
 		}
 	}

Common/Phantom.Common.Data/Instance/Launch/IInstanceLaunchStepExecutor.cs

@@ -0,0 +1,9 @@
+using System.Collections.Immutable;
+using Phantom.Common.Data.Minecraft;
+
+namespace Phantom.Common.Data.Instance.Launch;
+
+public interface IInstanceLaunchStepExecutor {
+	Task DownloadFile(FileDownloadInfo downloadInfo, IInstancePath path);
+	Task EditPropertiesFile(InstancePath.Local path, string comment, ImmutableDictionary<string, string> newValues);
+}

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

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Instance;
+namespace Phantom.Common.Data.Instance.Launch;
 
 public enum InstanceLaunchFailReason : byte {
 	UnknownError                  = 0,

Common/Phantom.Common.Data/Instance/Launch/InstanceLaunchRecipe.cs

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using MemoryPack;
 
-namespace Phantom.Common.Data.Agent.Instance.Launch;
+namespace Phantom.Common.Data.Instance.Launch;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceLaunchRecipe(

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

@@ -1,12 +1,12 @@
 using MemoryPack;
 using Phantom.Utils.Cryptography;
 
-namespace Phantom.Common.Data.Agent;
+namespace Phantom.Common.Data.Minecraft;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial class FileDownloadInfo {
 	[MemoryPackOrder(0)]
-	public string Url { get; }
+	public string DownloadUrl { get; }
 	
 	[MemoryPackOrder(1)]
 	[MemoryPackInclude]
@@ -15,11 +15,11 @@ public sealed partial class FileDownloadInfo {
 	[MemoryPackIgnore]
 	public Sha1String? Hash => hash == null ? null : Sha1String.FromString(hash);
 	
-	public FileDownloadInfo(string url, Sha1String? hash = null) : this(url, hash?.ToString()) {}
+	public FileDownloadInfo(string downloadUrl, Sha1String? hash = null) : this(downloadUrl, hash?.ToString()) {}
 	
 	[MemoryPackConstructor]
-	private FileDownloadInfo(string url, string? hash) {
-		this.Url = url;
+	private FileDownloadInfo(string downloadUrl, string? hash) {
+		this.DownloadUrl = downloadUrl;
 		this.hash = hash;
 	}
 }

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

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Web.Minecraft;
+namespace Phantom.Common.Data.Minecraft;
 
 public enum MinecraftServerKind : ushort {
 	Vanilla = 1,

Common/Phantom.Common.Data/Minecraft/MinecraftVersion.cs

@@ -1,6 +1,6 @@
 using MemoryPack;
 
-namespace Phantom.Common.Data.Web.Minecraft;
+namespace Phantom.Common.Data.Minecraft;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record MinecraftVersion(

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

@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace Phantom.Common.Data.Web.Minecraft;
+namespace Phantom.Common.Data.Minecraft;
 
 public enum MinecraftVersionType : ushort {
 	Other = 0,

Common/Phantom.Common.Data/Result.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using MemoryPack;
+using Phantom.Utils.Monads;
 using Phantom.Utils.Result;
 
 namespace Phantom.Common.Data;
@@ -24,6 +25,9 @@ public sealed partial class Result<TValue, TError> {
 	[MemoryPackIgnore]
 	public TError Error => !hasValue ? error! : throw new InvalidOperationException("Attempted to get error from a success result.");
 	
+	[MemoryPackIgnore]
+	public Either<TValue, TError> AsEither => hasValue ? Either.Left(value!) : Either.Right(error!);
+	
 	private Result(bool hasValue, TValue? value, TError? error) {
 		this.hasValue = hasValue;
 		this.value = value;
@@ -34,11 +38,6 @@ public sealed partial class Result<TValue, TError> {
 		return hasValue && EqualityComparer<TValue>.Default.Equals(value, expectedValue);
 	}
 	
-	[return: NotNullIfNotNull(nameof(valueIfError))]
-	public TValue? OrElse(TValue? valueIfError) {
-		return hasValue ? Value : valueIfError;
-	}
-	
 	public TOutput Into<TOutput>(Func<TValue, TOutput> valueConverter, Func<TError, TOutput> errorConverter) {
 		return hasValue ? valueConverter(value!) : errorConverter(error!);
 	}

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\Phantom.Common.Data.Agent\Phantom.Common.Data.Agent.csproj" />
+    <ProjectReference Include="..\Phantom.Common.Data\Phantom.Common.Data.csproj" />
     <ProjectReference Include="..\..\Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" />
     <ProjectReference Include="..\..\Utils\Phantom.Utils.Rpc\Phantom.Utils.Rpc.csproj" />
   </ItemGroup>

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

@@ -1,7 +1,7 @@
 using MemoryPack;
 using Phantom.Common.Data;
-using Phantom.Common.Data.Agent.Instance;
-using Phantom.Common.Data.Agent.Instance.Launch;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Instance.Launch;
 using Phantom.Common.Data.Replies;
 using Phantom.Utils.Actor;
 

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

@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using MemoryPack;
 using Phantom.Common.Data;
+using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Web.Instance;
 using Phantom.Common.Data.Web.Users;
 using Phantom.Utils.Actor;

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

@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 using MemoryPack;
-using Phantom.Common.Data.Web.Minecraft;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Utils.Actor;
 
 namespace Phantom.Common.Messages.Web.ToController;

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

@@ -1,12 +1,12 @@
 using System.Collections.Immutable;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Java;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Data.Web.Agent;
 using Phantom.Common.Data.Web.AuditLog;
 using Phantom.Common.Data.Web.EventLog;
 using Phantom.Common.Data.Web.Instance;
-using Phantom.Common.Data.Web.Minecraft;
 using Phantom.Common.Data.Web.Users;
 using Phantom.Common.Messages.Web.ToController;
 using Phantom.Common.Messages.Web.ToWeb;

Controller/Phantom.Controller.Database/ApplicationDbContext.cs

@@ -2,9 +2,9 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Phantom.Common.Data;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Web.AuditLog;
 using Phantom.Common.Data.Web.EventLog;
-using Phantom.Common.Data.Web.Minecraft;
 using Phantom.Controller.Database.Converters;
 using Phantom.Controller.Database.Entities;
 using Phantom.Controller.Database.Factories;

Controller/Phantom.Controller.Database/Entities/InstanceEntity.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics.CodeAnalysis;
 using Phantom.Common.Data;
-using Phantom.Common.Data.Web.Minecraft;
+using Phantom.Common.Data.Minecraft;
 
 namespace Phantom.Controller.Database.Entities;
 

Controller/Phantom.Controller.Minecraft/MinecraftLaunchRecipeCreationFailReason.cs

@@ -1,6 +0,0 @@
-namespace Phantom.Controller.Minecraft;
-
-public enum MinecraftLaunchRecipeCreationFailReason : byte {
-	UnknownError             = 0,
-	MinecraftVersionNotFound = 1,
-}

Controller/Phantom.Controller.Minecraft/MinecraftLaunchRecipes.cs

@@ -1,33 +1,34 @@
 using System.Collections.Immutable;
 using System.Text.RegularExpressions;
-using Phantom.Common.Data;
-using Phantom.Common.Data.Agent;
-using Phantom.Common.Data.Agent.Instance;
-using Phantom.Common.Data.Agent.Instance.Launch;
-using Phantom.Common.Data.Web.Instance;
-using Phantom.Common.Data.Web.Minecraft;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Instance.Launch;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Utils.Collections;
 
 namespace Phantom.Controller.Minecraft;
 
 public sealed partial class MinecraftLaunchRecipes(MinecraftVersions minecraftVersions) {
+	[GeneratedRegex(@"[^a-zA-Z0-9_\-\.]", RegexOptions.Compiled)]
+	private static partial Regex SanitizePathRegex();
+	
 	private static readonly ImmutableDictionary<string, string> Eula = ImmutableDictionary.From([
 		("eula", "true"),
 	]);
 	
-	public async Task<Result<InstanceLaunchRecipe, MinecraftLaunchRecipeCreationFailReason>> Create(InstanceConfiguration configuration, CancellationToken cancellationToken) {
+	public async Task<InstanceLaunchRecipe?> Create(InstanceConfiguration configuration, CancellationToken cancellationToken) {
 		string minecraftVersion = configuration.MinecraftVersion;
-		
-		var serverExecutableInfo = await minecraftVersions.GetServerExecutableInfo(minecraftVersion, cancellationToken);
-		if (serverExecutableInfo == null) {
-			return MinecraftLaunchRecipeCreationFailReason.MinecraftVersionNotFound;
-		}
+		string minecraftVersionPath = SanitizePathRegex().IsMatch(minecraftVersion) ? SanitizePathRegex().Replace(minecraftVersion, "_") : minecraftVersion;
 		
 		uint maximumHeapSizeMegabvtes = configuration.MemoryAllocation.InMegabytes;
 		uint initialHeapSizeMegabytes = maximumHeapSizeMegabvtes / 2;
 		
-		var minecraftVersionPathSegment = SanitizePath(minecraftVersion);
-		var vanillaJarFilePath = new InstancePath.Global(["minecraft", "vanilla", minecraftVersionPathSegment, "server.jar"]);
+		var serverExecutableInfo = await minecraftVersions.GetServerExecutableInfo(minecraftVersion, cancellationToken);
+		if (serverExecutableInfo == null) {
+			// TODO
+			return null;
+		}
+		
+		var vanillaJarFilePath = new InstancePath.Global(["minecraft", "vanilla", minecraftVersionPath, "server.jar"]);
 		
 		var steps = ImmutableArray.CreateBuilder<IInstanceLaunchStep>();
 		
@@ -39,8 +40,12 @@ public sealed partial class MinecraftLaunchRecipes(MinecraftVersions minecraftVe
 		var additionalJvmArguments = new List<IInstanceValue>();
 		
 		if (configuration.MinecraftServerKind == MinecraftServerKind.Fabric) {
-			var fabricLauncherFilePath = new InstancePath.Global(["minecraft", "fabric", minecraftVersionPathSegment, "loader.jar"]);
-			AddFabricDownloadStep(steps, configuration, fabricLauncherFilePath);
+			// TODO customizable loader version
+			string fabricLauncherUrl = $"https://meta.fabricmc.net/v2/versions/loader/{minecraftVersion}/stable/stable/server/jar";
+			
+			var fabricLauncherFilePath = new InstancePath.Global(["minecraft", "fabric", minecraftVersionPath, "loader.jar"]);
+			
+			steps.Add(new InstanceLaunchStep.DownloadFile(new FileDownloadInfo(fabricLauncherUrl), fabricLauncherFilePath));
 			
 			serverExecutableFilePath = fabricLauncherFilePath;
 			
@@ -53,21 +58,14 @@ public sealed partial class MinecraftLaunchRecipes(MinecraftVersions minecraftVe
 		return new InstanceLaunchRecipe(steps.ToImmutable(), new InstancePath.Runtime(configuration.JavaRuntimeGuid), [
 			..configuration.JvmArguments.Select(static arg => new InstanceValues.Text(arg)),
 			..additionalJvmArguments,
-			new InstanceValues.Text($"-Xms{initialHeapSizeMegabytes}M"),
-			new InstanceValues.Text($"-Xmx{maximumHeapSizeMegabvtes}M"),
+			new InstanceValues.Text("-Xms" + initialHeapSizeMegabytes + "M"),
+			new InstanceValues.Text("-Xmx" + maximumHeapSizeMegabvtes + "M"),
 			new InstanceValues.Text("-jar"),
 			new InstanceValues.Path(serverExecutableFilePath),
 			new InstanceValues.Text("-nogui"),
 		]);
 	}
 	
-	[GeneratedRegex(@"[^a-zA-Z0-9_\-\.]", RegexOptions.Compiled)]
-	private static partial Regex SanitizePathRegex();
-	
-	private static string SanitizePath(string path) {
-		return SanitizePathRegex().IsMatch(path) ? SanitizePathRegex().Replace(path, "_") : path;
-	}
-	
 	private static ImmutableDictionary<string, string> ServerProperties(InstanceConfiguration configuration) {
 		return ImmutableDictionary.From([
 			("server-port", configuration.ServerPort.ToString()),
@@ -76,11 +74,4 @@ public sealed partial class MinecraftLaunchRecipes(MinecraftVersions minecraftVe
 			("sync-chunk-writes", "false"),
 		]);
 	}
-	
-	private static void AddFabricDownloadStep(ImmutableArray<IInstanceLaunchStep>.Builder steps, InstanceConfiguration configuration, InstancePath.Global filePath) {
-		// TODO customizable loader version
-		string minecraftVersion = configuration.MinecraftVersion;
-		string fabricLauncherUrl = $"https://meta.fabricmc.net/v2/versions/loader/{minecraftVersion}/stable/stable/server/jar";
-		steps.Add(new InstanceLaunchStep.DownloadFile(new FileDownloadInfo(fabricLauncherUrl), filePath));
-	}
 }

Controller/Phantom.Controller.Minecraft/MinecraftVersionApi.cs

@@ -1,8 +1,7 @@
 using System.Collections.Immutable;
 using System.Net.Http.Json;
 using System.Text.Json;
-using Phantom.Common.Data.Agent;
-using Phantom.Common.Data.Web.Minecraft;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Utils.Cryptography;
 using Phantom.Utils.Logging;
 using Phantom.Utils.Runtime;

Controller/Phantom.Controller.Minecraft/MinecraftVersions.cs

@@ -1,7 +1,6 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
-using Phantom.Common.Data.Agent;
-using Phantom.Common.Data.Web.Minecraft;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Utils.Logging;
 using Serilog;
 
@@ -35,7 +34,7 @@ public sealed class MinecraftVersions : IDisposable {
 		return versions;
 	}
 	
-	internal async Task<FileDownloadInfo?> GetServerExecutableInfo(string version, CancellationToken cancellationToken) {
+	public async Task<FileDownloadInfo?> GetServerExecutableInfo(string version, CancellationToken cancellationToken) {
 		var versions = await GetVersions(cancellationToken);
 		return await GetCachedObject(() => cachedServerExecutables.ContainsKey(version), () => cachedServerExecutables[version], v => cachedServerExecutables[version] = v, ct => LoadServerExecutableInfo(versions, version, ct), cancellationToken);
 	}
@@ -47,7 +46,7 @@ public sealed class MinecraftVersions : IDisposable {
 			Logger.Information("Refreshed Minecraft {Version} server executable cache, no file found.", version);
 		}
 		else {
-			Logger.Information("Refreshed Minecraft {Version} server executable cache, found file: {Url}.", version, info.Url);
+			Logger.Information("Refreshed Minecraft {Version} server executable cache, found file: {Url}.", version, info.DownloadUrl);
 		}
 		
 		return info;

Controller/Phantom.Controller.Minecraft/Phantom.Controller.Minecraft.csproj

@@ -6,8 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\Common\Phantom.Common.Data.Agent\Phantom.Common.Data.Agent.csproj" />
-    <ProjectReference Include="..\..\Common\Phantom.Common.Data.Web\Phantom.Common.Data.Web.csproj" />
+    <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" />
     <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" />
     <ProjectReference Include="..\..\Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" />
   </ItemGroup>

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

@@ -2,8 +2,9 @@
 using Akka.Actor;
 using Microsoft.EntityFrameworkCore;
 using Phantom.Common.Data;
-using Phantom.Common.Data.Agent.Instance.Launch;
+using Phantom.Common.Data.Agent;
 using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Instance.Launch;
 using Phantom.Common.Data.Java;
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
@@ -190,14 +191,17 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 		var configurationMessages = ImmutableArray.CreateBuilder<ConfigureInstanceMessage>();
 		
 		foreach (var (instanceGuid, instanceConfiguration, _, _, launchAutomatically) in instanceDataByGuid.Values.ToImmutableArray()) {
-			var launchRecipe = await launchRecipes.Create(instanceConfiguration, cancellationToken);
-			var configurationMessage = new ConfigureInstanceMessage(instanceGuid, instanceConfiguration.AsInfo, launchRecipe.OrElse(null), launchAutomatically);
-			configurationMessages.Add(configurationMessage);
+			var launchRecipe = await CreateInstanceLaunchRecipe(instanceConfiguration);
+			configurationMessages.Add(new ConfigureInstanceMessage(instanceGuid, instanceConfiguration.AsInfo, launchRecipe, launchAutomatically));
 		}
 		
 		return configurationMessages.ToImmutable();
 	}
 	
+	private async Task<InstanceLaunchRecipe?> CreateInstanceLaunchRecipe(InstanceConfiguration configuration) {
+		return await launchRecipes.Create(configuration, cancellationToken);
+	}
+	
 	public interface ICommand;
 	
 	private sealed record InitializeCommand : ICommand;
@@ -346,29 +350,25 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 		                    .Unwrap();
 	}
 	
-	private Task<Result<CreateOrUpdateInstanceResult, InstanceActionFailure>> CreateOrUpdateInstance1(Result<InstanceLaunchRecipe, MinecraftLaunchRecipeCreationFailReason> launchRecipe, CreateOrUpdateInstanceCommand command) {
-		if (!launchRecipe) {
-			return Task.FromResult<Result<CreateOrUpdateInstanceResult, InstanceActionFailure>>(launchRecipe.Error switch {
-				MinecraftLaunchRecipeCreationFailReason.MinecraftVersionNotFound => CreateOrUpdateInstanceResult.MinecraftVersionNotFound,
-				_                                                                => CreateOrUpdateInstanceResult.UnknownError,
-			});
+	private Task<Result<CreateOrUpdateInstanceResult, InstanceActionFailure>> CreateOrUpdateInstance1(InstanceLaunchRecipe? launchRecipe, CreateOrUpdateInstanceCommand command) {
+		if (launchRecipe == null) {
+			// TODO
+			return Task.FromResult<Result<CreateOrUpdateInstanceResult, InstanceActionFailure>>(CreateOrUpdateInstanceResult.MinecraftVersionDownloadInfoNotFound);
 		}
 		
-		var instanceGuid = command.InstanceGuid;
 		var instanceConfiguration = command.Configuration;
 		
-		bool isCreatingInstance = !instanceActorByGuid.TryGetValue(instanceGuid, out var instanceActorRef);
+		bool isCreatingInstance = !instanceActorByGuid.TryGetValue(command.InstanceGuid, out var instanceActorRef);
 		if (isCreatingInstance) {
-			instanceActorRef = CreateNewInstance(Instance.Offline(instanceGuid, instanceConfiguration));
+			instanceActorRef = CreateNewInstance(Instance.Offline(command.InstanceGuid, instanceConfiguration));
 		}
 		
-		var configureInstanceCommand = new InstanceActor.ConfigureInstanceCommand(command.LoggedInUserGuid, instanceGuid, instanceConfiguration, launchRecipe.Value, isCreatingInstance);
+		var configureInstanceCommand = new InstanceActor.ConfigureInstanceCommand(command.LoggedInUserGuid, command.InstanceGuid, instanceConfiguration, launchRecipe, isCreatingInstance);
 		
 		return instanceActorRef.Request(configureInstanceCommand, cancellationToken)
 		                       .ContinueOnActor(CreateOrUpdateInstance2, configureInstanceCommand);
 	}
 	
-	#pragma warning disable CA2254
 	private Result<CreateOrUpdateInstanceResult, InstanceActionFailure> CreateOrUpdateInstance2(Result<ConfigureInstanceResult, InstanceActionFailure> result, InstanceActor.ConfigureInstanceCommand command) {
 		var instanceGuid = command.InstanceGuid;
 		var instanceName = command.Configuration.InstanceName;
@@ -388,7 +388,6 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 			return CreateOrUpdateInstanceResult.UnknownError;
 		}
 	}
-	#pragma warning restore CA2254
 	
 	private void UpdateInstanceStatus(UpdateInstanceStatusCommand command) {
 		TellInstance(command.InstanceGuid, new InstanceActor.SetStatusCommand(command.Status));

Controller/Phantom.Controller.Services/Agents/AgentManager.cs

@@ -52,11 +52,8 @@ sealed class AgentManager(
 			return null;
 		}
 		
-		var agentInfo = registration.AgentInfo;
-		var agentVersionInfo = new AgentVersionInfo(agentInfo.ProtocolVersion, agentInfo.BuildVersion);
-		var agentRuntimeInfo = new AgentRuntimeInfo(agentVersionInfo, agentInfo.MaxInstances, agentInfo.MaxMemory, agentInfo.AllowedServerPorts, agentInfo.AllowedAdditionalPorts);
-		
-		return await agentActor.Request(new AgentActor.RegisterCommand(agentRuntimeInfo, registration.JavaRuntimes), cancellationToken);
+		var runtimeInfo = AgentRuntimeInfo.From(registration.AgentInfo);
+		return await agentActor.Request(new AgentActor.RegisterCommand(runtimeInfo, registration.JavaRuntimes), cancellationToken);
 	}
 	
 	public async Task<AuthSecret?> GetAgentAuthSecret(Guid agentGuid) {

Controller/Phantom.Controller.Services/Instances/InstanceActor.cs

@@ -1,6 +1,6 @@
 using Phantom.Common.Data;
-using Phantom.Common.Data.Agent.Instance.Launch;
 using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Instance.Launch;
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Data.Web.Instance;

Controller/Phantom.Controller.Services/Instances/InstanceDatabaseStorageActor.cs

@@ -1,5 +1,5 @@
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Web.Instance;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Web.Minecraft;
 using Phantom.Controller.Database;
 using Phantom.Controller.Database.Entities;

Controller/Phantom.Controller.Services/Instances/InstanceExtensions.cs

@@ -1,10 +0,0 @@
-using Phantom.Common.Data.Agent.Instance;
-using Phantom.Common.Data.Web.Instance;
-
-namespace Phantom.Controller.Services.Instances;
-
-static class InstanceExtensions {
-	extension(InstanceConfiguration configuration) {
-		public InstanceInfo AsInfo => new (configuration.InstanceName, configuration.ServerPort, [configuration.RconPort], configuration.MemoryAllocation);
-	}
-}

Controller/Phantom.Controller.Services/Rpc/WebMessageHandlerActor.cs

@@ -1,12 +1,12 @@
 using System.Collections.Immutable;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Java;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Data.Web.Agent;
 using Phantom.Common.Data.Web.AuditLog;
 using Phantom.Common.Data.Web.EventLog;
 using Phantom.Common.Data.Web.Instance;
-using Phantom.Common.Data.Web.Minecraft;
 using Phantom.Common.Data.Web.Users;
 using Phantom.Common.Messages.Web;
 using Phantom.Common.Messages.Web.ToController;

PhantomPanel.sln

@@ -18,14 +18,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{92B26F48-235
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Agent", "Agent\Phantom.Agent\Phantom.Agent.csproj", "{418BE1BF-9F63-4B46-B4E4-DF64C3B3DDA7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Agent.Services.Tests", "Agent\Phantom.Agent.Services.Tests\Phantom.Agent.Services.Tests.csproj", "{065FFFA0-DFF4-43DB-AB3D-B92EE9848DDB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Agent.Minecraft", "Agent\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj", "{9FE000D0-91AC-4CB4-8956-91CCC0270015}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Agent.Minecraft.Tests", "Agent\Phantom.Agent.Minecraft.Tests\Phantom.Agent.Minecraft.Tests.csproj", "{065FFFA0-DFF4-43DB-AB3D-B92EE9848DDB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Agent.Services", "Agent\Phantom.Agent.Services\Phantom.Agent.Services.csproj", "{AEE8B77E-AB07-423F-9981-8CD829ACB834}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Common.Data", "Common\Phantom.Common.Data\Phantom.Common.Data.csproj", "{6C3DB1E5-F695-4D70-8F3A-78C2957274BE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Common.Data.Agent", "Common\Phantom.Common.Data.Agent\Phantom.Common.Data.Agent.csproj", "{6EB98B08-19B2-4726-B313-19C4FDA6F89F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Common.Data.Tests", "Common\Phantom.Common.Data.Tests\Phantom.Common.Data.Tests.csproj", "{435D7981-DFDA-46A0-8CD8-CD8C117935D7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Common.Data.Web", "Common\Phantom.Common.Data.Web\Phantom.Common.Data.Web.csproj", "{BC969D0B-0019-48E0-9FAF-F5CC906AAF09}"
@@ -74,6 +74,10 @@ Global
 		{418BE1BF-9F63-4B46-B4E4-DF64C3B3DDA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{418BE1BF-9F63-4B46-B4E4-DF64C3B3DDA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{418BE1BF-9F63-4B46-B4E4-DF64C3B3DDA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FE000D0-91AC-4CB4-8956-91CCC0270015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FE000D0-91AC-4CB4-8956-91CCC0270015}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FE000D0-91AC-4CB4-8956-91CCC0270015}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FE000D0-91AC-4CB4-8956-91CCC0270015}.Release|Any CPU.Build.0 = Release|Any CPU
 		{065FFFA0-DFF4-43DB-AB3D-B92EE9848DDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{065FFFA0-DFF4-43DB-AB3D-B92EE9848DDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{065FFFA0-DFF4-43DB-AB3D-B92EE9848DDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -86,10 +90,6 @@ Global
 		{6C3DB1E5-F695-4D70-8F3A-78C2957274BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6C3DB1E5-F695-4D70-8F3A-78C2957274BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6C3DB1E5-F695-4D70-8F3A-78C2957274BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6EB98B08-19B2-4726-B313-19C4FDA6F89F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EB98B08-19B2-4726-B313-19C4FDA6F89F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EB98B08-19B2-4726-B313-19C4FDA6F89F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6EB98B08-19B2-4726-B313-19C4FDA6F89F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{435D7981-DFDA-46A0-8CD8-CD8C117935D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{435D7981-DFDA-46A0-8CD8-CD8C117935D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{435D7981-DFDA-46A0-8CD8-CD8C117935D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -165,10 +165,10 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{418BE1BF-9F63-4B46-B4E4-DF64C3B3DDA7} = {F5878792-64C8-4ECF-A075-66341FF97127}
+		{9FE000D0-91AC-4CB4-8956-91CCC0270015} = {F5878792-64C8-4ECF-A075-66341FF97127}
 		{065FFFA0-DFF4-43DB-AB3D-B92EE9848DDB} = {94C1E464-3F91-49EA-99FF-3A3082C54CE8}
 		{AEE8B77E-AB07-423F-9981-8CD829ACB834} = {F5878792-64C8-4ECF-A075-66341FF97127}
 		{6C3DB1E5-F695-4D70-8F3A-78C2957274BE} = {01CB1A81-8950-471C-BFDF-F135FDDB2C18}
-		{6EB98B08-19B2-4726-B313-19C4FDA6F89F} = {01CB1A81-8950-471C-BFDF-F135FDDB2C18}
 		{95B55357-F8F0-48C2-A1C2-5EA997651783} = {01CB1A81-8950-471C-BFDF-F135FDDB2C18}
 		{6E798DEB-8921-41A2-8AFB-E4416A9E0704} = {01CB1A81-8950-471C-BFDF-F135FDDB2C18}
 		{435D7981-DFDA-46A0-8CD8-CD8C117935D7} = {D781E00D-8563-4102-A0CD-477A679193B5}

Web/Phantom.Web.Services/Instances/InstanceManager.cs

@@ -1,5 +1,6 @@
 using System.Collections.Immutable;
 using Phantom.Common.Data;
+using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Data.Web.Instance;

Web/Phantom.Web/Shared/InstanceAddOrEditForm.razor

@@ -2,7 +2,9 @@
 @using System.ComponentModel.DataAnnotations
 @using System.Diagnostics.CodeAnalysis
 @using Phantom.Common.Data
+@using Phantom.Common.Data.Instance
 @using Phantom.Common.Data.Java
+@using Phantom.Common.Data.Minecraft
 @using Phantom.Common.Data.Replies
 @using Phantom.Common.Data.Web.Agent
 @using Phantom.Common.Data.Web.Instance

Web/Phantom.Web/Shared/InstanceLog.razor

@@ -1,9 +1,9 @@
-@using System.Diagnostics
-@using Phantom.Common.Data.Web.Users
-@using Phantom.Utils.Collections
+@using Phantom.Utils.Collections
 @using Phantom.Utils.Events
+@using System.Diagnostics
 @using Phantom.Web.Services.Instances
-@inherits PhantomComponent
+@using Phantom.Common.Data.Web.Users
+@inherits Phantom.Web.Components.PhantomComponent
 @inject IJSRuntime Js;
 @inject InstanceLogManager InstanceLogManager;
 

Web/Phantom.Web/Utils/Messages.cs

@@ -1,4 +1,4 @@
-using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Instance.Launch;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Data.Web.Minecraft;
 using Phantom.Common.Data.Web.Users;