1.0.11:发布包改为单文件,非本体文件收进 .GC/bin
- 启动器改成 self-contained 单文件(压缩);GC.UI.Server 抽出 BackendServer.Start, 由启动器在自己的进程内托管,发布包只剩一个 exe,不再复制两套 .NET 运行时 - 后端保留独立入口(GC.UI.Server 仍可单独 dotnet run),开发调试方式不变 - 守护进程等非本体文件统一放 .GC/bin:首次启动复制到 .GC/safedog 再运行; 更新时只合并 .GC/bin,config/model/cache/update/logs 原地不动 - 压缩包不再预置 .GC 模板,首次启动由 AppPaths.EnsureCreated + RuntimeLayout 生成 - macOS 同样打进 .app 内的单文件启动器 - 版本号 1.0.11,version.json / model/version.json 重签(gc-2026-12)
This commit is contained in:
1 parent
631a90e862
commit
daf218ce71
15 files changed
+957
-863
No files matched your search
+52
-62
@@ -4,20 +4,24 @@ using System.IO;
|
||||
using System.Net.Http;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using GC.UI.Server;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
|
||||
namespace GC;
|
||||
|
||||
/// <summary>
|
||||
/// 新界面启动壳。
|
||||
///
|
||||
/// 发布包同时带 <c>GC.UI.Server</c>(本地 HTTP 后端 + 模型窗口宿主)和
|
||||
/// <c>GC-UI</c>(Flutter 前端)时,启动器只做三件事:
|
||||
/// 1. 拉起后端并等 <c>/api/health</c> 就绪;
|
||||
/// 发布包带 <c>GC-UI</c>(Flutter 前端)时,启动器只做三件事:
|
||||
/// 1. 在自己的进程里起后端(本地 HTTP API + 模型窗口宿主),等 <c>/api/health</c> 就绪;
|
||||
/// 2. 拉起 Flutter 窗口;
|
||||
/// 3. 界面退出后关掉后端。
|
||||
///
|
||||
/// 两个产物缺任意一个就返回 <c>false</c>,由调用方回退到内置 Avalonia 界面——
|
||||
/// 这样 `dotnet run`、只编了启动器的开发场景、以及交叉编译缺前端产物的包都能正常打开。
|
||||
/// 后端跑在进程内而不是单独一个 exe:两者用的是同一套 .NET 运行时,
|
||||
/// 拆成两个自包含进程等于把 60MB 运行时复制两份,发布包会白白大一倍。
|
||||
///
|
||||
/// 缺 Flutter 前端时返回 <c>false</c>,由调用方回退到内置 Avalonia 界面——
|
||||
/// 这样 `dotnet run`、只编了启动器的开发场景都能正常打开。
|
||||
/// </summary>
|
||||
internal static class FlutterShell
|
||||
{
|
||||
@@ -25,18 +29,18 @@ internal static class FlutterShell
|
||||
private const int Port = Services.GcUiContract.DefaultPort;
|
||||
|
||||
private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromSeconds(1.5) };
|
||||
private static Process? _backend;
|
||||
|
||||
private static WebApplication? _backend;
|
||||
|
||||
public static bool TryRun(string[] args)
|
||||
{
|
||||
var dir = AppContext.BaseDirectory;
|
||||
var backendPath = FindBackend(dir);
|
||||
var uiPath = FindUi(dir);
|
||||
if (backendPath == null || uiPath == null) return false;
|
||||
if (uiPath == null) return false;
|
||||
|
||||
// 用户可能重复启动:已有后端在跑就直接复用,退出时也不要关掉别人的进程。
|
||||
var port = Port;
|
||||
|
||||
// 用户可能重复启动:已有后端在跑就直接复用,退出时也不要关掉别人的进程。
|
||||
if (!IsHealthy(port))
|
||||
{
|
||||
// 端口可能被别的程序占用:17890 起向后试几个,选第一个能起来且健康的。
|
||||
@@ -46,52 +50,40 @@ internal static class FlutterShell
|
||||
|
||||
for (var candidate = start; candidate < start + Services.GcUiContract.PortScanRange; candidate++)
|
||||
{
|
||||
var process = Start(backendPath, $"--port {candidate}", dir);
|
||||
if (process == null) continue;
|
||||
var app = TryStartBackend(args, candidate);
|
||||
if (app == null) continue;
|
||||
|
||||
if (WaitHealthy(candidate, process, TimeSpan.FromSeconds(25)))
|
||||
if (WaitHealthy(candidate, TimeSpan.FromSeconds(25)))
|
||||
{
|
||||
port = candidate;
|
||||
_backend = process;
|
||||
_backend = app;
|
||||
break;
|
||||
}
|
||||
|
||||
Stop(process);
|
||||
StopBackend(app);
|
||||
}
|
||||
|
||||
if (_backend == null) return false;
|
||||
}
|
||||
|
||||
AppDomain.CurrentDomain.ProcessExit += (_, _) => Stop(_backend);
|
||||
AppDomain.CurrentDomain.ProcessExit += (_, _) => StopBackend(_backend);
|
||||
|
||||
var ui = Start(uiPath, null, dir, port);
|
||||
var ui = Start(uiPath, dir, port);
|
||||
if (ui == null)
|
||||
{
|
||||
Stop(_backend);
|
||||
StopBackend(_backend);
|
||||
_backend = null;
|
||||
return false;
|
||||
}
|
||||
|
||||
ui.WaitForExit();
|
||||
Stop(_backend);
|
||||
StopBackend(_backend);
|
||||
_backend = null;
|
||||
return true;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 产物定位
|
||||
|
||||
private static string? FindBackend(string dir)
|
||||
{
|
||||
foreach (var name in OperatingSystem.IsWindows()
|
||||
? new[] { "GC.UI.Server.exe", "GC.UI.Server" }
|
||||
: new[] { "GC.UI.Server", "GC.UI.Server.exe" })
|
||||
{
|
||||
var path = Path.Combine(dir, name);
|
||||
if (File.Exists(path)) return path;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Flutter 桌面产物。
|
||||
/// macOS 是 <c>GC-UI.app/Contents/MacOS/GC-UI</c>;Windows 是 <c>GC-UI.exe</c>;
|
||||
@@ -115,54 +107,55 @@ internal static class FlutterShell
|
||||
|
||||
// ---------------------------------------------------------------- 进程管理
|
||||
|
||||
private static Process? Start(string fileName, string? arguments, string workingDirectory, int port = 0)
|
||||
/// <summary>在本进程内启动后端;端口被占用等失败情况返回 null。</summary>
|
||||
private static WebApplication? TryStartBackend(string[] args, int port)
|
||||
{
|
||||
try
|
||||
{
|
||||
var info = new ProcessStartInfo(fileName)
|
||||
{
|
||||
WorkingDirectory = workingDirectory,
|
||||
UseShellExecute = false,
|
||||
CreateNoWindow = true,
|
||||
};
|
||||
if (!string.IsNullOrEmpty(arguments)) info.Arguments = arguments;
|
||||
|
||||
// 把实际端口传给子进程:后端读它监听,前端读它拼 baseUrl。
|
||||
// 这样换端口不需要重新编译前端。
|
||||
if (port > 0)
|
||||
info.Environment[Services.GcUiContract.PortEnvVar] = port.ToString();
|
||||
|
||||
// macOS .app 内的二进制也需要可执行位;发布包由 zip 解开时可能丢失。
|
||||
if (!OperatingSystem.IsWindows())
|
||||
{
|
||||
try { File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute); }
|
||||
catch { /* 权限不足时交给系统判断 */ }
|
||||
}
|
||||
|
||||
return Process.Start(info);
|
||||
var app = BackendServer.Start(args, port);
|
||||
app.StartAsync().GetAwaiter().GetResult();
|
||||
return app;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[shell] 启动失败 {fileName}: {ex.Message}");
|
||||
Console.Error.WriteLine($"[shell] 后端启动失败(端口 {port}): {ex.Message}");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static void Stop(Process? process)
|
||||
private static void StopBackend(WebApplication? app)
|
||||
{
|
||||
if (process == null) return;
|
||||
if (app == null) return;
|
||||
try
|
||||
{
|
||||
if (!process.HasExited) process.Kill(entireProcessTree: true);
|
||||
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(3));
|
||||
app.StopAsync(cts.Token).GetAwaiter().GetResult();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[shell] 关闭后端失败: {ex.Message}");
|
||||
}
|
||||
finally
|
||||
}
|
||||
|
||||
private static Process Start(string fileName, string workingDirectory, int port)
|
||||
{
|
||||
var info = new ProcessStartInfo(fileName)
|
||||
{
|
||||
process.Dispose();
|
||||
WorkingDirectory = workingDirectory,
|
||||
UseShellExecute = false,
|
||||
};
|
||||
|
||||
// 把实际端口传给前端:它读这个环境变量拼 baseUrl,换端口不需要重新编译界面。
|
||||
info.Environment[Services.GcUiContract.PortEnvVar] = port.ToString();
|
||||
|
||||
// macOS .app 内的二进制也需要可执行位;发布包由 zip 解开时可能丢失。
|
||||
if (!OperatingSystem.IsWindows())
|
||||
{
|
||||
try { File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute); }
|
||||
catch { /* 权限不足时交给系统判断 */ }
|
||||
}
|
||||
|
||||
return Process.Start(info)!;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 健康检查
|
||||
@@ -181,14 +174,11 @@ internal static class FlutterShell
|
||||
}
|
||||
}
|
||||
|
||||
private static bool WaitHealthy(int port, Process backend, TimeSpan timeout)
|
||||
private static bool WaitHealthy(int port, TimeSpan timeout)
|
||||
{
|
||||
var deadline = DateTime.UtcNow + timeout;
|
||||
while (DateTime.UtcNow < deadline)
|
||||
{
|
||||
// 后端进程已经退出就没必要再等:端口被占、依赖缺失都会走这里。
|
||||
if (backend.HasExited) return false;
|
||||
|
||||
if (IsHealthy(port)) return true;
|
||||
Thread.Sleep(250);
|
||||
}
|
||||
|
||||
@@ -17,9 +17,15 @@
|
||||
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- 后端以库的方式编进启动器:发布包只需要一个 exe,不用再带一份运行时 -->
|
||||
<FrameworkReference Include="Microsoft.AspNetCore.App" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\GC\src\GC.Core.csproj" />
|
||||
<ProjectReference Include="..\GC-DOWNLOAD\GC-DOWNLOAD.csproj" />
|
||||
<ProjectReference Include="..\GC-UI\backend\GC.UI.Server\GC.UI.Server.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
Reference in new issue
Block a user