WIP

.config/dotnet-tools.json

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

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

@@ -15,4 +15,30 @@ public sealed partial record Agent(
 ) {
 	[MemoryPackIgnore]
 	public RamAllocationUnits? AvailableMemory => RuntimeInfo.MaxMemory - Stats?.RunningInstanceMemory;
+	
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed partial record Update(
+		[property: MemoryPackOrder(0)] Optional<AgentConfiguration> Configuration,
+		[property: MemoryPackOrder(1)] Optional<ImmutableArray<byte>> ConnectionKey,
+		[property: MemoryPackOrder(2)] Optional<AgentRuntimeInfo> RuntimeInfo,
+		[property: MemoryPackOrder(3)] OptionalNullable<AgentStats> Stats,
+		[property: MemoryPackOrder(4)] Optional<IAgentConnectionStatus> ConnectionStatus
+	) {
+		public Update Merge(Update newer) => new (
+			newer.Configuration.Or(Configuration),
+			newer.ConnectionKey.Or(ConnectionKey),
+			newer.RuntimeInfo.Or(RuntimeInfo),
+			newer.Stats.Or(Stats),
+			newer.ConnectionStatus.Or(ConnectionStatus)
+		);
+		
+		public Agent Apply(Agent target) => new (
+			target.AgentGuid,
+			Configuration.Or(target.Configuration),
+			ConnectionKey.Or(target.ConnectionKey),
+			RuntimeInfo.Or(target.RuntimeInfo),
+			Stats.Or(target.Stats),
+			ConnectionStatus.Or(target.ConnectionStatus)
+		);
+	}
 }

Common/Phantom.Common.Data.Web/RemoteDictionary.cs

@@ -0,0 +1,5 @@
+namespace Phantom.Common.Data.Web;
+
+public class RemoteDictionary<K, V> {
+	
+}

Common/Phantom.Common.Data/Optional.cs

@@ -3,8 +3,47 @@
 namespace Phantom.Common.Data;
 
 [MemoryPackable]
-public readonly partial record struct Optional<T>(T? Value) {
+public readonly partial struct Optional<T> {
-	public static implicit operator Optional<T>(T? value) {
+	[MemoryPackOrder(0)]
+	public bool HasValue { get; }
+	
+	[MemoryPackOrder(1)]
+	public T Value {
+		get {
+			if (HasValue) {
+				return field!;
+			}
+			else {
+				throw new InvalidOperationException();
+			}
+		}
+	}
+	
+	[MemoryPackIgnore]
+	public T? ValueOrDefault => HasValue ? Value : default;
+	
+	public Optional() : this(hasValue: false, value: default) {}
+	public Optional(T value) : this(hasValue: true, value) {}
+	
+	[MemoryPackConstructor]
+	private Optional(bool hasValue, T? value) {
+		this.HasValue = hasValue;
+		this.Value = value;
+	}
+	
+	public Optional<R> Map<R>(Func<T, R> func) {
+		return HasValue ? new Optional<R>(func(Value)) : new Optional<R>();
+	}
+	
+	public T Or(T fallbackValue) {
+		return HasValue ? Value : fallbackValue;
+	}
+	
+	public Optional<T> Or(Optional<T> fallbackOptional) {
+		return HasValue ? Value : fallbackOptional;
+	}
+	
+	public static implicit operator Optional<T>(T value) {
 		return new Optional<T>(value);
 	}
 }

Common/Phantom.Common.Data/OptionalNullable.cs

@@ -0,0 +1,42 @@
+using MemoryPack;
+
+namespace Phantom.Common.Data;
+
+[MemoryPackable]
+public readonly partial struct OptionalNullable<T> {
+	[MemoryPackOrder(0)]
+	public bool HasValue { get; }
+	
+	[MemoryPackOrder(1)]
+	public T? Value {
+		get {
+			if (HasValue) {
+				return field;
+			}
+			else {
+				throw new InvalidOperationException();
+			}
+		}
+	}
+	
+	public OptionalNullable() : this(hasValue: false, value: default) {}
+	public OptionalNullable(T? value) : this(hasValue: true, value) {}
+	
+	[MemoryPackConstructor]
+	private OptionalNullable(bool hasValue, T? value) {
+		this.HasValue = hasValue;
+		this.Value = value;
+	}
+	
+	public T? Or(T? fallbackValue) {
+		return HasValue ? Value : fallbackValue;
+	}
+	
+	public OptionalNullable<T> Or(OptionalNullable<T> fallbackOptional) {
+		return HasValue ? Value : fallbackOptional;
+	}
+	
+	public static implicit operator OptionalNullable<T>(T? value) {
+		return new OptionalNullable<T>(value);
+	}
+}

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

@@ -0,0 +1,25 @@
+using System.Collections.Immutable;
+using MemoryPack;
+using Phantom.Common.Data.Web.Agent;
+
+namespace Phantom.Common.Messages.Web.ToWeb;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record RefreshAgentsMessage2(
+	[property: MemoryPackOrder(0)] ImmutableArray<RefreshAgentsMessage2.IItemAction> Actions
+) : IMessageToWeb {
+	[MemoryPackable]
+	[MemoryPackUnion(tag: 0, typeof(RemoveItem))]
+	[MemoryPackUnion(tag: 1, typeof(SetItem))]
+	[MemoryPackUnion(tag: 2, typeof(UpdateItem))]
+	public partial interface IItemAction;
+	
+	[MemoryPackable]
+	public sealed partial record RemoveItem(Guid AgentGuid) : IItemAction;
+	
+	[MemoryPackable]
+	public sealed partial record SetItem(Agent Agent) : IItemAction;
+	
+	[MemoryPackable]
+	public sealed partial record UpdateItem(Guid AgentGuid, Agent.Update Update) : IItemAction;
+}

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

@@ -42,6 +42,7 @@ public static class WebMessageRegistries {
 		ToController.Add<GetEventLogMessage, Result<ImmutableArray<EventLogItem>, UserActionFailure>>();
 		
 		ToWeb.Add<RefreshAgentsMessage>();
+		ToWeb.Add<RefreshAgentsMessage2>();
 		ToWeb.Add<RefreshInstancesMessage>();
 		ToWeb.Add<InstanceOutputMessage>();
 		ToWeb.Add<RefreshUserSessionMessage>();

Controller/Phantom.Controller.Database/Phantom.Controller.Database.csproj

@@ -11,7 +11,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Linq.Async" />
   </ItemGroup>
   
   <ItemGroup>

Controller/Phantom.Controller.Services/Users/Sessions/AuthenticatedUserCache.cs

@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
 using Phantom.Common.Data.Web.Users;
 using Phantom.Controller.Database;
 using Phantom.Controller.Database.Entities;
@@ -9,7 +10,7 @@ namespace Phantom.Controller.Services.Users.Sessions;
 sealed class AuthenticatedUserCache {
 	private readonly ConcurrentDictionary<Guid, AuthenticatedUserInfo> authenticatedUsersByGuid = new ();
 	
-	public bool TryGet(Guid userGuid, out AuthenticatedUserInfo? userInfo) {
+	public bool TryGet(Guid userGuid, [NotNullWhen(true)] out AuthenticatedUserInfo? userInfo) {
 		return authenticatedUsersByGuid.TryGetValue(userGuid, out userInfo);
 	}
 	

Controller/Phantom.Controller.Services/Users/Sessions/UserLoginManager.cs

@@ -77,8 +77,13 @@ sealed class UserLoginManager {
 		return userGuid != null && authenticatedUserCache.TryGet(userGuid.Value, out var userInfo) ? new LoggedInUser(userInfo) : default;
 	}
 	
-	public AuthenticatedUserInfo? GetAuthenticatedUser(Guid userGuid, ImmutableArray<byte> authToken) {
+	public Optional<AuthenticatedUserInfo> GetAuthenticatedUser(Guid userGuid, ImmutableArray<byte> authToken) {
-		return authenticatedUserCache.TryGet(userGuid, out var userInfo) && GetSessionBucket(authToken).Contains(userGuid, authToken) ? userInfo : null;
+		if (authenticatedUserCache.TryGet(userGuid, out var userInfo) && GetSessionBucket(authToken).Contains(userGuid, authToken)) {
+			return userInfo;
+		}
+		else {
+			return default;
+		}
 	}
 	
 	private sealed class UserSessionBucket {

Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
   
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
-    <LangVersion>13</LangVersion>
+    <LangVersion>14</LangVersion>
   </PropertyGroup>
   
   <PropertyGroup>

Dockerfile

@@ -1,7 +1,7 @@
 # +---------------+
 # | Prepare build |
 # +---------------+
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/nightly/sdk:9.0 AS phantom-builder
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/nightly/sdk:10.0 AS phantom-builder
 ARG TARGETARCH
 
 ADD . /app
@@ -19,7 +19,7 @@ RUN find .artifacts/publish/*/* -maxdepth 0 -execdir mv '{}' 'release' \;
 # +---------------------+
 # | Phantom Agent image |
 # +---------------------+
-FROM mcr.microsoft.com/dotnet/nightly/runtime:9.0 AS phantom-agent
+FROM mcr.microsoft.com/dotnet/nightly/runtime:10.0 AS phantom-agent
 
 RUN mkdir /data && chmod 777 /data
 WORKDIR /data
@@ -46,7 +46,7 @@ ENTRYPOINT ["dotnet", "/app/Phantom.Agent.dll"]
 # +--------------------------+
 # | Phantom Controller image |
 # +--------------------------+
-FROM mcr.microsoft.com/dotnet/nightly/runtime:9.0 AS phantom-controller
+FROM mcr.microsoft.com/dotnet/nightly/runtime:10.0 AS phantom-controller
 
 RUN mkdir /data && chmod 777 /data
 WORKDIR /data

Packages.props

@@ -1,15 +1,14 @@
 <Project>
   
   <ItemGroup>
-    <PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="9.0.9" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="10.0.1" />
-    <PackageReference Update="Microsoft.AspNetCore.Components.Web"           Version="9.0.9" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.Web"           Version="10.0.1" />
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Tools"      Version="10.0.1" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Tools"      Version="9.0.9" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="10.0.1" />
-    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL"    Version="9.0.4" />
+    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL"    Version="10.0.0" />
-    <PackageReference Update="System.Linq.Async"                        Version="6.0.3" />
   </ItemGroup>
   
   <ItemGroup>
@@ -23,7 +22,7 @@
   
   <ItemGroup>
     <PackageReference Update="Serilog"               Version="4.3.0" />
-    <PackageReference Update="Serilog.AspNetCore"    Version="9.0.0" />
+    <PackageReference Update="Serilog.AspNetCore"    Version="10.0.0" />
     <PackageReference Update="Serilog.Sinks.Async"   Version="2.1.0" />
     <PackageReference Update="Serilog.Sinks.Console" Version="6.0.0" />
   </ItemGroup>

Utils/Phantom.Utils/Processes/OneShotProcess.cs

@@ -2,17 +2,9 @@
 
 namespace Phantom.Utils.Processes;
 
-public sealed class OneShotProcess {
+public sealed class OneShotProcess(ILogger logger, ProcessConfigurator configurator) {
-	private readonly ILogger logger;
-	private readonly ProcessConfigurator configurator;
-	
 	public event EventHandler<Process.Output>? OutputReceived;
 	
-	public OneShotProcess(ILogger logger, ProcessConfigurator configurator) {
-		this.logger = logger;
-		this.configurator = configurator;
-	}
-	
 	public async Task<bool> Run(CancellationToken cancellationToken) {
 		using var process = configurator.CreateProcess();
 		process.OutputReceived += OutputReceived;

Utils/Phantom.Utils/Processes/ProcessConfigurator.cs

@@ -31,6 +31,12 @@ public sealed class ProcessConfigurator {
 		set => startInfo.UseShellExecute = value;
 	}
 	
+	public ProcessConfigurator() {
+		if (OperatingSystem.IsWindows()) {
+			startInfo.CreateNewProcessGroup = true;
+		}
+	}
+	
 	public Process CreateProcess() {
 		return new Process(new System.Diagnostics.Process { StartInfo = startInfo });
 	}

Web/Phantom.Web.Services/Authentication/CustomAuthenticationStateProvider.cs

@@ -87,12 +87,7 @@ public sealed class CustomAuthenticationStateProvider : ServerAuthenticationStat
 		}
 		
 		var session = await controllerConnection.Send<GetAuthenticatedUser, Optional<AuthenticatedUserInfo>>(new GetAuthenticatedUser(userGuid, authToken), TimeSpan.FromSeconds(30), cancellationToken);
-		if (session.Value is {} userInfo) {
+		return session.HasValue ? new AuthenticatedUser(session.Value, authToken) : null;
-			return new AuthenticatedUser(userInfo, authToken);
-		}
-		else {
-			return null;
-		}
 	}
 	
 	private void SetLoadedSession(AuthenticatedUser authenticatedUser) {

Web/Phantom.Web.Services/Authentication/UserLoginManager.cs

@@ -19,10 +19,12 @@ public sealed class UserLoginManager(Navigation navigation, UserSessionBrowserSt
 			return false;
 		}
 		
-		if (result.Value is not var (userInfo, authToken)) {
+		if (!result.HasValue) {
 			return false;
 		}
 		
+		var (userInfo, authToken) = result.Value;
+		
 		Logger.Information("Successfully logged in {Username}.", username);
 		
 		authenticationStateProvider.SetUnloadedSession();

Web/Phantom.Web/App.razor

@@ -1,8 +1,9 @@
-@using Phantom.Web.Services
+@using Phantom.Web.Errors
+@using Phantom.Web.Services
 @inject Navigation Navigation
 
 <CascadingAuthenticationState>
-  <Router AppAssembly="@typeof(App).Assembly">
+  <Router AppAssembly="@typeof(App).Assembly" NotFoundPage="typeof(NotFound)">
     <Found Context="routeData">
       <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
         <NotAuthorized>
@@ -17,11 +18,5 @@
       </AuthorizeRouteView>
       <FocusOnNavigate RouteData="@routeData" Selector="h1" />
     </Found>
-    <NotFound>
-      <LayoutView Layout="@typeof(MainLayout)">
-        <h1>Not Found</h1>
-        <p role="alert">Sorry, there's nothing at this address.</p>
-      </LayoutView>
-    </NotFound>
   </Router>
 </CascadingAuthenticationState>

Web/Phantom.Web/Errors/NotFound.razor

@@ -0,0 +1,5 @@
+@page "/error/404"
+@layout MainLayout
+
+<h1>Not Found</h1>
+<p role="alert">Sorry, there's nothing at this address.</p>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.0",
+    "version": "10.0.0",
     "rollForward": "latestMinor",
     "allowPrerelease": true
   }