.run/Agent 1.run.xml

@@ -9,10 +9,10 @@
       <env name="AGENT_NAME" value="Agent 1" />
       <env name="ALLOWED_RCON_PORTS" value="25575,27000,27001" />
       <env name="ALLOWED_SERVER_PORTS" value="25565,26000,26001" />
-      <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
       <env name="MAX_INSTANCES" value="3" />
       <env name="MAX_MEMORY" value="12G" />
+      <env name="SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />

.run/Agent 2.run.xml

@@ -9,10 +9,10 @@
       <env name="AGENT_NAME" value="Agent 2" />
       <env name="ALLOWED_RCON_PORTS" value="27002-27006" />
       <env name="ALLOWED_SERVER_PORTS" value="26002-26006" />
-      <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
       <env name="MAX_INSTANCES" value="5" />
       <env name="MAX_MEMORY" value="10G" />
+      <env name="SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />

.run/Agent 3.run.xml

@@ -9,10 +9,10 @@
       <env name="AGENT_NAME" value="Agent 3" />
       <env name="ALLOWED_RCON_PORTS" value="27007" />
       <env name="ALLOWED_SERVER_PORTS" value="26007" />
-      <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
       <env name="MAX_INSTANCES" value="1" />
       <env name="MAX_MEMORY" value="2560M" />
+      <env name="SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />

.run/Controller + Web + Agent.run.xml

@@ -1,8 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Controller + Web + Agent" type="CompoundRunConfigurationType">
-    <toRun name="Agent 1" type="DotNetProject" />
-    <toRun name="Controller" type="DotNetProject" />
-    <toRun name="Web" type="DotNetProject" />
-    <method v="2" />
-  </configuration>
-</component>

.run/Server + Agent x3.run.xml

@@ -1,10 +1,9 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Controller + Web + Agent x3" type="CompoundRunConfigurationType">
+  <configuration default="false" name="Server + Agent x3" type="CompoundRunConfigurationType">
     <toRun name="Agent 1" type="DotNetProject" />
     <toRun name="Agent 2" type="DotNetProject" />
     <toRun name="Agent 3" type="DotNetProject" />
-    <toRun name="Controller" type="DotNetProject" />
+    <toRun name="Server" type="DotNetProject" />
-    <toRun name="Web" type="DotNetProject" />
     <method v="2" />
   </configuration>
 </component>

.run/Server + Agent.run.xml

@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Server + Agent" type="CompoundRunConfigurationType">
+    <toRun name="Agent 1" type="DotNetProject" />
+    <toRun name="Server" type="DotNetProject" />
+    <method v="2" />
+  </configuration>
+</component>

.run/Server.run.xml

@@ -1,17 +1,18 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Controller" type="DotNetProject" factoryName=".NET Project">
+  <configuration default="false" name="Server" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Controller/debug/Phantom.Controller.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Controller" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Server" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
-      <env name="AGENT_RPC_SERVER_HOST" value="localhost" />
+      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
       <env name="PG_DATABASE" value="postgres" />
       <env name="PG_HOST" value="localhost" />
       <env name="PG_PASS" value="development" />
-      <env name="PG_PORT" value="9403" />
+      <env name="PG_PORT" value="9402" />
       <env name="PG_USER" value="postgres" />
-      <env name="WEB_RPC_SERVER_HOST" value="localhost" />
+      <env name="RPC_SERVER_HOST" value="localhost" />
+      <env name="WEB_SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />

.run/Web.run.xml

@@ -1,26 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Web" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Web/debug/Phantom.Web.exe" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Web" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <envs>
-      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
-      <env name="CONTROLLER_HOST" value="localhost" />
-      <env name="WEB_KEY" value="BMNHM9RRPMCBBY29D9XHS6KBKZSRY7F5XFN27YZX96XXWJC2NM2D6YRHM9PZN9JGQGCSJ6FMB2GGZ" />
-      <env name="WEB_SERVER_HOST" value="localhost" />
-    </envs>
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="RUNTIME_ARGUMENTS" value="" />
-    <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="net8.0" />
-    <method v="2">
-      <option name="Build" />
-    </method>
-  </configuration>
-</component>

.workdir/Controller/.gitignore

@@ -1 +0,0 @@
-

.workdir/Controller/secrets/web.key

@@ -1,2 +0,0 @@
-±™h?־<>ֹBx
-<02>
–f-<2D>¢יא
<01>“ש"8”כיJ–<4A>‎Jn/וda

.workdir/Controller/secrets/web.secret

@@ -1 +0,0 @@
-TΦ./gϋΏNρ°t<C2B0>$Ν!Β(ƒρ#η~ΖΞ}<14><:

Agent/Phantom.Agent.Rpc/ControllerConnection.cs

@@ -1,21 +0,0 @@
-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);
-	}
-}

Agent/Phantom.Agent.Rpc/KeepAliveLoop.cs

@@ -1,7 +1,5 @@
 using Phantom.Common.Logging;
-using Phantom.Common.Messages.Agent;
+using Phantom.Common.Messages.ToServer;
-using Phantom.Common.Messages.Agent.ToController;
-using Phantom.Utils.Rpc;
 using Serilog;
 
 namespace Phantom.Agent.Rpc;
@@ -11,10 +9,10 @@ sealed class KeepAliveLoop {
 
 	private static readonly TimeSpan KeepAliveInterval = TimeSpan.FromSeconds(10);
 
-	private readonly RpcConnectionToServer<IMessageToControllerListener> connection;
+	private readonly RpcServerConnection connection;
 	private readonly CancellationTokenSource cancellationTokenSource = new ();
 
-	public KeepAliveLoop(RpcConnectionToServer<IMessageToControllerListener> connection) {
+	public KeepAliveLoop(RpcServerConnection connection) {
 		this.connection = connection;
 		Task.Run(Run);
 	}

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

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

Agent/Phantom.Agent.Rpc/RpcClientRuntime.cs

@@ -1,38 +0,0 @@
-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.Rpc/RpcLauncher.cs

@@ -0,0 +1,107 @@
+using NetMQ;
+using NetMQ.Sockets;
+using Phantom.Common.Data.Agent;
+using Phantom.Common.Messages;
+using Phantom.Common.Messages.BiDirectional;
+using Phantom.Common.Messages.ToServer;
+using Phantom.Utils.Rpc;
+using Phantom.Utils.Rpc.Message;
+using Phantom.Utils.Tasks;
+using Serilog;
+using Serilog.Events;
+
+namespace Phantom.Agent.Rpc;
+
+public sealed class RpcLauncher : RpcRuntime<ClientSocket> {
+	public static Task Launch(RpcConfiguration config, AgentAuthToken authToken, AgentInfo agentInfo, Func<RpcServerConnection, IMessageToAgentListener> listenerFactory, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) {
+		var socket = new ClientSocket();
+		var options = socket.Options;
+
+		options.CurveServerCertificate = config.ServerCertificate;
+		options.CurveCertificate = new NetMQCertificate();
+		options.HelloMessage = MessageRegistries.ToServer.Write(new RegisterAgentMessage(authToken, agentInfo)).ToArray();
+
+		return new RpcLauncher(config, socket, agentInfo.Guid, listenerFactory, disconnectSemaphore, receiveCancellationToken).Launch();
+	}
+
+	private readonly RpcConfiguration config;
+	private readonly Guid agentGuid;
+	private readonly Func<RpcServerConnection, IMessageToAgentListener> messageListenerFactory;
+
+	private readonly SemaphoreSlim disconnectSemaphore;
+	private readonly CancellationToken receiveCancellationToken;
+
+	private RpcLauncher(RpcConfiguration config, ClientSocket socket, Guid agentGuid, Func<RpcServerConnection, IMessageToAgentListener> messageListenerFactory, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) : base(config, socket) {
+		this.config = config;
+		this.agentGuid = agentGuid;
+		this.messageListenerFactory = messageListenerFactory;
+		this.disconnectSemaphore = disconnectSemaphore;
+		this.receiveCancellationToken = receiveCancellationToken;
+	}
+
+	protected override void Connect(ClientSocket socket) {
+		var logger = config.RuntimeLogger;
+		var url = config.TcpUrl;
+
+		logger.Information("Starting ZeroMQ client and connecting to {Url}...", url);
+		socket.Connect(url);
+		logger.Information("ZeroMQ client ready.");
+	}
+
+	protected override void Run(ClientSocket socket, MessageReplyTracker replyTracker, TaskManager taskManager) {
+		var connection = new RpcServerConnection(socket, replyTracker);
+		ServerMessaging.SetCurrentConnection(connection);
+		
+		var logger = config.RuntimeLogger;
+		var handler = new MessageToAgentHandler(messageListenerFactory(connection), logger, taskManager, receiveCancellationToken);
+		var keepAliveLoop = new KeepAliveLoop(connection);
+
+		try {
+			while (!receiveCancellationToken.IsCancellationRequested) {
+				var data = socket.Receive(receiveCancellationToken);
+				
+				LogMessageType(logger, data);
+				
+				if (data.Length > 0) {
+					MessageRegistries.ToAgent.Handle(data, handler);
+				}
+			}
+		} catch (OperationCanceledException) {
+			// Ignore.
+		} finally {
+			logger.Debug("ZeroMQ client stopped receiving messages.");
+
+			disconnectSemaphore.Wait(CancellationToken.None);
+			keepAliveLoop.Cancel();
+		}
+	}
+
+	private static void LogMessageType(ILogger logger, ReadOnlyMemory<byte> data) {
+		if (!logger.IsEnabled(LogEventLevel.Verbose)) {
+			return;
+		}
+
+		if (data.Length > 0 && MessageRegistries.ToAgent.TryGetType(data, out var type)) {
+			logger.Verbose("Received {MessageType} ({Bytes} B) from server.", type.Name, data.Length);
+		}
+		else {
+			logger.Verbose("Received {Bytes} B message from server.", data.Length);
+		}
+	}
+
+	protected override async Task Disconnect() {
+		var unregisterTimeoutTask = Task.Delay(TimeSpan.FromSeconds(5), CancellationToken.None);
+		var finishedTask = await Task.WhenAny(ServerMessaging.Send(new UnregisterAgentMessage(agentGuid)), unregisterTimeoutTask);
+		if (finishedTask == unregisterTimeoutTask) {
+			config.RuntimeLogger.Error("Timed out communicating agent shutdown with the server.");
+		}
+	}
+
+	private sealed class MessageToAgentHandler : MessageHandler<IMessageToAgentListener> {
+		public MessageToAgentHandler(IMessageToAgentListener listener, ILogger logger, TaskManager taskManager, CancellationToken cancellationToken) : base(listener, logger, taskManager, cancellationToken) {}
+		
+		protected override Task SendReply(uint sequenceId, byte[] serializedReply) {
+			return ServerMessaging.Send(new ReplyMessage(sequenceId, serializedReply));
+		}
+	}
+}

Agent/Phantom.Agent.Rpc/RpcServerConnection.cs

@@ -0,0 +1,41 @@
+using NetMQ;
+using NetMQ.Sockets;
+using Phantom.Common.Messages;
+using Phantom.Common.Messages.BiDirectional;
+using Phantom.Utils.Rpc.Message;
+
+namespace Phantom.Agent.Rpc; 
+
+public sealed class RpcServerConnection {
+	private readonly ClientSocket socket;
+	private readonly MessageReplyTracker replyTracker;
+
+	internal RpcServerConnection(ClientSocket socket, MessageReplyTracker replyTracker) {
+		this.socket = socket;
+		this.replyTracker = replyTracker;
+	}
+
+	internal async Task Send<TMessage>(TMessage message) where TMessage : IMessageToServer {
+		var bytes = MessageRegistries.ToServer.Write(message).ToArray();
+		if (bytes.Length > 0) {
+			await socket.SendAsync(bytes);
+		}
+	}
+
+	internal async Task<TReply?> Send<TMessage, TReply>(TMessage message, TimeSpan waitForReplyTime, CancellationToken waitForReplyCancellationToken) where TMessage : IMessageToServer<TReply> where TReply : class {
+		var sequenceId = replyTracker.RegisterReply();
+		
+		var bytes = MessageRegistries.ToServer.Write<TMessage, TReply>(sequenceId, message).ToArray();
+		if (bytes.Length == 0) {
+			replyTracker.ForgetReply(sequenceId);
+			return null;
+		}
+
+		await socket.SendAsync(bytes);
+		return await replyTracker.WaitForReply<TReply>(sequenceId, waitForReplyTime, waitForReplyCancellationToken);
+	}
+
+	public void Receive(ReplyMessage message) {
+		replyTracker.ReceiveReply(message.SequenceId, message.SerializedReply);
+	}
+}

Agent/Phantom.Agent.Rpc/ServerMessaging.cs

@@ -0,0 +1,34 @@
+using Phantom.Common.Logging;
+using Phantom.Common.Messages;
+using Serilog;
+
+namespace Phantom.Agent.Rpc;
+
+public static class ServerMessaging {
+	private static readonly ILogger Logger = PhantomLogger.Create(nameof(ServerMessaging));
+	
+	private static RpcServerConnection? CurrentConnection { get; set; }
+	private static RpcServerConnection CurrentConnectionOrThrow => CurrentConnection ?? throw new InvalidOperationException("Server connection not ready.");
+	
+	private static readonly object SetCurrentConnectionLock = new ();
+
+	internal static void SetCurrentConnection(RpcServerConnection connection) {
+		lock (SetCurrentConnectionLock) {
+			if (CurrentConnection != null) {
+				throw new InvalidOperationException("Server connection can only be set once.");
+			}
+			
+			CurrentConnection = connection;
+		}
+		
+		Logger.Information("Server connection ready.");
+	}
+
+	public static Task Send<TMessage>(TMessage message) where TMessage : IMessageToServer {
+		return CurrentConnectionOrThrow.Send(message);
+	}
+
+	public static Task<TReply?> Send<TMessage, TReply>(TMessage message, TimeSpan waitForReplyTime, CancellationToken waitForReplyCancellationToken) where TMessage : IMessageToServer<TReply> where TReply : class {
+		return CurrentConnectionOrThrow.Send<TMessage, TReply>(message, waitForReplyTime, waitForReplyCancellationToken);
+	}
+}

Agent/Phantom.Agent.Services/AgentServices.cs

@@ -1,5 +1,4 @@
 using Phantom.Agent.Minecraft.Java;
-using Phantom.Agent.Rpc;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances;
 using Phantom.Common.Data.Agent;
@@ -19,12 +18,12 @@ public sealed class AgentServices {
 	internal JavaRuntimeRepository JavaRuntimeRepository { get; }
 	internal InstanceSessionManager InstanceSessionManager { get; }
 
-	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders, AgentServiceConfiguration serviceConfiguration, ControllerConnection controllerConnection) {
+	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders, AgentServiceConfiguration serviceConfiguration) {
 		this.AgentFolders = agentFolders;
 		this.TaskManager = new TaskManager(PhantomLogger.Create<TaskManager, AgentServices>());
 		this.BackupManager = new BackupManager(agentFolders, serviceConfiguration.MaxConcurrentCompressionTasks);
 		this.JavaRuntimeRepository = new JavaRuntimeRepository();
-		this.InstanceSessionManager = new InstanceSessionManager(controllerConnection, agentInfo, agentFolders, JavaRuntimeRepository, TaskManager, BackupManager);
+		this.InstanceSessionManager = new InstanceSessionManager(agentInfo, agentFolders, JavaRuntimeRepository, TaskManager, BackupManager);
 	}
 
 	public async Task Initialize() {

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

@@ -1,11 +1,12 @@
 using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Rpc;
 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 Phantom.Common.Messages.ToServer;
 using Serilog;
 
 namespace Phantom.Agent.Services.Instances;
@@ -56,7 +57,7 @@ sealed class Instance : IAsyncDisposable {
 
 	public void ReportLastStatus() {
 		TryUpdateStatus("Report last status of instance " + shortName, async () => {
-			await Services.ControllerConnection.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, currentStatus));
+			await ServerMessaging.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, currentStatus));
 		});
 	}
 
@@ -64,14 +65,14 @@ sealed class Instance : IAsyncDisposable {
 		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));
+				await ServerMessaging.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));
+		Services.TaskManager.Run("Report event for instance " + shortName, async () => await ServerMessaging.Send(message));
 	}
 	
 	internal void TransitionState(IInstanceState newState) {

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

@@ -2,7 +2,7 @@ using System.Collections.Immutable;
 using System.Threading.Channels;
 using Phantom.Agent.Rpc;
 using Phantom.Common.Logging;
-using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Common.Messages.ToServer;
 using Phantom.Utils.Tasks;
 
 namespace Phantom.Agent.Services.Instances;
@@ -16,14 +16,12 @@ sealed class InstanceLogSender : CancellableBackgroundTask {
 	
 	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, TaskManager taskManager, Guid instanceGuid, string loggerName) : base(PhantomLogger.Create<InstanceLogSender>(loggerName), taskManager, "Instance log sender for " + loggerName) {
+	public InstanceLogSender(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);
 		Start();
@@ -63,7 +61,7 @@ sealed class InstanceLogSender : CancellableBackgroundTask {
 
 	private async Task SendOutputToServer(ImmutableArray<string> lines) {
 		if (!lines.IsEmpty) {
-			await controllerConnection.Send(new InstanceOutputMessage(instanceGuid, lines));
+			await ServerMessaging.Send(new InstanceOutputMessage(instanceGuid, lines));
 		}
 	}
 

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

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

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

@@ -14,7 +14,7 @@ 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.Common.Messages.ToServer;
 using Phantom.Utils.IO;
 using Phantom.Utils.Tasks;
 using Serilog;
@@ -24,7 +24,6 @@ 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;
 
@@ -37,8 +36,7 @@ sealed class InstanceSessionManager : IAsyncDisposable {
 
 	private uint instanceLoggerSequenceId = 0;
 
-	public InstanceSessionManager(ControllerConnection controllerConnection, AgentInfo agentInfo, AgentFolders agentFolders, JavaRuntimeRepository javaRuntimeRepository, TaskManager taskManager, BackupManager backupManager) {
+	public InstanceSessionManager(AgentInfo agentInfo, AgentFolders agentFolders, JavaRuntimeRepository javaRuntimeRepository, TaskManager taskManager, BackupManager backupManager) {
-		this.controllerConnection = controllerConnection;
 		this.agentInfo = agentInfo;
 		this.basePath = agentFolders.InstancesFolderPath;
 		this.shutdownCancellationToken = shutdownCancellationTokenSource.Token;
@@ -47,7 +45,7 @@ sealed class InstanceSessionManager : IAsyncDisposable {
 		var launchServices = new LaunchServices(minecraftServerExecutables, javaRuntimeRepository);
 		var portManager = new PortManager(agentInfo.AllowedServerPorts, agentInfo.AllowedRconPorts);
 
-		this.instanceServices = new InstanceServices(controllerConnection, taskManager, portManager, backupManager, launchServices);
+		this.instanceServices = new InstanceServices(taskManager, portManager, backupManager, launchServices);
 	}
 
 	private async Task<InstanceActionResult<T>> AcquireSemaphoreAndRun<T>(Func<Task<InstanceActionResult<T>>> func) {
@@ -148,7 +146,7 @@ sealed class InstanceSessionManager : IAsyncDisposable {
 				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));
+				await ServerMessaging.Send(new ReportAgentStatusMessage(runningInstanceCount, runningInstanceMemory));
 			} finally {
 				semaphore.Release();
 			}

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

@@ -27,7 +27,7 @@ sealed class InstanceRunningState : IInstanceState, IDisposable {
 		this.context = context;
 		this.Process = process;
 
-		this.logSender = new InstanceLogSender(context.Services.ControllerConnection, context.Services.TaskManager, configuration.InstanceGuid, context.ShortName);
+		this.logSender = new InstanceLogSender(context.Services.TaskManager, configuration.InstanceGuid, context.ShortName);
 
 		this.backupScheduler = new BackupScheduler(context.Services.TaskManager, context.Services.BackupManager, process, context, configuration.ServerPort);
 		this.backupScheduler.BackupCompleted += OnScheduledBackupCompleted;

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

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

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

@@ -1,11 +1,11 @@
-using Phantom.Common.Data.Instance;
+using Phantom.Agent.Rpc;
+using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Logging;
-using Phantom.Common.Messages.Agent;
+using Phantom.Common.Messages;
-using Phantom.Common.Messages.Agent.BiDirectional;
+using Phantom.Common.Messages.BiDirectional;
-using Phantom.Common.Messages.Agent.ToAgent;
+using Phantom.Common.Messages.ToAgent;
-using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Common.Messages.ToServer;
-using Phantom.Utils.Rpc;
 using Phantom.Utils.Rpc.Message;
 using Serilog;
 
@@ -14,11 +14,11 @@ 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 RpcServerConnection connection;
 	private readonly AgentServices agent;
 	private readonly CancellationTokenSource shutdownTokenSource;
 
-	public MessageListener(RpcConnectionToServer<IMessageToControllerListener> connection, AgentServices agent, CancellationTokenSource shutdownTokenSource) {
+	public MessageListener(RpcServerConnection connection, AgentServices agent, CancellationTokenSource shutdownTokenSource) {
 		this.connection = connection;
 		this.agent = agent;
 		this.shutdownTokenSource = shutdownTokenSource;
@@ -40,7 +40,7 @@ public sealed class MessageListener : IMessageToAgentListener {
 			}
 		}
 
-		await connection.Send(new AdvertiseJavaRuntimesMessage(agent.JavaRuntimeRepository.All));
+		await ServerMessaging.Send(new AdvertiseJavaRuntimesMessage(agent.JavaRuntimeRepository.All));
 		await agent.InstanceSessionManager.RefreshAgentStatus();
 		
 		return NoReply.Instance;

Agent/Phantom.Agent/AgentKey.cs

@@ -1,5 +1,5 @@
 using NetMQ;
-using Phantom.Common.Data;
+using Phantom.Common.Data.Agent;
 using Phantom.Common.Logging;
 using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
@@ -10,7 +10,7 @@ namespace Phantom.Agent;
 static class AgentKey {
 	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(AgentKey));
 
-	public static Task<(NetMQCertificate, AuthToken)?> Load(string? agentKeyToken, string? agentKeyFilePath) {
+	public static Task<(NetMQCertificate, AgentAuthToken)?> Load(string? agentKeyToken, string? agentKeyFilePath) {
 		if (agentKeyFilePath != null) {
 			return LoadFromFile(agentKeyFilePath);
 		}
@@ -22,7 +22,7 @@ static class AgentKey {
 		}
 	}
 
-	private static async Task<(NetMQCertificate, AuthToken)?> LoadFromFile(string agentKeyFilePath) {
+	private static async Task<(NetMQCertificate, AgentAuthToken)?> LoadFromFile(string agentKeyFilePath) {
 		if (!File.Exists(agentKeyFilePath)) {
 			Logger.Fatal("Missing agent key file: {AgentKeyFilePath}", agentKeyFilePath);
 			return null;
@@ -41,7 +41,7 @@ static class AgentKey {
 		}
 	}
 
-	private static (NetMQCertificate, AuthToken)? LoadFromToken(string agentKey) {
+	private static (NetMQCertificate, AgentAuthToken)? LoadFromToken(string agentKey) {
 		try {
 			return LoadFromBytes(TokenGenerator.DecodeBytes(agentKey));
 		} catch (Exception) {
@@ -50,11 +50,11 @@ static class AgentKey {
 		}
 	}
 
-	private static (NetMQCertificate, AuthToken)? LoadFromBytes(byte[] agentKey) {
+	private static (NetMQCertificate, AgentAuthToken)? LoadFromBytes(byte[] agentKey) {
-		var (publicKey, agentToken) = ConnectionCommonKey.FromBytes(agentKey);
+		var (publicKey, agentToken) = AgentKeyData.FromBytes(agentKey);
-		var controllerCertificate = NetMQCertificate.FromPublicKey(publicKey);
+		var serverCertificate = NetMQCertificate.FromPublicKey(publicKey);
 		
 		Logger.Information("Loaded agent key.");
-		return (controllerCertificate, agentToken);
+		return (serverCertificate, agentToken);
 	}
 }

Agent/Phantom.Agent/Program.cs

@@ -1,15 +1,11 @@
 using System.Reflection;
-using NetMQ;
 using Phantom.Agent;
 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.ToController;
 using Phantom.Utils.Rpc;
-using Phantom.Utils.Rpc.Sockets;
 using Phantom.Utils.Runtime;
 using Phantom.Utils.Tasks;
 
@@ -30,7 +26,7 @@ try {
 	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 (serverHost, serverPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts, maxConcurrentBackupCompressionTasks) = Variables.LoadOrStop();
 
 	var agentKey = await AgentKey.Load(agentKeyToken, agentKeyFilePath);
 	if (agentKey == null) {
@@ -47,20 +43,21 @@ try {
 		return 1;
 	}
 
-	var (controllerCertificate, agentToken) = agentKey.Value;
+	var (serverCertificate, agentToken) = agentKey.Value;
 	var agentInfo = new AgentInfo(agentGuid.Value, agentName, ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
+	var agentServices = new AgentServices(agentInfo, folders, new AgentServiceConfiguration(maxConcurrentBackupCompressionTasks));
+
+	MessageListener MessageListenerFactory(RpcServerConnection connection) {
+		return new MessageListener(connection, agentServices, shutdownCancellationTokenSource);
+	}
 
 	PhantomLogger.Root.InformationHeading("Launching Phantom Panel agent...");
 
-	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 rpcConfiguration = new RpcConfiguration(PhantomLogger.Create("Rpc"), PhantomLogger.Create<TaskManager>("Rpc"), serverHost, serverPort, serverCertificate);
-	var rpcTask = RpcClientRuntime.Launch(rpcSocket, agentInfo, rpcMessageListener, rpcDisconnectSemaphore, shutdownCancellationToken);
+	var rpcTask = RpcLauncher.Launch(rpcConfiguration, agentToken, agentInfo, MessageListenerFactory, rpcDisconnectSemaphore, shutdownCancellationToken);
 	try {
 		await rpcTask.WaitAsync(shutdownCancellationToken);
 	} finally {
@@ -70,8 +67,6 @@ try {
 		rpcDisconnectSemaphore.Release();
 		await rpcTask;
 		rpcDisconnectSemaphore.Dispose();
-		
-		NetMQConfig.Cleanup();
 	}
 
 	return 0;

Agent/Phantom.Agent/Variables.cs

@@ -6,8 +6,8 @@ using Phantom.Utils.Runtime;
 namespace Phantom.Agent;
 
 sealed record Variables(
-	string ControllerHost,
+	string ServerHost,
-	ushort ControllerPort,
+	ushort ServerPort,
 	string JavaSearchPath,
 	string? AgentKeyToken,
 	string? AgentKeyFilePath,
@@ -23,8 +23,8 @@ sealed record Variables(
 		var javaSearchPath = EnvironmentVariables.GetString("JAVA_SEARCH_PATH").WithDefaultGetter(GetDefaultJavaSearchPath);
 
 		return new Variables(
-			EnvironmentVariables.GetString("CONTROLLER_HOST").Require,
+			EnvironmentVariables.GetString("SERVER_HOST").Require,
-			EnvironmentVariables.GetPortNumber("CONTROLLER_PORT").WithDefault(9401),
+			EnvironmentVariables.GetPortNumber("SERVER_PORT").WithDefault(9401),
 			javaSearchPath,
 			agentKeyToken,
 			agentKeyFilePath,

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

@@ -1,22 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Agent;
-
-namespace Phantom.Common.Data.Web.Agent;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record AgentWithStats(
-	[property: MemoryPackOrder(0)] Guid Guid,
-	[property: MemoryPackOrder(1)] string Name,
-	[property: MemoryPackOrder(2)] ushort ProtocolVersion,
-	[property: MemoryPackOrder(3)] string BuildVersion,
-	[property: MemoryPackOrder(4)] ushort MaxInstances,
-	[property: MemoryPackOrder(5)] RamAllocationUnits MaxMemory,
-	[property: MemoryPackOrder(6)] AllowedPorts? AllowedServerPorts,
-	[property: MemoryPackOrder(7)] AllowedPorts? AllowedRconPorts,
-	[property: MemoryPackOrder(8)] AgentStats? Stats,
-	[property: MemoryPackOrder(9)] DateTimeOffset? LastPing,
-	[property: MemoryPackOrder(10)] bool IsOnline
-) {
-	[MemoryPackIgnore]
-	public RamAllocationUnits? AvailableMemory => MaxMemory - Stats?.RunningInstanceMemory;
-}

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

@@ -1,14 +0,0 @@
-using MemoryPack;
-
-namespace Phantom.Common.Data.Web.AuditLog;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-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/EventLog/EventLogItem.cs

@@ -1,13 +0,0 @@
-using MemoryPack;
-
-namespace Phantom.Common.Data.Web.EventLog;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-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 +0,0 @@
-namespace Phantom.Common.Data.Web.EventLog;
-
-public enum EventLogSubjectType {
-	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,15 +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)] InstanceConfiguration Configuration,
-	[property: MemoryPackOrder(1)] IInstanceStatus Status,
-	[property: MemoryPackOrder(2)] bool LaunchAutomatically
-) {
-	public static Instance Offline(InstanceConfiguration configuration, bool launchAutomatically = false) {
-		return new Instance(configuration, InstanceStatus.Offline, launchAutomatically);
-	}
-}

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

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

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

@@ -1,28 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Common.Data.Web.Users.AddUserErrors;
-
-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() {}
-	}
-}
-
-namespace Phantom.Common.Data.Web.Users.AddUserErrors {
-	[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/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,31 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Web.Users.CreateOrUpdateAdministratorUserResults;
-
-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() {}
-	}
-}
-
-namespace Phantom.Common.Data.Web.Users.CreateOrUpdateAdministratorUserResults {
-	[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,23 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Web.Users.CreateUserResults;
-
-namespace Phantom.Common.Data.Web.Users {
-	[MemoryPackable]
-	[MemoryPackUnion(0, typeof(Success))]
-	[MemoryPackUnion(1, typeof(CreationFailed))]
-	[MemoryPackUnion(2, typeof(UnknownError))]
-	public abstract partial record CreateUserResult {
-		internal CreateUserResult() {}
-	}
-}
-
-namespace Phantom.Common.Data.Web.Users.CreateUserResults {
-	[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;
-}

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

@@ -1,11 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-
-namespace Phantom.Common.Data.Web.Users;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record LogInSuccess (
-	[property: MemoryPackOrder(0)] Guid UserGuid,
-	[property: MemoryPackOrder(1)] PermissionSet Permissions,
-	[property: MemoryPackOrder(2)] ImmutableArray<byte> Token
-);

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

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

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

@@ -1,29 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-
-namespace Phantom.Common.Data.Web.Users;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial class PermissionSet {
-	public static PermissionSet None { get; } = new (ImmutableHashSet<string>.Empty);
-	
-	[MemoryPackOrder(0)]
-	[MemoryPackInclude]
-	private readonly ImmutableHashSet<string> permissionIds;
-
-	public PermissionSet(ImmutableHashSet<string> permissionIds) {
-		this.permissionIds = permissionIds;
-	}
-
-	public bool Check(Permission? permission) {
-		while (permission != null) {
-			if (!permissionIds.Contains(permission.Id)) {
-				return false;
-			}
-
-			permission = permission.Parent;
-		}
-
-		return true;
-	}
-}

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

@@ -1,9 +0,0 @@
-using MemoryPack;
-
-namespace Phantom.Common.Data.Web.Users;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record RoleInfo(
-	[property: MemoryPackOrder(0)] Guid Guid,
-	[property: MemoryPackOrder(1)] string Name
-);

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

@@ -1,24 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Common.Data.Web.Users.SetUserPasswordErrors;
-
-namespace Phantom.Common.Data.Web.Users {
-	[MemoryPackable]
-	[MemoryPackUnion(0, typeof(UserNotFound))]
-	[MemoryPackUnion(1, typeof(PasswordIsInvalid))]
-	[MemoryPackUnion(2, typeof(UnknownError))]
-	public abstract partial record SetUserPasswordError {
-		internal SetUserPasswordError() {}
-	}
-}
-
-namespace Phantom.Common.Data.Web.Users.SetUserPasswordErrors {
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record UserNotFound : SetUserPasswordError;
-
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record PasswordIsInvalid([property: MemoryPackOrder(0)] ImmutableArray<PasswordRequirementViolation> Violations) : SetUserPasswordError;
-
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record UnknownError : SetUserPasswordError;
-}

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

@@ -1,9 +0,0 @@
-using MemoryPack;
-
-namespace Phantom.Common.Data.Web.Users;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record UserInfo(
-	[property: MemoryPackOrder(0)] Guid Guid,
-	[property: MemoryPackOrder(1)] string Name
-);

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

@@ -1,12 +0,0 @@
-namespace Phantom.Common.Data.Web.Users;
-
-public static class UserPasswords {
-	public static string Hash(string password) {
-		return BCrypt.Net.BCrypt.HashPassword(password, workFactor: 12);
-	}
-
-	public static bool Verify(string password, string hash) {
-		// TODO rehash
-		return BCrypt.Net.BCrypt.Verify(password, hash);
-	}
-}

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

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

Common/Phantom.Common.Data/Agent/AgentAuthToken.cs

@@ -2,18 +2,18 @@
 using System.Security.Cryptography;
 using MemoryPack;
 
-namespace Phantom.Common.Data;
+namespace Phantom.Common.Data.Agent;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-public sealed partial class AuthToken {
+public sealed partial class AgentAuthToken {
 	internal const int Length = 12;
 
 	[MemoryPackOrder(0)]
 	[MemoryPackInclude]
 	private readonly byte[] bytes;
 
-	internal AuthToken(byte[]? bytes) {
+	internal AgentAuthToken(byte[]? bytes) {
 		if (bytes == null) {
 			throw new ArgumentNullException(nameof(bytes));
 		}
@@ -25,7 +25,7 @@ public sealed partial class AuthToken {
 		this.bytes = bytes;
 	}
 
-	public bool FixedTimeEquals(AuthToken providedAuthToken) {
+	public bool FixedTimeEquals(AgentAuthToken providedAuthToken) {
 		return CryptographicOperations.FixedTimeEquals(bytes, providedAuthToken.bytes);
 	}
 
@@ -33,7 +33,7 @@ public sealed partial class AuthToken {
 		bytes.CopyTo(span);
 	}
 
-	public static AuthToken Generate() {
+	public static AgentAuthToken Generate() {
-		return new AuthToken(RandomNumberGenerator.GetBytes(Length));
+		return new AgentAuthToken(RandomNumberGenerator.GetBytes(Length));
 	}
 }

Common/Phantom.Common.Data/Agent/AgentKeyData.cs

@@ -0,0 +1,18 @@
+namespace Phantom.Common.Data.Agent;
+
+public static class AgentKeyData {
+	private const byte TokenLength = AgentAuthToken.Length;
+
+	public static byte[] ToBytes(byte[] publicKey, AgentAuthToken agentToken) {
+		Span<byte> agentKey = stackalloc byte[TokenLength + publicKey.Length];
+		agentToken.WriteTo(agentKey[..TokenLength]);
+		publicKey.CopyTo(agentKey[TokenLength..]);
+		return agentKey.ToArray();
+	}
+
+	public static (byte[] PublicKey, AgentAuthToken AgentToken) FromBytes(byte[] agentKey) {
+		var token = new AgentAuthToken(agentKey[..TokenLength]);
+		var publicKey = agentKey[TokenLength..];
+		return (publicKey, token);
+	}
+}

Common/Phantom.Common.Data/Agent/AgentStats.cs

@@ -1,9 +0,0 @@
-using MemoryPack;
-
-namespace Phantom.Common.Data.Agent;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record AgentStats(
-	[property: MemoryPackOrder(0)] int RunningInstanceCount,
-	[property: MemoryPackOrder(1)] RamAllocationUnits RunningInstanceMemory
-);

Common/Phantom.Common.Data/ConnectionCommonKey.cs

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

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

@@ -1,10 +1,7 @@
-using MemoryPack;
+namespace Phantom.Common.Data.Minecraft; 
 
-namespace Phantom.Common.Data.Minecraft;
+public sealed record MinecraftVersion(
-
+	string Id,
-[MemoryPackable(GenerateType.VersionTolerant)]
+	MinecraftVersionType Type,
-public sealed partial record MinecraftVersion(
+	string MetadataUrl
-	[property: MemoryPackOrder(0)] string Id,
-	[property: MemoryPackOrder(1)] MinecraftVersionType Type,
-	[property: MemoryPackOrder(2)] string MetadataUrl
 );

Common/Phantom.Common.Logging/PhantomLogger.cs

@@ -27,7 +27,7 @@ public static class PhantomLogger {
 	}
 
 	public static ILogger Create(string name1, string name2) {
-		return Create(ConcatNames(name1, name2));
+		return Create(name1 + ":" + name2);
 	}
 
 	public static ILogger Create<T>() {
@@ -38,18 +38,10 @@ public static class PhantomLogger {
 		return Create(typeof(T).Name, name);
 	}
 
-	public static ILogger Create<T>(string name1, string name2) {
-		return Create(typeof(T).Name, ConcatNames(name1, name2));
-	}
-
 	public static ILogger Create<T1, T2>() {
 		return Create(typeof(T1).Name, typeof(T2).Name);
 	}
 
-	private static string ConcatNames(string name1, string name2) {
-		return name1 + ":" + name2;
-	}
-
 	public static void Dispose() {
 		Root.Dispose();
 		Base.Dispose();

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

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

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

@@ -1,7 +0,0 @@
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Agent;
-
-public interface IMessageToController<TReply> : IMessage<IMessageToControllerListener, TReply> {}
-
-public interface IMessageToController : IMessageToController<NoReply> {}

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

@@ -1,11 +0,0 @@
-using MemoryPack;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Agent.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record AgentIsAliveMessage : IMessageToController {
-	public Task<NoReply> Accept(IMessageToControllerListener listener) {
-		return listener.HandleAgentIsAlive(this);
-	}
-}

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

@@ -1,15 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Agent.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record InstanceOutputMessage(
-	[property: MemoryPackOrder(0)] Guid InstanceGuid,
-	[property: MemoryPackOrder(1)] ImmutableArray<string> Lines
-) : IMessageToController {
-	public Task<NoReply> Accept(IMessageToControllerListener listener) {
-		return listener.HandleInstanceOutput(this);
-	}
-}

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

@@ -1,11 +0,0 @@
-using MemoryPack;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Agent.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record UnregisterAgentMessage : IMessageToController {
-	public Task<NoReply> Accept(IMessageToControllerListener listener) {
-		return listener.HandleUnregisterAgent(this);
-	}
-}

Common/Phantom.Common.Messages.Web/BiDirectional/ReplyMessage.cs

@@ -1,18 +0,0 @@
-using MemoryPack;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Web.BiDirectional;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record ReplyMessage(
-	[property: MemoryPackOrder(0)] uint SequenceId,
-	[property: MemoryPackOrder(1)] byte[] SerializedReply
-) : IMessageToController, IMessageToWeb, IReply {
-	public Task<NoReply> Accept(IMessageToControllerListener listener) {
-		return listener.HandleReply(this);
-	}
-
-	public Task<NoReply> Accept(IMessageToWebListener listener) {
-		return listener.HandleReply(this);
-	}
-}

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

@@ -1,7 +0,0 @@
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Web;
-
-public interface IMessageToController<TReply> : IMessage<IMessageToControllerListener, TReply> {}
-
-public interface IMessageToController : IMessageToController<NoReply> {}

Common/Phantom.Common.Messages.Web/IMessageToControllerListener.cs

@@ -1,35 +0,0 @@
-using System.Collections.Immutable;
-using Phantom.Common.Data.Java;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-using Phantom.Common.Data.Web.AuditLog;
-using Phantom.Common.Data.Web.EventLog;
-using Phantom.Common.Data.Web.Instance;
-using Phantom.Common.Data.Web.Users;
-using Phantom.Common.Messages.Web.BiDirectional;
-using Phantom.Common.Messages.Web.ToController;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Web;
-
-public interface IMessageToControllerListener {
-	Task<NoReply> HandleRegisterWeb(RegisterWebMessage message);
-	Task<NoReply> HandleUnregisterWeb(UnregisterWebMessage message);
-	Task<LogInSuccess?> HandleLogIn(LogInMessage message);
-	Task<CreateOrUpdateAdministratorUserResult> HandleCreateOrUpdateAdministratorUser(CreateOrUpdateAdministratorUserMessage message);
-	Task<CreateUserResult> HandleCreateUser(CreateUserMessage message);
-	Task<ImmutableArray<UserInfo>> HandleGetUsers(GetUsersMessage message);
-	Task<ImmutableArray<RoleInfo>> HandleGetRoles(GetRolesMessage message);
-	Task<ImmutableDictionary<Guid, ImmutableArray<Guid>>> HandleGetUserRoles(GetUserRolesMessage message);
-	Task<ChangeUserRolesResult> HandleChangeUserRoles(ChangeUserRolesMessage message);
-	Task<DeleteUserResult> HandleDeleteUser(DeleteUserMessage message);
-	Task<InstanceActionResult<CreateOrUpdateInstanceResult>> HandleCreateOrUpdateInstance(CreateOrUpdateInstanceMessage message);
-	Task<InstanceActionResult<LaunchInstanceResult>> HandleLaunchInstance(LaunchInstanceMessage message);
-	Task<InstanceActionResult<StopInstanceResult>> HandleStopInstance(StopInstanceMessage message);
-	Task<InstanceActionResult<SendCommandToInstanceResult>> HandleSendCommandToInstance(SendCommandToInstanceMessage message);
-	Task<ImmutableArray<MinecraftVersion>> HandleGetMinecraftVersions(GetMinecraftVersionsMessage message);
-	Task<ImmutableDictionary<Guid, ImmutableArray<TaggedJavaRuntime>>> HandleGetAgentJavaRuntimes(GetAgentJavaRuntimesMessage message);
-	Task<ImmutableArray<AuditLogItem>> HandleGetAuditLog(GetAuditLogMessage message);
-	Task<ImmutableArray<EventLogItem>> HandleGetEventLog(GetEventLogMessage message);
-	Task<NoReply> HandleReply(ReplyMessage message);
-}

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

@@ -1,7 +0,0 @@
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Web;
-
-public interface IMessageToWeb<TReply> : IMessage<IMessageToWebListener, TReply> {}
-
-public interface IMessageToWeb : IMessageToWeb<NoReply> {}

Common/Phantom.Common.Messages.Web/IMessageToWebListener.cs

@@ -1,13 +0,0 @@
-using Phantom.Common.Messages.Web.BiDirectional;
-using Phantom.Common.Messages.Web.ToWeb;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Web;
-
-public interface IMessageToWebListener {
-	Task<NoReply> HandleRegisterWebResult(RegisterWebResultMessage message);
-	Task<NoReply> HandleRefreshAgents(RefreshAgentsMessage message);
-	Task<NoReply> HandleRefreshInstances(RefreshInstancesMessage message);
-	Task<NoReply> HandleInstanceOutput(InstanceOutputMessage message);
-	Task<NoReply> HandleReply(ReplyMessage message);
-}

Common/Phantom.Common.Messages.Web/Phantom.Common.Messages.Web.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\Phantom.Common.Logging\Phantom.Common.Logging.csproj" />
-    <ProjectReference Include="..\Phantom.Common.Data\Phantom.Common.Data.csproj" />
-    <ProjectReference Include="..\Phantom.Common.Data.Web\Phantom.Common.Data.Web.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Rpc\Phantom.Utils.Rpc.csproj" />
-  </ItemGroup>
-
-</Project>

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

@@ -1,17 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Common.Data.Web.Users;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record ChangeUserRolesMessage(
-	[property: MemoryPackOrder(0)] Guid LoggedInUserGuid,
-	[property: MemoryPackOrder(1)] Guid SubjectUserGuid,
-	[property: MemoryPackOrder(2)] ImmutableHashSet<Guid> AddToRoleGuids,
-	[property: MemoryPackOrder(3)] ImmutableHashSet<Guid> RemoveFromRoleGuids
-) : IMessageToController<ChangeUserRolesResult> {
-	public Task<ChangeUserRolesResult> Accept(IMessageToControllerListener listener) {
-		return listener.HandleChangeUserRoles(this);
-	}
-}

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

@@ -1,14 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Web.Users;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record CreateOrUpdateAdministratorUserMessage(
-	[property: MemoryPackOrder(0)] string Username,
-	[property: MemoryPackOrder(1)] string Password
-) : IMessageToController<CreateOrUpdateAdministratorUserResult> {
-	public Task<CreateOrUpdateAdministratorUserResult> Accept(IMessageToControllerListener listener) {
-		return listener.HandleCreateOrUpdateAdministratorUser(this);
-	}
-}

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

@@ -1,16 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Replies;
-using Phantom.Common.Data.Web.Instance;
-
-namespace Phantom.Common.Messages.Web.ToController; 
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record CreateOrUpdateInstanceMessage(
-	[property: MemoryPackOrder(0)] Guid LoggedInUserGuid,
-	[property: MemoryPackOrder(1)] InstanceConfiguration Configuration
-) : IMessageToController<InstanceActionResult<CreateOrUpdateInstanceResult>> {
-	public Task<InstanceActionResult<CreateOrUpdateInstanceResult>> Accept(IMessageToControllerListener listener) {
-		return listener.HandleCreateOrUpdateInstance(this);
-	}
-}

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

@@ -1,15 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Web.Users;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record CreateUserMessage(
-	[property: MemoryPackOrder(0)] Guid LoggedInUserGuid,
-	[property: MemoryPackOrder(1)] string Username,
-	[property: MemoryPackOrder(2)] string Password
-) : IMessageToController<CreateUserResult> {
-	public Task<CreateUserResult> Accept(IMessageToControllerListener listener) {
-		return listener.HandleCreateUser(this);
-	}
-}

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

@@ -1,14 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Web.Users;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record DeleteUserMessage(
-	[property: MemoryPackOrder(0)] Guid LoggedInUserGuid,
-	[property: MemoryPackOrder(1)] Guid SubjectUserGuid
-) : IMessageToController<DeleteUserResult> {
-	public Task<DeleteUserResult> Accept(IMessageToControllerListener listener) {
-		return listener.HandleDeleteUser(this);
-	}
-}

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

@@ -1,12 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Common.Data.Java;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record GetAgentJavaRuntimesMessage : IMessageToController<ImmutableDictionary<Guid, ImmutableArray<TaggedJavaRuntime>>> {
-	public Task<ImmutableDictionary<Guid, ImmutableArray<TaggedJavaRuntime>>> Accept(IMessageToControllerListener listener) {
-		return listener.HandleGetAgentJavaRuntimes(this);
-	}
-}

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

@@ -1,14 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Common.Data.Web.AuditLog;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record GetAuditLogMessage(
-	[property: MemoryPackOrder(0)] int Count
-) : IMessageToController<ImmutableArray<AuditLogItem>> {
-	public Task<ImmutableArray<AuditLogItem>> Accept(IMessageToControllerListener listener) {
-		return listener.HandleGetAuditLog(this);
-	}
-}

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

@@ -1,14 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Common.Data.Web.EventLog;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record GetEventLogMessage(
-	[property: MemoryPackOrder(0)] int Count
-) : IMessageToController<ImmutableArray<EventLogItem>> {
-	public Task<ImmutableArray<EventLogItem>> Accept(IMessageToControllerListener listener) {
-		return listener.HandleGetEventLog(this);
-	}
-}

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

@@ -1,12 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Common.Data.Minecraft;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record GetMinecraftVersionsMessage : IMessageToController<ImmutableArray<MinecraftVersion>> {
-	public Task<ImmutableArray<MinecraftVersion>> Accept(IMessageToControllerListener listener) {
-		return listener.HandleGetMinecraftVersions(this);
-	}
-}

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

@@ -1,12 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Common.Data.Web.Users;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record GetRolesMessage : IMessageToController<ImmutableArray<RoleInfo>> {
-	public Task<ImmutableArray<RoleInfo>> Accept(IMessageToControllerListener listener) {
-		return listener.HandleGetRoles(this);
-	}
-}

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

@@ -1,13 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record GetUserRolesMessage(
-	[property: MemoryPackOrder(0)] ImmutableHashSet<Guid> UserGuids
-) : IMessageToController<ImmutableDictionary<Guid, ImmutableArray<Guid>>> {
-	public Task<ImmutableDictionary<Guid, ImmutableArray<Guid>>> Accept(IMessageToControllerListener listener) {
-		return listener.HandleGetUserRoles(this);
-	}
-}

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

@@ -1,12 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Common.Data.Web.Users;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record GetUsersMessage : IMessageToController<ImmutableArray<UserInfo>> {
-	public Task<ImmutableArray<UserInfo>> Accept(IMessageToControllerListener listener) {
-		return listener.HandleGetUsers(this);
-	}
-}

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

@@ -1,14 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Replies;
-
-namespace Phantom.Common.Messages.Web.ToController; 
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record LaunchInstanceMessage(
-	[property: MemoryPackOrder(0)] Guid LoggedInUserGuid,
-	[property: MemoryPackOrder(1)] Guid InstanceGuid
-) : IMessageToController<InstanceActionResult<LaunchInstanceResult>> {
-	public Task<InstanceActionResult<LaunchInstanceResult>> Accept(IMessageToControllerListener listener) {
-		return listener.HandleLaunchInstance(this);
-	}
-}

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

@@ -1,14 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Web.Users;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record LogInMessage(
-	[property: MemoryPackOrder(0)] string Username,
-	[property: MemoryPackOrder(1)] string Password
-) : IMessageToController<LogInSuccess?> {
-	public Task<LogInSuccess?> Accept(IMessageToControllerListener listener) {
-		return listener.HandleLogIn(this);
-	}
-}

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

@@ -1,14 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record RegisterWebMessage(
-	[property: MemoryPackOrder(0)] AuthToken AuthToken
-) : IMessageToController {
-	public Task<NoReply> Accept(IMessageToControllerListener listener) {
-		return listener.HandleRegisterWeb(this);
-	}
-}

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

@@ -1,15 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Replies;
-
-namespace Phantom.Common.Messages.Web.ToController; 
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record SendCommandToInstanceMessage(
-	[property: MemoryPackOrder(0)] Guid LoggedInUserGuid,
-	[property: MemoryPackOrder(1)] Guid InstanceGuid,
-	[property: MemoryPackOrder(2)] string Command
-) : IMessageToController<InstanceActionResult<SendCommandToInstanceResult>> {
-	public Task<InstanceActionResult<SendCommandToInstanceResult>> Accept(IMessageToControllerListener listener) {
-		return listener.HandleSendCommandToInstance(this);
-	}
-}

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

@@ -1,16 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-
-namespace Phantom.Common.Messages.Web.ToController; 
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record StopInstanceMessage(
-	[property: MemoryPackOrder(0)] Guid LoggedInUserGuid,
-	[property: MemoryPackOrder(1)] Guid InstanceGuid,
-	[property: MemoryPackOrder(2)] MinecraftStopStrategy StopStrategy
-) : IMessageToController<InstanceActionResult<StopInstanceResult>> {
-	public Task<InstanceActionResult<StopInstanceResult>> Accept(IMessageToControllerListener listener) {
-		return listener.HandleStopInstance(this);
-	}
-}

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

@@ -1,11 +0,0 @@
-using MemoryPack;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record UnregisterWebMessage : IMessageToController {
-	public Task<NoReply> Accept(IMessageToControllerListener listener) {
-		return listener.HandleUnregisterWeb(this);
-	}
-}

Common/Phantom.Common.Messages.Web/ToWeb/RefreshAgentsMessage.cs

@@ -1,15 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Common.Data.Web.Agent;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Web.ToWeb; 
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record RefreshAgentsMessage(
-	[property: MemoryPackOrder(0)] ImmutableArray<AgentWithStats> Agents
-) : IMessageToWeb {
-	public Task<NoReply> Accept(IMessageToWebListener listener) {
-		return listener.HandleRefreshAgents(this);
-	}
-}

Common/Phantom.Common.Messages.Web/ToWeb/RefreshInstancesMessage.cs

@@ -1,15 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-using Phantom.Common.Data.Web.Instance;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Web.ToWeb; 
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record RefreshInstancesMessage(
-	[property: MemoryPackOrder(0)] ImmutableArray<Instance> Instances
-) : IMessageToWeb {
-	public Task<NoReply> Accept(IMessageToWebListener listener) {
-		return listener.HandleRefreshInstances(this);
-	}
-}

Common/Phantom.Common.Messages.Web/ToWeb/RegisterWebResultMessage.cs

@@ -1,13 +0,0 @@
-using MemoryPack;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Web.ToWeb; 
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record RegisterWebResultMessage(
-	[property: MemoryPackOrder(0)] bool Success
-) : IMessageToWeb {
-	public Task<NoReply> Accept(IMessageToWebListener listener) {
-		return listener.HandleRegisterWebResult(this);
-	}
-}

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

@@ -1,63 +0,0 @@
-using System.Collections.Immutable;
-using Phantom.Common.Data.Java;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-using Phantom.Common.Data.Web.AuditLog;
-using Phantom.Common.Data.Web.EventLog;
-using Phantom.Common.Data.Web.Instance;
-using Phantom.Common.Data.Web.Users;
-using Phantom.Common.Logging;
-using Phantom.Common.Messages.Web.BiDirectional;
-using Phantom.Common.Messages.Web.ToController;
-using Phantom.Common.Messages.Web.ToWeb;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Web;
-
-public static class WebMessageRegistries {
-	public static MessageRegistry<IMessageToControllerListener> ToController { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToController)));
-	public static MessageRegistry<IMessageToWebListener> ToWeb { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToWeb)));
-	
-	public static IMessageDefinitions<IMessageToWebListener, IMessageToControllerListener, ReplyMessage> Definitions { get; } = new MessageDefinitions();
-
-	static WebMessageRegistries() {
-		ToController.Add<RegisterWebMessage>(0);
-		ToController.Add<UnregisterWebMessage>(1);
-		ToController.Add<LogInMessage, LogInSuccess?>(2);
-		ToController.Add<CreateOrUpdateAdministratorUserMessage, CreateOrUpdateAdministratorUserResult>(3);
-		ToController.Add<CreateUserMessage, CreateUserResult>(4);
-		ToController.Add<DeleteUserMessage, DeleteUserResult>(5);
-		ToController.Add<GetUsersMessage, ImmutableArray<UserInfo>>(6);
-		ToController.Add<GetRolesMessage, ImmutableArray<RoleInfo>>(7);
-		ToController.Add<GetUserRolesMessage, ImmutableDictionary<Guid, ImmutableArray<Guid>>>(8);
-		ToController.Add<ChangeUserRolesMessage, ChangeUserRolesResult>(9);
-		ToController.Add<CreateOrUpdateInstanceMessage, InstanceActionResult<CreateOrUpdateInstanceResult>>(10);
-		ToController.Add<LaunchInstanceMessage, InstanceActionResult<LaunchInstanceResult>>(11);
-		ToController.Add<StopInstanceMessage, InstanceActionResult<StopInstanceResult>>(12);
-		ToController.Add<SendCommandToInstanceMessage, InstanceActionResult<SendCommandToInstanceResult>>(13);
-		ToController.Add<GetMinecraftVersionsMessage, ImmutableArray<MinecraftVersion>>(14);
-		ToController.Add<GetAgentJavaRuntimesMessage, ImmutableDictionary<Guid, ImmutableArray<TaggedJavaRuntime>>>(15);
-		ToController.Add<GetAuditLogMessage, ImmutableArray<AuditLogItem>>(16);
-		ToController.Add<GetEventLogMessage, ImmutableArray<EventLogItem>>(17);
-		ToController.Add<ReplyMessage>(127);
-		
-		ToWeb.Add<RegisterWebResultMessage>(0);
-		ToWeb.Add<RefreshAgentsMessage>(1);
-		ToWeb.Add<RefreshInstancesMessage>(2);
-		ToWeb.Add<InstanceOutputMessage>(3);
-		ToWeb.Add<ReplyMessage>(127);
-	}
-
-	private sealed class MessageDefinitions : IMessageDefinitions<IMessageToWebListener, IMessageToControllerListener, ReplyMessage> {
-		public MessageRegistry<IMessageToWebListener> ToClient => ToWeb;
-		public MessageRegistry<IMessageToControllerListener> ToServer => ToController;
-
-		public bool IsRegistrationMessage(Type messageType) {
-			return messageType == typeof(RegisterWebMessage);
-		}
-
-		public ReplyMessage CreateReplyMessage(uint sequenceId, byte[] serializedReply) {
-			return new ReplyMessage(sequenceId, serializedReply);
-		}
-	}
-}

Common/Phantom.Common.Messages/BiDirectional/ReplyMessage.cs

@@ -1,14 +1,14 @@
 using MemoryPack;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Agent.BiDirectional;
+namespace Phantom.Common.Messages.BiDirectional;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record ReplyMessage(
 	[property: MemoryPackOrder(0)] uint SequenceId,
 	[property: MemoryPackOrder(1)] byte[] SerializedReply
-) : IMessageToController, IMessageToAgent, IReply {
+) : IMessageToServer, IMessageToAgent {
-	public Task<NoReply> Accept(IMessageToControllerListener listener) {
+	public Task<NoReply> Accept(IMessageToServerListener listener) {
 		return listener.HandleReply(this);
 	}
 

Common/Phantom.Common.Messages/IMessageToAgent.cs

@@ -1,6 +1,6 @@
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Agent;
+namespace Phantom.Common.Messages;
 
 public interface IMessageToAgent<TReply> : IMessage<IMessageToAgentListener, TReply> {}
 

Common/Phantom.Common.Messages/IMessageToAgentListener.cs

@@ -1,9 +1,9 @@
 using Phantom.Common.Data.Replies;
-using Phantom.Common.Messages.Agent.BiDirectional;
+using Phantom.Common.Messages.BiDirectional;
-using Phantom.Common.Messages.Agent.ToAgent;
+using Phantom.Common.Messages.ToAgent;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Agent;
+namespace Phantom.Common.Messages;
 
 public interface IMessageToAgentListener {
 	Task<NoReply> HandleRegisterAgentSuccess(RegisterAgentSuccessMessage message);

Common/Phantom.Common.Messages/IMessageToServer.cs

@@ -0,0 +1,7 @@
+using Phantom.Utils.Rpc.Message;
+
+namespace Phantom.Common.Messages;
+
+public interface IMessageToServer<TReply> : IMessage<IMessageToServerListener, TReply> {}
+
+public interface IMessageToServer : IMessageToServer<NoReply> {}

Common/Phantom.Common.Messages/IMessageToServerListener.cs

@@ -1,10 +1,11 @@
-using Phantom.Common.Messages.Agent.BiDirectional;
+using Phantom.Common.Messages.BiDirectional;
-using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Common.Messages.ToServer;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Agent;
+namespace Phantom.Common.Messages; 
 
-public interface IMessageToControllerListener {
+public interface IMessageToServerListener {
+	bool IsDisposed { get; }
 	Task<NoReply> HandleRegisterAgent(RegisterAgentMessage message);
 	Task<NoReply> HandleUnregisterAgent(UnregisterAgentMessage message);
 	Task<NoReply> HandleAgentIsAlive(AgentIsAliveMessage message);

Common/Phantom.Common.Messages/MessageRegistries.cs

@@ -0,0 +1,33 @@
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Logging;
+using Phantom.Common.Messages.BiDirectional;
+using Phantom.Common.Messages.ToAgent;
+using Phantom.Common.Messages.ToServer;
+using Phantom.Utils.Rpc.Message;
+
+namespace Phantom.Common.Messages; 
+
+public static class MessageRegistries {
+	public static MessageRegistry<IMessageToAgentListener> ToAgent { get; } = new (PhantomLogger.Create("MessageRegistry:ToAgent"));
+	public static MessageRegistry<IMessageToServerListener> ToServer { get; } = new (PhantomLogger.Create("MessageRegistry:ToServer"));
+
+	static MessageRegistries() {
+		ToAgent.Add<RegisterAgentSuccessMessage>(0);
+		ToAgent.Add<RegisterAgentFailureMessage>(1);
+		ToAgent.Add<ConfigureInstanceMessage, InstanceActionResult<ConfigureInstanceResult>>(2);
+		ToAgent.Add<LaunchInstanceMessage, InstanceActionResult<LaunchInstanceResult>>(3);
+		ToAgent.Add<StopInstanceMessage, InstanceActionResult<StopInstanceResult>>(4);
+		ToAgent.Add<SendCommandToInstanceMessage, InstanceActionResult<SendCommandToInstanceResult>>(5);
+		ToAgent.Add<ReplyMessage>(127);
+		
+		ToServer.Add<RegisterAgentMessage>(0);
+		ToServer.Add<UnregisterAgentMessage>(1);
+		ToServer.Add<AgentIsAliveMessage>(2);
+		ToServer.Add<AdvertiseJavaRuntimesMessage>(3);
+		ToServer.Add<ReportInstanceStatusMessage>(4);
+		ToServer.Add<InstanceOutputMessage>(5);
+		ToServer.Add<ReportAgentStatusMessage>(6);
+		ToServer.Add<ReportInstanceEventMessage>(7);
+		ToServer.Add<ReplyMessage>(127);
+	}
+}

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

@@ -2,7 +2,7 @@
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Replies;
 
-namespace Phantom.Common.Messages.Agent.ToAgent;
+namespace Phantom.Common.Messages.ToAgent;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record ConfigureInstanceMessage(

Common/Phantom.Common.Messages/ToAgent/LaunchInstanceMessage.cs

@@ -1,7 +1,7 @@
 using MemoryPack;
 using Phantom.Common.Data.Replies;
 
-namespace Phantom.Common.Messages.Agent.ToAgent;
+namespace Phantom.Common.Messages.ToAgent; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record LaunchInstanceMessage(

Common/Phantom.Common.Messages/ToAgent/RegisterAgentFailureMessage.cs

@@ -2,7 +2,7 @@
 using Phantom.Common.Data.Replies;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Agent.ToAgent;
+namespace Phantom.Common.Messages.ToAgent;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record RegisterAgentFailureMessage(