WIP

Agent/Phantom.Agent/Variables.cs

@@ -43,7 +43,7 @@ sealed record Variables(
 		try {
 			return LoadOrThrow();
 		} catch (Exception e) {
-			PhantomLogger.Root.Fatal("{}", e.Message);
+			PhantomLogger.Root.Fatal(e.Message);
 			throw StopProcedureException.Instance;
 		}
 	}

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

@@ -9,10 +9,10 @@ public sealed partial record Agent(
 	[property: MemoryPackOrder(0)] Guid AgentGuid,
 	[property: MemoryPackOrder(1)] AgentConfiguration Configuration,
 	[property: MemoryPackOrder(2)] ImmutableArray<byte> ConnectionKey,
-	[property: MemoryPackOrder(3)] AgentRuntimeInfo RuntimeInfo,
+	[property: MemoryPackOrder(3)] AgentRuntimeInfo? RuntimeInfo,
 	[property: MemoryPackOrder(4)] AgentStats? Stats,
 	[property: MemoryPackOrder(5)] IAgentConnectionStatus ConnectionStatus
 ) {
 	[MemoryPackIgnore]
-	public RamAllocationUnits? AvailableMemory => RuntimeInfo.MaxMemory - Stats?.RunningInstanceMemory;
+	public RamAllocationUnits? AvailableMemory => RuntimeInfo?.MaxMemory - Stats?.RunningInstanceMemory;
 }

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

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

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

@@ -1,9 +0,0 @@
-using MemoryPack;
-
-namespace Phantom.Common.Data.Web.Agent;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public readonly partial record struct AgentVersionInfo(
-	[property: MemoryPackOrder(0)] ushort ProtocolVersion,
-	[property: MemoryPackOrder(1)] string BuildVersion
-);

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

@@ -2,7 +2,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics.CodeAnalysis;
 using Phantom.Common.Data;
-using Phantom.Common.Data.Web.Agent;
 using Phantom.Utils.Rpc;
 
 namespace Phantom.Controller.Database.Entities;
@@ -14,18 +13,14 @@ public sealed class AgentEntity {
 	public Guid AgentGuid { get; init; }
 	
 	public string Name { get; set; }
-	public ushort? ProtocolVersion { get; set; }
-	public string? BuildVersion { get; set; }
-	public ushort? MaxInstances { get; set; }
-	public RamAllocationUnits? MaxMemory { get; set; }
+	public ushort ProtocolVersion { get; set; }
+	public string BuildVersion { get; set; }
+	public ushort MaxInstances { get; set; }
+	public RamAllocationUnits MaxMemory { get; set; }
 	
 	[MaxLength(AuthSecret.Length)]
 	public AuthSecret? AuthSecret { get; set; }
 	
-	public AgentConfiguration Configuration => new (Name);
-	public AgentVersionInfo? VersionInfo => ProtocolVersion is null || BuildVersion is null ? null : new AgentVersionInfo(ProtocolVersion, BuildVersion);
-	public AgentRuntimeInfo RuntimeInfo => new (VersionInfo, MaxInstances, MaxMemory);
-	
 	internal AgentEntity(Guid agentGuid) {
 		AgentGuid = agentGuid;
 		Name = null!;

Controller/Phantom.Controller.Database/Factories/AbstractUpsertHelper.cs

@@ -14,21 +14,15 @@ public abstract class AbstractUpsertHelper<T> where T : class {
 	private protected abstract T Construct(Guid guid);
 	
 	public T Fetch(Guid guid) {
-		return Fetch(guid, out _);
-	}
-	
-	public T Fetch(Guid guid, out bool wasCreated) {
 		DbSet<T> set = Set;
 		T? entity = set.Find(guid);
 		
 		if (entity == null) {
 			entity = Construct(guid);
 			set.Add(entity);
-			wasCreated = true;
 		}
 		else {
 			set.Update(entity);
-			wasCreated = false;
 		}
 		
 		return entity;

Controller/Phantom.Controller.Minecraft/MinecraftVersionApi.cs

@@ -150,12 +150,12 @@ sealed class MinecraftVersionApi : IDisposable {
 	
 	private static JsonElement GetJsonPropertyOrThrow(JsonElement parentElement, string propertyKey, JsonValueKind expectedKind, string location) {
 		if (!parentElement.TryGetProperty(propertyKey, out var valueElement)) {
-			Logger.Error("Missing \"{Property}\" key in {Location}.", propertyKey, location);
+			Logger.Error("Missing \"{Property}\" key in " + location + ".", propertyKey);
 			throw StopProcedureException.Instance;
 		}
 		
 		if (valueElement.ValueKind != expectedKind) {
-			Logger.Error("The \"{Property}\" key in {Location} does not contain a JSON {ExpectedType}. Actual type: {ActualType}", propertyKey, location, expectedKind, valueElement.ValueKind);
+			Logger.Error("The \"{Property}\" key in " + location + " does not contain a JSON {ExpectedType}. Actual type: {ActualType}", propertyKey, expectedKind, valueElement.ValueKind);
 			throw StopProcedureException.Instance;
 		}
 		

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

@@ -34,7 +34,6 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 	private static readonly TimeSpan DisconnectionThreshold = TimeSpan.FromSeconds(12);
 	
 	public readonly record struct Init(
-		Guid? LoggedInUserGuid,
 		Guid AgentGuid,
 		AgentConfiguration AgentConfiguration,
 		AuthSecret AuthSecret,
@@ -108,10 +107,6 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 		
 		this.databaseStorageActor = Context.ActorOf(AgentDatabaseStorageActor.Factory(new AgentDatabaseStorageActor.Init(agentGuid, init.DbProvider, init.CancellationToken)), "DatabaseStorage");
 		
-		if (init.LoggedInUserGuid is {} loggedInUserGuid) {
-			databaseStorageActor.Tell(new AgentDatabaseStorageActor.StoreAgentConfigurationCommand(loggedInUserGuid, configuration));
-		}
-		
 		NotifyAgentUpdated();
 		
 		ReceiveAsync<InitializeCommand>(Initialize);
@@ -275,7 +270,7 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 		
 		Logger.Information("Registered agent \"{AgentName}\" (GUID {AgentGuid}).", AgentName, agentGuid);
 		
-		databaseStorageActor.Tell(new AgentDatabaseStorageActor.StoreAgentRuntimeInfoCommand(runtimeInfo));
+		databaseStorageActor.Tell(new AgentDatabaseStorageActor.StoreAgentDataCommand(configuration, authInfo.Secret, runtimeInfo));
 		
 		javaRuntimes = command.JavaRuntimes;
 		controllerState.UpdateAgentJavaRuntimes(agentGuid, javaRuntimes);
@@ -369,15 +364,19 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 		var isCreating = command.IsCreatingInstance;
 		
 		if (result.Is(ConfigureInstanceResult.Success)) {
-			string action = isCreating ? "Created" : "Edited";
-			Logger.Information(action + " instance \"{InstanceName}\" (GUID {InstanceGuid}) in agent \"{AgentName}\".", instanceName, instanceGuid, AgentName);
+			string action = isCreating ? "Added" : "Edited";
+			string relation = isCreating ? "to agent" : "in agent";
+			
+			Logger.Information(action + " instance \"{InstanceName}\" (GUID {InstanceGuid}) " + relation + " \"{AgentName}\".", instanceName, instanceGuid, AgentName);
 			
 			return CreateOrUpdateInstanceResult.Success;
 		}
 		else {
-			string action = isCreating ? "creating" : "editing";
+			string action = isCreating ? "adding" : "editing";
+			string relation = isCreating ? "to agent" : "in agent";
 			string reason = result.Into(ConfigureInstanceResultExtensions.ToSentence, InstanceActionFailureExtensions.ToSentence);
-			Logger.Information("Failed " + action + " instance \"{InstanceName}\" (GUID {InstanceGuid}) in agent \"{AgentName}\". {ErrorMessage}", instanceName, instanceGuid, AgentName, reason);
+			
+			Logger.Information("Failed " + action + " instance \"{InstanceName}\" (GUID {InstanceGuid}) " + relation + " \"{AgentName}\". {ErrorMessage}", instanceName, instanceGuid, AgentName, reason);
 			
 			return CreateOrUpdateInstanceResult.UnknownError;
 		}

Controller/Phantom.Controller.Services/Agents/AgentDatabaseStorageActor.cs

@@ -5,6 +5,7 @@ using Phantom.Controller.Database.Entities;
 using Phantom.Controller.Database.Repositories;
 using Phantom.Utils.Actor;
 using Phantom.Utils.Logging;
+using Phantom.Utils.Rpc;
 using Serilog;
 
 namespace Phantom.Controller.Services.Agents;
@@ -24,16 +25,17 @@ sealed class AgentDatabaseStorageActor : ReceiveActor<AgentDatabaseStorageActor.
 	private readonly IDbContextProvider dbProvider;
 	private readonly CancellationToken cancellationToken;
 	
-	private StoreAgentRuntimeInfoCommand? storeRuntimeInfoCommand;
+	private StoreAgentDataCommand? storeCommand;
+	private bool hasScheduledFlush;
 	
 	private AgentDatabaseStorageActor(Init init) {
 		this.agentGuid = init.AgentGuid;
 		this.dbProvider = init.DbProvider;
 		this.cancellationToken = init.CancellationToken;
 		
-		Receive<StoreAgentRuntimeInfoCommand>(StoreAgentRuntimeInfo);
+		Receive<StoreAgentDataCommand>(StoreAgentData);
+		ReceiveAsync<FlushAgentDataCommand>(FlushAgentData);
 		ReceiveAsync<StoreAgentConfigurationCommand>(StoreAgentConfiguration);
-		ReceiveAsync<FlushAgentRuntimeInfoCommand>(FlushAgentRuntimeInfo);
 	}
 	
 	private ValueTask<AgentEntity?> FindAgentEntity(ILazyDbContext db) {
@@ -42,84 +44,71 @@ sealed class AgentDatabaseStorageActor : ReceiveActor<AgentDatabaseStorageActor.
 	
 	public interface ICommand;
 	
+	public sealed record StoreAgentDataCommand(AgentConfiguration Configuration, AuthSecret AuthSecret, AgentRuntimeInfo RuntimeInfo) : ICommand;
+	
+	private sealed record FlushAgentDataCommand : ICommand;
+	
 	public sealed record StoreAgentConfigurationCommand(Guid AuditLogUserGuid, AgentConfiguration Configuration) : ICommand;
 	
-	public sealed record StoreAgentRuntimeInfoCommand(AgentRuntimeInfo RuntimeInfo) : ICommand;
-	
-	private sealed record FlushAgentRuntimeInfoCommand : ICommand;
-	
-	private async Task StoreAgentConfiguration(StoreAgentConfigurationCommand command) {
-		await FlushAgentRuntimeInfo();
-		
-		bool wasCreated;
-		string agentName;
-		
-		await using (var db = dbProvider.Lazy()) {
-			var entity = db.Ctx.AgentUpsert.Fetch(agentGuid, out wasCreated);
-			
-			agentName = entity.Name = command.Configuration.AgentName;
-			
-			var auditLogWriter = new AuditLogRepository(db).Writer(command.AuditLogUserGuid);
-			if (wasCreated) {
-				auditLogWriter.AgentCreated(agentGuid);
-			}
-			else {
-				auditLogWriter.AgentEdited(agentGuid);
-			}
-			
-			await db.Ctx.SaveChangesAsync(cancellationToken);
-		}
-		
-		string action = wasCreated ? "Created" : "Edited";
-		Logger.Information(action + " agent \"{AgentName}\" (GUID {AgentGuid}) in database.", agentName, agentGuid);
-	}
-	
-	private void StoreAgentRuntimeInfo(StoreAgentRuntimeInfoCommand command) {
-		storeRuntimeInfoCommand = command;
+	private void StoreAgentData(StoreAgentDataCommand command) {
+		storeCommand = command;
 		ScheduleFlush(TimeSpan.FromSeconds(2));
 	}
 	
 	private void ScheduleFlush(TimeSpan delay) {
-		if (storeRuntimeInfoCommand != null) {
-			Timers.StartSingleTimer("FlushChanges", new FlushAgentRuntimeInfoCommand(), delay, Self);
+		if (!hasScheduledFlush) {
+			hasScheduledFlush = true;
+			Timers.StartSingleTimer("FlushChanges", new FlushAgentDataCommand(), delay, Self);
 		}
 	}
 	
-	private Task FlushAgentRuntimeInfo(FlushAgentRuntimeInfoCommand command) {
-		return FlushAgentRuntimeInfo();
+	private Task FlushAgentData(FlushAgentDataCommand command) {
+		return FlushAgentData();
 	}
 	
-	private async Task FlushAgentRuntimeInfo() {
-		if (storeRuntimeInfoCommand == null) {
+	private async Task FlushAgentData() {
+		hasScheduledFlush = false;
+		
+		if (storeCommand == null) {
 			return;
 		}
 		
-		string agentName;
-		
-		await using (var db = dbProvider.Lazy()) {
-			var entity = await FindAgentEntity(db);
-			if (entity == null) {
-				return;
-			}
-			
-			agentName = entity.Name;
-			
 		try {
-				entity.ProtocolVersion = storeRuntimeInfoCommand.RuntimeInfo.VersionInfo?.ProtocolVersion;
-				entity.BuildVersion = storeRuntimeInfoCommand.RuntimeInfo.VersionInfo?.BuildVersion;
-				entity.MaxInstances = storeRuntimeInfoCommand.RuntimeInfo.MaxInstances;
-				entity.MaxMemory = storeRuntimeInfoCommand.RuntimeInfo.MaxMemory;
+			await using var ctx = dbProvider.Eager();
+			var entity = ctx.AgentUpsert.Fetch(agentGuid);
 			
-				await db.Ctx.SaveChangesAsync(cancellationToken);
+			entity.Name = storeCommand.Configuration.AgentName;
+			entity.ProtocolVersion = storeCommand.RuntimeInfo.ProtocolVersion;
+			entity.BuildVersion = storeCommand.RuntimeInfo.BuildVersion;
+			entity.MaxInstances = storeCommand.RuntimeInfo.MaxInstances;
+			entity.MaxMemory = storeCommand.RuntimeInfo.MaxMemory;
+			entity.AuthSecret = storeCommand.AuthSecret;
+			
+			await ctx.SaveChangesAsync(cancellationToken);
 		} catch (Exception e) {
 			ScheduleFlush(TimeSpan.FromSeconds(10));
-				Logger.Error(e, "Could not update agent \"{AgentName}\" (GUID {AgentGuid}) in database.", entity.Name, agentGuid);
+			Logger.Error(e, "Could not store agent \"{AgentName}\" (GUID {AgentGuid}) in database.", storeCommand.Configuration.AgentName, agentGuid);
 			return;
 		}
+		
+		Logger.Information("Stored agent \"{AgentName}\" (GUID {AgentGuid}) in database.", storeCommand.Configuration.AgentName, agentGuid);
+		
+		storeCommand = null;
 	}
 	
-		Logger.Information("Updated agent \"{AgentName}\" (GUID {AgentGuid}) in database.", agentName, agentGuid);
+	private async Task StoreAgentConfiguration(StoreAgentConfigurationCommand command) {
+		await FlushAgentData();
 		
-		storeRuntimeInfoCommand = null;
+		await using var db = dbProvider.Lazy();
+		
+		var entity = await FindAgentEntity(db);
+		if (entity != null) {
+			entity.Name = command.Configuration.AgentName;
+		}
+		
+		var auditLogWriter = new AuditLogRepository(db).Writer(command.AuditLogUserGuid);
+		auditLogWriter.AgentEdited(agentGuid);
+		
+		await db.Ctx.SaveChangesAsync(cancellationToken);
 	}
 }

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

@@ -37,15 +37,17 @@ sealed class AgentManager(
 		
 		await foreach (var entity in ctx.Agents.AsAsyncEnumerable().WithCancellation(cancellationToken)) {
 			var agentGuid = entity.AgentGuid;
+			var configuration = new AgentConfiguration(entity.Name);
+			var runtimeInfo = new AgentRuntimeInfo(entity.ProtocolVersion, entity.BuildVersion, entity.MaxInstances, entity.MaxMemory);
 			
-			if (AddAgent(loggedInUserGuid: null, agentGuid, entity.Configuration, entity.AuthSecret!, entity.RuntimeInfo)) {
+			if (AddAgent(agentGuid, configuration, entity.AuthSecret!, runtimeInfo)) {
 				Logger.Information("Loaded agent \"{AgentName}\" (GUID {AgentGuid}) from database.", entity.Name, agentGuid);
 			}
 		}
 	}
 	
-	private bool AddAgent(Guid? loggedInUserGuid, Guid agentGuid, AgentConfiguration configuration, AuthSecret authSecret, AgentRuntimeInfo runtimeInfo) {
-		var init = new AgentActor.Init(loggedInUserGuid, agentGuid, configuration, authSecret, runtimeInfo, agentConnectionKeys, controllerState, minecraftVersions, dbProvider, cancellationToken);
+	private bool AddAgent(Guid agentGuid, AgentConfiguration configuration, AuthSecret authSecret, AgentRuntimeInfo runtimeInfo) {
+		var init = new AgentActor.Init(agentGuid, configuration, authSecret, runtimeInfo, agentConnectionKeys, controllerState, minecraftVersions, dbProvider, cancellationToken);
 		var name = "Agent:" + agentGuid;
 		return agentsByAgentGuid.TryAdd(agentGuid, actorSystem.ActorOf(AgentActor.Factory(init), name));
 	}
@@ -87,31 +89,13 @@ sealed class AgentManager(
 			return true;
 		}
 		else {
-			Logger.Warning("Could not deliver command {CommandType} to unknown agent {AgentGuid}.", command.GetType().Name, agentGuid);
+			Logger.Warning("Could not deliver command {CommandType} to non-existent agent {AgentGuid}.", command.GetType().Name, agentGuid);
 			return false;
 		}
 	}
 	
-	public Result<CreateOrUpdateAgentResult, UserActionFailure> CreateOrUpdateAgent(LoggedInUser loggedInUser, Guid agentGuid, AgentConfiguration configuration) {
-		if (!loggedInUser.CheckPermission(Permission.ManageAllAgents)) {
-			return UserActionFailure.NotAuthorized;
-		}
-		
-		if (configuration.AgentName.Length == 0) {
-			return CreateOrUpdateAgentResult.AgentNameMustNotBeEmpty;
-		}
-		
-		if (agentsByAgentGuid.TryGetValue(agentGuid, out var agent)) {
-			agent.Tell(new AgentActor.ConfigureAgentCommand(loggedInUser.Guid!.Value, configuration));
-		}
-		else {
-			AddAgent(loggedInUser.Guid!.Value, agentGuid, configuration, AuthSecret.Generate(), new AgentRuntimeInfo());
-		}
-		
-		return CreateOrUpdateAgentResult.Success;
-	}
-	
-	public async Task<Result<TReply, UserInstanceActionFailure>> DoInstanceAction<TCommand, TReply>(LoggedInUser loggedInUser, Permission requiredPermission, Guid agentGuid, Func<Guid, TCommand> commandFactoryFromLoggedInUserGuid) where TCommand : class, AgentActor.ICommand, ICanReply<Result<TReply, InstanceActionFailure>> {
+	public async Task<Result<TReply, UserInstanceActionFailure>> DoInstanceAction<TCommand, TReply>(Permission requiredPermission, ImmutableArray<byte> authToken, Guid agentGuid, Func<Guid, TCommand> commandFactoryFromLoggedInUserGuid) where TCommand : class, AgentActor.ICommand, ICanReply<Result<TReply, InstanceActionFailure>> {
+		var loggedInUser = userLoginManager.GetLoggedInUser(authToken);
 		if (!loggedInUser.HasAccessToAgent(agentGuid) || !loggedInUser.CheckPermission(requiredPermission)) {
 			return (UserInstanceActionFailure) UserActionFailure.NotAuthorized;
 		}

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

@@ -74,7 +74,7 @@ sealed class WebMessageHandlerActor : ReceiveActor<IMessageToController> {
 		ReceiveAndReplyLater<GetUserRolesMessage, ImmutableDictionary<Guid, ImmutableArray<Guid>>>(GetUserRoles);
 		ReceiveAndReplyLater<ChangeUserRolesMessage, Result<ChangeUserRolesResult, UserActionFailure>>(ChangeUserRoles);
 		ReceiveAndReplyLater<DeleteUserMessage, Result<DeleteUserResult, UserActionFailure>>(DeleteUser);
-		ReceiveAndReply<CreateOrUpdateAgentMessage, Result<CreateOrUpdateAgentResult, UserActionFailure>>(CreateOrUpdateAgentMessage);
+		ReceiveAndReplyLater<CreateOrUpdateAgentMessage, Result<CreateOrUpdateAgentResult, UserActionFailure>>(CreateOrUpdateAgentMessage);
 		ReceiveAndReply<GetAgentJavaRuntimesMessage, ImmutableDictionary<Guid, ImmutableArray<TaggedJavaRuntime>>>(GetAgentJavaRuntimes);
 		ReceiveAndReplyLater<CreateOrUpdateInstanceMessage, Result<CreateOrUpdateInstanceResult, UserInstanceActionFailure>>(CreateOrUpdateInstance);
 		ReceiveAndReplyLater<LaunchInstanceMessage, Result<LaunchInstanceResult, UserInstanceActionFailure>>(LaunchInstance);
@@ -125,7 +125,7 @@ sealed class WebMessageHandlerActor : ReceiveActor<IMessageToController> {
 		return userManager.DeleteByGuid(userLoginManager.GetLoggedInUser(message.AuthToken), message.SubjectUserGuid);
 	}
 	
-	private Result<CreateOrUpdateAgentResult, UserActionFailure> CreateOrUpdateAgentMessage(CreateOrUpdateAgentMessage message) {
+	private Task<Result<CreateOrUpdateAgentResult, UserActionFailure>> CreateOrUpdateAgentMessage(CreateOrUpdateAgentMessage message) {
 		return agentManager.CreateOrUpdateAgent(userLoginManager.GetLoggedInUser(message.AuthToken), message.AgentGuid, message.Configuration);
 	}
 	

Web/Phantom.Web/Pages/Agents.razor

@@ -37,33 +37,33 @@
       <small class="font-monospace text-uppercase">@agent.AgentGuid.ToString()</small>
     </Cell>
     <Cell class="text-end">
-      @if (runtimeInfo.MaxInstances is {} maxInstances) {
-        <ProgressBar Value="@(usedInstances ?? 0)" Maximum="@maxInstances">
-          @(usedInstances?.ToString() ?? "?") / @maxInstances.ToString()
-        </ProgressBar>
+      @if (runtimeInfo == null) {
+        <text>N/A</text>
       }
       else {
-        @:N/A
+        <ProgressBar Value="@(usedInstances ?? 0)" Maximum="@runtimeInfo.MaxInstances">
+          @(usedInstances?.ToString() ?? "?") / @runtimeInfo.MaxInstances.ToString()
+        </ProgressBar>
       }
     </Cell>
     <Cell class="text-end">
-      @if (runtimeInfo.MaxMemory is {} maxMemory) {
-        <ProgressBar Value="@(usedMemory ?? 0)" Maximum="@maxMemory.InMegabytes">
-          @(usedMemory?.ToString() ?? "?") / @maxMemory.InMegabytes.ToString() MB
-        </ProgressBar>
+      @if (runtimeInfo == null) {
+        <text>N/A</text>
       }
       else {
-        @:N/A
+        <ProgressBar Value="@(usedMemory ?? 0)" Maximum="@runtimeInfo.MaxMemory.InMegabytes">
+          @(usedMemory?.ToString() ?? "?") / @runtimeInfo.MaxMemory.InMegabytes.ToString() MB
+        </ProgressBar>
       }
     </Cell>
     <Cell class="text-condensed">
-      @if (runtimeInfo.VersionInfo is {} versionInfo) {
-        <text>Build: <span class="font-monospace">@versionInfo.BuildVersion</span></text>
-        <br>
-        <text>Protocol: <span class="font-monospace">v@(versionInfo.ProtocolVersion.ToString())</span></text>
+      @if (runtimeInfo == null) {
+        <text>N/A</text>
       }
       else {
-        @:N/A
+        <text>Build: <span class="font-monospace">@runtimeInfo.BuildVersion</span></text>
+        <br>
+        <text>Protocol: <span class="font-monospace">v@(runtimeInfo.ProtocolVersion.ToString())</span></text>
       }
     </Cell>
     @switch (agent.ConnectionStatus) {

Web/Phantom.Web/Shared/InstanceAddOrEditForm.razor

@@ -33,11 +33,11 @@
           return
             @<option value="@agent.AgentGuid">
               @agent.Configuration.AgentName
-              @if (runtimeInfo.MaxInstances is not null && runtimeInfo.MaxMemory is not null) {
+              @if (runtimeInfo != null) {
                 <text>&bullet;</text>
                 <text>@(agent.Stats?.RunningInstanceCount.ToString() ?? "?")/@(runtimeInfo.MaxInstances) @(runtimeInfo.MaxInstances == 1 ? "Instance" : "Instances")</text>
                 <text>&bullet;</text>
-                <text>@(agent.Stats?.RunningInstanceMemory.InMegabytes.ToString() ?? "?")/@(runtimeInfo.MaxMemory.Value.InMegabytes) MB RAM</text>
+                <text>@(agent.Stats?.RunningInstanceMemory.InMegabytes.ToString() ?? "?")/@(runtimeInfo.MaxMemory.InMegabytes) MB RAM</text>
               }
             </option>;
         }
@@ -103,8 +103,8 @@
     </div>
 
     @{
-      string? allowedServerPorts = selectedAgent?.RuntimeInfo.AllowedServerPorts?.ToString();
-      string? allowedRconPorts = selectedAgent?.RuntimeInfo.AllowedRconPorts?.ToString();
+      string? allowedServerPorts = selectedAgent?.RuntimeInfo?.AllowedServerPorts?.ToString();
+      string? allowedRconPorts = selectedAgent?.RuntimeInfo?.AllowedRconPorts?.ToString();
     }
     <div class="col-sm-6 col-xl-2 mb-3">
       <FormNumberInput Id="instance-server-port" @bind-Value="form.ServerPort" min="0" max="65535">
@@ -143,11 +143,11 @@
       }
       <FormNumberInput Id="instance-memory" Type="FormNumberInputType.Range" DebounceMillis="0" DisableTwoWayBinding="true" @bind-Value="form.MemoryUnits" min="@MinimumMemoryUnits" max="@maximumMemoryUnits" disabled="@(maximumMemoryUnits == 0)" class="form-range split-danger" style="@memoryInputSplitVar">
         <LabelFragment>
-          @if (maximumMemoryUnits == 0 || selectedAgent?.RuntimeInfo.MaxMemory is not {} maxMemory) {
+          @if (maximumMemoryUnits == 0 || selectedAgent?.RuntimeInfo == null) {
             <text>RAM</text>
           }
           else {
-            <text>RAM &bullet; <code>@(form.MemoryAllocation?.InMegabytes ?? 0) / @(maxMemory.InMegabytes) MB</code></text>
+            <text>RAM &bullet; <code>@(form.MemoryAllocation?.InMegabytes ?? 0) / @(selectedAgent.RuntimeInfo.MaxMemory.InMegabytes) MB</code></text>
           }
         </LabelFragment>
       </FormNumberInput>
@@ -211,7 +211,7 @@
 
     public ImmutableArray<TaggedJavaRuntime> JavaRuntimesForSelectedAgent => TryGet(page.allAgentJavaRuntimes, SelectedAgentGuid, out var javaRuntimes) ? javaRuntimes : ImmutableArray<TaggedJavaRuntime>.Empty;
 
-    public ushort MaximumMemoryUnits => SelectedAgent?.RuntimeInfo.MaxMemory?.RawValue ?? 0;
+    public ushort MaximumMemoryUnits => SelectedAgent?.RuntimeInfo?.MaxMemory.RawValue ?? 0;
     public ushort AvailableMemoryUnits => Math.Min((SelectedAgent?.AvailableMemory + editedInstanceRamAllocation)?.RawValue ?? MaximumMemoryUnits, MaximumMemoryUnits);
     private ushort selectedMemoryUnits = 4;
 
@@ -252,12 +252,12 @@
 
     public sealed class ServerPortMustBeAllowedAttribute : FormValidationAttribute<ConfigureInstanceFormModel, int> {
       protected override string FieldName => nameof(ServerPort);
-      protected override bool IsValid(ConfigureInstanceFormModel model, int value) => model.SelectedAgent is not {} agent || agent.RuntimeInfo.AllowedServerPorts?.Contains((ushort) value) == true;
+      protected override bool IsValid(ConfigureInstanceFormModel model, int value) => model.SelectedAgent is not {} agent || agent.RuntimeInfo?.AllowedServerPorts?.Contains((ushort) value) == true;
     }
 
     public sealed class RconPortMustBeAllowedAttribute : FormValidationAttribute<ConfigureInstanceFormModel, int> {
       protected override string FieldName => nameof(RconPort);
-      protected override bool IsValid(ConfigureInstanceFormModel model, int value) => model.SelectedAgent is not {} agent || agent.RuntimeInfo.AllowedRconPorts?.Contains((ushort) value) == true;
+      protected override bool IsValid(ConfigureInstanceFormModel model, int value) => model.SelectedAgent is not {} agent || agent.RuntimeInfo?.AllowedRconPorts?.Contains((ushort) value) == true;
     }
 
     public sealed class RconPortMustDifferFromServerPortAttribute : FormValidationAttribute<ConfigureInstanceFormModel, int?> {