fix(POSTV1-01): 允许非关键外部服务降级启动

2026-08-05 11:22:42 +08:00
parent 443e8b94f0
commit 99fe07a761
4 changed files with 21 additions and 16 deletions
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Security.Cryptography;

 namespace Dada.Supervisor;

@@ -34,10 +35,7 @@ internal sealed class SupervisorRuntime : IAsyncDisposable
        {
            return SupervisorState.StorageUnavailable;
        }
-        if (CredentialCatalog.RequiredFor(ChildRole.Api).Concat(CredentialCatalog.RequiredFor(ChildRole.Worker)).Any(target => !credentials.IsConfigured(target)))
-        {
-            return SupervisorState.StartupFailed;
-        }
+        EnsureAdminPepper();

        var node = Path.Combine(AppContext.BaseDirectory, "runtime", "node.exe");
        var apiEntry = Path.Combine(AppContext.BaseDirectory, "server", "api.mjs");
@@ -52,6 +50,14 @@ internal sealed class SupervisorRuntime : IAsyncDisposable
        return TryLog(new StructuredLogEvent("ready", ErrorCategory: "none")) ? SupervisorState.Ready : SupervisorState.StorageUnavailable;
    }

+    private void EnsureAdminPepper()
+    {
+        if (credentials.IsConfigured(CredentialCatalog.AdminPepper)) return;
+        var pepper = Convert.ToBase64String(RandomNumberGenerator.GetBytes(32));
+        credentials.Write(CredentialCatalog.AdminPepper, pepper);
+        Array.Clear(System.Text.Encoding.UTF8.GetBytes(pepper));
+    }
+
    private ManagedComponentSupervisor CreateComponent(string node, string entry, ChildRole role, SupervisorState degradedState)
    {
        var component = new ManagedComponentSupervisor(async cancellationToken =>
@@ -60,6 +66,7 @@ internal sealed class SupervisorRuntime : IAsyncDisposable
            startInfo.WorkingDirectory = AppContext.BaseDirectory;
            startInfo.Environment["DADA_SQLITE_NATIVE_BINDING"] = Path.Combine(AppContext.BaseDirectory, "server", "native", "better_sqlite3.node");
            startInfo.Environment["DADA_SUPPORT_GATE_ROOT"] = Path.Combine(AppContext.BaseDirectory, "web", "support-gate");
+            startInfo.Environment["DADA_WEB_ROOT"] = Path.Combine(AppContext.BaseDirectory, "web");
            startInfo.Environment["DADA_INSTANCE_CONFIG_PATH"] = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Dada", "P0A", "config", "instance.json");
            startInfo.ArgumentList.Add(entry);
            var child = await ManagedChildProcess.StartAsync(startInfo, role, credentials, cancellationToken);