WIP

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "9.0.9",
+      "version": "10.0.1",
       "commands": [
         "dotnet-ef"
       ],

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 static implicit operator Optional<T>(T? value) {
+public readonly partial struct Optional<T> {
+	[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.Postgres/Migrations/20251228053557_AgentFieldNullability.Designer.cs

@@ -0,0 +1,356 @@
+// <auto-generated />
+using System;
+using System.Text.Json;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Phantom.Controller.Database;
+
+#nullable disable
+
+namespace Phantom.Controller.Database.Postgres.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20251228053557_AgentFieldNullability")]
+    partial class AgentFieldNullability
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "9.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
+                {
+                    b.Property<Guid>("AgentGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<byte[]>("AuthSecret")
+                        .HasMaxLength(12)
+                        .HasColumnType("bytea");
+
+                    b.Property<string>("BuildVersion")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("MaxInstances")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("MaxMemory")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int?>("ProtocolVersion")
+                        .HasColumnType("integer");
+
+                    b.HasKey("AgentGuid");
+
+                    b.ToTable("Agents", "agents");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<JsonDocument>("Data")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("UserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("UtcTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserGuid");
+
+                    b.ToTable("AuditLog", "system");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
+                {
+                    b.Property<Guid>("EventGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AgentGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<JsonDocument>("Data")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("UtcTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("EventGuid");
+
+                    b.ToTable("EventLog", "system");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
+                {
+                    b.Property<Guid>("InstanceGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AgentGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("InstanceName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("JavaRuntimeGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("JvmArguments")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("LaunchAutomatically")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("MemoryAllocation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("MinecraftServerKind")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("MinecraftVersion")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RconPort")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ServerPort")
+                        .HasColumnType("integer");
+
+                    b.HasKey("InstanceGuid");
+
+                    b.ToTable("Instances", "agents");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Permissions", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RoleEntity", b =>
+                {
+                    b.Property<Guid>("RoleGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("RoleGuid");
+
+                    b.ToTable("Roles", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
+                {
+                    b.Property<Guid>("RoleGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("PermissionId")
+                        .HasColumnType("text");
+
+                    b.HasKey("RoleGuid", "PermissionId");
+
+                    b.HasIndex("PermissionId");
+
+                    b.ToTable("RolePermissions", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserAgentAccessEntity", b =>
+                {
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AgentGuid")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserGuid", "AgentGuid");
+
+                    b.HasIndex("AgentGuid");
+
+                    b.ToTable("UserAgentAccess", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserEntity", b =>
+                {
+                    b.Property<Guid>("UserGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PasswordHash")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("UserGuid");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("Users", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
+                {
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("PermissionId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserGuid", "PermissionId");
+
+                    b.HasIndex("PermissionId");
+
+                    b.ToTable("UserPermissions", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
+                {
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleGuid")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserGuid", "RoleGuid");
+
+                    b.HasIndex("RoleGuid");
+
+                    b.ToTable("UserRoles", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
+                {
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
+                        .WithMany()
+                        .HasForeignKey("UserGuid")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
+                {
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
+                        .WithMany()
+                        .HasForeignKey("PermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", null)
+                        .WithMany()
+                        .HasForeignKey("RoleGuid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserAgentAccessEntity", b =>
+                {
+                    b.HasOne("Phantom.Controller.Database.Entities.AgentEntity", null)
+                        .WithMany()
+                        .HasForeignKey("AgentGuid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
+                        .WithMany()
+                        .HasForeignKey("UserGuid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
+                {
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
+                        .WithMany()
+                        .HasForeignKey("PermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
+                        .WithMany()
+                        .HasForeignKey("UserGuid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
+                {
+                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleGuid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
+                        .WithMany()
+                        .HasForeignKey("UserGuid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Role");
+
+                    b.Navigation("User");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Controller/Phantom.Controller.Database.Postgres/Migrations/20251228053557_AgentFieldNullability.cs

@@ -0,0 +1,98 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Phantom.Controller.Database.Postgres.Migrations
+{
+    /// <inheritdoc />
+    public partial class AgentFieldNullability : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "ProtocolVersion",
+                schema: "agents",
+                table: "Agents",
+                type: "integer",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "integer");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "MaxMemory",
+                schema: "agents",
+                table: "Agents",
+                type: "integer",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "integer");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "MaxInstances",
+                schema: "agents",
+                table: "Agents",
+                type: "integer",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "integer");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "BuildVersion",
+                schema: "agents",
+                table: "Agents",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "ProtocolVersion",
+                schema: "agents",
+                table: "Agents",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "integer",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "MaxMemory",
+                schema: "agents",
+                table: "Agents",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "integer",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "MaxInstances",
+                schema: "agents",
+                table: "Agents",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "integer",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "BuildVersion",
+                schema: "agents",
+                table: "Agents",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+        }
+    }
+}

Controller/Phantom.Controller.Database.Postgres/Migrations/20251228211902_AgentAuthSecretNullability.Designer.cs

@@ -0,0 +1,357 @@
+// <auto-generated />
+using System;
+using System.Text.Json;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Phantom.Controller.Database;
+
+#nullable disable
+
+namespace Phantom.Controller.Database.Postgres.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20251228211902_AgentAuthSecretNullability")]
+    partial class AgentAuthSecretNullability
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "9.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
+                {
+                    b.Property<Guid>("AgentGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<byte[]>("AuthSecret")
+                        .IsRequired()
+                        .HasMaxLength(12)
+                        .HasColumnType("bytea");
+
+                    b.Property<string>("BuildVersion")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("MaxInstances")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("MaxMemory")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int?>("ProtocolVersion")
+                        .HasColumnType("integer");
+
+                    b.HasKey("AgentGuid");
+
+                    b.ToTable("Agents", "agents");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<JsonDocument>("Data")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("UserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("UtcTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserGuid");
+
+                    b.ToTable("AuditLog", "system");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
+                {
+                    b.Property<Guid>("EventGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AgentGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<JsonDocument>("Data")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubjectType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("UtcTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("EventGuid");
+
+                    b.ToTable("EventLog", "system");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
+                {
+                    b.Property<Guid>("InstanceGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AgentGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("InstanceName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("JavaRuntimeGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("JvmArguments")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("LaunchAutomatically")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("MemoryAllocation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("MinecraftServerKind")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("MinecraftVersion")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RconPort")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ServerPort")
+                        .HasColumnType("integer");
+
+                    b.HasKey("InstanceGuid");
+
+                    b.ToTable("Instances", "agents");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Permissions", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RoleEntity", b =>
+                {
+                    b.Property<Guid>("RoleGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("RoleGuid");
+
+                    b.ToTable("Roles", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
+                {
+                    b.Property<Guid>("RoleGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("PermissionId")
+                        .HasColumnType("text");
+
+                    b.HasKey("RoleGuid", "PermissionId");
+
+                    b.HasIndex("PermissionId");
+
+                    b.ToTable("RolePermissions", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserAgentAccessEntity", b =>
+                {
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AgentGuid")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserGuid", "AgentGuid");
+
+                    b.HasIndex("AgentGuid");
+
+                    b.ToTable("UserAgentAccess", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserEntity", b =>
+                {
+                    b.Property<Guid>("UserGuid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PasswordHash")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("UserGuid");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("Users", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
+                {
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("PermissionId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserGuid", "PermissionId");
+
+                    b.HasIndex("PermissionId");
+
+                    b.ToTable("UserPermissions", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
+                {
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleGuid")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserGuid", "RoleGuid");
+
+                    b.HasIndex("RoleGuid");
+
+                    b.ToTable("UserRoles", "identity");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
+                {
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
+                        .WithMany()
+                        .HasForeignKey("UserGuid")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
+                {
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
+                        .WithMany()
+                        .HasForeignKey("PermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", null)
+                        .WithMany()
+                        .HasForeignKey("RoleGuid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserAgentAccessEntity", b =>
+                {
+                    b.HasOne("Phantom.Controller.Database.Entities.AgentEntity", null)
+                        .WithMany()
+                        .HasForeignKey("AgentGuid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
+                        .WithMany()
+                        .HasForeignKey("UserGuid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
+                {
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
+                        .WithMany()
+                        .HasForeignKey("PermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
+                        .WithMany()
+                        .HasForeignKey("UserGuid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
+                {
+                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleGuid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
+                        .WithMany()
+                        .HasForeignKey("UserGuid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Role");
+
+                    b.Navigation("User");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Controller/Phantom.Controller.Database.Postgres/Migrations/20251228211902_AgentAuthSecretNullability.cs

@@ -0,0 +1,42 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Phantom.Controller.Database.Postgres.Migrations
+{
+    /// <inheritdoc />
+    public partial class AgentAuthSecretNullability : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<byte[]>(
+                name: "AuthSecret",
+                schema: "agents",
+                table: "Agents",
+                type: "bytea",
+                maxLength: 12,
+                nullable: false,
+                defaultValue: new byte[0],
+                oldClrType: typeof(byte[]),
+                oldType: "bytea",
+                oldMaxLength: 12,
+                oldNullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<byte[]>(
+                name: "AuthSecret",
+                schema: "agents",
+                table: "Agents",
+                type: "bytea",
+                maxLength: 12,
+                nullable: true,
+                oldClrType: typeof(byte[]),
+                oldType: "bytea",
+                oldMaxLength: 12);
+        }
+    }
+}

Controller/Phantom.Controller.Database.Postgres/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -30,24 +30,24 @@ namespace Phantom.Controller.Database.Postgres.Migrations
                         .HasColumnType("uuid");
 
                     b.Property<byte[]>("AuthSecret")
+                        .IsRequired()
                         .HasMaxLength(12)
                         .HasColumnType("bytea");
 
                     b.Property<string>("BuildVersion")
-                        .IsRequired()
                         .HasColumnType("text");
 
-                    b.Property<int>("MaxInstances")
+                    b.Property<int?>("MaxInstances")
                         .HasColumnType("integer");
 
-                    b.Property<int>("MaxMemory")
+                    b.Property<int?>("MaxMemory")
                         .HasColumnType("integer");
 
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasColumnType("text");
 
-                    b.Property<int>("ProtocolVersion")
+                    b.Property<int?>("ProtocolVersion")
                         .HasColumnType("integer");
 
                     b.HasKey("AgentGuid");

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

@@ -20,15 +20,16 @@ public sealed class AgentEntity {
 	public RamAllocationUnits? MaxMemory { get; set; }
 	
 	[MaxLength(AuthSecret.Length)]
-	public AuthSecret? AuthSecret { get; set; }
+	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 AgentVersionInfo? VersionInfo => ProtocolVersion is {} protocolVersion && BuildVersion is {} buildVersion ? new AgentVersionInfo(protocolVersion, buildVersion) : null;
 	public AgentRuntimeInfo RuntimeInfo => new (VersionInfo, MaxInstances, MaxMemory);
 	
 	internal AgentEntity(Guid agentGuid) {
 		AgentGuid = agentGuid;
 		Name = null!;
 		BuildVersion = null!;
+		AuthSecret = null!;
 	}
 }

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/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;
@@ -52,12 +53,15 @@ sealed class AgentDatabaseStorageActor : ReceiveActor<AgentDatabaseStorageActor.
 		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;
+			if (wasCreated) {
+				entity.AuthSecret = AuthSecret.Generate();
+			}
+			
+			entity.Name = command.Configuration.AgentName;
 			
 			var auditLogWriter = new AuditLogRepository(db).Writer(command.AuditLogUserGuid);
 			if (wasCreated) {
@@ -71,7 +75,7 @@ sealed class AgentDatabaseStorageActor : ReceiveActor<AgentDatabaseStorageActor.
 		}
 		
 		string action = wasCreated ? "Created" : "Edited";
-		Logger.Information(action + " agent \"{AgentName}\" (GUID {AgentGuid}) in database.", agentName, agentGuid);
+		Logger.Information(action + " agent \"{AgentName}\" (GUID {AgentGuid}) in database.", command.Configuration.AgentName, agentGuid);
 	}
 	
 	private void StoreAgentRuntimeInfo(StoreAgentRuntimeInfoCommand command) {

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

@@ -1,7 +1,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Immutable;
 using Akka.Actor;
-using Microsoft.EntityFrameworkCore;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Data.Web.Agent;
@@ -9,7 +8,6 @@ using Phantom.Common.Data.Web.Users;
 using Phantom.Common.Messages.Agent.Handshake;
 using Phantom.Common.Messages.Agent.ToAgent;
 using Phantom.Controller.Database;
-using Phantom.Controller.Database.Entities;
 using Phantom.Controller.Minecraft;
 using Phantom.Controller.Services.Users.Sessions;
 using Phantom.Utils.Actor;
@@ -33,12 +31,11 @@ sealed class AgentManager(
 	
 	public async Task Initialize() {
 		await using var ctx = dbProvider.Eager();
-		await Migrate(ctx);
 		
 		await foreach (var entity in ctx.Agents.AsAsyncEnumerable().WithCancellation(cancellationToken)) {
 			var agentGuid = entity.AgentGuid;
 			
-			if (AddAgent(loggedInUserGuid: null, agentGuid, entity.Configuration, entity.AuthSecret!, entity.RuntimeInfo)) {
+			if (AddAgent(loggedInUserGuid: null, agentGuid, entity.Configuration, entity.AuthSecret, entity.RuntimeInfo)) {
 				Logger.Information("Loaded agent \"{AgentName}\" (GUID {AgentGuid}) from database.", entity.Name, agentGuid);
 			}
 		}
@@ -50,19 +47,6 @@ sealed class AgentManager(
 		return agentsByAgentGuid.TryAdd(agentGuid, actorSystem.ActorOf(AgentActor.Factory(init), name));
 	}
 	
-	private async Task Migrate(ApplicationDbContext ctx) {
-		List<AgentEntity> agentsWithoutSecrets = await ctx.Agents.Where(static entity => entity.AuthSecret == null).ToListAsync(cancellationToken);
-		if (agentsWithoutSecrets.Count == 0) {
-			return;
-		}
-		
-		foreach (var entity in agentsWithoutSecrets) {
-			entity.AuthSecret = AuthSecret.Generate();
-		}
-		
-		await ctx.SaveChangesAsync(cancellationToken);
-	}
-	
 	public async Task<ImmutableArray<ConfigureInstanceMessage>?> RegisterAgent(Guid agentGuid, AgentRegistration registration) {
 		if (!agentsByAgentGuid.TryGetValue(agentGuid, out var agentActor)) {
 			return null;

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) {
-		return authenticatedUserCache.TryGet(userGuid, out var userInfo) && GetSessionBucket(authToken).Contains(userGuid, authToken) ? userInfo : null;
+	public Optional<AuthenticatedUserInfo> GetAuthenticatedUser(Guid userGuid, ImmutableArray<byte> authToken) {
+		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>
-    <LangVersion>13</LangVersion>
+    <TargetFramework>net10.0</TargetFramework>
+    <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.Web"           Version="9.0.9" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="10.0.1" />
+    <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="9.0.9" />
-    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL"    Version="9.0.4" />
-    <PackageReference Update="System.Linq.Async"                        Version="6.0.3" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Tools"      Version="10.0.1" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="10.0.1" />
+    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL"    Version="10.0.0" />
   </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>

README.md

@@ -88,8 +88,8 @@ Use volumes to persist either the whole `/data` folder, or just `/data/data` if
 * **Controller Communication**
   - `CONTROLLER_HOST` is the hostname of the Controller.
   - `CONTROLLER_PORT` is the Agent RPC port of the Controller. Default: `9401`
-  - `AGENT_KEY` is the [Agent Key](#agent--web-keys). Mutually exclusive with `AGENT_KEY_FILE`.
-  - `AGENT_KEY_FILE` is a path to a file containing the [Agent Key](#agent--web-keys). Mutually exclusive with `AGENT_KEY`.
+  - `AGENT_KEY` is the [Agent Key](#secrets). Mutually exclusive with `AGENT_KEY_FILE`.
+  - `AGENT_KEY_FILE` is a path to a file containing the [Agent Key](#secrets). Mutually exclusive with `AGENT_KEY`.
 * **Agent Configuration**
   - `MAX_INSTANCES` is the number of instances that can be created.
   - `MAX_MEMORY` is the maximum amount of RAM that can be distributed among all instances. Use a positive integer with an optional suffix 'M' for MB, or 'G' for GB. Examples: `4096M`, `16G`
@@ -110,8 +110,8 @@ Use volumes to persist the whole `/data` folder.
 * **Controller Communication**
   - `CONTROLLER_HOST` is the hostname of the Controller.
   - `CONTROLLER_PORT` is the Web RPC port of the Controller. Default: `9402`
-  - `WEB_KEY` is the [Web Key](#agent--web-keys). Mutually exclusive with `WEB_KEY_FILE`.
-  - `WEB_KEY_FILE` is a path to a file containing the [Web Key](#agent--web-keys). Mutually exclusive with `WEB_KEY`.
+  - `WEB_KEY` is the [Web Key](#secrets). Mutually exclusive with `WEB_KEY_FILE`.
+  - `WEB_KEY_FILE` is a path to a file containing the [Web Key](#secrets). Mutually exclusive with `WEB_KEY`.
 * **Web Server**
   - `WEB_SERVER_HOST` is the host. Default: `0.0.0.0`
   - `WEB_SERVER_PORT` is the port. Default: `9400`

Utils/Phantom.Utils/Processes/OneShotProcess.cs

@@ -2,17 +2,9 @@
 
 namespace Phantom.Utils.Processes;
 
-public sealed class OneShotProcess {
-	private readonly ILogger logger;
-	private readonly ProcessConfigurator configurator;
-	
+public sealed class OneShotProcess(ILogger logger, 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.Components/Graphics/ProgressBar.razor

@@ -1,7 +1,7 @@
 <div>
   <div class="progress-label">@ChildContent</div>
   <div class="progress">
-    <div class="progress-bar" role="progressbar" style="width: @(100 * Value / Maximum)%;" aria-valuenow="@Value" aria-valuemin="0" aria-valuemax="@Maximum"></div>
+    <div class="progress-bar" role="progressbar" style="width: @(Maximum <= 0 ? 0 : 100 * Value / Maximum)%;" aria-valuenow="@Value" aria-valuemin="0" aria-valuemax="@Maximum"></div>
   </div>
 </div>
 

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 new AuthenticatedUser(userInfo, authToken);
-		}
-		else {
-			return null;
-		}
+		return session.HasValue ? new AuthenticatedUser(session.Value, authToken) : 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>

Web/Phantom.Web/Layout/_Layout.cshtml

@@ -34,7 +34,7 @@
     <script src="_framework/blazor.server.js"></script>
     @* ReSharper restore Html.PathError *@
     <script src="lib/bootstrap/bootstrap.bundle.min.js"></script>
-    <script src="js/site.js"></script>
+    <script src="js/site.js?v=2"></script>
   </body>
 
 </html>

Web/Phantom.Web/Pages/Agents.razor

@@ -37,35 +37,37 @@
       <small class="font-monospace text-uppercase">@agent.AgentGuid.ToString()</small>
     </Cell>
     <Cell class="text-end">
+      <ProgressBar Value="@(usedInstances ?? 0)" Maximum="@(runtimeInfo.MaxInstances ?? 0)">
         @if (runtimeInfo.MaxInstances is {} maxInstances) {
-        <ProgressBar Value="@(usedInstances ?? 0)" Maximum="@maxInstances">
-          @(usedInstances?.ToString() ?? "?") / @maxInstances.ToString()
-        </ProgressBar>
+          <text>@(usedInstances?.ToString() ?? "?") / @maxInstances.ToString()</text>
         }
         else {
           @:N/A
         }
+      </ProgressBar>
     </Cell>
     <Cell class="text-end">
+      <ProgressBar Value="@(usedMemory ?? 0)" Maximum="@(runtimeInfo.MaxMemory?.InMegabytes ?? 0)">
         @if (runtimeInfo.MaxMemory is {} maxMemory) {
-        <ProgressBar Value="@(usedMemory ?? 0)" Maximum="@maxMemory.InMegabytes">
-          @(usedMemory?.ToString() ?? "?") / @maxMemory.InMegabytes.ToString() MB
+          <text>@(usedMemory?.ToString() ?? "?") / @maxMemory.InMegabytes MB</text>
+        }
+        else {
+          @:N/A
+        }
       </ProgressBar>
-      }
-      else {
-        @:N/A
-      }
     </Cell>
-    <Cell class="text-condensed">
     @if (runtimeInfo.VersionInfo is {} versionInfo) {
-        <text>Build: <span class="font-monospace">@versionInfo.BuildVersion</span></text>
+      <Cell class="text-condensed">
+        Build: <span class="font-monospace">@versionInfo.BuildVersion</span>
         <br>
-        <text>Protocol: <span class="font-monospace">v@(versionInfo.ProtocolVersion.ToString())</span></text>
+        Protocol: <span class="font-monospace">v@(versionInfo.ProtocolVersion.ToString())</span>
+      </Cell>
     }
     else {
-        @:N/A
-      }
+      <Cell>
+        N/A
       </Cell>
+    }
     @switch (agent.ConnectionStatus) {
       case AgentIsOnline:
         <Cell class="fw-semibold text-center text-success">Online</Cell>
@@ -89,7 +91,10 @@
         break;
     }
     <Cell>
-      <button type="button" class="btn btn-danger btn-sm" data-clipboard="@connectionKey" onclick="copyToClipboard(this);">Copy Agent Key</button>
+      <PermissionView Permission="Permission.ManageAllAgents">
+        <a href="agents/@agent.AgentGuid/edit" type="button" class="btn btn-primary btn-sm">Edit Agent</a>
+        <button type="button" class="btn btn-warning btn-sm" data-clipboard="@connectionKey" onclick="copyToClipboard(this);">Copy Agent Key</button>
+      </PermissionView>
     </Cell>
   </ItemRow>
   <NoItemsRow>

Web/Phantom.Web/Shared/AgentAddOrEditForm.razor

@@ -10,7 +10,7 @@
 
 <Form Model="form" OnSubmit="AddOrEditAgent">
   <div class="row">
-    <div class="col-xl-5 mb-3">
+    <div class="col-xl-12 mb-3">
       <FormTextInput Id="agent-name" Label="Agent Name" @bind-Value="form.AgentName" />
     </div>
   </div>

Web/Phantom.Web/Shared/InstanceAddOrEditForm.razor

@@ -31,12 +31,16 @@
         static RenderFragment GetAgentOption(Agent agent) {
           var runtimeInfo = agent.RuntimeInfo;
           return
-            @<option value="@agent.AgentGuid">
+            @<option value="@agent.AgentGuid" disabled="@(agent.ConnectionStatus is not AgentIsOnline)">
               @agent.Configuration.AgentName
-              @if (runtimeInfo.MaxInstances is not null && runtimeInfo.MaxMemory is not null) {
-                <text>&bullet;</text>
+              @if (agent.ConnectionStatus is not AgentIsOnline) {
+                <text> &bullet; </text>
+                <text>Offline</text>
+              }
+              else if (runtimeInfo.MaxInstances is not null && runtimeInfo.MaxMemory is not null) {
+                <text> &bullet; </text>
                 <text>@(agent.Stats?.RunningInstanceCount.ToString() ?? "?")/@(runtimeInfo.MaxInstances) @(runtimeInfo.MaxInstances == 1 ? "Instance" : "Instances")</text>
-                <text>&bullet;</text>
+                <text> &bullet; </text>
                 <text>@(agent.Stats?.RunningInstanceMemory.InMegabytes.ToString() ?? "?")/@(runtimeInfo.MaxMemory.Value.InMegabytes) MB RAM</text>
               }
             </option>;
@@ -45,7 +49,7 @@
       @if (EditedInstance == null) {
         <FormSelectInput Id="instance-agent" Label="Agent" @bind-Value="form.SelectedAgentGuid">
           <option value="" selected>Select which agent will run the instance...</option>
-          @foreach (var agent in allAgentsByGuid.Values.Where(static agent => agent.ConnectionStatus is AgentIsOnline).OrderBy(static agent => agent.Configuration.AgentName)) {
+          @foreach (var agent in allAgentsByGuid.Values.OrderBy(static agent => agent.Configuration.AgentName)) {
             @GetAgentOption(agent)
           }
         </FormSelectInput>

global.json

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