feat!: probes generate their own keys and enroll with a join token; node and peer keys are separate [CI]

backend/tests/MoShiro.Backend.Tests/ProbeHarness.cs

@@ -5,16 +5,18 @@ using MoShiro.Probe;
 
 namespace MoShiro.Backend.Tests;
 
-/// <summary>进程内的真实 Probe：用后端生成的身份文件（和面板下载的 probe.json 同一份）启动 <see cref="ProbeApp"/>。</summary>
+/// <summary>进程内的真实 Probe：用加入令牌注册出来的身份（节点自己生成的两把密钥）启动 <see cref="ProbeApp"/>。</summary>
 public sealed class ProbeHarness : IAsyncDisposable
 {
     private readonly CancellationTokenSource _stop = new();
     private readonly string _directory;
     private readonly Task _run;
+    private readonly EnrolledProbe _enrolled;
 
-    private ProbeHarness(string directory, ProbeApp app)
+    private ProbeHarness(string directory, ProbeApp app, EnrolledProbe enrolled)
     {
         _directory = directory;
+        _enrolled = enrolled;
         App = app;
         _run = Task.Run(() => app.RunAsync(_stop.Token), CancellationToken.None);
     }
@@ -25,21 +27,19 @@ public sealed class ProbeHarness : IAsyncDisposable
 
     public string ProbeId { get; init; } = "";
 
-    /// <summary>向后端申请身份（<c>POST /api/admin/probe/identity</c>），写成 <c>probe.json</c> 并启动。</summary>
+    /// <summary>用加入令牌注册（节点自己生成密钥），把面板地址和身份目录写进 <c>probe.json</c>，然后启动。</summary>
     public static async Task<ProbeHarness> StartAsync(BackendFixture backend, Action<ProbeFile>? configure = null)
     {
-        JsonNode created = await backend.CreateProbeAsync();
-        string json = created.ToJsonString();
-
-        string directory = Path.Combine(Path.GetTempPath(), "moshiro-probe-" + Guid.NewGuid().ToString("N"));
-        System.IO.Directory.CreateDirectory(directory);
+        EnrolledProbe enrolled = await backend.CreateProbeAsync();
+        string directory = enrolled.Directory;
         string path = Path.Combine(directory, "probe.json");
-        await File.WriteAllTextAsync(path, json, Encoding.UTF8);
+        var written = new ProbeFile { Fleet = { Server = backend.BaseAddress.ToString(), IdentityDir = directory } };
+        await File.WriteAllTextAsync(path, System.Text.Json.JsonSerializer.Serialize(written, ProbeConfigContext.Default.ProbeFile), Encoding.UTF8);
 
         ProbeFile file = Fleet.Hosting.NodeConfig.Load(path, ProbeConfigContext.Default.ProbeFile);
         configure?.Invoke(file);
-        var app = new ProbeApp(file, directory, TimeProvider.System, new Fleet.Hosting.ConsoleNodeLog(TimeProvider.System, Console.Out));
-        return new ProbeHarness(directory, app) { ProbeId = created["probe_id"]!.GetValue<string>() };
+        var app = new ProbeApp(file, enrolled.Identity, directory, TimeProvider.System, new Fleet.Hosting.ConsoleNodeLog(TimeProvider.System, Console.Out));
+        return new ProbeHarness(directory, app, enrolled) { ProbeId = enrolled.ProbeId };
     }
 
     public async ValueTask DisposeAsync()
@@ -55,6 +55,7 @@ public sealed class ProbeHarness : IAsyncDisposable
         }
 
         App.Dispose();
+        _enrolled.Dispose();
         _stop.Dispose();
         try
         {