From ead63e8ffe69271b4577af0c21eb9f0fbb56e521 Mon Sep 17 00:00:00 2001 From: chenmoyuan1214 Date: Thu, 19 Nov 2026 20:24:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(macos):=20=E6=A8=A1=E5=9E=8B=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E6=94=B9=E7=94=B1=E4=B8=BB=E7=BA=BF=E7=A8=8B=E6=89=BF?= =?UTF-8?q?=E8=BD=BD=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E5=A4=B1=E8=B4=A5=E4=B8=8E=E5=90=8E=E7=AB=AF=E5=B4=A9?= =?UTF-8?q?=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit macOS 的 AppKit 要求 NSApplication 运行在主线程。此前 AvaloniaHost 把 StartWithClassicDesktopLifetime 放到新建的后台线程,点「启动模型」即触发 进程崩溃:界面无反应、后端随之消失,部分机器表现为模型启动失败。 - AvaloniaHost 新增 RunOnCurrentThread / Shutdown:事件循环必须在主线程运行, EnsureStartedAsync 改为只等待就绪信号,不再自行起线程。 - BackendServer.Start 增加 out AvaloniaHost 重载,把模型窗口宿主交给启动器。 - FlutterShell 在前端拉起后于主线程运行 Avalonia 事件循环,界面退出时从后台 请求关闭;无桌面会话(Avalonia 起不来)时退化为继续等待界面退出。 - 独立进程入口 Program.cs 同样把后端放后台,主线程留给 Avalonia。 --- GC-BOOT/FlutterShell.cs | 35 ++++++++- GC-UI/backend/GC.UI.Server/AvaloniaHost.cs | 86 +++++++++++---------- GC-UI/backend/GC.UI.Server/BackendServer.cs | 24 ++++-- GC-UI/backend/GC.UI.Server/Program.cs | 20 ++++- 4 files changed, 114 insertions(+), 51 deletions(-) diff --git a/GC-BOOT/FlutterShell.cs b/GC-BOOT/FlutterShell.cs index bd1b18f..bacc40f 100644 --- a/GC-BOOT/FlutterShell.cs +++ b/GC-BOOT/FlutterShell.cs @@ -39,6 +39,7 @@ internal static class FlutterShell if (uiPath == null) return false; var port = Port; + AvaloniaHost? uiHost = null; // 用户可能重复启动:已有后端在跑就直接复用,退出时也不要关掉别人的进程。 if (!IsHealthy(port)) @@ -50,13 +51,14 @@ internal static class FlutterShell for (var candidate = start; candidate < start + Services.GcUiContract.PortScanRange; candidate++) { - var app = TryStartBackend(args, candidate); + var app = TryStartBackend(args, candidate, out var host); if (app == null) continue; if (WaitHealthy(candidate, TimeSpan.FromSeconds(25))) { port = candidate; _backend = app; + uiHost = host; break; } @@ -76,7 +78,29 @@ internal static class FlutterShell return false; } - ui.WaitForExit(); + // 前端窗口已拉起。模型窗口由 Avalonia 承载,而 macOS 的 AppKit 要求 + // NSApplication 必须在**主线程**——所以事件循环要跑在这里(当前正是主线程), + // 不能再丢到副线程,否则一点「启动模型」就会把整个后端带崩。 + ui.EnableRaisingEvents = true; + var closed = 0; + void RequestClose() + { + if (Interlocked.Exchange(ref closed, 1) == 1) return; + uiHost?.Shutdown(); + } + + ui.Exited += (_, _) => RequestClose(); + if (ui.HasExited) RequestClose(); + + if (!ui.HasExited && uiHost != null) + { + // 阻塞直到界面退出(或图形环境初始化失败)。 + uiHost.RunOnCurrentThread(); + } + + // Avalonia 起不来(无桌面会话)时仍要等界面退出,避免后端被提前收掉。 + if (!ui.HasExited) ui.WaitForExit(); + StopBackend(_backend); _backend = null; return true; @@ -108,11 +132,14 @@ internal static class FlutterShell // ---------------------------------------------------------------- 进程管理 /// 在本进程内启动后端;端口被占用等失败情况返回 null。 - private static WebApplication? TryStartBackend(string[] args, int port) + /// 成功时交出模型窗口宿主,由调用方在主线程跑事件循环。 + private static WebApplication? TryStartBackend(string[] args, int port, out AvaloniaHost? uiHost) { + uiHost = null; try { - var app = BackendServer.Start(args, port); + var app = BackendServer.Start(args, port, out var host); + uiHost = host; app.StartAsync().GetAwaiter().GetResult(); return app; } diff --git a/GC-UI/backend/GC.UI.Server/AvaloniaHost.cs b/GC-UI/backend/GC.UI.Server/AvaloniaHost.cs index 0b83d6b..3261aa5 100644 --- a/GC-UI/backend/GC.UI.Server/AvaloniaHost.cs +++ b/GC-UI/backend/GC.UI.Server/AvaloniaHost.cs @@ -29,7 +29,9 @@ public sealed class AvaloniaHost private readonly AppServices _services; private readonly object _gate = new(); private readonly Dictionary _windows = new(StringComparer.OrdinalIgnoreCase); - private Task? _startTask; + private readonly TaskCompletionSource _ready = + new(TaskCreationOptions.RunContinuationsAsynchronously); + private int _started; public AvaloniaHost(AppServices services) => _services = services; @@ -37,56 +39,60 @@ public sealed class AvaloniaHost public string? LastError { get; private set; } - public Task EnsureStartedAsync() + /// + /// 后端线程调用:等待「主线程已把 Avalonia 事件循环跑起来」。 + /// + /// 关键点:macOS 的 AppKit 要求 NSApplication 在**主线程**。以前这里把 + /// StartWithClassicDesktopLifetime 丢到一个新建的后台线程里跑,在 macOS 上 + /// 会直接崩掉整个后端进程(表现为点「启动模型」界面无反应、随后后端消失)。 + /// 现在改为由启动器在主线程调用 , + /// 这里只等待就绪信号。 + /// + public Task EnsureStartedAsync() => _ready.Task; + + /// + /// 必须在 UI 主线程调用。启动 Avalonia 桌面生命周期并阻塞,直到 。 + /// 返回后(或初始化失败后)调用方负责收尾。 + /// + public void RunOnCurrentThread() { - lock (_gate) + if (Interlocked.Exchange(ref _started, 1) == 1) return; + + try { - _startTask ??= Task.Run(StartCore); - return _startTask; + AppBuilder.Configure() + .UsePlatformDetect() + .AfterSetup(_ => + { + IsAvailable = true; + _ready.TrySetResult(true); + }) + .StartWithClassicDesktopLifetime(Array.Empty()); + } + catch (Exception ex) + { + // 无桌面会话(CI / 无头环境):模型窗口不可用,但后端其余接口照常。 + LastError = ex.Message; + _ready.TrySetResult(false); } } - private bool StartCore() + /// 从任意线程请求结束事件循环,使 返回。 + public void Shutdown() { - var ready = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - var thread = new Thread(() => + if (_started == 0) return; + try { - try + Dispatcher.UIThread.Post(() => { - AppBuilder.Configure() - .UsePlatformDetect() - .AfterSetup(_ => ready.TrySetResult(true)) - .StartWithClassicDesktopLifetime(Array.Empty()); - } - catch (Exception ex) - { - LastError = ex.Message; - ready.TrySetResult(false); - } - }) - { - IsBackground = true, - Name = "gc-ui-avalonia" - }; - - // Windows 上 Avalonia 需要 STA 线程;macOS / Linux 不支持也不必要。 - if (OperatingSystem.IsWindows()) - { - try { thread.SetApartmentState(ApartmentState.STA); } - catch { /* 忽略:部分运行时不允许设置 */ } + if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + desktop.Shutdown(); + }); } - - thread.Start(); - - if (!ready.Task.Wait(TimeSpan.FromSeconds(30))) + catch { - LastError = "图形环境初始化超时"; - return false; + // 事件循环尚未建立或已退出:无需处理 } - - IsAvailable = ready.Task.Result; - return IsAvailable; } /// 在 Avalonia UI 线程上加载模型并打开它自己的窗口。 diff --git a/GC-UI/backend/GC.UI.Server/BackendServer.cs b/GC-UI/backend/GC.UI.Server/BackendServer.cs index 97eb0e8..c8fac54 100644 --- a/GC-UI/backend/GC.UI.Server/BackendServer.cs +++ b/GC-UI/backend/GC.UI.Server/BackendServer.cs @@ -30,19 +30,33 @@ public static class BackendServer { /// 按命令行 / GC_UI_PORT 解析端口并构建(未启动)的后端。 public static WebApplication StartFromCommandLine(string[] args) - => Start(args, ResolvePort(args)); + => Start(args, ResolvePort(args), out _); + + /// 同上,并交出模型窗口宿主(独立进程入口用:主线程留给 Avalonia)。 + public static WebApplication StartFromCommandLine(string[] args, out AvaloniaHost uiHost) + => Start(args, ResolvePort(args), out uiHost); /// /// 构建后端。返回的 尚未启动: /// 独立进程直接 Run(),启动器用 StartAsync() 之后继续拉起界面。 /// public static WebApplication Start(string[] args, int port) + => Start(args, port, out _); + + /// + /// 构建后端,并通过 交出模型窗口宿主。 + /// + /// 调用方(启动器)必须在**主线程**调用 : + /// macOS 的 AppKit 要求 NSApplication 运行在主线程,否则打开模型窗口时整个进程会崩溃。 + /// + public static WebApplication Start(string[] args, int port, out AvaloniaHost uiHost) { // 下载模块(GC-DOWNLOAD)通过宿主钩子注入,和 GC-BOOT 的做法一致。 DownloadModuleHost.Factory = new DownloadModuleFactory(); var services = AppServices.Create(); - var uiHost = new AvaloniaHost(services); + var host = new AvaloniaHost(services); + uiHost = host; var builder = WebApplication.CreateBuilder(new WebApplicationOptions { Args = args }); builder.Logging.ClearProviders(); @@ -161,8 +175,8 @@ public static class BackendServer true, LauncherRuntimeInfo.CurrentLauncherVersion, LauncherRuntimeInfo.CurrentRid, - uiHost.IsAvailable, - uiHost.LastError))); + host.IsAvailable, + host.LastError))); // ---- 已安装模型 ----------------------------------------------------------- @@ -190,7 +204,7 @@ public static class BackendServer try { services.Memory.Refresh(); - var message = await uiHost.LaunchAsync(package); + var message = await host.LaunchAsync(package); return Results.Ok(new LaunchResultDto(true, message)); } catch (Exception ex) diff --git a/GC-UI/backend/GC.UI.Server/Program.cs b/GC-UI/backend/GC.UI.Server/Program.cs index 64d6f10..b4efb5a 100644 --- a/GC-UI/backend/GC.UI.Server/Program.cs +++ b/GC-UI/backend/GC.UI.Server/Program.cs @@ -1,6 +1,22 @@ using GC.UI.Server; +using Microsoft.Extensions.Hosting; // 独立进程入口:`GC.UI.Server --port 17890` // 启动器在进程内直接调用 BackendServer.Start,不会走到这里。 -var app = BackendServer.StartFromCommandLine(args); -app.Run(); +var app = BackendServer.StartFromCommandLine(args, out var host); + +// 模型窗口由 Avalonia 承载,macOS 的 AppKit 要求 NSApplication 在主线程。 +// 所以后端交给 Kestrel 自己的线程池在后台跑,主线程留给 Avalonia 事件循环。 +app.StartAsync().GetAwaiter().GetResult(); +host.RunOnCurrentThread(); + +if (host.IsAvailable) +{ + // 事件循环结束 → 收尾后端 + app.StopAsync().GetAwaiter().GetResult(); +} +else +{ + // 无图形环境(无头调试):退化为纯后端常驻 + app.WaitForShutdown(); +} -- 2.54.0