Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a5fcaeb658 | ||
|
|
fcaacf3b33 | ||
|
|
0997de514e | ||
|
|
192f2a63e9 | ||
|
|
a1a14f106b | ||
|
|
e67cc63998 | ||
|
|
2ba4789c95 | ||
|
|
22baa6fda9 | ||
|
|
6ee2e8bead | ||
|
|
daf218ce71 | ||
|
|
631a90e862 | ||
|
|
40af11f78a | ||
|
|
4bcffa782d | ||
|
|
097bfd198e | ||
|
|
31b0c93b25 | ||
|
|
39dc23cb57 | ||
|
|
a361c889f8 | ||
|
|
461e79aa7f | ||
|
|
7e34cb0467 |
No files matched your search
@@ -1,9 +1,9 @@
|
||||
# GC-UI 夜间 alpha 构建(Gitea Actions)
|
||||
# GC-UI alpha 构建(Gitea Actions)
|
||||
#
|
||||
# 触发:每天 21:00(Asia/Shanghai)自动跑一次,产出 Windows 与 macOS 的 Flutter 前端产物,
|
||||
# 发布为一个「预览版(prerelease)」Release —— 不占用 latest。
|
||||
# 手动:Actions 页面点 Run workflow(Gitea 的 workflow_dispatch),用于验证 runner 是否就绪;
|
||||
# 也可以从命令行调 POST /api/v1/repos/{owner}/{repo}/actions/workflows/{file}/dispatches。
|
||||
# 触发:**仅手动**。定时任务已取消(不再每天自动构建),需要时在 Actions 页面点
|
||||
# Run workflow,或从命令行调
|
||||
# POST /api/v1/repos/{owner}/{repo}/actions/workflows/{file}/dispatches。
|
||||
# 产物:Windows 与 macOS 的 Flutter 前端,发布为一个「预览版(prerelease)」Release —— 不占用 latest。
|
||||
#
|
||||
# 为什么是 .gitea/workflows/:本仓库是自建 Gitea,不是 GitHub。Gitea Actions 语法与
|
||||
# GitHub Actions 基本一致,但工作流目录是 .gitea/workflows/,API 前缀是 /api/v1,
|
||||
@@ -16,12 +16,8 @@
|
||||
name: GC-UI Alpha
|
||||
|
||||
on:
|
||||
schedule:
|
||||
# 每天晚上 21:00,北京时间。
|
||||
# Gitea 1.23 起 Actions 的 cron 默认按 UTC 解释,这里显式带 TZ= 前缀(robfig/cron 支持的
|
||||
# 时区前缀语法),这样不依赖服务器自身时区设置。
|
||||
# 如果所在实例不认 TZ= 前缀,改用等效的 UTC 写法 '0 13 * * *'。
|
||||
- cron: 'TZ=Asia/Shanghai 0 21 * * *'
|
||||
# 定时触发已取消:夜间构建会绕开 build.sh,产出不含后端/前端的空壳包,
|
||||
# 且 cron 的 TZ= 前缀在部分 Gitea 版本上非法。需要时手动 dispatch。
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
note:
|
||||
@@ -67,7 +63,7 @@ jobs:
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# 北京时间当天日期,让产物名和 tag 与「每晚 9 点」对得上
|
||||
# 北京时间当天日期,让同一天的多次手动构建落在同一个日期前缀下
|
||||
DATE=$(TZ=Asia/Shanghai date +%Y%m%d)
|
||||
# 同一天重跑时用 run_number 区分,tag 不重复
|
||||
VERSION="${BASE}-alpha.${DATE}.${{ github.run_number }}"
|
||||
@@ -122,11 +118,11 @@ jobs:
|
||||
tag, version, sha, server = sys.argv[1:5]
|
||||
short = sha[:7]
|
||||
body = (
|
||||
"GC-UI 夜间 alpha 构建(自动生成,**预览版 / prerelease**)。\n\n"
|
||||
"GC-UI alpha 构建(手动触发,**预览版 / prerelease**)。\n\n"
|
||||
"- 版本:`%s`\n"
|
||||
"- 提交:`%s`\n"
|
||||
"- 构建来源:%s/commit/%s\n"
|
||||
"- 通道:alpha —— 每晚 21:00(Asia/Shanghai)自动构建\n\n"
|
||||
"- 通道:alpha —— 手动触发(定时任务已取消)\n\n"
|
||||
"产物说明:\n\n"
|
||||
"| 文件 | 平台 | 内容 |\n"
|
||||
"|---|---|---|\n"
|
||||
|
||||
@@ -1,115 +0,0 @@
|
||||
# ---------------------------------------------------------------------------
|
||||
# 每晚预发布(Gitea Actions)
|
||||
#
|
||||
# 触发:每天 UTC 13:00(北京时间 21:00)定时执行,也可手动触发。
|
||||
# 行为:
|
||||
# 1. 编译并发布 Linux / Windows 启动器,打成 zip;
|
||||
# 2. 先删除仓库里所有旧的 nightly-* 预发布(Release 与 tag);
|
||||
# 3. 创建当天的新 Release:prerelease=true(不会成为 Latest),
|
||||
# tag 形如 nightly-20261117,并上传构建产物。
|
||||
#
|
||||
# 注意:Gitea Actions 的 cron 按 UTC 计算,故 13:00 UTC = 21:00 Asia/Shanghai。
|
||||
# ---------------------------------------------------------------------------
|
||||
name: 每晚预发布
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 13 * * *'
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: nightly-prerelease
|
||||
cancel-in-progress: false
|
||||
|
||||
env:
|
||||
AVALONIA_TELEMETRY_OPTOUT: '1'
|
||||
DOTNET_NOLOGO: '1'
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: '1'
|
||||
|
||||
jobs:
|
||||
nightly:
|
||||
name: 构建并发布预发布
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
# 优先用仓库 Secret;未配置时回退到 Actions 内置令牌。
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN || github.token }}
|
||||
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
||||
steps:
|
||||
- name: 检出代码
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: 安装 .NET 8
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: '8.0.x'
|
||||
|
||||
- name: 发布启动器(linux-x64 / win-x64)
|
||||
run: |
|
||||
set -eu
|
||||
mkdir -p dist
|
||||
dotnet publish GC-BOOT/GC-BOOT.csproj -c Release -r linux-x64 \
|
||||
--self-contained true -p:PublishTrimmed=false -p:EnableWindowsTargeting=true \
|
||||
-o dist/nightly/linux-x64
|
||||
dotnet publish GC-BOOT/GC-BOOT.csproj -c Release -r win-x64 \
|
||||
--self-contained true -p:PublishTrimmed=false -p:EnableWindowsTargeting=true \
|
||||
-o dist/nightly/win-x64
|
||||
(cd dist/nightly && zip -qr ../GC-nightly-linux-x64.zip linux-x64)
|
||||
(cd dist/nightly && zip -qr ../GC-nightly-win-x64.zip win-x64)
|
||||
ls -lh dist/*.zip
|
||||
|
||||
- name: 删除旧的 nightly 预发布
|
||||
run: |
|
||||
set -eu
|
||||
echo "读取现有 Release…"
|
||||
RELEASES=$(curl -sf -H "Authorization: token $GITEA_TOKEN" "$API/releases?limit=100" || echo '[]')
|
||||
echo "$RELEASES" | jq -r '.[] | select(.prerelease == true and (.tag_name | startswith("nightly-"))) | "\(.id) \(.tag_name)"' |
|
||||
while read -r id tag; do
|
||||
[ -z "${id:-}" ] && continue
|
||||
echo "删除旧预发布: $tag (id=$id)"
|
||||
curl -sf -X DELETE -H "Authorization: token $GITEA_TOKEN" "$API/releases/$id" || true
|
||||
curl -sf -X DELETE -H "Authorization: token $GITEA_TOKEN" "$API/tags/$tag" || true
|
||||
done
|
||||
|
||||
- name: 创建当天预发布并上传产物
|
||||
run: |
|
||||
set -eu
|
||||
TAG="nightly-$(date -u +%Y%m%d)"
|
||||
NOW="$(date -u '+%Y-%m-%d %H:%M UTC')"
|
||||
BODY="自动构建 · ${NOW}
|
||||
基于提交 ${GITHUB_SHA}
|
||||
产物:Linux x64 / Windows x64 启动器(未签名,仅供测试)"
|
||||
echo "创建预发布 $TAG"
|
||||
|
||||
PAYLOAD=$(jq -n \
|
||||
--arg tag "$TAG" \
|
||||
--arg sha "${GITHUB_SHA}" \
|
||||
--arg name "Nightly ${TAG}" \
|
||||
--arg body "$BODY" \
|
||||
'{tag_name:$tag, target_commitish:$sha, name:$name, body:$body, prerelease:true, draft:false}')
|
||||
|
||||
RESP=$(curl -sf -X POST \
|
||||
-H "Authorization: token $GITEA_TOKEN" \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d "$PAYLOAD" "$API/releases")
|
||||
ID=$(echo "$RESP" | jq -r '.id')
|
||||
echo "Release id=$ID"
|
||||
|
||||
for f in dist/GC-nightly-*.zip; do
|
||||
[ -e "$f" ] || continue
|
||||
echo "上传 $(basename "$f")"
|
||||
curl -sf -X POST \
|
||||
-H "Authorization: token $GITEA_TOKEN" \
|
||||
-F "attachment=@$f" \
|
||||
"$API/releases/$ID/assets?name=$(basename "$f")" || echo "⚠ 上传失败: $f"
|
||||
done
|
||||
|
||||
echo "完成:$TAG 已作为预发布创建(Latest 仍是最近一次正式版)。"
|
||||
|
||||
- name: 保存构建产物(便于排查)
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: nightly-build
|
||||
path: dist/*.zip
|
||||
if-no-files-found: ignore
|
||||
retention-days: 7
|
||||
@@ -51,3 +51,6 @@ GC-UI/frontend/**/DebugProfile.entitlements.bak
|
||||
GC-UI/frontend/**/*.iml
|
||||
GC-UI/frontend/test/shots/
|
||||
|
||||
# GC.Tests 离屏渲染输出(dotnet run ... GC.Tests 默认写到仓库根 screenshots/)
|
||||
screenshots/
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
-->
|
||||
<AvaloniaVersion>11.3.9</AvaloniaVersion>
|
||||
<MvvmVersion>8.2.2</MvvmVersion>
|
||||
<Version>1.0.9</Version>
|
||||
<Version>1.1.0</Version>
|
||||
<Company>Morris</Company>
|
||||
<Product>GC</Product>
|
||||
<NeutralLanguage>zh-Hans</NeutralLanguage>
|
||||
|
||||
+72
-64
@@ -4,81 +4,86 @@ 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
|
||||
{
|
||||
/// <summary>与 GC-UI/frontend 的默认 baseUrl 保持一致,前端不需要额外配置。</summary>
|
||||
private const int Port = 17890;
|
||||
/// <summary>与前端、后端共用的默认端口(定义在 GC.Services.GcUiContract)。</summary>
|
||||
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;
|
||||
|
||||
// 用户可能重复启动:已有后端在跑就直接复用,退出时也不要关掉别人的进程。
|
||||
var reused = IsHealthy();
|
||||
if (!reused)
|
||||
if (!IsHealthy(port))
|
||||
{
|
||||
_backend = Start(backendPath, $"--port {Port}", dir);
|
||||
if (_backend == null) return false;
|
||||
// 端口可能被别的程序占用:17890 起向后试几个,选第一个能起来且健康的。
|
||||
var start = Environment.GetEnvironmentVariable(Services.GcUiContract.PortEnvVar) is { Length: > 0 }
|
||||
? Services.GcUiContract.PortFromEnvironment()
|
||||
: Port;
|
||||
|
||||
if (!WaitHealthy(TimeSpan.FromSeconds(25)))
|
||||
for (var candidate = start; candidate < start + Services.GcUiContract.PortScanRange; candidate++)
|
||||
{
|
||||
Stop(_backend);
|
||||
_backend = null;
|
||||
return false;
|
||||
var app = TryStartBackend(args, candidate);
|
||||
if (app == null) continue;
|
||||
|
||||
if (WaitHealthy(candidate, TimeSpan.FromSeconds(25)))
|
||||
{
|
||||
port = candidate;
|
||||
_backend = app;
|
||||
break;
|
||||
}
|
||||
|
||||
StopBackend(app);
|
||||
}
|
||||
|
||||
if (_backend == null) return false;
|
||||
}
|
||||
|
||||
AppDomain.CurrentDomain.ProcessExit += (_, _) => Stop(_backend);
|
||||
AppDomain.CurrentDomain.ProcessExit += (_, _) => StopBackend(_backend);
|
||||
|
||||
var ui = Start(uiPath, null, dir);
|
||||
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>;
|
||||
@@ -102,58 +107,64 @@ internal static class FlutterShell
|
||||
|
||||
// ---------------------------------------------------------------- 进程管理
|
||||
|
||||
private static Process? Start(string fileName, string? arguments, string workingDirectory)
|
||||
/// <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;
|
||||
|
||||
// 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)!;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 健康检查
|
||||
|
||||
private static bool IsHealthy()
|
||||
private static bool IsHealthy(int port)
|
||||
{
|
||||
try
|
||||
{
|
||||
using var response = Http.GetAsync($"http://127.0.0.1:{Port}/api/health")
|
||||
using var response = Http.GetAsync($"http://127.0.0.1:{port}/api/health")
|
||||
.GetAwaiter().GetResult();
|
||||
return response.IsSuccessStatusCode;
|
||||
}
|
||||
@@ -163,15 +174,12 @@ internal static class FlutterShell
|
||||
}
|
||||
}
|
||||
|
||||
private static bool WaitHealthy(TimeSpan timeout)
|
||||
private static bool WaitHealthy(int port, TimeSpan timeout)
|
||||
{
|
||||
var deadline = DateTime.UtcNow + timeout;
|
||||
while (DateTime.UtcNow < deadline)
|
||||
{
|
||||
// 后端进程已经退出就没必要再等:端口被占、依赖缺失都会走这里。
|
||||
if (_backend is { HasExited: true }) return false;
|
||||
|
||||
if (IsHealthy()) return true;
|
||||
if (IsHealthy(port)) return true;
|
||||
Thread.Sleep(250);
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -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>
|
||||
@@ -15,6 +15,9 @@ internal static class Program
|
||||
var paths = AppPaths.Discover();
|
||||
paths.EnsureCreated();
|
||||
|
||||
// 目录约定 + 双语日志 + 把包里的守护进程落到 .GC/safedog
|
||||
RuntimeLayout.Ensure(paths);
|
||||
|
||||
// 上次下载的启动器新版,到这次启动才应用
|
||||
if (DownloadModuleHost.Factory.TryApplyPending(paths)) return;
|
||||
|
||||
|
||||
@@ -29,7 +29,8 @@ public static class LauncherArtifacts
|
||||
"win-arm64" => "win-arm64",
|
||||
"osx-arm64" => "mac-arm64",
|
||||
"osx-x64" => "mac-x64",
|
||||
"linux-x64" => "linux-amd64",
|
||||
"linux-x64" => "linux-amd64", // 旧产物目录名,仍能读
|
||||
"linux-arm64" => "linux-arm64",
|
||||
_ => rid
|
||||
};
|
||||
|
||||
@@ -46,9 +47,9 @@ public static class LauncherArtifacts
|
||||
return new[] { label, rid };
|
||||
}
|
||||
|
||||
/// <summary>启动器包应有的文件名,如 <c>GC-1.0.7-mac-arm64.zip</c>。</summary>
|
||||
/// <summary>启动器包应有的文件名,如 <c>GCL-1.0.10-mac-arm64.zip</c>。</summary>
|
||||
public static string PackageFileName(string version, string rid)
|
||||
=> $"GC-{version.Trim().TrimStart('v', 'V')}-{LabelOf(rid)}.zip";
|
||||
=> $"GCL-{version.Trim().TrimStart('v', 'V')}-{LabelOf(rid)}.zip";
|
||||
|
||||
/// <summary>
|
||||
/// 判断某个 zip 名是不是「这个版本 + 这个平台」的启动器包。
|
||||
@@ -57,7 +58,10 @@ public static class LauncherArtifacts
|
||||
public static bool LooksLikePackage(string fileName, string version, string rid)
|
||||
{
|
||||
if (!fileName.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)) return false;
|
||||
if (!fileName.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) return false;
|
||||
// 1.0.10 起发布包统一叫 GCL-<版本>-<平台>.zip;GC- 是老命名,
|
||||
// 一并认,装过 1.0.9 及更早版本的机器才不会把新包当成「不是启动器包」。
|
||||
if (!fileName.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase) &&
|
||||
!fileName.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) return false;
|
||||
|
||||
var v = version.Trim().TrimStart('v', 'V');
|
||||
if (v.Length > 0 && fileName.IndexOf(v, StringComparison.OrdinalIgnoreCase) < 0) return false;
|
||||
|
||||
@@ -367,8 +367,12 @@ public static class LauncherUpdater
|
||||
else if (File.Exists(manifestCopy))
|
||||
File.Delete(manifestCopy);
|
||||
|
||||
// 包名:GC-<版本>-<平台标签>.app/.exe(SAVEDOG 找不到时会自行扫描包内顶层)
|
||||
var packageName = $"GC-{latest}-{PlatformLabel}" + (OperatingSystem.IsMacOS() ? ".app" : ".exe");
|
||||
// 包名:GCL-<版本>-<平台标签>.app/.exe(SAVEDOG 找不到时会自行扫描包内顶层)。
|
||||
// Linux 的启动器没有扩展名,别硬加 .exe —— 那会让按包名查找永远落空。
|
||||
var packageName = $"GCL-{latest}-{PlatformLabel}" +
|
||||
(OperatingSystem.IsMacOS() ? ".app"
|
||||
: OperatingSystem.IsWindows() ? ".exe"
|
||||
: "");
|
||||
|
||||
var request = new SavedogRequest
|
||||
{
|
||||
@@ -447,7 +451,8 @@ public static class LauncherUpdater
|
||||
/// 找不到 SAVEDOG 时退回旧脚本流程(只用于从老版本升级的过渡)。
|
||||
/// 返回 true 表示调用方应立即退出进程。
|
||||
/// </summary>
|
||||
public static bool ScheduleApply(AppPaths paths, string packageName)
|
||||
/// <param name="execute">只写脚本不执行(测试用,避免真的搬动文件)。</param>
|
||||
public static bool ScheduleApply(AppPaths paths, string packageName, bool execute = true)
|
||||
{
|
||||
// 安全阀:绝不在源码目录执行替换(防止误删源码)
|
||||
if (File.Exists(Path.Combine(paths.InstallDirectory, "GC.sln")))
|
||||
@@ -484,6 +489,8 @@ public static class LauncherUpdater
|
||||
catch { }
|
||||
}
|
||||
|
||||
if (!execute) return true;
|
||||
|
||||
var psi = isWin
|
||||
? new System.Diagnostics.ProcessStartInfo("cmd.exe")
|
||||
{ UseShellExecute = false, CreateNoWindow = true }
|
||||
@@ -576,7 +583,10 @@ public static class LauncherUpdater
|
||||
s.AppendLine();
|
||||
s.AppendLine("# delete old GC-* files: SAME platform only, version != latest");
|
||||
s.AppendLine("# files of OTHER platforms are NEVER touched");
|
||||
s.AppendLine("for item in \"$DST\"/GC-*.app \"$DST\"/GC-*.exe; do");
|
||||
// Linux 的启动器没有扩展名(GC-1.0.9-linux-amd64),只匹配 *.app/*.exe 会漏掉,
|
||||
// 结果是每次更新都在安装目录里多留一个旧版本。这里统一按 GC- 前缀扫,
|
||||
// 再用「版本号-平台」的形态兜底,避免误删同目录的其它文件。
|
||||
s.AppendLine("for item in \"$DST\"/GC-*; do");
|
||||
s.AppendLine(" [ -e \"$item\" ] || continue");
|
||||
s.AppendLine(" [ \"$item\" = \"$NEW\" ] && continue");
|
||||
s.AppendLine(" base=$(basename \"$item\")");
|
||||
@@ -584,6 +594,10 @@ public static class LauncherUpdater
|
||||
s.AppendLine(" case \"$base\" in");
|
||||
s.AppendLine(" *.app) stem=${stem%.app} ;;");
|
||||
s.AppendLine(" *.exe) stem=${stem%.exe} ;;");
|
||||
s.AppendLine(" esac");
|
||||
s.AppendLine(" # 只认 <版本>-<系统>-<架构>,其它名字一律不动");
|
||||
s.AppendLine(" case \"$stem\" in");
|
||||
s.AppendLine(" [0-9]*-*-*) ;;");
|
||||
s.AppendLine(" *) continue ;;");
|
||||
s.AppendLine(" esac");
|
||||
s.AppendLine(" ver=${stem%%-*}");
|
||||
@@ -711,6 +725,17 @@ public static class LauncherUpdater
|
||||
return name;
|
||||
}
|
||||
if (name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)) return name;
|
||||
|
||||
// Linux 的启动器没有扩展名(GC-1.0.9-linux-amd64),以前只认 .app/.exe,
|
||||
// 结果解压完判定「没找到新版启动器」,Linux 更新永远失败。
|
||||
// 注意不能用 Path.HasExtension:版本号 9.9.9 里的点会让它误判成有扩展名。
|
||||
if ((name.StartsWith("GC-", StringComparison.OrdinalIgnoreCase) ||
|
||||
name.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase)) &&
|
||||
name.EndsWith("-" + PlatformLabel, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
TryMarkExecutable(dest);
|
||||
return name;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -720,6 +745,22 @@ public static class LauncherUpdater
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>给 Linux/macOS 上的可执行文件补上执行位(zip 不保留权限)。</summary>
|
||||
private static void TryMarkExecutable(string path)
|
||||
{
|
||||
if (OperatingSystem.IsWindows() || !File.Exists(path)) return;
|
||||
try
|
||||
{
|
||||
var mode = File.GetUnixFileMode(path);
|
||||
File.SetUnixFileMode(path, mode | UnixFileMode.UserExecute |
|
||||
UnixFileMode.GroupExecute | UnixFileMode.OtherExecute);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// 权限设置失败不影响后续流程,用户可手动 chmod
|
||||
}
|
||||
}
|
||||
|
||||
private static string? ReadMarker(string file, string key)
|
||||
{
|
||||
try
|
||||
|
||||
@@ -20,9 +20,21 @@ public static class SavedogLauncher
|
||||
var name = SavedogFiles.ExecutableName;
|
||||
var install = paths.InstallDirectory;
|
||||
|
||||
// 首选 .GC/safedog:更新时整目录替换不会碰这里,正在运行的守护进程也安全。
|
||||
var home = Path.Combine(paths.SafedogRoot, name);
|
||||
if (File.Exists(home)) return home;
|
||||
|
||||
// 包内 payload:非本体文件统一收在 .GC/bin
|
||||
var payload = Path.Combine(install, ".GC", "bin", name);
|
||||
if (File.Exists(payload)) return payload;
|
||||
|
||||
var direct = Path.Combine(install, name);
|
||||
if (File.Exists(direct)) return direct;
|
||||
|
||||
// 1.0.10 及更早的包把守护进程放在 safedog/ 子目录
|
||||
var packaged = Path.Combine(install, "safedog", name);
|
||||
if (File.Exists(packaged)) return packaged;
|
||||
|
||||
// macOS:可能放在 .app 内部
|
||||
try
|
||||
{
|
||||
|
||||
@@ -40,7 +40,8 @@ public sealed class SourceSelector : ISourceSelector
|
||||
|
||||
/// <summary>
|
||||
/// 探测两个源并返回最快的。force=true 时忽略缓存。
|
||||
/// 两个都失败时返回 GitCode(默认源)。
|
||||
/// 两个都失败时退回主源(Xhmcl):GitCode 镜像已停更,用它兜底只会拿到过期的
|
||||
/// version.json —— 反而让人以为「没有更新」。
|
||||
/// </summary>
|
||||
public async Task<SourcePreset> PickFastestAsync(bool force = false, CancellationToken ct = default)
|
||||
{
|
||||
@@ -64,12 +65,20 @@ public sealed class SourceSelector : ISourceSelector
|
||||
LastLatency = latencies;
|
||||
|
||||
var usable = results.Where(r => r.Ok).OrderBy(r => r.Ms).ToList();
|
||||
var chosen = usable.Count > 0 ? usable[0].Preset : SourcePreset.GitCode;
|
||||
// 全部探测失败时退回主源(SourcePreset.All 的第一项 = Xhmcl),
|
||||
// 不要退回已停更的 GitCode 镜像。
|
||||
var fallback = SourcePreset.All.Length > 0 ? SourcePreset.All[0] : SourcePreset.Xhmcl;
|
||||
var chosen = usable.Count > 0 ? usable[0].Preset : fallback;
|
||||
|
||||
if (usable.Count == 0)
|
||||
Console.WriteLine($"[selector] 所有源探测失败,退回主源 {chosen.Name}(稍后由实际请求再判定)");
|
||||
|
||||
lock (_lock)
|
||||
{
|
||||
_cached = chosen;
|
||||
_cachedAt = DateTime.UtcNow;
|
||||
// 全部探测失败的结果不缓存:网络刚恢复时应该立刻重新测速,
|
||||
// 而不是被一次失败的探测锁住 3 分钟。
|
||||
_cachedAt = usable.Count > 0 ? DateTime.UtcNow : DateTime.MinValue;
|
||||
}
|
||||
|
||||
Console.WriteLine("[selector] 测速:" + string.Join(" ",
|
||||
|
||||
@@ -4,7 +4,7 @@ using System.Globalization;
|
||||
namespace GC.Services;
|
||||
|
||||
/// <summary>
|
||||
/// 版本号工具:Release tag 有 v1.0.6 / GC-1.0.6 / 1.0.6 等写法,
|
||||
/// 版本号工具:Release tag 有 v1.0.6 / GCL-1.0.6 / GC-1.0.6 / 1.0.6 等写法,
|
||||
/// 统一成可比较的 Version 再排序,挑**版本号最高**的那个。
|
||||
/// </summary>
|
||||
public static class VersionUtil
|
||||
@@ -15,8 +15,9 @@ public static class VersionUtil
|
||||
if (string.IsNullOrWhiteSpace(tag)) return "";
|
||||
var s = tag!.Trim();
|
||||
|
||||
// 去掉前缀:v / V / GC- / release-
|
||||
if (s.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) s = s[3..];
|
||||
// 去掉前缀:v / V / GC- / GCL- / release-
|
||||
if (s.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase)) s = s[4..];
|
||||
else if (s.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) s = s[3..];
|
||||
else if (s.StartsWith("release-", StringComparison.OrdinalIgnoreCase)) s = s[8..];
|
||||
s = s.TrimStart('v', 'V');
|
||||
|
||||
|
||||
+389
-112
@@ -26,13 +26,14 @@ internal sealed class ApplyOptions
|
||||
/// </summary>
|
||||
internal sealed class Applier
|
||||
{
|
||||
private static readonly Regex ArtifactPattern = new(
|
||||
@"^GC-(?<ver>.+?)-(?<plat>[^\-]+-[^\-]+)\.(app|exe)$",
|
||||
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
|
||||
|
||||
private readonly ApplyOptions _options;
|
||||
private readonly Log _log;
|
||||
|
||||
/// <summary>发布包里的启动器文件名:GC-1.0.9-win-amd64.exe。</summary>
|
||||
private static readonly Regex VersionedExePattern = new(
|
||||
@"^(?:GC|GCL)-\d+(?:\.\d+)+-[A-Za-z0-9]+-[A-Za-z0-9]+\.exe$",
|
||||
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Compiled);
|
||||
|
||||
public Applier(ApplyOptions options, Log log)
|
||||
{
|
||||
_options = options;
|
||||
@@ -45,20 +46,24 @@ internal sealed class Applier
|
||||
var requestPath = Path.Combine(updateDir, SavedogFiles.ApplyRequest);
|
||||
|
||||
if (!File.Exists(requestPath))
|
||||
return Fail(updateDir, "找不到更新申请 " + SavedogFiles.ApplyRequest, 3);
|
||||
return Fail(updateDir, "找不到更新申请 " + SavedogFiles.ApplyRequest, 3,
|
||||
"Update request not found: " + SavedogFiles.ApplyRequest);
|
||||
|
||||
var request = Json.Read<SavedogRequest>(requestPath);
|
||||
if (request == null || string.IsNullOrWhiteSpace(request.Version))
|
||||
return Fail(updateDir, "更新申请内容不完整", 3);
|
||||
return Fail(updateDir, "更新申请内容不完整", 3, "The update request is incomplete");
|
||||
|
||||
if (!ValidName(request.PackageName))
|
||||
return Fail(updateDir, "更新包名不合法: " + request.PackageName, 3);
|
||||
return Fail(updateDir, "更新包名不合法: " + request.PackageName, 3,
|
||||
"Invalid package name: " + request.PackageName);
|
||||
|
||||
_log.Info($"开始应用 v{request.Version}({request.Rid},{request.PackageName})");
|
||||
_log.Info($"开始应用 v{request.Version}({request.Rid},{request.PackageName})",
|
||||
$"Starting apply of v{request.Version} ({request.Rid}, {request.PackageName})");
|
||||
|
||||
// 1. 等旧进程退出(否则 Windows 上文件还被占用)
|
||||
if (_options.WaitPid > 0 && !WaitForExit(_options.WaitPid, TimeSpan.FromSeconds(60)))
|
||||
_log.Warn($"等待进程 {_options.WaitPid} 退出超时,继续尝试");
|
||||
_log.Warn($"等待进程 {_options.WaitPid} 退出超时,继续尝试",
|
||||
$"Timed out waiting for process {_options.WaitPid} to exit; continuing anyway");
|
||||
|
||||
// 2. 安装目录定位与安全检查
|
||||
var installDir = string.IsNullOrWhiteSpace(_options.InstallDir)
|
||||
@@ -66,10 +71,12 @@ internal sealed class Applier
|
||||
: Path.GetFullPath(_options.InstallDir!);
|
||||
|
||||
if (!Directory.Exists(installDir))
|
||||
return Fail(updateDir, "安装目录不存在: " + installDir, 4);
|
||||
return Fail(updateDir, "安装目录不存在: " + installDir, 4,
|
||||
"Install directory does not exist: " + installDir);
|
||||
|
||||
if (!_options.Force && File.Exists(Path.Combine(installDir, "GC.sln")))
|
||||
return Fail(updateDir, "检测到源码目录,拒绝在源码树里替换程序", 4);
|
||||
return Fail(updateDir, "检测到源码目录,拒绝在源码树里替换程序", 4,
|
||||
"Source tree detected; refusing to replace files inside it");
|
||||
|
||||
// 3. 二次验签:不信任「启动器说它验过了」
|
||||
var require = request.RequireSignature && SignatureKeyring.Enforced;
|
||||
@@ -79,40 +86,50 @@ internal sealed class Applier
|
||||
|
||||
if (verification.IsRejected)
|
||||
{
|
||||
_log.Error($"清单验签失败({verification.Trust}):{verification.Error}");
|
||||
_log.Error($"清单验签失败({verification.Trust}):{verification.Error}",
|
||||
$"Manifest signature check failed ({verification.Trust}): {verification.Error}");
|
||||
return Refuse(updateDir, request, verification);
|
||||
}
|
||||
_log.Info($"清单可信度:{verification.Trust}" +
|
||||
(verification.KeyId != null ? $"({verification.KeyId})" : ""));
|
||||
(verification.KeyId != null ? $"({verification.KeyId})" : ""),
|
||||
$"Manifest trust: {verification.Trust}" +
|
||||
(verification.KeyId != null ? $" ({verification.KeyId})" : ""));
|
||||
|
||||
// 4. 校验更新包
|
||||
var zipPath = Path.Combine(updateDir, request.PackageZip);
|
||||
if (!File.Exists(zipPath))
|
||||
return Fail(updateDir, "更新包不存在: " + request.PackageZip, 5);
|
||||
return Fail(updateDir, "更新包不存在: " + request.PackageZip, 5,
|
||||
"Package not found: " + request.PackageZip);
|
||||
|
||||
var zipInfo = new FileInfo(zipPath);
|
||||
if (request.PackageSize > 0 && zipInfo.Length != request.PackageSize)
|
||||
return Fail(updateDir, $"更新包体积不符(期望 {request.PackageSize},实际 {zipInfo.Length})", 5);
|
||||
return Fail(updateDir, $"更新包体积不符(期望 {request.PackageSize},实际 {zipInfo.Length})", 5,
|
||||
$"Package size mismatch (expected {request.PackageSize}, got {zipInfo.Length})");
|
||||
|
||||
var actualSha = ContentHash.Sha256File(zipPath);
|
||||
if (!string.IsNullOrWhiteSpace(request.PackageSha256) &&
|
||||
!string.Equals(actualSha, request.PackageSha256, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return Fail(updateDir, "更新包 sha256 与清单不符,已丢弃", 5);
|
||||
return Fail(updateDir, "更新包 sha256 与清单不符,已丢弃", 5,
|
||||
"Package sha256 does not match the manifest; discarded");
|
||||
}
|
||||
if (string.IsNullOrWhiteSpace(request.PackageSha256))
|
||||
_log.Warn("清单没有提供 sha256,仅依赖签名与解压校验");
|
||||
_log.Warn("清单没有提供 sha256,仅依赖签名与解压校验",
|
||||
"Manifest has no sha256; relying on the signature and extraction checks only");
|
||||
|
||||
SafeArchive.Inspection inspection;
|
||||
try
|
||||
{
|
||||
inspection = SafeArchive.Inspect(zipPath);
|
||||
_log.Info($"更新包检查通过:{inspection.Entries} 个条目," +
|
||||
$"{inspection.UncompressedBytes / 1024 / 1024} MB,压缩比 {inspection.Ratio:0.0}:1");
|
||||
$"{inspection.UncompressedBytes / 1024 / 1024} MB,压缩比 {inspection.Ratio:0.0}:1",
|
||||
$"Package inspection passed: {inspection.Entries} entries, " +
|
||||
$"{inspection.UncompressedBytes / 1024 / 1024} MB, ratio {inspection.Ratio:0.0}:1");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return Fail(updateDir, "更新包安全性检查失败: " + ex.Message, 5);
|
||||
return Fail(updateDir, "更新包安全性检查失败: " + ex.Message, 5,
|
||||
"Package safety check failed: " + ex.Message);
|
||||
}
|
||||
|
||||
// 5. 解压到暂存区(与安装目录同卷,后续 rename 才是原子的)
|
||||
@@ -126,30 +143,39 @@ internal sealed class Applier
|
||||
catch (Exception ex)
|
||||
{
|
||||
ClearDirectory(stage);
|
||||
return Fail(updateDir, "解压失败: " + ex.Message, 6);
|
||||
return Fail(updateDir, "解压失败: " + ex.Message, 6, "Extraction failed: " + ex.Message);
|
||||
}
|
||||
|
||||
var artifact = FindArtifact(stage, request.PackageName);
|
||||
if (artifact == null)
|
||||
{
|
||||
ClearDirectory(stage);
|
||||
return Fail(updateDir, "更新包里没有找到新版程序(" + request.PackageName + ")", 6);
|
||||
return Fail(updateDir, "更新包里没有找到新版程序(" + request.PackageName + ")", 6,
|
||||
"No new launcher found in the package (" + request.PackageName + ")");
|
||||
}
|
||||
|
||||
var target = Path.Combine(installDir, Path.GetFileName(artifact));
|
||||
var alreadyInstalled = File.Exists(target) || Directory.Exists(target);
|
||||
// 主程序:优先用清单里的包名,否则按已知名字挑一个(发布包是整目录,
|
||||
// 里面同时有 GC-UI.exe / GC.UI.Server.exe / GC-SAVEDOG.exe,不能瞎猜第一个)。
|
||||
var mainName = Path.GetFileName(artifact);
|
||||
var mainTarget = Path.Combine(installDir, mainName);
|
||||
|
||||
if (_options.DryRun)
|
||||
{
|
||||
_log.Info($"[dry-run] 校验全部通过,将安装到 {target}");
|
||||
_log.Info($"[dry-run] 校验全部通过,将整目录安装到 {installDir}" +
|
||||
$"({Directory.GetFileSystemEntries(stage).Length} 个顶层条目)",
|
||||
$"[dry-run] All checks passed; would install the whole directory to {installDir} " +
|
||||
$"({Directory.GetFileSystemEntries(stage).Length} top-level entries)");
|
||||
ClearDirectory(stage);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (alreadyInstalled)
|
||||
var previous = ReadLastGood(updateDir);
|
||||
if (previous != null && SameVersion(previous.Version, request.Version) &&
|
||||
(File.Exists(mainTarget) || Directory.Exists(mainTarget)))
|
||||
{
|
||||
// 同一版本重复下发:当成已安装,避免反复覆盖正在运行的文件
|
||||
_log.Info("目标版本已存在,视为已安装");
|
||||
_log.Info($"v{request.Version} 已安装且上次启动正常,视为已安装",
|
||||
$"v{request.Version} is already installed and started fine last time; treating as installed");
|
||||
ClearDirectory(stage);
|
||||
TryDelete(zipPath);
|
||||
TryDelete(requestPath);
|
||||
@@ -157,40 +183,38 @@ internal sealed class Applier
|
||||
{
|
||||
Status = "applied",
|
||||
Version = request.Version,
|
||||
PackageName = Path.GetFileName(artifact),
|
||||
PackageName = mainName,
|
||||
Verified = true,
|
||||
Message = "目标版本已存在,无需替换"
|
||||
});
|
||||
return 0;
|
||||
}
|
||||
|
||||
// 6. 移入安装目录(不覆盖任何已有文件)
|
||||
try
|
||||
{
|
||||
Directory.CreateDirectory(installDir);
|
||||
if (Directory.Exists(artifact)) Directory.Move(artifact, target);
|
||||
else File.Move(artifact, target);
|
||||
_log.Info("新版已就位: " + Path.GetFileName(target));
|
||||
}
|
||||
catch (Exception ex)
|
||||
// 6. 整目录替换:旧内容先搬到 backup,新内容就位;失败可原样还原。
|
||||
// 只动程序文件,.GC(模型库 / 设置 / 更新目录)永远不碰。
|
||||
var replaced = new List<(string Name, string? BackupPath)>();
|
||||
if (!ReplaceInstallDirectory(stage, installDir, updateDir, replaced, out var replaceError))
|
||||
{
|
||||
RestoreFromBackup(installDir, replaced);
|
||||
ClearDirectory(stage);
|
||||
return Fail(updateDir, "移动到安装目录失败: " + ex.Message, 7);
|
||||
return Fail(updateDir, "安装失败: " + replaceError, 7, "Installation failed: " + replaceError);
|
||||
}
|
||||
_log.Info($"新版已就位:{mainName}(替换 {replaced.Count} 个条目)",
|
||||
$"New version in place: {mainName} (replaced {replaced.Count} entries)");
|
||||
|
||||
// 7. 启动并看护
|
||||
var previous = ReadLastGood(updateDir);
|
||||
StartupHealth.Clear(updateDir);
|
||||
|
||||
Process? child;
|
||||
try
|
||||
{
|
||||
child = Launch(target);
|
||||
child = Launch(mainTarget);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
child = null;
|
||||
_log.Error("启动新版失败: " + ex.Message);
|
||||
_log.Error("启动新版失败: " + ex.Message,
|
||||
"Failed to start the new version: " + ex.Message);
|
||||
}
|
||||
|
||||
var healthy = child != null && WaitForHealth(updateDir, request.Version, child,
|
||||
@@ -198,15 +222,16 @@ internal sealed class Applier
|
||||
|
||||
if (healthy)
|
||||
{
|
||||
_log.Info($"v{request.Version} 启动正常,更新完成");
|
||||
CleanupOldVersions(installDir, Path.GetFileName(target), request.PlatformLabel);
|
||||
WriteLastGood(updateDir, request.Version, Path.GetFileName(target));
|
||||
_log.Info($"v{request.Version} 启动正常,更新完成",
|
||||
$"v{request.Version} started successfully; update complete");
|
||||
CleanupBackup(updateDir);
|
||||
WriteLastGood(updateDir, request.Version, mainName);
|
||||
WriteState(updateDir, new SavedogState
|
||||
{
|
||||
Status = "applied",
|
||||
Version = request.Version,
|
||||
PreviousVersion = previous?.Version,
|
||||
PackageName = Path.GetFileName(target),
|
||||
PackageName = mainName,
|
||||
Verified = true,
|
||||
Message = "更新已应用"
|
||||
});
|
||||
@@ -216,21 +241,23 @@ internal sealed class Applier
|
||||
return 0;
|
||||
}
|
||||
|
||||
// 8. 回滚
|
||||
_log.Error($"v{request.Version} 启动后未通过健康检查({_options.TimeoutSeconds}s),开始回滚");
|
||||
// 8. 回滚:撤掉新装的文件,把备份原样搬回
|
||||
_log.Error($"v{request.Version} 启动后未通过健康检查({_options.TimeoutSeconds}s),开始回滚",
|
||||
$"v{request.Version} did not pass the health check after {_options.TimeoutSeconds}s; rolling back");
|
||||
TryKill(child);
|
||||
var removed = RemoveNewVersion(target);
|
||||
_log.Info(removed ? "已移除未通过检查的新版" : "新版文件被占用,未能完全移除");
|
||||
var restored = RestoreFromBackup(installDir, replaced);
|
||||
_log.Info(restored ? "已还原为更新前的文件" : "部分文件未能还原,请手动重新安装",
|
||||
restored ? "Restored the pre-update files" : "Some files could not be restored; please reinstall manually");
|
||||
|
||||
var restored = TryLaunchPrevious(installDir, updateDir, previous, request.PlatformLabel);
|
||||
var relaunched = restored && TryLaunchPrevious(installDir, updateDir, previous, request.PlatformLabel);
|
||||
WriteState(updateDir, new SavedogState
|
||||
{
|
||||
Status = "rolledback",
|
||||
Version = request.Version,
|
||||
PreviousVersion = previous?.Version,
|
||||
PackageName = Path.GetFileName(target),
|
||||
PackageName = mainName,
|
||||
Verified = true,
|
||||
Message = restored
|
||||
Message = relaunched
|
||||
? "新版本未通过启动检查,已回滚到上一个版本"
|
||||
: "新版本未通过启动检查,已移除;未找到可回滚的旧版本,请手动重新安装"
|
||||
});
|
||||
@@ -243,11 +270,18 @@ internal sealed class Applier
|
||||
|
||||
// ------------------------------------------------------------------ 校验辅助
|
||||
|
||||
/// <summary>
|
||||
/// 包名合法性:只允许「一个文件名」,杜绝 `../` 之类的路径穿越。
|
||||
///
|
||||
/// 不能只认 .app / .exe —— Linux 的启动器没有扩展名
|
||||
/// (GC-1.0.9-linux-amd64),按旧规则会被直接判成非法包名、更新永远失败。
|
||||
/// </summary>
|
||||
private static bool ValidName(string name)
|
||||
=> name.Length > 0 && name.Length < 200 &&
|
||||
name.IndexOfAny(new[] { '/', '\\', ':', '\0' }) < 0 &&
|
||||
(name.EndsWith(".app", StringComparison.OrdinalIgnoreCase) ||
|
||||
name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase));
|
||||
=> SafeNamePattern.IsMatch(name);
|
||||
|
||||
private static readonly Regex SafeNamePattern = new(
|
||||
@"^[A-Za-z0-9][A-Za-z0-9._-]{0,198}$",
|
||||
RegexOptions.CultureInvariant | RegexOptions.Compiled);
|
||||
|
||||
private static bool WaitForExit(int pid, TimeSpan timeout)
|
||||
{
|
||||
@@ -280,22 +314,64 @@ internal sealed class Applier
|
||||
Directory.Move(temp, stage);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 在解压结果里找主程序。
|
||||
///
|
||||
/// 发布包是「整目录」结构(exe + dll + data/),同一层可能有好几个 exe
|
||||
/// (GC-UI / GC.UI.Server / GC-SAVEDOG / createdump),必须按固定优先级挑,
|
||||
/// 不能取第一个 —— 否则会把守护进程或调试辅助程序当成启动器拉起来。
|
||||
/// </summary>
|
||||
private static string? FindArtifact(string stage, string packageName)
|
||||
{
|
||||
var direct = Path.Combine(stage, packageName);
|
||||
if (File.Exists(direct) || Directory.Exists(direct)) return direct;
|
||||
|
||||
foreach (var entry in Directory.GetFileSystemEntries(stage))
|
||||
if (!string.IsNullOrWhiteSpace(packageName))
|
||||
{
|
||||
var name = Path.GetFileName(entry);
|
||||
if (name.EndsWith(".app", StringComparison.OrdinalIgnoreCase) && Directory.Exists(entry))
|
||||
return entry;
|
||||
if (name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase) && File.Exists(entry))
|
||||
var named = Path.Combine(stage, packageName);
|
||||
if (File.Exists(named) || Directory.Exists(named)) return named;
|
||||
}
|
||||
|
||||
var entries = Directory.GetFileSystemEntries(stage);
|
||||
var byName = entries
|
||||
.Where(e => File.Exists(e))
|
||||
.OrderByDescending(e => MainExecutablePriority(Path.GetFileName(e)))
|
||||
.ThenBy(e => Path.GetFileName(e), StringComparer.OrdinalIgnoreCase)
|
||||
.ToList();
|
||||
|
||||
var best = byName.FirstOrDefault(e => MainExecutablePriority(Path.GetFileName(e)) > 0);
|
||||
if (best != null) return best;
|
||||
|
||||
// macOS:.app 目录本身就是「可执行单元」
|
||||
foreach (var entry in entries)
|
||||
{
|
||||
if (Directory.Exists(entry) &&
|
||||
Path.GetFileName(entry).EndsWith(".app", StringComparison.OrdinalIgnoreCase))
|
||||
return entry;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>主程序优先级:数字越大越优先,0 表示不是主程序。</summary>
|
||||
private static int MainExecutablePriority(string fileName)
|
||||
{
|
||||
if (!fileName.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)) return 0;
|
||||
|
||||
// 发布包把启动器改名成 GCL-<版本>-<系统>-<架构>.exe(旧包是 GC-),先按这个模式认出来。
|
||||
if (VersionedExePattern.IsMatch(fileName)) return 110;
|
||||
|
||||
var name = Path.GetFileNameWithoutExtension(fileName);
|
||||
return name switch
|
||||
{
|
||||
"GC-UI" => 100,
|
||||
"GC" => 90,
|
||||
"GC.UI.Server" => 80,
|
||||
// 守护进程 / 调试辅助 / 运行时工具:永远不当主程序
|
||||
"GC-SAVEDOG" => 0,
|
||||
"createdump" => 0,
|
||||
"singlefilehost" => 0,
|
||||
_ => 10
|
||||
};
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ 启动与看护
|
||||
|
||||
private Process? Launch(string target)
|
||||
@@ -362,13 +438,14 @@ internal sealed class Applier
|
||||
var health = StartupHealth.Read(updateDir);
|
||||
if (health != null && health.Ok && SameVersion(health.Version, version))
|
||||
{
|
||||
_log.Info($"收到健康标记(pid {health.Pid})");
|
||||
_log.Info($"收到健康标记(pid {health.Pid})", $"Health marker received (pid {health.Pid})");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (child.HasExited)
|
||||
{
|
||||
_log.Error($"新版进程已退出(退出码 {child.ExitCode})");
|
||||
_log.Error($"新版进程已退出(退出码 {child.ExitCode})",
|
||||
$"The new process exited (code {child.ExitCode})");
|
||||
return false;
|
||||
}
|
||||
Thread.Sleep(250);
|
||||
@@ -377,7 +454,8 @@ internal sealed class Applier
|
||||
// 超时但进程还活着:可能是尚未写入健康标记的旧构建,谨慎放行
|
||||
if (!child.HasExited)
|
||||
{
|
||||
_log.Warn("未收到健康标记,但进程仍在运行,按成功处理");
|
||||
_log.Warn("未收到健康标记,但进程仍在运行,按成功处理",
|
||||
"No health marker, but the process is still running; treating as success");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -410,57 +488,254 @@ internal sealed class Applier
|
||||
catch { }
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ 清理 / 回滚
|
||||
// ------------------------------------------------------------------ 整目录安装 / 回滚
|
||||
|
||||
private void CleanupOldVersions(string installDir, string keepName, string platformLabel)
|
||||
/// <summary>
|
||||
/// 把 <paramref name="stage"/> 的内容替换进 <paramref name="installDir"/>。
|
||||
///
|
||||
/// 发布包是「整目录」(启动器 + 后端运行时 + Flutter 前端资源),只搬一个 exe 会留下
|
||||
/// 旧后端 / 旧界面,所以这里按目录整体替换:
|
||||
/// 1. 安装目录里「新版没有」的条目 → 移到 backup(旧版本残留,如上一版的旧文件名);
|
||||
/// 2. 与新版同名的条目 → 先移到 backup,再把新版放进来(覆盖正在被占用的文件会失败,
|
||||
/// 这种情况直接报错并还原,绝不留下半新半旧的目录);
|
||||
/// 3. `.GC` 只合并 `bin/`(非本体文件),其余子目录与更新目录自身一律跳过。
|
||||
///
|
||||
/// 返回 false 时调用方应调用 <see cref="RestoreFromBackup"/> 还原。
|
||||
/// </summary>
|
||||
private bool ReplaceInstallDirectory(string stage, string installDir, string updateDir,
|
||||
List<(string Name, string? BackupPath)> replaced, out string? error)
|
||||
{
|
||||
foreach (var entry in Directory.GetFileSystemEntries(installDir))
|
||||
{
|
||||
var name = Path.GetFileName(entry);
|
||||
if (string.Equals(name, keepName, StringComparison.OrdinalIgnoreCase)) continue;
|
||||
error = null;
|
||||
var backupDir = Path.Combine(updateDir, "backup");
|
||||
|
||||
var match = ArtifactPattern.Match(name);
|
||||
if (!match.Success) continue;
|
||||
|
||||
var platform = match.Groups["plat"].Value;
|
||||
if (!string.Equals(platform, platformLabel, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
_log.Info($"保留其它平台版本: {name}");
|
||||
continue;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
if (Directory.Exists(entry)) Directory.Delete(entry, true);
|
||||
else File.Delete(entry);
|
||||
_log.Info("清理旧版本: " + name);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_log.Warn($"清理旧版本失败 {name}: {ex.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private bool RemoveNewVersion(string target)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (Directory.Exists(target)) Directory.Delete(target, true);
|
||||
else if (File.Exists(target)) File.Delete(target);
|
||||
Directory.CreateDirectory(installDir);
|
||||
ClearDirectory(backupDir);
|
||||
Directory.CreateDirectory(backupDir);
|
||||
|
||||
var incoming = new List<string>();
|
||||
foreach (var entry in Directory.GetFileSystemEntries(stage))
|
||||
{
|
||||
var name = Path.GetFileName(entry);
|
||||
if (string.Equals(name, ".GC", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
// .GC 里只有 bin/ 属于程序本体(守护进程这类「非本体」文件),
|
||||
// 其余(config / model / cache / update / logs / safedog)是用户数据,
|
||||
// 整目录替换时必须原地不动。
|
||||
MergeGcBin(entry, installDir, backupDir, replaced);
|
||||
continue;
|
||||
}
|
||||
if (IsProtected(name))
|
||||
{
|
||||
// 例如 GC-SAVEDOG.exe:本进程正在运行,Windows 上无法替换。
|
||||
// 保留旧版守护进程即可,它下次启动会随包里的新版本一起被更新。
|
||||
_log.Warn($"跳过受保护文件,保留旧版本:{name}",
|
||||
$"Skipping protected file, keeping the old one: {name}");
|
||||
continue;
|
||||
}
|
||||
incoming.Add(entry);
|
||||
}
|
||||
var incomingNames = new HashSet<string>(
|
||||
incoming.Select(e => Path.GetFileName(e)), StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
// 1. 旧版独有的条目先清走(保留在 backup 里以便回滚)
|
||||
foreach (var entry in Directory.GetFileSystemEntries(installDir))
|
||||
{
|
||||
var name = Path.GetFileName(entry);
|
||||
if (incomingNames.Contains(name)) continue;
|
||||
if (IsProtected(name)) continue;
|
||||
if (IsSameOrInside(entry, updateDir)) continue;
|
||||
|
||||
var target = Path.Combine(backupDir, name);
|
||||
MoveEntry(entry, target);
|
||||
replaced.Add((name, target));
|
||||
_log.Info("旧版残留已备份: " + name, "Old leftover backed up: " + name);
|
||||
}
|
||||
|
||||
// 2. 同名条目:旧 → backup,新 → 安装目录
|
||||
foreach (var entry in incoming)
|
||||
{
|
||||
var name = Path.GetFileName(entry);
|
||||
var target = Path.Combine(installDir, name);
|
||||
var backup = Path.Combine(backupDir, name);
|
||||
|
||||
if (File.Exists(target) || Directory.Exists(target))
|
||||
{
|
||||
MoveEntry(target, backup);
|
||||
replaced.Add((name, backup));
|
||||
}
|
||||
else
|
||||
{
|
||||
// 纯新增:回滚时直接删掉,没有备份可还原
|
||||
replaced.Add((name, null));
|
||||
}
|
||||
|
||||
MoveEntry(entry, target);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_log.Warn("移除新版失败: " + ex.Message);
|
||||
error = ex.Message;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 合并新包里的 <c>.GC/bin</c>:只搬这一层文件,不动 .GC 下的用户数据。
|
||||
///
|
||||
/// 守护进程放在这里(而不是安装目录根)是为了「非本体文件全部收进 .GC/bin」;
|
||||
/// 但正在运行的是 <c>.GC/safedog</c> 里的副本,所以这里的文件可以安全替换。
|
||||
/// </summary>
|
||||
private void MergeGcBin(string stageGc, string installDir, string backupDir,
|
||||
List<(string Name, string? BackupPath)> replaced)
|
||||
{
|
||||
try
|
||||
{
|
||||
var bin = Path.Combine(stageGc, "bin");
|
||||
if (!Directory.Exists(bin)) return;
|
||||
|
||||
var relBin = Path.Combine(".GC", "bin");
|
||||
var targetBin = Path.Combine(installDir, relBin);
|
||||
Directory.CreateDirectory(targetBin);
|
||||
|
||||
foreach (var file in Directory.GetFiles(bin))
|
||||
{
|
||||
var name = Path.GetFileName(file);
|
||||
var rel = Path.Combine(relBin, name);
|
||||
var target = Path.Combine(targetBin, name);
|
||||
var backup = Path.Combine(backupDir, ".GC-bin", name);
|
||||
|
||||
if (File.Exists(target))
|
||||
{
|
||||
MoveEntry(target, backup);
|
||||
replaced.Add((rel, backup));
|
||||
}
|
||||
else
|
||||
{
|
||||
replaced.Add((rel, null));
|
||||
}
|
||||
|
||||
MoveEntry(file, target);
|
||||
_log.Info("已更新非本体文件: " + rel, "Updated non-core file: " + rel);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_log.Warn($"合并 .GC/bin 失败(继续使用已有版本):{ex.Message}",
|
||||
$"Failed to merge .GC/bin (keeping the existing one): {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 把备份里的条目原样搬回安装目录,撤掉新装的内容。
|
||||
/// <paramref name="BackupPath"/> 为 null 表示这一项是新包里独有的(没有旧版本),
|
||||
/// 回滚时只需要删掉。
|
||||
/// </summary>
|
||||
private bool RestoreFromBackup(string installDir, List<(string Name, string? BackupPath)> replaced)
|
||||
{
|
||||
var ok = true;
|
||||
foreach (var (name, backup) in replaced)
|
||||
{
|
||||
var target = Path.Combine(installDir, name);
|
||||
try
|
||||
{
|
||||
// 先撤掉新版(新包里独有的文件也要删干净,否则回滚后目录里新旧混杂)
|
||||
DeleteEntry(target);
|
||||
|
||||
if (string.IsNullOrWhiteSpace(backup) ||
|
||||
(!File.Exists(backup) && !Directory.Exists(backup)))
|
||||
continue;
|
||||
|
||||
MoveEntry(backup, target);
|
||||
_log.Info("已还原: " + name, "Restored: " + name);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
ok = false;
|
||||
_log.Warn($"还原 {name} 失败: {ex.Message}", $"Failed to restore {name}: {ex.Message}");
|
||||
}
|
||||
}
|
||||
return ok;
|
||||
}
|
||||
|
||||
/// <summary>更新成功:删掉整份备份,不再占用磁盘。</summary>
|
||||
private void CleanupBackup(string updateDir)
|
||||
{
|
||||
var backupDir = Path.Combine(updateDir, "backup");
|
||||
try
|
||||
{
|
||||
if (Directory.Exists(backupDir)) Directory.Delete(backupDir, true);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_log.Warn("清理备份失败: " + ex.Message, "Failed to clean up the backup: " + ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 安装目录里不该被更新碰的东西:
|
||||
/// · .GC —— 模型库、设置、日志、更新目录本身都在这里(只有 bin/ 由 MergeGcBin 单独处理);
|
||||
/// · GC-SAVEDOG.exe —— 本进程正在运行,Windows 上无法替换。
|
||||
/// </summary>
|
||||
private static bool IsProtected(string name)
|
||||
{
|
||||
if (string.Equals(name, ".GC", StringComparison.OrdinalIgnoreCase)) return true;
|
||||
var self = Environment.ProcessPath;
|
||||
if (!string.IsNullOrWhiteSpace(self) &&
|
||||
string.Equals(name, Path.GetFileName(self!), StringComparison.OrdinalIgnoreCase))
|
||||
return true;
|
||||
return string.Equals(name, "backup", StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
|
||||
private static bool IsSameOrInside(string path, string root)
|
||||
{
|
||||
try
|
||||
{
|
||||
var full = Path.GetFullPath(path).TrimEnd(Path.DirectorySeparatorChar);
|
||||
var rootFull = Path.GetFullPath(root).TrimEnd(Path.DirectorySeparatorChar);
|
||||
return full.Equals(rootFull, StringComparison.OrdinalIgnoreCase) ||
|
||||
full.StartsWith(rootFull + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
catch { return false; }
|
||||
}
|
||||
|
||||
/// <summary>移动条目;跨卷或目标占用时退回「复制 + 删除」。</summary>
|
||||
private static void MoveEntry(string from, string to)
|
||||
{
|
||||
var parent = Path.GetDirectoryName(to);
|
||||
if (!string.IsNullOrWhiteSpace(parent)) Directory.CreateDirectory(parent);
|
||||
|
||||
if (Directory.Exists(from))
|
||||
{
|
||||
Directory.Move(from, to);
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
File.Move(from, to, overwrite: true);
|
||||
}
|
||||
catch (IOException)
|
||||
{
|
||||
File.Copy(from, to, overwrite: true);
|
||||
File.Delete(from);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>删除文件或目录,失败时抛出(由调用方决定是否回滚)。</summary>
|
||||
private static void DeleteEntry(string path)
|
||||
{
|
||||
if (Directory.Exists(path)) Directory.Delete(path, true);
|
||||
else if (File.Exists(path)) File.Delete(path);
|
||||
}
|
||||
|
||||
private bool TryLaunchPrevious(string installDir, string updateDir, LastGoodVersion? lastGood,
|
||||
string platformLabel)
|
||||
{
|
||||
// 优先用上次成功的版本;否则挑一个同平台的其它版本
|
||||
// 优先用上次成功启动的主程序;否则按优先级在安装目录里找
|
||||
var candidates = new List<string>();
|
||||
if (lastGood != null && !string.IsNullOrWhiteSpace(lastGood.PackageName))
|
||||
candidates.Add(Path.Combine(installDir, lastGood.PackageName));
|
||||
@@ -468,25 +743,27 @@ internal sealed class Applier
|
||||
foreach (var entry in Directory.GetFileSystemEntries(installDir))
|
||||
{
|
||||
var name = Path.GetFileName(entry);
|
||||
var match = ArtifactPattern.Match(name);
|
||||
if (!match.Success) continue;
|
||||
if (!string.Equals(match.Groups["plat"].Value, platformLabel, StringComparison.OrdinalIgnoreCase))
|
||||
continue;
|
||||
candidates.Add(entry);
|
||||
if (IsProtected(name)) continue;
|
||||
if (MainExecutablePriority(name) > 0) candidates.Add(entry);
|
||||
else if (Directory.Exists(entry) &&
|
||||
name.EndsWith(".app", StringComparison.OrdinalIgnoreCase))
|
||||
candidates.Add(entry);
|
||||
}
|
||||
|
||||
foreach (var candidate in candidates)
|
||||
foreach (var candidate in candidates.Distinct(StringComparer.OrdinalIgnoreCase))
|
||||
{
|
||||
if (!File.Exists(candidate) && !Directory.Exists(candidate)) continue;
|
||||
try
|
||||
{
|
||||
Launch(candidate);
|
||||
_log.Info("已回滚启动: " + Path.GetFileName(candidate));
|
||||
_log.Info("已回滚启动: " + Path.GetFileName(candidate),
|
||||
"Rolled back and started: " + Path.GetFileName(candidate));
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_log.Warn($"回滚启动失败 {Path.GetFileName(candidate)}: {ex.Message}");
|
||||
_log.Warn($"回滚启动失败 {Path.GetFileName(candidate)}: {ex.Message}",
|
||||
$"Failed to start rollback candidate {Path.GetFileName(candidate)}: {ex.Message}");
|
||||
}
|
||||
}
|
||||
return false;
|
||||
@@ -497,12 +774,12 @@ internal sealed class Applier
|
||||
private void WriteState(string updateDir, SavedogState state)
|
||||
{
|
||||
try { Json.Write(Path.Combine(updateDir, SavedogFiles.State), state); }
|
||||
catch (Exception ex) { _log.Warn("写状态失败: " + ex.Message); }
|
||||
catch (Exception ex) { _log.Warn("写状态失败: " + ex.Message, "Failed to write state: " + ex.Message); }
|
||||
}
|
||||
|
||||
private int Fail(string updateDir, string message, int code)
|
||||
private int Fail(string updateDir, string message, int code, string? messageEn = null)
|
||||
{
|
||||
_log.Error(message);
|
||||
_log.Error(message, messageEn ?? message);
|
||||
WriteState(updateDir, new SavedogState { Status = "failed", Message = message });
|
||||
return code;
|
||||
}
|
||||
|
||||
@@ -42,6 +42,8 @@
|
||||
ManifestLoader 依赖启动器的 RepoVersion 模型,守护进程不需要,排除。 -->
|
||||
<Compile Include="..\GC\src\Security\**\*.cs" Exclude="..\GC\src\Security\ManifestLoader.cs" LinkBase="Security" />
|
||||
<Compile Include="..\GC\src\Services\Json.cs" Link="Shared\Json.cs" />
|
||||
<!-- 与启动器共用同一份双语日志实现,保证 .GC/logs 里格式一致 -->
|
||||
<Compile Include="..\GC\src\Services\GcLog.cs" Link="Shared\GcLog.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
+13
-25
@@ -1,34 +1,22 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using GC.Services;
|
||||
|
||||
namespace GC.Savedog;
|
||||
|
||||
/// <summary>同时写 stdout 与 .GC/update/savedog.log,便于用户离线排查。</summary>
|
||||
/// <summary>
|
||||
/// 守护进程的日志入口,实际写入 <see cref="GcLog"/>:控制台 + <c>.GC/logs</c> 下的
|
||||
/// <c>gc-YYYYMMDD.log</c>(中文)与 <c>gc-YYYYMMDD.en.log</c>(英文)。
|
||||
///
|
||||
/// 每条日志都必须同时给中英两份文案 —— 用户反馈问题时直接发对应语言的文件。
|
||||
/// </summary>
|
||||
internal sealed class Log
|
||||
{
|
||||
private readonly string? _path;
|
||||
private readonly object _gate = new();
|
||||
|
||||
public Log(string? path) => _path = path;
|
||||
|
||||
public void Info(string message) => Write("INFO ", message);
|
||||
public void Warn(string message) => Write("WARN ", message);
|
||||
public void Error(string message) => Write("ERROR", message);
|
||||
|
||||
private void Write(string level, string message)
|
||||
public Log(string? dir)
|
||||
{
|
||||
var line = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss} [{level}] {message}";
|
||||
Console.WriteLine(line);
|
||||
if (string.IsNullOrWhiteSpace(_path)) return;
|
||||
try
|
||||
{
|
||||
lock (_gate)
|
||||
{
|
||||
var dir = Path.GetDirectoryName(_path!);
|
||||
if (!string.IsNullOrEmpty(dir)) Directory.CreateDirectory(dir);
|
||||
File.AppendAllText(_path!, line + "\n");
|
||||
}
|
||||
}
|
||||
catch { /* 日志失败不能影响更新 */ }
|
||||
if (!string.IsNullOrWhiteSpace(dir)) GcLog.Init(dir);
|
||||
}
|
||||
|
||||
public void Info(string zh, string en) => GcLog.Info(zh, en);
|
||||
public void Warn(string zh, string en) => GcLog.Warn(zh, en);
|
||||
public void Error(string zh, string en) => GcLog.Error(zh, en);
|
||||
}
|
||||
@@ -67,7 +67,10 @@ internal static class Program
|
||||
return 3;
|
||||
}
|
||||
|
||||
var log = new Log(Path.Combine(Path.GetFullPath(updateDir), SavedogFiles.Log));
|
||||
// 日志统一放 .GC/logs(update 目录的上一层),不再塞在 update/ 里
|
||||
var updateRoot = Path.GetFullPath(updateDir);
|
||||
var home = Path.GetDirectoryName(updateRoot) ?? updateRoot;
|
||||
var log = new Log(Path.Combine(home, "logs"));
|
||||
var applyOptions = new ApplyOptions
|
||||
{
|
||||
UpdateDir = updateDir,
|
||||
|
||||
+26
-3
@@ -1,6 +1,9 @@
|
||||
# GC-UI 持续集成
|
||||
|
||||
夜间 alpha 构建的工作流在 [`.gitea/workflows/gc-ui-alpha.yml`](../.gitea/workflows/gc-ui-alpha.yml)。
|
||||
alpha 构建的工作流在 [`.gitea/workflows/gc-ui-alpha.yml`](../.gitea/workflows/gc-ui-alpha.yml),
|
||||
**只支持手动触发**(定时任务已取消:它绕开 build.sh,产出的包没有后端、没有前端,跑起来只是个空壳;
|
||||
另外 `cron` 里的 `TZ=` 前缀在部分 Gitea 版本上是非法表达式)。
|
||||
PR 审核流水线在 [`.gitea/workflows/pr-check.yml`](../.gitea/workflows/pr-check.yml)。
|
||||
本仓库是自建 Gitea(不是 GitHub),所以目录是 `.gitea/workflows/`,语法与 GitHub Actions 基本一致,
|
||||
差异集中在 **runner 标签** 和 **API 前缀** 两处。
|
||||
|
||||
@@ -66,7 +69,8 @@ Windows 还需要 **VS Build Tools 的「使用 C++ 的桌面开发」工作负
|
||||
```bash
|
||||
# 按构建主机自动选目标,每条产物都带 Flutter 前端:
|
||||
# macOS 主机 → mac-arm64(原生)+ win-amd64 / win-arm64(mingw 交叉)
|
||||
# Linux 主机 → linux-amd64(原生)+ win-amd64 / win-arm64(mingw 交叉)
|
||||
# Linux 主机 → win-amd64 / win-arm64(mingw 交叉)
|
||||
# Linux 产物默认不出:需 aarch64 主机 + GC_BUILD_LINUX=1
|
||||
# Windows 主机 → win-amd64 / win-arm64(原生)
|
||||
./build.sh build
|
||||
|
||||
@@ -93,7 +97,7 @@ sudo apt install clang cmake ninja-build pkg-config libgtk-3-dev libstdc++-14-de
|
||||
`-lstdc++`,系统只装了 gcc-13 的开发包时链接会失败,报 `cannot find -lstdc++`。
|
||||
|
||||
产物布局:`GC-UI` + `lib/libflutter_linux_gtk.so` + `data/`,与官方 `flutter build
|
||||
linux` 的 bundle 一致,直接铺进 `dist/linux-amd64/`。
|
||||
linux` 的 bundle 一致,直接铺进 `dist/linux-arm64/`。
|
||||
|
||||
### Windows 前端交叉编译
|
||||
|
||||
@@ -133,6 +137,25 @@ GC-UI.exe flutter_windows.dll data/{icudtl.dat, app.so, flutter_assets/}
|
||||
- `Runner.rc` 在 windres 下有两处不兼容:图标用反斜杠相对路径、`VERSION_AS_STRING`
|
||||
依赖命令行传 `-D` 的转义字符串。脚本生成一份路径与宏都已规整的 rc 副本再编译。
|
||||
|
||||
### 交叉编译必须自己嵌 DPI 清单
|
||||
|
||||
`windows/runner/CMakeLists.txt` 把 `runner.exe.manifest` 当**源文件**列进 target,
|
||||
Visual Studio 生成器会把它交给链接器(`/MANIFESTINPUT`)自动嵌入 exe;
|
||||
但 `buildsh/cross/CMakeLists.txt` 只用 windres 编 `Runner.rc`,CMake 不会做这一步。
|
||||
结果就是交叉编出来的 `GC-UI.exe` **完全没有清单**:Windows 认为它「DPI 不感知」,
|
||||
在 125% / 150% 缩放的屏幕上把整块窗口当位图拉伸 —— 界面整体发虚,中文小字最明显。
|
||||
|
||||
现在两处都已加固,改这块代码时不要拆掉任何一处:
|
||||
|
||||
| 位置 | 做法 |
|
||||
|---|---|
|
||||
| `buildsh/cross/CMakeLists.txt` | 往 `Runner.cross.rc` 追加 `1 24 "<abs>/runner.exe.manifest"`(id 1 = CREATEPROCESS_MANIFEST_RESOURCE_ID,type 24 = RT_MANIFEST) |
|
||||
| `windows/runner/main.cpp` | 建窗之前调 `SetProcessDpiAwarenessContext(PER_MONITOR_AWARE_V2)`,失败依次退到 `SetProcessDpiAwareness` / `SetProcessDPIAware` |
|
||||
|
||||
`main.cpp` 那层是兜底:即使清单因为工具链原因没嵌进去,程序自己也会声明 DPI 感知。
|
||||
验证办法(Windows):`GC-UI.exe` 属性 →「兼容性」里不该出现「替代高 DPI 缩放行为」,
|
||||
或在 125% 缩放下截图,文字边缘应是锐利的 1.25 倍像素,而不是模糊的插值。
|
||||
|
||||
`.gitea/workflows` 里的 `windows` 任务仍然跑在 `windows-latest` 上;若手头只有 macOS/Linux
|
||||
构建机,可以把该任务的 `runs-on` 换成对应标签,直接复用这套交叉编译脚本,
|
||||
不再需要 VS Build Tools。
|
||||
+35
-6
@@ -55,6 +55,10 @@ Windows 与 macOS 用**同一套 Flutter 代码 + 各自的原生 runner**:
|
||||
|
||||
### 1. 启动后端
|
||||
|
||||
发布版里后端不走独立进程:`GC-BOOT` 直接引用本工程,调用
|
||||
`BackendServer.Start(args, port)` 在自己进程内托管,发布包因此只有一个 exe
|
||||
(两个自包含进程会把 60MB 运行时复制两份)。下面的独立运行方式只用于开发调试。
|
||||
|
||||
```bash
|
||||
# 仓库根目录
|
||||
dotnet run --project GC-UI/backend/GC.UI.Server
|
||||
@@ -65,7 +69,11 @@ dotnet run --project GC-UI/backend/GC.UI.Server -- --port 17890
|
||||
GC_UI_PORT=17890 dotnet run --project GC-UI/backend/GC.UI.Server
|
||||
```
|
||||
|
||||
启动后会在 `~/.GC/ui-backend.json` 写入 `{ port, pid, url, version, platform }`,前端可据此发现端口。
|
||||
端口约定集中在 `GC.Services.GcUiContract`(`DefaultPort` / `PortEnvVar`):
|
||||
正式启动时由 GC-BOOT 选端口(17890 被占用就往后试 9 个),再通过 `GC_UI_PORT`
|
||||
环境变量同时传给后端和前端,所以**不需要为了换端口重新编译前端**。
|
||||
启动后后端会在 `~/.GC/ui-backend.json` 写入 `{ port, pid, url, version, platform }`,
|
||||
排查问题时可以据此确认实际端口。
|
||||
|
||||
### 2. 启动前端
|
||||
|
||||
@@ -141,14 +149,35 @@ flutter test
|
||||
# 前后端联调(需要后端正在运行;后端没起时自动跳过)
|
||||
flutter test test/backend_contract_test.dart
|
||||
|
||||
# 生成界面截图到 test/shots/(视觉检查用)
|
||||
# 生成界面截图到 test/shots/(视觉检查用,不需要后端)
|
||||
flutter test tool/render_shots_test.dart
|
||||
```
|
||||
|
||||
截图脚本覆盖四个页面(首页 / 下载 / 设置 / 关于)再加一整套外壳:
|
||||
`test/shots/home.png`、`download.png`、`settings.png`、`about.png`、`shell.png`。
|
||||
需要先在本机 17890 端口跑起后端;脚本用 `runAsync` 给真实 HTTP 留出时间,
|
||||
否则 `flutter_test` 的假时钟会让页面停在加载态。
|
||||
截图脚本覆盖四个页面(首页 / 下载 / 设置 / 关于),再加一整套外壳与 1024×680 小窗回归:
|
||||
`test/shots/home.png`、`download.png`、`settings.png`、`about.png`、`shell.png`、
|
||||
`home-small.png`、`download-small.png`、`settings-small.png`,以及浅色主题的
|
||||
`home-light.png`、`settings-light.png`。小窗用例会顺带抓布局溢出(RenderFlex overflow)。
|
||||
|
||||
四个页面都用预置数据(`initialModels` / `initialSources` / `initialAbout` 等)渲染,
|
||||
所以**不需要先起后端**。测试环境的字体是 Ahem(所有字都是方块),脚本会显式加载
|
||||
系统里的 Noto Sans SC / 微软雅黑 / 苹方,并顺带加载 Material 图标字体,中文和图标才正常。
|
||||
截图必须放在 `runAsync` 里取像素(`toImage` / `toByteData` 走真实引擎管线),
|
||||
否则 fake async 时钟不推进,每个用例会卡满 10 分钟才超时。
|
||||
|
||||
## 界面清晰度(DPI)
|
||||
|
||||
`GC-UI.exe` 必须在启动时就声明 DPI 感知,否则 Windows 在 125% / 150% 缩放下会把
|
||||
整块窗口当位图拉伸,界面看起来「糊」—— 中文小字最先糊。两处保证:
|
||||
|
||||
- `windows/runner/runner.exe.manifest`:PerMonitorV2(原生 MSVC 构建由 CMake 自动嵌入)
|
||||
- `windows/runner/main.cpp`:建窗前再声明一次,依次尝试
|
||||
`SetProcessDpiAwarenessContext` → `SetProcessDpiAwareness` → `SetProcessDPIAware`
|
||||
- `buildsh/cross/CMakeLists.txt`:交叉编译时把清单写进 `.rc`(windres 不会自动嵌入)
|
||||
|
||||
另外主题里做了两件跟「清晰」有关的事:字体族走
|
||||
`Segoe UI + Microsoft YaHei UI`(macOS 走苹方)而不是让引擎随意回退;
|
||||
正文最小 12px、行高固定,中文不再挤成一片。详见
|
||||
[CI.md 的「交叉编译必须自己嵌 DPI 清单」](CI.md#交叉编译必须自己嵌-dpi-清单)。
|
||||
|
||||
## 「关于」页展示的技术栈
|
||||
|
||||
|
||||
@@ -133,6 +133,15 @@ public sealed record AboutDto(
|
||||
|
||||
public sealed record LaunchResultDto(bool Ok, string Message);
|
||||
|
||||
/// <summary>
|
||||
/// 通用错误响应。限流 / 参数校验这类与具体业务无关的失败用它,
|
||||
/// 不要复用 <see cref="LaunchResultDto"/> —— 那会让前端误以为「启动模型」有结果。
|
||||
/// </summary>
|
||||
public sealed record ErrorDto(bool Ok, string Message)
|
||||
{
|
||||
public static ErrorDto Of(string message) => new(false, message);
|
||||
}
|
||||
|
||||
public sealed record DownloadRequest(string SourceId, string ModelId);
|
||||
|
||||
public sealed record PathRequest(string Path);
|
||||
|
||||
@@ -28,7 +28,7 @@ public sealed class AvaloniaHost
|
||||
{
|
||||
private readonly AppServices _services;
|
||||
private readonly object _gate = new();
|
||||
private readonly List<PlayerWindow> _windows = new();
|
||||
private readonly Dictionary<string, PlayerWindow> _windows = new(StringComparer.OrdinalIgnoreCase);
|
||||
private Task<bool>? _startTask;
|
||||
|
||||
public AvaloniaHost(AppServices services) => _services = services;
|
||||
@@ -98,6 +98,27 @@ public sealed class AvaloniaHost
|
||||
|
||||
return await Dispatcher.UIThread.InvokeAsync<string>(async () =>
|
||||
{
|
||||
// 同一个模型已经在运行:把已有窗口提到前台,不再加载第二份实例
|
||||
// (连点「启动模型」会各占一份内存与显存,低配机器直接卡死)。
|
||||
lock (_gate)
|
||||
{
|
||||
if (_windows.TryGetValue(package.Id, out var existing))
|
||||
{
|
||||
try
|
||||
{
|
||||
if (existing.WindowState == WindowState.Minimized)
|
||||
existing.WindowState = WindowState.Normal;
|
||||
existing.Activate();
|
||||
return $"模型 {package.Id} 已在运行";
|
||||
}
|
||||
catch
|
||||
{
|
||||
// 窗口已失效:清掉记录,按新窗口重新打开
|
||||
_windows.Remove(package.Id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
PlayerWindow? window = null;
|
||||
LoadedModel? loaded = null;
|
||||
try
|
||||
@@ -111,13 +132,18 @@ public sealed class AvaloniaHost
|
||||
|
||||
window = new PlayerWindow(package, loaded);
|
||||
var captured = loaded;
|
||||
var id = package.Id;
|
||||
window.Closed += (_, _) =>
|
||||
{
|
||||
try { captured.Dispose(); } catch { /* 释放失败不影响退出 */ }
|
||||
lock (_gate) _windows.Remove(window!);
|
||||
lock (_gate)
|
||||
{
|
||||
if (_windows.TryGetValue(id, out var current) && ReferenceEquals(current, window))
|
||||
_windows.Remove(id);
|
||||
}
|
||||
};
|
||||
|
||||
lock (_gate) _windows.Add(window);
|
||||
lock (_gate) _windows[id] = window;
|
||||
window.Show();
|
||||
return $"已启动模型 {package.Id}";
|
||||
}
|
||||
|
||||
@@ -0,0 +1,664 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text.Json;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using GC.Download;
|
||||
using GC.Models;
|
||||
using GC.Services;
|
||||
using GC.UI.Server;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace GC.UI.Server;
|
||||
|
||||
/// <summary>
|
||||
/// GC-UI 后端(本地 HTTP 服务:模型扫描 / 下载 / 更新 / 设置 / 模型窗口宿主)。
|
||||
///
|
||||
/// 两种跑法共用同一份代码:
|
||||
/// · 独立进程:<c>GC.UI.Server</c> 可执行文件(开发调试 / 旧包兼容);
|
||||
/// · 进程内:启动器直接调用 <see cref="Start"/>,把后端跑在自己的进程里 ——
|
||||
/// 发布包因此只需要一个 exe,不必再复制一份完整的 .NET 运行时。
|
||||
/// </summary>
|
||||
public static class BackendServer
|
||||
{
|
||||
/// <summary>按命令行 / GC_UI_PORT 解析端口并构建(未启动)的后端。</summary>
|
||||
public static WebApplication StartFromCommandLine(string[] args)
|
||||
=> Start(args, ResolvePort(args));
|
||||
|
||||
/// <summary>
|
||||
/// 构建后端。返回的 <see cref="WebApplication"/> 尚未启动:
|
||||
/// 独立进程直接 <c>Run()</c>,启动器用 <c>StartAsync()</c> 之后继续拉起界面。
|
||||
/// </summary>
|
||||
public static WebApplication Start(string[] args, int port)
|
||||
{
|
||||
// 下载模块(GC-DOWNLOAD)通过宿主钩子注入,和 GC-BOOT 的做法一致。
|
||||
DownloadModuleHost.Factory = new DownloadModuleFactory();
|
||||
|
||||
var services = AppServices.Create();
|
||||
var uiHost = new AvaloniaHost(services);
|
||||
|
||||
var builder = WebApplication.CreateBuilder(new WebApplicationOptions { Args = args });
|
||||
builder.Logging.ClearProviders();
|
||||
builder.WebHost.UseUrls($"http://127.0.0.1:{port}");
|
||||
|
||||
// 本地伴随进程:限制请求体大小、关闭 Server 头、收紧超时,减少被本地恶意页面
|
||||
// 或异常客户端拖垮的攻击面。
|
||||
builder.WebHost.ConfigureKestrel(options =>
|
||||
{
|
||||
options.AddServerHeader = false;
|
||||
options.Limits.MaxRequestBodySize = 2 * 1024 * 1024;
|
||||
options.Limits.RequestHeadersTimeout = TimeSpan.FromSeconds(15);
|
||||
options.Limits.KeepAliveTimeout = TimeSpan.FromMinutes(2);
|
||||
options.Limits.MaxConcurrentConnections = 64;
|
||||
});
|
||||
|
||||
// 桌面端(Windows/macOS)走原生 HTTP,不需要 CORS;
|
||||
// 这里放开本机回环来源,方便用 `flutter run -d chrome` 调试界面。
|
||||
builder.Services.AddCors(options => options.AddDefaultPolicy(policy => policy
|
||||
.SetIsOriginAllowed(origin =>
|
||||
Uri.TryCreate(origin, UriKind.Absolute, out var uri) &&
|
||||
(uri.Host == "127.0.0.1" || uri.Host == "localhost" || uri.Host == "::1"))
|
||||
.AllowAnyHeader()
|
||||
.AllowAnyMethod()));
|
||||
|
||||
var app = builder.Build();
|
||||
app.UseCors();
|
||||
|
||||
// 日志与启动器共用 .GC/logs,整条启动链路(启动器 → 后端 → 守护进程)都在同一组文件里。
|
||||
var logPaths = AppPaths.Discover();
|
||||
GcLog.Init(logPaths.LogsRoot);
|
||||
GcLog.Info($"GC-UI 后端启动,监听 127.0.0.1:{port}",
|
||||
$"GC-UI backend started on 127.0.0.1:{port}");
|
||||
|
||||
// 设置白名单 / 标识校验用到的规则(只在本进程内使用)。
|
||||
var allowedLanguages = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
|
||||
{ "auto", "zh-CN", "en" };
|
||||
var allowedThemes = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
|
||||
{ "light", "dark", "system" };
|
||||
var accentHexRegex = new System.Text.RegularExpressions.Regex(
|
||||
"^#(?:[0-9A-Fa-f]{6})$", System.Text.RegularExpressions.RegexOptions.Compiled);
|
||||
var safeIdRegex = new System.Text.RegularExpressions.Regex(
|
||||
"^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$", System.Text.RegularExpressions.RegexOptions.Compiled);
|
||||
|
||||
// 安全响应头 + Host/Origin 校验(抵御 DNS rebinding 与跨站调用)。
|
||||
app.Use(async (context, next) =>
|
||||
{
|
||||
var headers = context.Response.Headers;
|
||||
headers["X-Content-Type-Options"] = "nosniff";
|
||||
headers["X-Frame-Options"] = "DENY";
|
||||
headers["Referrer-Policy"] = "no-referrer";
|
||||
headers["Content-Security-Policy"] = "default-src 'none'; frame-ancestors 'none'";
|
||||
headers["Cache-Control"] = "no-store";
|
||||
|
||||
var host = context.Request.Host.Host;
|
||||
if (!string.Equals(host, "127.0.0.1", StringComparison.OrdinalIgnoreCase) &&
|
||||
!string.Equals(host, "localhost", StringComparison.OrdinalIgnoreCase) &&
|
||||
!string.Equals(host, "::1", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
context.Response.StatusCode = StatusCodes.Status403Forbidden;
|
||||
return;
|
||||
}
|
||||
|
||||
var origin = context.Request.Headers.Origin.ToString();
|
||||
if (!string.IsNullOrEmpty(origin) &&
|
||||
!(Uri.TryCreate(origin, UriKind.Absolute, out var parsed) &&
|
||||
(parsed.Host == "127.0.0.1" || parsed.Host == "localhost" || parsed.Host == "::1")))
|
||||
{
|
||||
context.Response.StatusCode = StatusCodes.Status403Forbidden;
|
||||
return;
|
||||
}
|
||||
|
||||
await next();
|
||||
});
|
||||
|
||||
// 写入类接口做简单限流:单 IP 每秒最多 40 次,防止本地脚本刷爆下载/更新。
|
||||
var writeBuckets =
|
||||
new System.Collections.Concurrent.ConcurrentDictionary<string, (long Window, int Count)>();
|
||||
app.Use(async (context, next) =>
|
||||
{
|
||||
if (HttpMethods.IsPost(context.Request.Method) ||
|
||||
HttpMethods.IsDelete(context.Request.Method))
|
||||
{
|
||||
var key = context.Connection.RemoteIpAddress?.ToString() ?? "local";
|
||||
var now = Environment.TickCount64;
|
||||
|
||||
// 定期丢弃过期窗口:本机连接数不多,但长时间运行后桶只增不减会缓慢泄漏。
|
||||
if (writeBuckets.Count > 256)
|
||||
{
|
||||
foreach (var entry in writeBuckets)
|
||||
{
|
||||
if (now - entry.Value.Window > 60_000)
|
||||
writeBuckets.TryRemove(entry.Key, out _);
|
||||
}
|
||||
}
|
||||
|
||||
var bucket = writeBuckets.AddOrUpdate(
|
||||
key,
|
||||
_ => (now, 1),
|
||||
(_, old) => now - old.Window > 1000 ? (now, 1) : (old.Window, old.Count + 1));
|
||||
|
||||
if (bucket.Count > 40)
|
||||
{
|
||||
context.Response.StatusCode = StatusCodes.Status429TooManyRequests;
|
||||
await context.Response.WriteAsJsonAsync(ErrorDto.Of("请求过于频繁,请稍后再试"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
await next();
|
||||
});
|
||||
|
||||
// ---- 健康检查 -------------------------------------------------------------
|
||||
|
||||
app.MapGet("/api/health", () => Results.Ok(new HealthDto(
|
||||
true,
|
||||
LauncherRuntimeInfo.CurrentLauncherVersion,
|
||||
LauncherRuntimeInfo.CurrentRid,
|
||||
uiHost.IsAvailable,
|
||||
uiHost.LastError)));
|
||||
|
||||
// ---- 已安装模型 -----------------------------------------------------------
|
||||
|
||||
app.MapGet("/api/models", () =>
|
||||
Results.Ok(services.Models.Scan().Select(ToModelDto).ToList()));
|
||||
|
||||
app.MapGet("/api/models/{id}/preview", (string id, HttpResponse response) =>
|
||||
{
|
||||
if (!IsSafeId(id)) return Results.BadRequest(ErrorDto.Of("模型标识无效"));
|
||||
var package = services.Models.Find(id);
|
||||
if (package == null || !File.Exists(package.PreviewPath)) return Results.NotFound();
|
||||
|
||||
// 封面是静态图,允许前端缓存:默认全局中间件写的 no-store 会让每次滚动都重新请求。
|
||||
// 按扩展名给准确的 MIME —— 统一写 image/png 时,WebP / JPEG 封面在部分平台显示不出来。
|
||||
response.Headers.CacheControl = "private, max-age=300";
|
||||
return Results.File(package.PreviewPath, GuessImageContentType(package.PreviewPath));
|
||||
});
|
||||
|
||||
app.MapPost("/api/models/{id}/launch", async (string id) =>
|
||||
{
|
||||
if (!IsSafeId(id)) return Results.BadRequest(new LaunchResultDto(false, "模型标识无效"));
|
||||
var package = services.Models.Find(id);
|
||||
if (package == null) return Results.NotFound(new LaunchResultDto(false, $"没有找到模型 {id}"));
|
||||
|
||||
try
|
||||
{
|
||||
services.Memory.Refresh();
|
||||
var message = await uiHost.LaunchAsync(package);
|
||||
return Results.Ok(new LaunchResultDto(true, message));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 细节只写日志,不回显给调用方,避免泄漏本机路径等内部信息。
|
||||
Console.Error.WriteLine($"[launch] 启动模型 {id} 失败: {ex}");
|
||||
return Results.Json(new LaunchResultDto(false, "模型启动失败,请查看后端日志"), statusCode: 503);
|
||||
}
|
||||
});
|
||||
|
||||
app.MapDelete("/api/models/{id}", (string id) =>
|
||||
{
|
||||
if (!IsSafeId(id)) return Results.BadRequest(ErrorDto.Of("模型标识无效"));
|
||||
var ok = services.Models.Delete(id);
|
||||
if (ok) services.Models.NotifyChanged();
|
||||
return ok
|
||||
? Results.Ok(new LaunchResultDto(true, $"已删除模型 {id}"))
|
||||
: Results.NotFound(ErrorDto.Of($"没有找到模型 {id}"));
|
||||
});
|
||||
|
||||
// ---- 设置 -----------------------------------------------------------------
|
||||
|
||||
app.MapGet("/api/settings", () => Results.Ok(ToSettingsDto()));
|
||||
|
||||
app.MapPost("/api/settings", (SettingsPatch? patch) =>
|
||||
{
|
||||
if (patch == null) return Results.BadRequest(ErrorDto.Of("缺少设置内容"));
|
||||
|
||||
// 白名单校验:设置项会写进磁盘并被前端直接使用,不接受任意字符串。
|
||||
if (patch.Language != null && !allowedLanguages.Contains(patch.Language))
|
||||
return Results.BadRequest(ErrorDto.Of("不支持的界面语言"));
|
||||
if (patch.Theme != null && !allowedThemes.Contains(patch.Theme))
|
||||
return Results.BadRequest(ErrorDto.Of("不支持的主题"));
|
||||
if (patch.AccentColor != null && !accentHexRegex.IsMatch(patch.AccentColor))
|
||||
return Results.BadRequest(ErrorDto.Of("主题色需为 #RRGGBB"));
|
||||
if (patch.UpdateRepository != null && !IsAllowedRepository(patch.UpdateRepository))
|
||||
return Results.BadRequest(ErrorDto.Of("更新仓库地址不受信任"));
|
||||
|
||||
services.Settings.Apply(s =>
|
||||
{
|
||||
if (patch.Language != null) s.Language = patch.Language;
|
||||
if (patch.Theme != null) s.Theme = patch.Theme;
|
||||
if (patch.AccentColor != null) s.AccentColor = patch.AccentColor.ToUpperInvariant();
|
||||
if (patch.RenderFps.HasValue) s.RenderFps = Math.Clamp(patch.RenderFps.Value, 12, 120);
|
||||
if (patch.MemoryMb.HasValue) s.MemoryMb = Math.Clamp(patch.MemoryMb.Value, 256, 16384);
|
||||
if (patch.MemoryAuto.HasValue) s.MemoryAuto = patch.MemoryAuto.Value;
|
||||
if (patch.AutoUpdateOnStartup.HasValue) s.AutoUpdateOnStartup = patch.AutoUpdateOnStartup.Value;
|
||||
if (patch.RequireSignedManifest.HasValue) s.RequireSignedManifest = patch.RequireSignedManifest.Value;
|
||||
if (patch.UpdateRepository != null) s.UpdateRepository = patch.UpdateRepository;
|
||||
if (patch.UpdateLocalRoot != null) s.UpdateLocalRoot = patch.UpdateLocalRoot;
|
||||
if (patch.ModelRootOverride != null) s.ModelRootOverride = patch.ModelRootOverride;
|
||||
});
|
||||
|
||||
if (patch.Language != null) L.I.SetLanguage(patch.Language);
|
||||
if (patch.MemoryMb.HasValue || patch.MemoryAuto.HasValue)
|
||||
services.Memory.ApplyAuto(services.Settings.Current.MemoryAuto, services.Settings.Current.MemoryMb);
|
||||
|
||||
return Results.Ok(ToSettingsDto());
|
||||
});
|
||||
|
||||
// ---- 模型源 ---------------------------------------------------------------
|
||||
|
||||
app.MapGet("/api/sources", () =>
|
||||
Results.Ok(services.Settings.Current.Sources.Select(ToSourceDto).ToList()));
|
||||
|
||||
app.MapPost("/api/sources/select", async (ForceRequest? request) =>
|
||||
{
|
||||
var force = request?.Force ?? false;
|
||||
try
|
||||
{
|
||||
var fastest = await services.Selector.PickFastestAsync(force, CancellationToken.None);
|
||||
services.Updates.UseRemote(services.DownloadModule.CreateRemote(fastest));
|
||||
return Results.Ok(new LatencyDto(
|
||||
fastest.Id, fastest.Name,
|
||||
services.Selector.LastLatency.TryGetValue(fastest.Id, out var ms) ? ms : 0));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[sources] 切换模型源失败: {ex}");
|
||||
return Results.Json(ErrorDto.Of("模型源切换失败"), statusCode: 503);
|
||||
}
|
||||
});
|
||||
|
||||
app.MapGet("/api/remote/models", async (string? sourceId, bool force) =>
|
||||
{
|
||||
var source = ResolveSource(sourceId);
|
||||
if (source == null) return Results.NotFound(ErrorDto.Of("没有可用的模型源"));
|
||||
|
||||
var index = await services.Sources.FetchAsync(source, force, null, CancellationToken.None);
|
||||
var installed = services.Models.Scan()
|
||||
.ToDictionary(p => p.Id, p => p.Manifest.Version, StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
return Results.Ok(new SourceIndexDto(
|
||||
index.SourceId,
|
||||
index.Root,
|
||||
index.FromCache,
|
||||
index.Error,
|
||||
index.ResolvedFrom,
|
||||
index.Models.Select(m => new RemoteModelDto(
|
||||
m.Id,
|
||||
m.LocalizedName,
|
||||
m.LocalizedDescription,
|
||||
m.Manifest.Version,
|
||||
m.SizeBytes,
|
||||
ModelScanner.HumanSize(m.SizeBytes),
|
||||
m.SourceId,
|
||||
installed.ContainsKey(m.Id),
|
||||
installed.TryGetValue(m.Id, out var v) ? v : null)).ToList()));
|
||||
});
|
||||
|
||||
// ---- 下载 -----------------------------------------------------------------
|
||||
|
||||
app.MapPost("/api/download", async (DownloadRequest? request) =>
|
||||
{
|
||||
if (request == null || string.IsNullOrWhiteSpace(request.ModelId))
|
||||
return Results.BadRequest(ErrorDto.Of("缺少 modelId"));
|
||||
|
||||
var source = ResolveSource(request.SourceId);
|
||||
if (source == null) return Results.NotFound(ErrorDto.Of("没有可用的模型源"));
|
||||
|
||||
var index = await services.Sources.FetchAsync(source, false, null, CancellationToken.None);
|
||||
var model = index.Models.FirstOrDefault(m =>
|
||||
m.Id.Equals(request.ModelId, StringComparison.OrdinalIgnoreCase));
|
||||
if (model == null)
|
||||
return Results.NotFound(ErrorDto.Of($"源里没有模型 {request.ModelId}"));
|
||||
|
||||
var job = services.Downloads.Enqueue(model);
|
||||
return Results.Ok(ToJobDto(job));
|
||||
});
|
||||
|
||||
app.MapGet("/api/download/jobs", () =>
|
||||
Results.Ok(services.Downloads.Jobs.Select(ToJobDto).ToList()));
|
||||
|
||||
app.MapPost("/api/download/{id}/cancel", (string id) =>
|
||||
ActOnJob(id, job => services.Downloads.Cancel(job)));
|
||||
|
||||
app.MapPost("/api/download/{id}/retry", (string id) =>
|
||||
ActOnJob(id, job => services.Downloads.Retry(job)));
|
||||
|
||||
app.MapPost("/api/download/{id}/remove", (string id) =>
|
||||
ActOnJob(id, job => services.Downloads.Remove(job)));
|
||||
|
||||
app.MapPost("/api/download/clear-finished", () =>
|
||||
{
|
||||
services.Downloads.ClearFinished();
|
||||
return Results.Ok(new LaunchResultDto(true, "已清除完成的任务"));
|
||||
});
|
||||
|
||||
// ---- 更新 -----------------------------------------------------------------
|
||||
|
||||
app.MapPost("/api/update/check", async (ForceRequest? request) =>
|
||||
{
|
||||
var force = request?.Force ?? true;
|
||||
var messages = new List<string>();
|
||||
|
||||
try
|
||||
{
|
||||
var fastest = await services.Selector.PickFastestAsync(force, CancellationToken.None);
|
||||
services.Updates.UseRemote(services.DownloadModule.CreateRemote(fastest));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[update] 测速失败,沿用当前源: {ex.Message}");
|
||||
}
|
||||
|
||||
string? launcherLatest = null;
|
||||
try
|
||||
{
|
||||
launcherLatest = await services.LauncherUpdates.CheckAsync(
|
||||
services.Updates.Remote, CancellationToken.None);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[update] 启动器版本检查失败: {ex.Message}");
|
||||
}
|
||||
|
||||
var progress = new Progress<UpdateProgress>(p =>
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(p.Message)) messages.Add(p.Message);
|
||||
});
|
||||
|
||||
var result = await services.Updates.RunAsync(force, progress, CancellationToken.None);
|
||||
|
||||
return Results.Ok(new UpdateCheckDto(
|
||||
result.Outcome.ToString(),
|
||||
result.Message,
|
||||
result.UpdatedModels,
|
||||
result.ModelNames,
|
||||
result.LauncherMessage,
|
||||
result.Error,
|
||||
launcherLatest,
|
||||
services.Updates.Remote.DisplayName,
|
||||
services.Selector.LastLatency
|
||||
.Select(kv => new LatencyDto(
|
||||
kv.Key,
|
||||
SourcePreset.Find(kv.Key)?.Name ?? kv.Key,
|
||||
kv.Value))
|
||||
.ToList()));
|
||||
});
|
||||
|
||||
// ---- 关于 -----------------------------------------------------------------
|
||||
|
||||
app.MapGet("/api/about", async () =>
|
||||
{
|
||||
var repository = services.Settings.Current.UpdateRepository;
|
||||
var contributors = new List<ContributorDto>();
|
||||
try
|
||||
{
|
||||
foreach (var c in await ContributorsService.FetchAsync(repository, CancellationToken.None))
|
||||
contributors.Add(new ContributorDto(c.DisplayName, c.Contributions, c.AvatarUrl));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[about] 读取贡献者失败: {ex.Message}");
|
||||
}
|
||||
|
||||
return Results.Ok(new AboutDto(
|
||||
"Morris GC",
|
||||
LauncherRuntimeInfo.CurrentLauncherVersion,
|
||||
LauncherRuntimeInfo.CurrentRid,
|
||||
repository,
|
||||
contributors,
|
||||
// 「关于」页展示的技术栈信息:源码语言与前端框架。
|
||||
SourceLanguage: "C#",
|
||||
Frontend: "Flutter"));
|
||||
});
|
||||
|
||||
// ---- 系统集成 -------------------------------------------------------------
|
||||
|
||||
app.MapPost("/api/shell/open-folder", (PathRequest? request) =>
|
||||
{
|
||||
var path = request?.Path;
|
||||
if (string.IsNullOrWhiteSpace(path))
|
||||
return Results.BadRequest(ErrorDto.Of("缺少 path"));
|
||||
|
||||
// 只允许打开启动器自己的目录,避免前端被当成任意路径执行器
|
||||
if (!IsInsideKnownRoot(path!))
|
||||
return Results.BadRequest(ErrorDto.Of("只允许打开启动器自己的目录"));
|
||||
|
||||
Shell.OpenFolder(path!);
|
||||
return Results.Ok(new LaunchResultDto(true, "已打开目录"));
|
||||
});
|
||||
|
||||
app.MapPost("/api/shell/open-url", (UrlRequest? request) =>
|
||||
{
|
||||
var url = request?.Url;
|
||||
if (string.IsNullOrWhiteSpace(url) || url.Length > 2048 ||
|
||||
!Uri.TryCreate(url, UriKind.Absolute, out var uri))
|
||||
return Results.BadRequest(ErrorDto.Of("URL 无效"));
|
||||
|
||||
if (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps)
|
||||
return Results.BadRequest(ErrorDto.Of("只允许 http/https 链接"));
|
||||
|
||||
if (!string.IsNullOrEmpty(uri.UserInfo))
|
||||
return Results.BadRequest(ErrorDto.Of("URL 不允许携带账号密码"));
|
||||
|
||||
Shell.OpenUrl(url!);
|
||||
return Results.Ok(new LaunchResultDto(true, "已打开链接"));
|
||||
});
|
||||
|
||||
// ---- 启动 -----------------------------------------------------------------
|
||||
|
||||
WriteEndpointFile(services, port);
|
||||
Console.WriteLine($"[GC-UI] 后端已启动: http://127.0.0.1:{port}");
|
||||
Console.WriteLine($"[GC-UI] 模型库: {services.Paths.ModelRoot}");
|
||||
|
||||
return app;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// 局部辅助
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
static void WriteEndpointFile(AppServices services, int port)
|
||||
{
|
||||
try
|
||||
{
|
||||
var file = Path.Combine(services.Paths.HomeRoot, "ui-backend.json");
|
||||
var payload = JsonSerializer.Serialize(new
|
||||
{
|
||||
port,
|
||||
pid = Environment.ProcessId,
|
||||
url = $"http://127.0.0.1:{port}",
|
||||
version = LauncherRuntimeInfo.CurrentLauncherVersion,
|
||||
platform = LauncherRuntimeInfo.CurrentRid,
|
||||
startedAt = DateTimeOffset.UtcNow.ToString("o")
|
||||
}, new JsonSerializerOptions { WriteIndented = true });
|
||||
|
||||
File.WriteAllText(file, payload);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[GC-UI] 写入端点文件失败: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>按扩展名推断图片 MIME;模型封面允许 png / jpg / webp / gif。</summary>
|
||||
static string GuessImageContentType(string path) => Path.GetExtension(path).ToLowerInvariant() switch
|
||||
{
|
||||
".jpg" or ".jpeg" => "image/jpeg",
|
||||
".webp" => "image/webp",
|
||||
".gif" => "image/gif",
|
||||
".bmp" => "image/bmp",
|
||||
".svg" => "image/svg+xml",
|
||||
_ => "image/png"
|
||||
};
|
||||
|
||||
ModelDto ToModelDto(ModelPackage package) => new( package.Id,
|
||||
package.LocalizedName,
|
||||
package.LocalizedDescription,
|
||||
package.Manifest.Version,
|
||||
package.Manifest.Author,
|
||||
package.SizeBytes,
|
||||
ModelScanner.HumanSize(package.SizeBytes),
|
||||
package.Manifest.Tags ?? new List<string>(),
|
||||
File.Exists(package.PreviewPath),
|
||||
$"/api/models/{package.Id}/preview",
|
||||
package.Directory,
|
||||
package.DataDirectory);
|
||||
|
||||
SourceDto ToSourceDto(ModelSource source) => new(
|
||||
source.Id,
|
||||
string.IsNullOrWhiteSpace(source.Name) ? source.Id : source.Name,
|
||||
source.Url,
|
||||
source.Enabled,
|
||||
source.BuiltIn,
|
||||
source.DisplayHost);
|
||||
|
||||
SettingsDto ToSettingsDto() => new(
|
||||
services.Settings.Current.Language,
|
||||
services.Settings.Current.Theme,
|
||||
services.Settings.Current.AccentColor,
|
||||
services.Settings.Current.RenderFps,
|
||||
services.Settings.Current.MemoryMb,
|
||||
services.Settings.Current.MemoryAuto,
|
||||
services.Settings.Current.AutoUpdateOnStartup,
|
||||
services.Settings.Current.RequireSignedManifest,
|
||||
services.Settings.Current.UpdateRepository,
|
||||
services.Settings.Current.UpdateLocalRoot,
|
||||
services.Settings.Current.ModelRootOverride,
|
||||
services.Memory.BudgetMb,
|
||||
services.Memory.UsageText,
|
||||
services.Paths.ModelRoot,
|
||||
services.Paths.DataRoot,
|
||||
services.Paths.SettingsFile,
|
||||
LauncherRuntimeInfo.CurrentLauncherVersion,
|
||||
LauncherRuntimeInfo.CurrentRid,
|
||||
services.Settings.Current.Sources.Select(ToSourceDto).ToList(),
|
||||
L.Supported.Select(s => new LanguageDto(s.Code, s.Label)).ToList());
|
||||
|
||||
JobDto ToJobDto(IDownloadJob job) => new(
|
||||
job.Id,
|
||||
job.Model.Id,
|
||||
job.Name,
|
||||
job.Version,
|
||||
job.State.ToString(),
|
||||
job.Progress,
|
||||
job.StatusText,
|
||||
job.DetailText,
|
||||
job.Error,
|
||||
job.IsActive,
|
||||
job.CanRetry,
|
||||
job.IsDone);
|
||||
|
||||
ModelSource? ResolveSource(string? sourceId)
|
||||
{
|
||||
var sources = services.Settings.Current.Sources;
|
||||
if (!string.IsNullOrWhiteSpace(sourceId))
|
||||
{
|
||||
var exact = sources.FirstOrDefault(s =>
|
||||
s.Id.Equals(sourceId, StringComparison.OrdinalIgnoreCase));
|
||||
if (exact != null) return exact;
|
||||
}
|
||||
|
||||
return sources.FirstOrDefault(s => s.Enabled && !string.IsNullOrWhiteSpace(s.Url))
|
||||
?? sources.FirstOrDefault();
|
||||
}
|
||||
|
||||
IResult ActOnJob(string id, Action<IDownloadJob> action)
|
||||
{
|
||||
if (!IsSafeId(id)) return Results.BadRequest(ErrorDto.Of("任务标识无效"));
|
||||
var job = services.Downloads.Jobs.FirstOrDefault(j =>
|
||||
j.Id.Equals(id, StringComparison.OrdinalIgnoreCase));
|
||||
if (job == null) return Results.NotFound(ErrorDto.Of($"没有找到任务 {id}"));
|
||||
|
||||
action(job);
|
||||
return Results.Ok(ToJobDto(job));
|
||||
}
|
||||
|
||||
bool IsInsideKnownRoot(string path)
|
||||
{
|
||||
try
|
||||
{
|
||||
var full = Path.GetFullPath(path);
|
||||
var roots = new[]
|
||||
{
|
||||
services.Paths.ModelRoot,
|
||||
services.Paths.DataRoot,
|
||||
services.Paths.HomeRoot,
|
||||
services.Paths.AppRoot
|
||||
};
|
||||
|
||||
foreach (var root in roots)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(root)) continue;
|
||||
var rootFull = Path.GetFullPath(root);
|
||||
if (full.Equals(rootFull, StringComparison.OrdinalIgnoreCase)) return true;
|
||||
if (full.StartsWith(rootFull + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase))
|
||||
return true;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// 路由标识:只允许字母数字开头,后接字母数字/点/下划线/短横线,长度上限 64。
|
||||
// 用于模型 id、任务 id,杜绝 `../` 之类的路径穿越尝试。
|
||||
bool IsSafeId(string? id) => !string.IsNullOrEmpty(id) && safeIdRegex.IsMatch(id);
|
||||
|
||||
// 更新仓库地址:必须是 https、不带账号密码、不是回环/内网 IP。
|
||||
// 防止把本地后端当成 SSRF 跳板去访问内网服务。
|
||||
bool IsAllowedRepository(string value)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(value)) return false;
|
||||
if (!Uri.TryCreate(value, UriKind.Absolute, out var uri)) return false;
|
||||
if (uri.Scheme != Uri.UriSchemeHttps) return false;
|
||||
if (!string.IsNullOrEmpty(uri.UserInfo)) return false;
|
||||
if (string.Equals(uri.Host, "localhost", StringComparison.OrdinalIgnoreCase)) return false;
|
||||
if (System.Net.IPAddress.TryParse(uri.Host, out var ip) &&
|
||||
(System.Net.IPAddress.IsLoopback(ip) || IsPrivateAddress(ip)))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool IsPrivateAddress(System.Net.IPAddress ip)
|
||||
{
|
||||
var bytes = ip.GetAddressBytes();
|
||||
if (bytes.Length != 4) return false;
|
||||
return bytes[0] == 10
|
||||
|| (bytes[0] == 172 && bytes[1] >= 16 && bytes[1] <= 31)
|
||||
|| (bytes[0] == 192 && bytes[1] == 168)
|
||||
|| (bytes[0] == 169 && bytes[1] == 254);
|
||||
}
|
||||
}
|
||||
|
||||
public static int ResolvePort(string[] args)
|
||||
{
|
||||
// 优先用启动器传来的端口(GC_UI_PORT),保证前端拼出来的 baseUrl 和这里一致。
|
||||
var env = Environment.GetEnvironmentVariable(GcUiContract.PortEnvVar);
|
||||
if (int.TryParse(env, out var fromEnv) && fromEnv > 0 && fromEnv < 65536) return fromEnv;
|
||||
|
||||
for (var i = 0; i < args.Length; i++)
|
||||
{
|
||||
if (args[i] == "--port" && i + 1 < args.Length &&
|
||||
int.TryParse(args[i + 1], out var next) && next > 0 && next < 65536)
|
||||
return next;
|
||||
|
||||
const string prefix = "--port=";
|
||||
if (args[i].StartsWith(prefix, StringComparison.Ordinal) &&
|
||||
int.TryParse(args[i][prefix.Length..], out var inline) && inline > 0 && inline < 65536)
|
||||
return inline;
|
||||
}
|
||||
|
||||
return GcUiContract.DefaultPort;
|
||||
}
|
||||
}
|
||||
@@ -1,634 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text.Json;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using GC.Download;
|
||||
using GC.Models;
|
||||
using GC.Services;
|
||||
using GC.UI.Server;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// GC-UI 后端:本地 HTTP 服务(只监听 127.0.0.1)。
|
||||
//
|
||||
// 它把原来 GC 启动器里的服务层原样复用(GC.Core / GC-DOWNLOAD),
|
||||
// 只是把「界面」从 Avalonia 换成 Flutter —— 前端通过下面这些接口驱动后端。
|
||||
//
|
||||
// GET /api/health 健康检查 + 图形环境是否可用
|
||||
// GET /api/models 已安装模型
|
||||
// GET /api/models/{id}/preview 模型封面图
|
||||
// POST /api/models/{id}/launch 启动模型(打开模型自己的窗口)
|
||||
// DELETE /api/models/{id} 删除模型
|
||||
// GET /api/settings 读取设置
|
||||
// POST /api/settings 修改设置(补丁式)
|
||||
// GET /api/sources 模型源列表
|
||||
// POST /api/sources/select 双源测速并切到最快
|
||||
// GET /api/remote/models 远端可下载模型
|
||||
// POST /api/download 入队下载
|
||||
// GET /api/download/jobs 下载任务
|
||||
// POST /api/download/{id}/cancel|retry|remove
|
||||
// POST /api/download/clear-finished 清除已完成
|
||||
// POST /api/update/check 检查模型 / 启动器更新
|
||||
// GET /api/about 版本 + 贡献者
|
||||
// POST /api/shell/open-folder|open-url 打开目录 / 链接
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
var port = ResolvePort(args);
|
||||
|
||||
// 下载模块(GC-DOWNLOAD)通过宿主钩子注入,和 GC-BOOT 的做法一致。
|
||||
DownloadModuleHost.Factory = new DownloadModuleFactory();
|
||||
|
||||
var services = AppServices.Create();
|
||||
var uiHost = new AvaloniaHost(services);
|
||||
|
||||
var builder = WebApplication.CreateBuilder(new WebApplicationOptions { Args = args });
|
||||
builder.Logging.ClearProviders();
|
||||
builder.WebHost.UseUrls($"http://127.0.0.1:{port}");
|
||||
|
||||
// 本地伴随进程:限制请求体大小、关闭 Server 头、收紧超时,减少被本地恶意页面
|
||||
// 或异常客户端拖垮的攻击面。
|
||||
builder.WebHost.ConfigureKestrel(options =>
|
||||
{
|
||||
options.AddServerHeader = false;
|
||||
options.Limits.MaxRequestBodySize = 2 * 1024 * 1024;
|
||||
options.Limits.RequestHeadersTimeout = TimeSpan.FromSeconds(15);
|
||||
options.Limits.KeepAliveTimeout = TimeSpan.FromMinutes(2);
|
||||
options.Limits.MaxConcurrentConnections = 64;
|
||||
});
|
||||
|
||||
// 桌面端(Windows/macOS)走原生 HTTP,不需要 CORS;
|
||||
// 这里放开本机回环来源,方便用 `flutter run -d chrome` 调试界面。
|
||||
builder.Services.AddCors(options => options.AddDefaultPolicy(policy => policy
|
||||
.SetIsOriginAllowed(origin =>
|
||||
Uri.TryCreate(origin, UriKind.Absolute, out var uri) &&
|
||||
(uri.Host == "127.0.0.1" || uri.Host == "localhost" || uri.Host == "::1"))
|
||||
.AllowAnyHeader()
|
||||
.AllowAnyMethod()));
|
||||
|
||||
var app = builder.Build();
|
||||
app.UseCors();
|
||||
|
||||
// 设置白名单 / 标识校验用到的规则(只在本进程内使用)。
|
||||
var allowedLanguages = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
|
||||
{ "auto", "zh-CN", "en" };
|
||||
var allowedThemes = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
|
||||
{ "light", "dark", "system" };
|
||||
var accentHexRegex = new System.Text.RegularExpressions.Regex(
|
||||
"^#(?:[0-9A-Fa-f]{6})$", System.Text.RegularExpressions.RegexOptions.Compiled);
|
||||
var safeIdRegex = new System.Text.RegularExpressions.Regex(
|
||||
"^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$", System.Text.RegularExpressions.RegexOptions.Compiled);
|
||||
|
||||
// 安全响应头 + Host/Origin 校验(抵御 DNS rebinding 与跨站调用)。
|
||||
app.Use(async (context, next) =>
|
||||
{
|
||||
var headers = context.Response.Headers;
|
||||
headers["X-Content-Type-Options"] = "nosniff";
|
||||
headers["X-Frame-Options"] = "DENY";
|
||||
headers["Referrer-Policy"] = "no-referrer";
|
||||
headers["Content-Security-Policy"] = "default-src 'none'; frame-ancestors 'none'";
|
||||
headers["Cache-Control"] = "no-store";
|
||||
|
||||
var host = context.Request.Host.Host;
|
||||
if (!string.Equals(host, "127.0.0.1", StringComparison.OrdinalIgnoreCase) &&
|
||||
!string.Equals(host, "localhost", StringComparison.OrdinalIgnoreCase) &&
|
||||
!string.Equals(host, "::1", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
context.Response.StatusCode = StatusCodes.Status403Forbidden;
|
||||
return;
|
||||
}
|
||||
|
||||
var origin = context.Request.Headers.Origin.ToString();
|
||||
if (!string.IsNullOrEmpty(origin) &&
|
||||
!(Uri.TryCreate(origin, UriKind.Absolute, out var parsed) &&
|
||||
(parsed.Host == "127.0.0.1" || parsed.Host == "localhost" || parsed.Host == "::1")))
|
||||
{
|
||||
context.Response.StatusCode = StatusCodes.Status403Forbidden;
|
||||
return;
|
||||
}
|
||||
|
||||
await next();
|
||||
});
|
||||
|
||||
// 写入类接口做简单限流:单 IP 每秒最多 40 次,防止本地脚本刷爆下载/更新。
|
||||
var writeBuckets =
|
||||
new System.Collections.Concurrent.ConcurrentDictionary<string, (long Window, int Count)>();
|
||||
app.Use(async (context, next) =>
|
||||
{
|
||||
if (HttpMethods.IsPost(context.Request.Method) ||
|
||||
HttpMethods.IsDelete(context.Request.Method))
|
||||
{
|
||||
var key = context.Connection.RemoteIpAddress?.ToString() ?? "local";
|
||||
var now = Environment.TickCount64;
|
||||
var bucket = writeBuckets.AddOrUpdate(
|
||||
key,
|
||||
_ => (now, 1),
|
||||
(_, old) => now - old.Window > 1000 ? (now, 1) : (old.Window, old.Count + 1));
|
||||
|
||||
if (bucket.Count > 40)
|
||||
{
|
||||
context.Response.StatusCode = StatusCodes.Status429TooManyRequests;
|
||||
await context.Response.WriteAsJsonAsync(
|
||||
new LaunchResultDto(false, "请求过于频繁,请稍后再试"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
await next();
|
||||
});
|
||||
|
||||
// ---- 健康检查 -------------------------------------------------------------
|
||||
|
||||
app.MapGet("/api/health", () => Results.Ok(new HealthDto(
|
||||
true,
|
||||
LauncherRuntimeInfo.CurrentLauncherVersion,
|
||||
LauncherRuntimeInfo.CurrentRid,
|
||||
uiHost.IsAvailable,
|
||||
uiHost.LastError)));
|
||||
|
||||
// ---- 已安装模型 -----------------------------------------------------------
|
||||
|
||||
app.MapGet("/api/models", () =>
|
||||
Results.Ok(services.Models.Scan().Select(ToModelDto).ToList()));
|
||||
|
||||
app.MapGet("/api/models/{id}/preview", (string id) =>
|
||||
{
|
||||
if (!IsSafeId(id)) return Results.BadRequest();
|
||||
var package = services.Models.Find(id);
|
||||
if (package == null || !File.Exists(package.PreviewPath)) return Results.NotFound();
|
||||
return Results.File(package.PreviewPath, "image/png");
|
||||
});
|
||||
|
||||
app.MapPost("/api/models/{id}/launch", async (string id) =>
|
||||
{
|
||||
if (!IsSafeId(id)) return Results.BadRequest(new LaunchResultDto(false, "模型标识无效"));
|
||||
var package = services.Models.Find(id);
|
||||
if (package == null) return Results.NotFound(new LaunchResultDto(false, $"没有找到模型 {id}"));
|
||||
|
||||
try
|
||||
{
|
||||
services.Memory.Refresh();
|
||||
var message = await uiHost.LaunchAsync(package);
|
||||
return Results.Ok(new LaunchResultDto(true, message));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 细节只写日志,不回显给调用方,避免泄漏本机路径等内部信息。
|
||||
Console.Error.WriteLine($"[launch] 启动模型 {id} 失败: {ex}");
|
||||
return Results.Json(new LaunchResultDto(false, "模型启动失败,请查看后端日志"), statusCode: 503);
|
||||
}
|
||||
});
|
||||
|
||||
app.MapDelete("/api/models/{id}", (string id) =>
|
||||
{
|
||||
if (!IsSafeId(id)) return Results.BadRequest(new LaunchResultDto(false, "模型标识无效"));
|
||||
var ok = services.Models.Delete(id);
|
||||
if (ok) services.Models.NotifyChanged();
|
||||
return ok
|
||||
? Results.Ok(new LaunchResultDto(true, $"已删除模型 {id}"))
|
||||
: Results.NotFound(new LaunchResultDto(false, $"没有找到模型 {id}"));
|
||||
});
|
||||
|
||||
// ---- 设置 -----------------------------------------------------------------
|
||||
|
||||
app.MapGet("/api/settings", () => Results.Ok(ToSettingsDto()));
|
||||
|
||||
app.MapPost("/api/settings", (SettingsPatch? patch) =>
|
||||
{
|
||||
if (patch == null) return Results.BadRequest(new LaunchResultDto(false, "缺少设置内容"));
|
||||
|
||||
// 白名单校验:设置项会写进磁盘并被前端直接使用,不接受任意字符串。
|
||||
if (patch.Language != null && !allowedLanguages.Contains(patch.Language))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "不支持的界面语言"));
|
||||
if (patch.Theme != null && !allowedThemes.Contains(patch.Theme))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "不支持的主题"));
|
||||
if (patch.AccentColor != null && !accentHexRegex.IsMatch(patch.AccentColor))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "主题色需为 #RRGGBB"));
|
||||
if (patch.UpdateRepository != null && !IsAllowedRepository(patch.UpdateRepository))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "更新仓库地址不受信任"));
|
||||
|
||||
services.Settings.Apply(s =>
|
||||
{
|
||||
if (patch.Language != null) s.Language = patch.Language;
|
||||
if (patch.Theme != null) s.Theme = patch.Theme;
|
||||
if (patch.AccentColor != null) s.AccentColor = patch.AccentColor.ToUpperInvariant();
|
||||
if (patch.RenderFps.HasValue) s.RenderFps = Math.Clamp(patch.RenderFps.Value, 12, 120);
|
||||
if (patch.MemoryMb.HasValue) s.MemoryMb = Math.Clamp(patch.MemoryMb.Value, 256, 16384);
|
||||
if (patch.MemoryAuto.HasValue) s.MemoryAuto = patch.MemoryAuto.Value;
|
||||
if (patch.AutoUpdateOnStartup.HasValue) s.AutoUpdateOnStartup = patch.AutoUpdateOnStartup.Value;
|
||||
if (patch.RequireSignedManifest.HasValue) s.RequireSignedManifest = patch.RequireSignedManifest.Value;
|
||||
if (patch.UpdateRepository != null) s.UpdateRepository = patch.UpdateRepository;
|
||||
if (patch.UpdateLocalRoot != null) s.UpdateLocalRoot = patch.UpdateLocalRoot;
|
||||
if (patch.ModelRootOverride != null) s.ModelRootOverride = patch.ModelRootOverride;
|
||||
});
|
||||
|
||||
if (patch.Language != null) L.I.SetLanguage(patch.Language);
|
||||
if (patch.MemoryMb.HasValue || patch.MemoryAuto.HasValue)
|
||||
services.Memory.ApplyAuto(services.Settings.Current.MemoryAuto, services.Settings.Current.MemoryMb);
|
||||
|
||||
return Results.Ok(ToSettingsDto());
|
||||
});
|
||||
|
||||
// ---- 模型源 ---------------------------------------------------------------
|
||||
|
||||
app.MapGet("/api/sources", () =>
|
||||
Results.Ok(services.Settings.Current.Sources.Select(ToSourceDto).ToList()));
|
||||
|
||||
app.MapPost("/api/sources/select", async (ForceRequest? request) =>
|
||||
{
|
||||
var force = request?.Force ?? false;
|
||||
try
|
||||
{
|
||||
var fastest = await services.Selector.PickFastestAsync(force, CancellationToken.None);
|
||||
services.Updates.UseRemote(services.DownloadModule.CreateRemote(fastest));
|
||||
return Results.Ok(new LatencyDto(
|
||||
fastest.Id, fastest.Name,
|
||||
services.Selector.LastLatency.TryGetValue(fastest.Id, out var ms) ? ms : 0));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[sources] 切换模型源失败: {ex}");
|
||||
return Results.Json(new LaunchResultDto(false, "模型源切换失败"), statusCode: 503);
|
||||
}
|
||||
});
|
||||
|
||||
app.MapGet("/api/remote/models", async (string? sourceId, bool force) =>
|
||||
{
|
||||
var source = ResolveSource(sourceId);
|
||||
if (source == null) return Results.NotFound(new LaunchResultDto(false, "没有可用的模型源"));
|
||||
|
||||
var index = await services.Sources.FetchAsync(source, force, null, CancellationToken.None);
|
||||
var installed = services.Models.Scan()
|
||||
.ToDictionary(p => p.Id, p => p.Manifest.Version, StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
return Results.Ok(new SourceIndexDto(
|
||||
index.SourceId,
|
||||
index.Root,
|
||||
index.FromCache,
|
||||
index.Error,
|
||||
index.ResolvedFrom,
|
||||
index.Models.Select(m => new RemoteModelDto(
|
||||
m.Id,
|
||||
m.LocalizedName,
|
||||
m.LocalizedDescription,
|
||||
m.Manifest.Version,
|
||||
m.SizeBytes,
|
||||
ModelScanner.HumanSize(m.SizeBytes),
|
||||
m.SourceId,
|
||||
installed.ContainsKey(m.Id),
|
||||
installed.TryGetValue(m.Id, out var v) ? v : null)).ToList()));
|
||||
});
|
||||
|
||||
// ---- 下载 -----------------------------------------------------------------
|
||||
|
||||
app.MapPost("/api/download", async (DownloadRequest? request) =>
|
||||
{
|
||||
if (request == null || string.IsNullOrWhiteSpace(request.ModelId))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "缺少 modelId"));
|
||||
|
||||
var source = ResolveSource(request.SourceId);
|
||||
if (source == null) return Results.NotFound(new LaunchResultDto(false, "没有可用的模型源"));
|
||||
|
||||
var index = await services.Sources.FetchAsync(source, false, null, CancellationToken.None);
|
||||
var model = index.Models.FirstOrDefault(m =>
|
||||
m.Id.Equals(request.ModelId, StringComparison.OrdinalIgnoreCase));
|
||||
if (model == null)
|
||||
return Results.NotFound(new LaunchResultDto(false, $"源里没有模型 {request.ModelId}"));
|
||||
|
||||
var job = services.Downloads.Enqueue(model);
|
||||
return Results.Ok(ToJobDto(job));
|
||||
});
|
||||
|
||||
app.MapGet("/api/download/jobs", () =>
|
||||
Results.Ok(services.Downloads.Jobs.Select(ToJobDto).ToList()));
|
||||
|
||||
app.MapPost("/api/download/{id}/cancel", (string id) =>
|
||||
ActOnJob(id, job => services.Downloads.Cancel(job)));
|
||||
|
||||
app.MapPost("/api/download/{id}/retry", (string id) =>
|
||||
ActOnJob(id, job => services.Downloads.Retry(job)));
|
||||
|
||||
app.MapPost("/api/download/{id}/remove", (string id) =>
|
||||
ActOnJob(id, job => services.Downloads.Remove(job)));
|
||||
|
||||
app.MapPost("/api/download/clear-finished", () =>
|
||||
{
|
||||
services.Downloads.ClearFinished();
|
||||
return Results.Ok(new LaunchResultDto(true, "已清除完成的任务"));
|
||||
});
|
||||
|
||||
// ---- 更新 -----------------------------------------------------------------
|
||||
|
||||
app.MapPost("/api/update/check", async (ForceRequest? request) =>
|
||||
{
|
||||
var force = request?.Force ?? true;
|
||||
var messages = new List<string>();
|
||||
|
||||
try
|
||||
{
|
||||
var fastest = await services.Selector.PickFastestAsync(force, CancellationToken.None);
|
||||
services.Updates.UseRemote(services.DownloadModule.CreateRemote(fastest));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[update] 测速失败,沿用当前源: {ex.Message}");
|
||||
}
|
||||
|
||||
string? launcherLatest = null;
|
||||
try
|
||||
{
|
||||
launcherLatest = await services.LauncherUpdates.CheckAsync(
|
||||
services.Updates.Remote, CancellationToken.None);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[update] 启动器版本检查失败: {ex.Message}");
|
||||
}
|
||||
|
||||
var progress = new Progress<UpdateProgress>(p =>
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(p.Message)) messages.Add(p.Message);
|
||||
});
|
||||
|
||||
var result = await services.Updates.RunAsync(force, progress, CancellationToken.None);
|
||||
|
||||
return Results.Ok(new UpdateCheckDto(
|
||||
result.Outcome.ToString(),
|
||||
result.Message,
|
||||
result.UpdatedModels,
|
||||
result.ModelNames,
|
||||
result.LauncherMessage,
|
||||
result.Error,
|
||||
launcherLatest,
|
||||
services.Updates.Remote.DisplayName,
|
||||
services.Selector.LastLatency
|
||||
.Select(kv => new LatencyDto(
|
||||
kv.Key,
|
||||
SourcePreset.Find(kv.Key)?.Name ?? kv.Key,
|
||||
kv.Value))
|
||||
.ToList()));
|
||||
});
|
||||
|
||||
// ---- 关于 -----------------------------------------------------------------
|
||||
|
||||
app.MapGet("/api/about", async () =>
|
||||
{
|
||||
var repository = services.Settings.Current.UpdateRepository;
|
||||
var contributors = new List<ContributorDto>();
|
||||
try
|
||||
{
|
||||
foreach (var c in await ContributorsService.FetchAsync(repository, CancellationToken.None))
|
||||
contributors.Add(new ContributorDto(c.DisplayName, c.Contributions, c.AvatarUrl));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[about] 读取贡献者失败: {ex.Message}");
|
||||
}
|
||||
|
||||
return Results.Ok(new AboutDto(
|
||||
"Morris GC",
|
||||
LauncherRuntimeInfo.CurrentLauncherVersion,
|
||||
LauncherRuntimeInfo.CurrentRid,
|
||||
repository,
|
||||
contributors,
|
||||
// 「关于」页展示的技术栈信息:源码语言与前端框架。
|
||||
SourceLanguage: "C#",
|
||||
Frontend: "Flutter"));
|
||||
});
|
||||
|
||||
// ---- 系统集成 -------------------------------------------------------------
|
||||
|
||||
app.MapPost("/api/shell/open-folder", (PathRequest? request) =>
|
||||
{
|
||||
var path = request?.Path;
|
||||
if (string.IsNullOrWhiteSpace(path))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "缺少 path"));
|
||||
|
||||
// 只允许打开启动器自己的目录,避免前端被当成任意路径执行器
|
||||
if (!IsInsideKnownRoot(path!))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "只允许打开启动器自己的目录"));
|
||||
|
||||
Shell.OpenFolder(path!);
|
||||
return Results.Ok(new LaunchResultDto(true, "已打开目录"));
|
||||
});
|
||||
|
||||
app.MapPost("/api/shell/open-url", (UrlRequest? request) =>
|
||||
{
|
||||
var url = request?.Url;
|
||||
if (string.IsNullOrWhiteSpace(url) || url.Length > 2048 ||
|
||||
!Uri.TryCreate(url, UriKind.Absolute, out var uri))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "URL 无效"));
|
||||
|
||||
if (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps)
|
||||
return Results.BadRequest(new LaunchResultDto(false, "只允许 http/https 链接"));
|
||||
|
||||
if (!string.IsNullOrEmpty(uri.UserInfo))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "URL 不允许携带账号密码"));
|
||||
|
||||
Shell.OpenUrl(url!);
|
||||
return Results.Ok(new LaunchResultDto(true, "已打开链接"));
|
||||
});
|
||||
|
||||
// ---- 启动 -----------------------------------------------------------------
|
||||
|
||||
WriteEndpointFile(services, port);
|
||||
Console.WriteLine($"[GC-UI] 后端已启动: http://127.0.0.1:{port}");
|
||||
Console.WriteLine($"[GC-UI] 模型库: {services.Paths.ModelRoot}");
|
||||
|
||||
// 独立进程入口:`GC.UI.Server --port 17890`
|
||||
// 启动器在进程内直接调用 BackendServer.Start,不会走到这里。
|
||||
var app = BackendServer.StartFromCommandLine(args);
|
||||
app.Run();
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// 局部辅助
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
static int ResolvePort(string[] args)
|
||||
{
|
||||
var env = Environment.GetEnvironmentVariable("GC_UI_PORT");
|
||||
if (int.TryParse(env, out var fromEnv) && fromEnv > 0 && fromEnv < 65536) return fromEnv;
|
||||
|
||||
for (var i = 0; i < args.Length; i++)
|
||||
{
|
||||
if (args[i] == "--port" && i + 1 < args.Length &&
|
||||
int.TryParse(args[i + 1], out var next) && next > 0 && next < 65536)
|
||||
return next;
|
||||
|
||||
const string prefix = "--port=";
|
||||
if (args[i].StartsWith(prefix, StringComparison.Ordinal) &&
|
||||
int.TryParse(args[i][prefix.Length..], out var inline) && inline > 0 && inline < 65536)
|
||||
return inline;
|
||||
}
|
||||
|
||||
return 17890;
|
||||
}
|
||||
|
||||
static void WriteEndpointFile(AppServices services, int port)
|
||||
{
|
||||
try
|
||||
{
|
||||
var file = Path.Combine(services.Paths.HomeRoot, "ui-backend.json");
|
||||
var payload = JsonSerializer.Serialize(new
|
||||
{
|
||||
port,
|
||||
pid = Environment.ProcessId,
|
||||
url = $"http://127.0.0.1:{port}",
|
||||
version = LauncherRuntimeInfo.CurrentLauncherVersion,
|
||||
platform = LauncherRuntimeInfo.CurrentRid,
|
||||
startedAt = DateTimeOffset.UtcNow.ToString("o")
|
||||
}, new JsonSerializerOptions { WriteIndented = true });
|
||||
|
||||
File.WriteAllText(file, payload);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[GC-UI] 写入端点文件失败: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
ModelDto ToModelDto(ModelPackage package) => new(
|
||||
package.Id,
|
||||
package.LocalizedName,
|
||||
package.LocalizedDescription,
|
||||
package.Manifest.Version,
|
||||
package.Manifest.Author,
|
||||
package.SizeBytes,
|
||||
ModelScanner.HumanSize(package.SizeBytes),
|
||||
package.Manifest.Tags ?? new List<string>(),
|
||||
File.Exists(package.PreviewPath),
|
||||
$"/api/models/{package.Id}/preview",
|
||||
package.Directory,
|
||||
package.DataDirectory);
|
||||
|
||||
SourceDto ToSourceDto(ModelSource source) => new(
|
||||
source.Id,
|
||||
string.IsNullOrWhiteSpace(source.Name) ? source.Id : source.Name,
|
||||
source.Url,
|
||||
source.Enabled,
|
||||
source.BuiltIn,
|
||||
source.DisplayHost);
|
||||
|
||||
SettingsDto ToSettingsDto() => new(
|
||||
services.Settings.Current.Language,
|
||||
services.Settings.Current.Theme,
|
||||
services.Settings.Current.AccentColor,
|
||||
services.Settings.Current.RenderFps,
|
||||
services.Settings.Current.MemoryMb,
|
||||
services.Settings.Current.MemoryAuto,
|
||||
services.Settings.Current.AutoUpdateOnStartup,
|
||||
services.Settings.Current.RequireSignedManifest,
|
||||
services.Settings.Current.UpdateRepository,
|
||||
services.Settings.Current.UpdateLocalRoot,
|
||||
services.Settings.Current.ModelRootOverride,
|
||||
services.Memory.BudgetMb,
|
||||
services.Memory.UsageText,
|
||||
services.Paths.ModelRoot,
|
||||
services.Paths.DataRoot,
|
||||
services.Paths.SettingsFile,
|
||||
LauncherRuntimeInfo.CurrentLauncherVersion,
|
||||
LauncherRuntimeInfo.CurrentRid,
|
||||
services.Settings.Current.Sources.Select(ToSourceDto).ToList(),
|
||||
L.Supported.Select(s => new LanguageDto(s.Code, s.Label)).ToList());
|
||||
|
||||
JobDto ToJobDto(IDownloadJob job) => new(
|
||||
job.Id,
|
||||
job.Model.Id,
|
||||
job.Name,
|
||||
job.Version,
|
||||
job.State.ToString(),
|
||||
job.Progress,
|
||||
job.StatusText,
|
||||
job.DetailText,
|
||||
job.Error,
|
||||
job.IsActive,
|
||||
job.CanRetry,
|
||||
job.IsDone);
|
||||
|
||||
ModelSource? ResolveSource(string? sourceId)
|
||||
{
|
||||
var sources = services.Settings.Current.Sources;
|
||||
if (!string.IsNullOrWhiteSpace(sourceId))
|
||||
{
|
||||
var exact = sources.FirstOrDefault(s =>
|
||||
s.Id.Equals(sourceId, StringComparison.OrdinalIgnoreCase));
|
||||
if (exact != null) return exact;
|
||||
}
|
||||
|
||||
return sources.FirstOrDefault(s => s.Enabled && !string.IsNullOrWhiteSpace(s.Url))
|
||||
?? sources.FirstOrDefault();
|
||||
}
|
||||
|
||||
IResult ActOnJob(string id, Action<IDownloadJob> action)
|
||||
{
|
||||
if (!IsSafeId(id)) return Results.BadRequest(new LaunchResultDto(false, "任务标识无效"));
|
||||
var job = services.Downloads.Jobs.FirstOrDefault(j =>
|
||||
j.Id.Equals(id, StringComparison.OrdinalIgnoreCase));
|
||||
if (job == null) return Results.NotFound(new LaunchResultDto(false, $"没有找到任务 {id}"));
|
||||
|
||||
action(job);
|
||||
return Results.Ok(ToJobDto(job));
|
||||
}
|
||||
|
||||
bool IsInsideKnownRoot(string path)
|
||||
{
|
||||
try
|
||||
{
|
||||
var full = Path.GetFullPath(path);
|
||||
var roots = new[]
|
||||
{
|
||||
services.Paths.ModelRoot,
|
||||
services.Paths.DataRoot,
|
||||
services.Paths.HomeRoot,
|
||||
services.Paths.AppRoot
|
||||
};
|
||||
|
||||
foreach (var root in roots)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(root)) continue;
|
||||
var rootFull = Path.GetFullPath(root);
|
||||
if (full.Equals(rootFull, StringComparison.OrdinalIgnoreCase)) return true;
|
||||
if (full.StartsWith(rootFull + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase))
|
||||
return true;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// 路由标识:只允许字母数字开头,后接字母数字/点/下划线/短横线,长度上限 64。
|
||||
// 用于模型 id、任务 id,杜绝 `../` 之类的路径穿越尝试。
|
||||
bool IsSafeId(string? id) => !string.IsNullOrEmpty(id) && safeIdRegex.IsMatch(id);
|
||||
|
||||
// 更新仓库地址:必须是 https、不带账号密码、不是回环/内网 IP。
|
||||
// 防止把本地后端当成 SSRF 跳板去访问内网服务。
|
||||
bool IsAllowedRepository(string value)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(value)) return false;
|
||||
if (!Uri.TryCreate(value, UriKind.Absolute, out var uri)) return false;
|
||||
if (uri.Scheme != Uri.UriSchemeHttps) return false;
|
||||
if (!string.IsNullOrEmpty(uri.UserInfo)) return false;
|
||||
if (string.Equals(uri.Host, "localhost", StringComparison.OrdinalIgnoreCase)) return false;
|
||||
if (System.Net.IPAddress.TryParse(uri.Host, out var ip) &&
|
||||
(System.Net.IPAddress.IsLoopback(ip) || IsPrivateAddress(ip)))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool IsPrivateAddress(System.Net.IPAddress ip)
|
||||
{
|
||||
var bytes = ip.GetAddressBytes();
|
||||
if (bytes.Length != 4) return false;
|
||||
return bytes[0] == 10
|
||||
|| (bytes[0] == 172 && bytes[1] >= 16 && bytes[1] <= 31)
|
||||
|| (bytes[0] == 192 && bytes[1] == 168)
|
||||
|| (bytes[0] == 169 && bytes[1] == 254);
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:http/http.dart' as http;
|
||||
|
||||
@@ -334,16 +335,65 @@ List<String> _stringList(dynamic value) =>
|
||||
|
||||
/// GC-UI 后端客户端。
|
||||
///
|
||||
/// 后端是本地伴随进程,默认监听 127.0.0.1:17890;端口可用
|
||||
/// `--dart-define=GC_UI_BASE_URL=http://127.0.0.1:12345` 覆盖。
|
||||
/// 后端是本地伴随进程,端口由启动器(GC-BOOT)选定后通过 `GC_UI_PORT`
|
||||
/// 环境变量传进来 —— 这样端口被占用时换端口不用重新编译前端。
|
||||
/// 也可用 `--dart-define=GC_UI_BASE_URL=http://127.0.0.1:12345` 强制指定。
|
||||
class GcApi {
|
||||
GcApi({String? baseUrl})
|
||||
: baseUrl = baseUrl ?? defaultBaseUrl;
|
||||
|
||||
static const String defaultBaseUrl = String.fromEnvironment(
|
||||
'GC_UI_BASE_URL',
|
||||
defaultValue: 'http://127.0.0.1:17890',
|
||||
);
|
||||
/// 复用同一个 HTTP 连接:轮询(下载任务每秒一次)时每次都新建连接
|
||||
/// 会不断握手,桌面端也能明显看到延迟抖动。
|
||||
static final http.Client _client = http.Client();
|
||||
|
||||
/// 兜底默认端口,与后端 GC.Services.GcUiContract.DefaultPort 保持一致。
|
||||
static const int fallbackPort = 17890;
|
||||
|
||||
static String get defaultBaseUrl {
|
||||
const fromDefine = String.fromEnvironment('GC_UI_BASE_URL');
|
||||
if (fromDefine.isNotEmpty) return fromDefine;
|
||||
|
||||
final fromEnvUrl = Platform.environment['GC_UI_BASE_URL'];
|
||||
if (fromEnvUrl != null && fromEnvUrl.isNotEmpty) return fromEnvUrl;
|
||||
|
||||
// 启动器通过 GC_UI_PORT 传端口(主路径)。
|
||||
final port = int.tryParse(Platform.environment['GC_UI_PORT'] ?? '');
|
||||
if (port != null) return 'http://127.0.0.1:$port';
|
||||
|
||||
// 手动起后端 / 前端调试时没有环境变量:读后端写的 .GC/ui-backend.json。
|
||||
final discovered = _endpointFileUrl();
|
||||
if (discovered != null) return discovered;
|
||||
|
||||
return 'http://127.0.0.1:$fallbackPort';
|
||||
}
|
||||
|
||||
/// 从运行目录下的 `.GC/ui-backend.json` 发现后端地址。
|
||||
///
|
||||
/// 后端每次启动都会写这个文件(port / pid / url)。只认 24 小时内的记录:
|
||||
/// 更早的多半是上次遗留的,连过去只会得到一个「无法连接」。
|
||||
static String? _endpointFileUrl() {
|
||||
try {
|
||||
final file = File('${Directory.current.path}/.GC/ui-backend.json');
|
||||
if (!file.existsSync()) return null;
|
||||
|
||||
final age = DateTime.now().difference(file.lastModifiedSync());
|
||||
if (age.inHours >= 24) return null;
|
||||
|
||||
final decoded = jsonDecode(file.readAsStringSync());
|
||||
if (decoded is! Map<String, dynamic>) return null;
|
||||
|
||||
final url = decoded['url'];
|
||||
if (url is String && url.startsWith('http://127.0.0.1:')) return url;
|
||||
|
||||
final port = (decoded['port'] as num?)?.toInt();
|
||||
if (port != null && port > 0 && port < 65536) {
|
||||
return 'http://127.0.0.1:$port';
|
||||
}
|
||||
} catch (_) {
|
||||
// 文件损坏 / 无权限:退回默认端口即可
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
final String baseUrl;
|
||||
|
||||
@@ -357,17 +407,17 @@ class GcApi {
|
||||
try {
|
||||
switch (method) {
|
||||
case 'GET':
|
||||
response = await http.get(uri).timeout(const Duration(seconds: 30));
|
||||
response = await _client.get(uri).timeout(const Duration(seconds: 30));
|
||||
break;
|
||||
case 'POST':
|
||||
response = await http
|
||||
response = await _client
|
||||
.post(uri,
|
||||
headers: const {'Content-Type': 'application/json'},
|
||||
body: body == null ? null : jsonEncode(body))
|
||||
.timeout(const Duration(seconds: 120));
|
||||
break;
|
||||
case 'DELETE':
|
||||
response = await http.delete(uri).timeout(const Duration(seconds: 30));
|
||||
response = await _client.delete(uri).timeout(const Duration(seconds: 30));
|
||||
break;
|
||||
default:
|
||||
throw ApiException('不支持的方法 $method');
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
import 'api_client.dart';
|
||||
@@ -24,26 +26,75 @@ class ShellController extends ChangeNotifier {
|
||||
String updateDetail = '';
|
||||
String launcherNotice = '';
|
||||
|
||||
/// 模型库版本号:安装 / 删除 / 下载完成后自增,首页据此重新拉列表。
|
||||
///
|
||||
/// 首页被 `Offstage` 保活,切走再切回不会重建;没有这个信号时,
|
||||
/// 下载完模型回到首页仍然显示旧的空列表。
|
||||
int modelsRevision = 0;
|
||||
|
||||
Timer? _retryTimer;
|
||||
int _retryAttempt = 0;
|
||||
|
||||
bool get backendReady => settings != null;
|
||||
|
||||
Future<void> bootstrap() async {
|
||||
try {
|
||||
// 健康检查与设置并行请求:两者互不依赖,串行会白白多等一次网络往返。
|
||||
final healthFuture = api.health();
|
||||
final settingsFuture = api.settings();
|
||||
health = await healthFuture;
|
||||
settings = await settingsFuture;
|
||||
loadError = null;
|
||||
_applySettings(settings!);
|
||||
} catch (error) {
|
||||
loadError = error.toString();
|
||||
_retryTimer?.cancel();
|
||||
|
||||
HealthInfo? healthResult;
|
||||
SettingsInfo? settingsResult;
|
||||
Object? firstError;
|
||||
|
||||
// 两个请求互不依赖,并行发;各自捕获异常,避免一方失败时
|
||||
// 另一个的 Future 抛成未处理异常(Flutter 会在控制台打出恶性警告)。
|
||||
await Future.wait<void>(<Future<void>>[
|
||||
() async {
|
||||
try {
|
||||
healthResult = await api.health();
|
||||
} catch (error) {
|
||||
firstError ??= error;
|
||||
}
|
||||
}(),
|
||||
() async {
|
||||
try {
|
||||
settingsResult = await api.settings();
|
||||
} catch (error) {
|
||||
firstError ??= error;
|
||||
}
|
||||
}(),
|
||||
]);
|
||||
|
||||
if (healthResult != null) health = healthResult;
|
||||
if (settingsResult != null) {
|
||||
settings = settingsResult;
|
||||
_applySettings(settingsResult!);
|
||||
}
|
||||
|
||||
if (firstError != null && settingsResult == null) {
|
||||
loadError = firstError.toString();
|
||||
_scheduleRetry();
|
||||
} else {
|
||||
loadError = null;
|
||||
_retryAttempt = 0;
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// 后端没起来时自动重试(2s、4s、8s…最多 5 次),不必让用户手动点。
|
||||
void _scheduleRetry() {
|
||||
if (_retryAttempt >= 5) return;
|
||||
final seconds = 1 << _retryAttempt; // 1,2,4,8,16
|
||||
_retryAttempt++;
|
||||
_retryTimer?.cancel();
|
||||
_retryTimer = Timer(Duration(seconds: seconds), () {
|
||||
if (settings == null) bootstrap();
|
||||
});
|
||||
}
|
||||
|
||||
void _applySettings(SettingsInfo value) {
|
||||
I18n.setLanguage(value.language);
|
||||
GcPalette.apply(value.accentColor);
|
||||
GcPalette.applyTheme(value.theme);
|
||||
}
|
||||
|
||||
void goTo(int value) {
|
||||
@@ -52,6 +103,12 @@ class ShellController extends ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// 模型库有变化(安装 / 删除 / 下载完成):通知首页刷新。
|
||||
void modelsChanged() {
|
||||
modelsRevision++;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> reloadSettings() async {
|
||||
try {
|
||||
settings = await api.settings();
|
||||
@@ -112,6 +169,7 @@ class ShellController extends ChangeNotifier {
|
||||
detail: result.error ?? '',
|
||||
notice: result.launcherMessage ?? '',
|
||||
);
|
||||
if (result.updatedModels > 0) modelsChanged();
|
||||
} catch (error) {
|
||||
setUpdateStatus(
|
||||
busy: false,
|
||||
@@ -120,4 +178,10 @@ class ShellController extends ChangeNotifier {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_retryTimer?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -64,6 +64,11 @@ class I18n {
|
||||
'set.subtitle': '模型源、启动时内存分配与本地存储。',
|
||||
'set.general': '通用',
|
||||
'set.appearance': '外观',
|
||||
'set.theme': '主题模式',
|
||||
'set.theme.desc': '深色、浅色,或跟随系统设置。',
|
||||
'set.theme.dark': '深色',
|
||||
'set.theme.light': '浅色',
|
||||
'set.theme.system': '跟随系统',
|
||||
'set.accent': '主题颜色',
|
||||
'set.accent.desc': '选择启动器的主色调,按钮、滑块与高亮会同步换色。',
|
||||
'set.accent.custom': '自定义颜色',
|
||||
@@ -133,6 +138,11 @@ class I18n {
|
||||
'about.architectureValue': 'Flutter 前端 + .NET 后端(本地 HTTP)',
|
||||
'about.sourceLanguage': '源码语言',
|
||||
'about.frontend': '前端',
|
||||
'about.gitService': 'Git 服务',
|
||||
'about.thanks': '感谢',
|
||||
'about.thanksHint': '特别感谢以下朋友的支持',
|
||||
'about.thanksGit': 'Git 服务与部署支持',
|
||||
'about.thanksGeo': '地理学科内容指导',
|
||||
},
|
||||
'en': <String, String>{
|
||||
'app.name': 'Morris GC',
|
||||
@@ -189,6 +199,11 @@ class I18n {
|
||||
'set.subtitle': 'Model sources, startup memory allocation and local storage.',
|
||||
'set.general': 'General',
|
||||
'set.appearance': 'Appearance',
|
||||
'set.theme': 'Theme mode',
|
||||
'set.theme.desc': 'Dark, light, or follow the system setting.',
|
||||
'set.theme.dark': 'Dark',
|
||||
'set.theme.light': 'Light',
|
||||
'set.theme.system': 'System',
|
||||
'set.accent': 'Theme color',
|
||||
'set.accent.desc': 'Pick the launcher accent color; buttons, sliders and highlights follow it.',
|
||||
'set.accent.custom': 'Custom color',
|
||||
@@ -258,6 +273,11 @@ class I18n {
|
||||
'about.architectureValue': 'Flutter frontend + .NET backend (local HTTP)',
|
||||
'about.sourceLanguage': 'Source language',
|
||||
'about.frontend': 'Frontend',
|
||||
'about.gitService': 'Git hosting',
|
||||
'about.thanks': 'Thanks',
|
||||
'about.thanksHint': 'Special thanks to',
|
||||
'about.thanksGit': 'Git hosting and deployment',
|
||||
'about.thanksGeo': 'Geography content guidance',
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ void main() {
|
||||
runApp(const GcUiApp());
|
||||
}
|
||||
|
||||
/// GC-UI 前端:Flutter 桌面应用(Windows / macOS)。
|
||||
/// GC-UI 前端:Flutter 桌面应用(Windows / macOS / Linux)。
|
||||
///
|
||||
/// 界面全部在这里;模型扫描、下载、更新、设置、模型窗口宿主都在后端
|
||||
/// (GC-UI/backend/GC.UI.Server,本地 HTTP 服务)。
|
||||
@@ -28,7 +28,7 @@ class _GcUiAppState extends State<GcUiApp> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// 语言与强调色都会触发重建:只重建 MaterialApp 的主题层,
|
||||
// 语言、强调色、主题模式都会触发重建:只重建 MaterialApp 的主题层,
|
||||
// 不触碰页面状态(页面由 ShellPage 自己持有)。
|
||||
return ValueListenableBuilder<String>(
|
||||
valueListenable: I18n.language,
|
||||
@@ -36,11 +36,30 @@ class _GcUiAppState extends State<GcUiApp> {
|
||||
return ValueListenableBuilder<Color>(
|
||||
valueListenable: GcPalette.accent,
|
||||
builder: (context, accent, _) {
|
||||
return MaterialApp(
|
||||
title: 'Morris GC',
|
||||
debugShowCheckedModeBanner: false,
|
||||
theme: buildGcTheme(),
|
||||
home: ShellPage(controller: _controller),
|
||||
return ValueListenableBuilder<ThemeMode>(
|
||||
valueListenable: GcPalette.mode,
|
||||
builder: (context, mode, _) {
|
||||
return MaterialApp(
|
||||
title: 'Morris GC',
|
||||
debugShowCheckedModeBanner: false,
|
||||
// 桌面端不要移动端那套拉伸回弹和边缘光晕。
|
||||
scrollBehavior: const GcScrollBehavior(),
|
||||
theme: buildGcTheme(Brightness.light),
|
||||
darkTheme: buildGcTheme(Brightness.dark),
|
||||
themeMode: mode,
|
||||
// GcColors 是静态取值,必须按当前实际亮度(含跟随系统)绑定,
|
||||
// 再用 key 强制子树重建,否则切主题后颜色仍是上一套。
|
||||
builder: (context, child) {
|
||||
final brightness = Theme.of(context).brightness;
|
||||
GcColors.bind(brightness);
|
||||
return KeyedSubtree(
|
||||
key: ValueKey<bool>(brightness == Brightness.dark),
|
||||
child: child ?? const SizedBox.shrink(),
|
||||
);
|
||||
},
|
||||
home: ShellPage(controller: _controller),
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
+1367
-894
File diff suppressed because it is too large.
Load diff
+186
-88
@@ -14,12 +14,31 @@ class _NavItem {
|
||||
}
|
||||
|
||||
const List<_NavItem> _navItems = <_NavItem>[
|
||||
_NavItem(Icons.grid_view_rounded, 'nav.home'),
|
||||
_NavItem(Icons.dashboard_rounded, 'nav.home'),
|
||||
_NavItem(Icons.download_rounded, 'nav.download'),
|
||||
_NavItem(Icons.tune_rounded, 'nav.settings'),
|
||||
_NavItem(Icons.info_outline_rounded, 'nav.about'),
|
||||
];
|
||||
|
||||
/// 桌面端滚动行为:去掉移动端的拉伸回弹和边缘光晕,滚轮更跟手。
|
||||
class GcScrollBehavior extends MaterialScrollBehavior {
|
||||
const GcScrollBehavior();
|
||||
|
||||
@override
|
||||
Widget buildOverscrollIndicator(
|
||||
BuildContext context,
|
||||
Widget child,
|
||||
ScrollableDetails details,
|
||||
) {
|
||||
return child;
|
||||
}
|
||||
|
||||
@override
|
||||
ScrollPhysics getScrollPhysics(BuildContext context) {
|
||||
return const ClampingScrollPhysics(parent: AlwaysScrollableScrollPhysics());
|
||||
}
|
||||
}
|
||||
|
||||
/// 应用外壳:左侧导航 + 右侧内容 + 底部更新状态条。
|
||||
class ShellPage extends StatefulWidget {
|
||||
const ShellPage({super.key, required this.controller});
|
||||
@@ -52,6 +71,7 @@ class _ShellPageState extends State<ShellPage> {
|
||||
body: Row(
|
||||
children: <Widget>[
|
||||
_Sidebar(controller: controller),
|
||||
Container(width: 1, color: GcColors.line),
|
||||
Expanded(
|
||||
child: Column(
|
||||
children: <Widget>[
|
||||
@@ -75,9 +95,9 @@ class _ShellPageState extends State<ShellPage> {
|
||||
}
|
||||
return const Center(
|
||||
child: SizedBox(
|
||||
width: 26,
|
||||
height: 26,
|
||||
child: CircularProgressIndicator(strokeWidth: 2.4),
|
||||
width: 22,
|
||||
height: 22,
|
||||
child: CircularProgressIndicator(strokeWidth: 2),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -124,52 +144,25 @@ class _Sidebar extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
final settings = controller.settings;
|
||||
return Container(
|
||||
width: 236,
|
||||
width: GcSize.sidebar,
|
||||
color: GcColors.sideBg,
|
||||
padding: const EdgeInsets.fromLTRB(16, 20, 16, 18),
|
||||
padding: const EdgeInsets.fromLTRB(
|
||||
GcSpace.xl, GcSpace.xxl, GcSpace.lg, GcSpace.lg),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
Row(
|
||||
children: <Widget>[
|
||||
Container(
|
||||
width: 26,
|
||||
height: 26,
|
||||
decoration: BoxDecoration(
|
||||
color: GcColors.surfaceAlt,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
'◎',
|
||||
style: TextStyle(fontSize: 14, color: GcColors.accent),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
const Expanded(
|
||||
child: Text(
|
||||
'Morris GC',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: GcColors.ink,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 6),
|
||||
GcHint(T('app.tagline')),
|
||||
const SizedBox(height: 26),
|
||||
_brand(),
|
||||
const SizedBox(height: GcSpace.xxxl),
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(left: 14, bottom: 6),
|
||||
padding: EdgeInsets.only(left: 10, bottom: GcSpace.sm),
|
||||
child: Text(
|
||||
'MENU',
|
||||
style: TextStyle(
|
||||
fontSize: 9.5,
|
||||
letterSpacing: 1.2,
|
||||
fontSize: 11,
|
||||
height: 1.2,
|
||||
letterSpacing: 1.4,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Color(0xFF4C5F80),
|
||||
color: Color(0xFF5C6A80),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -181,25 +174,91 @@ class _Sidebar extends StatelessWidget {
|
||||
),
|
||||
const Spacer(),
|
||||
Container(height: 1, color: GcColors.line),
|
||||
const SizedBox(height: 10),
|
||||
const SizedBox(height: GcSpace.md),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 14),
|
||||
child: Text(
|
||||
'v${settings?.version ?? '—'}',
|
||||
style: const TextStyle(fontSize: 10.5, color: GcColors.faint),
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 14, top: 2),
|
||||
child: Text(
|
||||
settings?.platform ?? '—',
|
||||
style: const TextStyle(fontSize: 10, color: Color(0xFF4F6080)),
|
||||
padding: const EdgeInsets.only(left: 10),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
Text(
|
||||
'v${settings?.version ?? '—'}',
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
height: 1.4,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: GcColors.muted,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 2),
|
||||
Text(
|
||||
settings?.platform ?? '—',
|
||||
style: TextStyle(
|
||||
fontSize: 11.5,
|
||||
height: 1.4,
|
||||
color: GcColors.ghost,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// 品牌区:一个渐变圆角标 + 名称 + 一句定位。
|
||||
Widget _brand() {
|
||||
return Row(
|
||||
children: <Widget>[
|
||||
Container(
|
||||
width: 32,
|
||||
height: 32,
|
||||
alignment: Alignment.center,
|
||||
decoration: BoxDecoration(
|
||||
color: GcColors.accentSoft,
|
||||
borderRadius: BorderRadius.circular(9),
|
||||
border: Border.all(
|
||||
color: Color.alphaBlend(
|
||||
GcColors.accent.withOpacity(0.35), GcColors.sideBg),
|
||||
),
|
||||
),
|
||||
child: Text(
|
||||
'◎',
|
||||
style: TextStyle(fontSize: 16, height: 1.1, color: GcColors.accent),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: GcSpace.md),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
Text(
|
||||
'Morris GC',
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
height: 1.3,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: GcColors.ink,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 1),
|
||||
Text(
|
||||
'SCIENCE · CLASSROOM',
|
||||
style: TextStyle(
|
||||
fontSize: 10,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.9,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: GcColors.ghost,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _NavButton extends StatelessWidget {
|
||||
@@ -216,29 +275,34 @@ class _NavButton extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(bottom: 4),
|
||||
padding: const EdgeInsets.only(bottom: GcSpace.xs),
|
||||
child: Material(
|
||||
color: active ? GcColors.surfaceAlt : Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(9),
|
||||
color: active ? GcColors.accentSoft : Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(GcRadius.control),
|
||||
child: InkWell(
|
||||
borderRadius: BorderRadius.circular(9),
|
||||
borderRadius: BorderRadius.circular(GcRadius.control),
|
||||
onTap: onTap,
|
||||
hoverColor: GcColors.surfaceHover,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: GcSpace.md,
|
||||
vertical: 11,
|
||||
),
|
||||
child: Row(
|
||||
children: <Widget>[
|
||||
Icon(
|
||||
item.icon,
|
||||
size: 16,
|
||||
size: 17,
|
||||
color: active ? GcColors.accent : GcColors.faint,
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
const SizedBox(width: GcSpace.md),
|
||||
Text(
|
||||
T(item.labelKey),
|
||||
style: TextStyle(
|
||||
fontSize: 12.5,
|
||||
fontSize: 13.5,
|
||||
height: 1.2,
|
||||
fontWeight: active ? FontWeight.w600 : FontWeight.w400,
|
||||
color: active ? GcColors.ink : GcColors.muted,
|
||||
color: active ? GcColors.accent : GcColors.muted,
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -258,24 +322,32 @@ class _UpdateBar extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
decoration: const BoxDecoration(
|
||||
decoration: BoxDecoration(
|
||||
color: GcColors.surface,
|
||||
border: Border(top: BorderSide(color: GcColors.line)),
|
||||
),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 9),
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: GcSpace.xxl,
|
||||
vertical: GcSpace.md,
|
||||
),
|
||||
child: Row(
|
||||
children: <Widget>[
|
||||
Text('⟳',
|
||||
style: TextStyle(fontSize: 16, color: GcColors.accent)),
|
||||
const SizedBox(width: 12),
|
||||
Icon(
|
||||
Icons.sync_rounded,
|
||||
size: 18,
|
||||
color: GcColors.accent,
|
||||
),
|
||||
const SizedBox(width: GcSpace.md),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
Text(
|
||||
controller.updateStatus,
|
||||
style: const TextStyle(
|
||||
fontSize: 12.5,
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
height: 1.35,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: GcColors.ink,
|
||||
),
|
||||
@@ -284,23 +356,41 @@ class _UpdateBar extends StatelessWidget {
|
||||
if (controller.updateDetail.isNotEmpty)
|
||||
Text(
|
||||
controller.updateDetail,
|
||||
style: const TextStyle(fontSize: 11, color: GcColors.faint),
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
height: 1.4,
|
||||
color: GcColors.faint,
|
||||
),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
if (controller.launcherNotice.isNotEmpty)
|
||||
Text(
|
||||
controller.launcherNotice,
|
||||
style: const TextStyle(fontSize: 11, color: GcColors.warn),
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
height: 1.4,
|
||||
color: GcColors.warn,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (controller.updateBusy)
|
||||
const SizedBox(
|
||||
width: 130,
|
||||
child: LinearProgressIndicator(minHeight: 4),
|
||||
if (controller.updateBusy) ...<Widget>[
|
||||
const SizedBox(width: GcSpace.lg),
|
||||
SizedBox(
|
||||
width: 140,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(3),
|
||||
child: LinearProgressIndicator(
|
||||
value: controller.updateProgress > 0
|
||||
? controller.updateProgress.clamp(0, 1).toDouble()
|
||||
: null,
|
||||
minHeight: 4,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 14),
|
||||
],
|
||||
const SizedBox(width: GcSpace.lg),
|
||||
TextButton(
|
||||
onPressed: controller.updateBusy
|
||||
? null
|
||||
@@ -324,24 +414,32 @@ class _BackendDown extends StatelessWidget {
|
||||
child: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 520),
|
||||
child: GcCard(
|
||||
padding: const EdgeInsets.all(28),
|
||||
padding: const EdgeInsets.all(GcSpace.xxl),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
Text(
|
||||
T('common.error'),
|
||||
style: const TextStyle(
|
||||
fontSize: 17,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: GcColors.ink,
|
||||
),
|
||||
Row(
|
||||
children: <Widget>[
|
||||
Icon(Icons.error_outline_rounded,
|
||||
size: 20, color: GcColors.danger),
|
||||
const SizedBox(width: GcSpace.sm),
|
||||
Text(
|
||||
T('common.error'),
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
height: 1.35,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: GcColors.ink,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 10),
|
||||
const SizedBox(height: GcSpace.md),
|
||||
GcHint(controller.loadError ?? ''),
|
||||
const SizedBox(height: 6),
|
||||
GcHint('后端地址:${controller.api.baseUrl}'),
|
||||
const SizedBox(height: 16),
|
||||
const SizedBox(height: GcSpace.xs),
|
||||
GcHint('${T('set.backend')}: ${controller.api.baseUrl}'),
|
||||
const SizedBox(height: GcSpace.lg),
|
||||
FilledButton(
|
||||
onPressed: controller.bootstrap,
|
||||
child: Text(T('common.retry')),
|
||||
|
||||
+914
-66
File diff suppressed because it is too large.
Load diff
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||
# In Windows, build-name is used as the major, minor, and patch parts
|
||||
# of the product and file versions while build-number is used as the build suffix.
|
||||
version: 1.0.0+1
|
||||
version: 1.1.0+1
|
||||
|
||||
environment:
|
||||
sdk: ^3.5.4
|
||||
|
||||
@@ -73,7 +73,7 @@ void main() {
|
||||
testWidgets('renders a card with its child', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
theme: buildGcTheme(),
|
||||
theme: buildGcTheme(Brightness.dark),
|
||||
home: const Scaffold(
|
||||
body: GcCard(child: Text('hello')),
|
||||
),
|
||||
|
||||
@@ -21,9 +21,18 @@ import 'package:gc_ui/theme.dart';
|
||||
/// flutter test tool/render_shots_test.dart
|
||||
void main() {
|
||||
setUpAll(() async {
|
||||
HttpOverrides.global = null;
|
||||
|
||||
// 不要设置 HttpOverrides.global = null:那会打开真实网络,
|
||||
// flutter_test 的假时钟下 HTTP 定时器永远悬着,用例结束时
|
||||
// 会撞上「!timersPending」断言。保持 flutter_test 默认的 FakeHttpClient
|
||||
// (所有请求立即返回 400),页面本身都用预置数据渲染,不需要后端。
|
||||
// 测试环境默认用 Ahem 占位字体(所有字都是方块),必须显式加载一套真字体:
|
||||
// Linux CI 用 Noto CJK,Windows 本机用 Noto Sans SC / 微软雅黑,macOS 用苹方。
|
||||
const candidates = <String>[
|
||||
r'C:\Windows\Fonts\Deng.ttf',
|
||||
r'C:\Windows\Fonts\NotoSansSC-VF.ttf',
|
||||
r'C:\Windows\Fonts\msyh.ttc',
|
||||
r'C:\Windows\Fonts\simhei.ttf',
|
||||
'/System/Library/Fonts/PingFang.ttc',
|
||||
'/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc',
|
||||
'/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc',
|
||||
];
|
||||
@@ -36,6 +45,22 @@ void main() {
|
||||
await loader.load();
|
||||
break;
|
||||
}
|
||||
|
||||
// Material 图标字体:flutter_test 不会自动加载,不加载的话所有 Icon
|
||||
// 都是方框,截图就没法检查图标。SDK 缓存里那份由 flutter test 通过
|
||||
// FLUTTER_ROOT 指过来。
|
||||
final flutterRoot = Platform.environment['FLUTTER_ROOT'];
|
||||
if (flutterRoot != null) {
|
||||
final icons = File(
|
||||
'$flutterRoot/bin/cache/artifacts/material_fonts/materialicons-regular.otf',
|
||||
);
|
||||
if (icons.existsSync()) {
|
||||
final bytes = icons.readAsBytesSync();
|
||||
final loader = FontLoader('MaterialIcons')
|
||||
..addFont(Future<ByteData>.value(ByteData.view(bytes.buffer)));
|
||||
await loader.load();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
SettingsInfo sampleSettings() => SettingsInfo.fromJson(<String, dynamic>{
|
||||
@@ -123,19 +148,43 @@ void main() {
|
||||
'uiAvailable': true,
|
||||
});
|
||||
|
||||
Future<void> shoot(WidgetTester tester, String name, Widget page) async {
|
||||
tester.view.physicalSize = const Size(1280, 820);
|
||||
/// 外壳用的 controller:bootstrap 直接返回,不去连后端。
|
||||
///
|
||||
/// 真 ShellPage 会在 initState 里 bootstrap,后端不在时会挂重试定时器,
|
||||
/// 用例结束时报「!timersPending」。这里只把 bootstrap 换成空实现,
|
||||
/// 页面里的数据请求仍会走 flutter_test 的假 HTTP(立即 400)。
|
||||
ShellController shellController() => _StubShellController()
|
||||
..settings = sampleSettings()
|
||||
..health = HealthInfo.fromJson(<String, dynamic>{
|
||||
'ok': true,
|
||||
'version': '1.0.7',
|
||||
'platform': 'osx-arm64',
|
||||
'uiAvailable': true,
|
||||
});
|
||||
|
||||
Future<void> shoot(WidgetTester tester, String name, Widget page,
|
||||
{Brightness brightness = Brightness.dark,
|
||||
Size size = const Size(1280, 860)}) async {
|
||||
// 1280×860:与发布包窗口默认尺寸(1280×720)接近,再多留一点高度看得到
|
||||
// 底部状态条。像素比 1.0,方便逐像素检查描边和文字。
|
||||
tester.view.physicalSize = size;
|
||||
tester.view.devicePixelRatio = 1.0;
|
||||
addTearDown(tester.view.reset);
|
||||
|
||||
// GcColors 是静态取值,截图前先按目标亮度绑定,否则浅色截图仍是深色配色。
|
||||
GcColors.bind(brightness);
|
||||
|
||||
final key = GlobalKey();
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
debugShowCheckedModeBanner: false,
|
||||
theme: buildGcTheme().copyWith(
|
||||
textTheme: buildGcTheme().textTheme.apply(
|
||||
fontFamily: 'Noto Sans CJK SC',
|
||||
),
|
||||
// 四个页面都用预置数据渲染,不需要后端;字体统一换成测试里加载的
|
||||
// 那一套,并且清空 fallback —— 否则主题里的按钮 / 输入框样式会去
|
||||
// 找系统字体(测试环境没有),缺字处就画成方块。
|
||||
theme: buildGcTheme(
|
||||
brightness,
|
||||
fontFamily: 'Noto Sans CJK SC',
|
||||
fontFamilyFallback: const <String>[],
|
||||
),
|
||||
home: RepaintBoundary(
|
||||
key: key,
|
||||
@@ -144,25 +193,27 @@ void main() {
|
||||
),
|
||||
);
|
||||
await tester.pump(const Duration(milliseconds: 200));
|
||||
// 页面里的数据来自真实后端(/api/about、/api/sources 等)。
|
||||
// flutter_test 默认用假时钟,真实 HTTP 永远不会完成,所以这里用 runAsync
|
||||
// 让出真实时间,等请求回来后再 pump 出最终画面。
|
||||
await tester.runAsync(() async {
|
||||
await Future<void>.delayed(const Duration(milliseconds: 1200));
|
||||
});
|
||||
await tester.pump(const Duration(milliseconds: 300));
|
||||
await tester.runAsync(() async {
|
||||
await Future<void>.delayed(const Duration(milliseconds: 600));
|
||||
});
|
||||
await tester.pump(const Duration(milliseconds: 300));
|
||||
|
||||
final boundary =
|
||||
key.currentContext!.findRenderObject()! as RenderRepaintBoundary;
|
||||
final image = await boundary.toImage(pixelRatio: 1.0);
|
||||
final bytes = await image.toByteData(format: ui.ImageByteFormat.png);
|
||||
// toImage / toByteData 要走真实引擎的异步管线,必须放在 runAsync 里,
|
||||
// 否则 fake async 时钟不会推进,Future 一直不完成(表现为每个用例卡
|
||||
// 满 10 分钟超时才返回)。
|
||||
final stopwatch = Stopwatch()..start();
|
||||
final image = await tester.runAsync(
|
||||
() => boundary.toImage(pixelRatio: 1.0),
|
||||
);
|
||||
final bytes = await tester.runAsync(
|
||||
() => image!.toByteData(format: ui.ImageByteFormat.png),
|
||||
);
|
||||
|
||||
final dir = Directory('test/shots')..createSync(recursive: true);
|
||||
File('${dir.path}/$name.png').writeAsBytesSync(bytes!.buffer.asUint8List());
|
||||
stopwatch.stop();
|
||||
// ignore: avoid_print
|
||||
print(
|
||||
'[shots] $name (${brightness.name}) 耗时 ${stopwatch.elapsedMilliseconds} ms');
|
||||
}
|
||||
|
||||
testWidgets('home', (tester) async {
|
||||
@@ -170,7 +221,8 @@ void main() {
|
||||
await shoot(
|
||||
tester,
|
||||
'home',
|
||||
HomePageView(controller: sampleController(), initialModels: sampleModels()),
|
||||
HomePageView(
|
||||
controller: sampleController(), initialModels: sampleModels()),
|
||||
);
|
||||
});
|
||||
|
||||
@@ -257,7 +309,8 @@ void main() {
|
||||
|
||||
testWidgets('settings', (tester) async {
|
||||
I18n.language.value = 'zh-CN';
|
||||
await shoot(tester, 'settings', SettingsPageView(controller: sampleController()));
|
||||
await shoot(
|
||||
tester, 'settings', SettingsPageView(controller: sampleController()));
|
||||
});
|
||||
|
||||
testWidgets('about', (tester) async {
|
||||
@@ -288,6 +341,103 @@ void main() {
|
||||
|
||||
testWidgets('shell', (tester) async {
|
||||
I18n.language.value = 'zh-CN';
|
||||
await shoot(tester, 'shell', ShellPage(controller: sampleController()));
|
||||
final controller = shellController()
|
||||
..setUpdateStatus(
|
||||
visible: true,
|
||||
busy: false,
|
||||
progress: 1,
|
||||
status: '已更新 2 个模型,立即生效',
|
||||
detail: '模型与启动器均为最新版',
|
||||
notice: '',
|
||||
);
|
||||
await shoot(tester, 'shell', ShellPage(controller: controller));
|
||||
});
|
||||
|
||||
/// 小窗口回归:1024×680 下不应出现溢出条纹或卡片挤压。
|
||||
testWidgets('home-small', (tester) async {
|
||||
I18n.language.value = 'zh-CN';
|
||||
await shoot(
|
||||
tester,
|
||||
'home-small',
|
||||
HomePageView(
|
||||
controller: sampleController(), initialModels: sampleModels()),
|
||||
size: const Size(1024, 680),
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets('download-small', (tester) async {
|
||||
I18n.language.value = 'zh-CN';
|
||||
await shoot(
|
||||
tester,
|
||||
'download-small',
|
||||
DownloadPageView(
|
||||
controller: sampleController(),
|
||||
initialSources: <SourceInfo>[
|
||||
SourceInfo.fromJson(<String, dynamic>{
|
||||
'id': 'github',
|
||||
'name': 'GitHub',
|
||||
'url': 'https://github.com/Morris-GC/GC',
|
||||
'enabled': true,
|
||||
'builtIn': true,
|
||||
'host': 'github.com',
|
||||
}),
|
||||
],
|
||||
initialIndex: SourceIndexInfo.fromJson(<String, dynamic>{
|
||||
'sourceId': 'github',
|
||||
'root': 'https://github.com/Morris-GC/GC',
|
||||
'fromCache': false,
|
||||
'resolvedFrom': 'version.json',
|
||||
'models': <dynamic>[
|
||||
<String, dynamic>{
|
||||
'id': 'sun',
|
||||
'name': '太阳系',
|
||||
'description': '观察八大行星的公转轨道与相对大小。',
|
||||
'version': '1.2',
|
||||
'sizeText': '2.3 MB',
|
||||
'installed': true,
|
||||
},
|
||||
],
|
||||
}),
|
||||
initialJobs: const <JobInfo>[],
|
||||
),
|
||||
size: const Size(1024, 680),
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets('settings-small', (tester) async {
|
||||
I18n.language.value = 'zh-CN';
|
||||
await shoot(
|
||||
tester,
|
||||
'settings-small',
|
||||
SettingsPageView(controller: sampleController()),
|
||||
size: const Size(1024, 680),
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets('home-light', (tester) async {
|
||||
I18n.language.value = 'zh-CN';
|
||||
await shoot(
|
||||
tester,
|
||||
'home-light',
|
||||
HomePageView(
|
||||
controller: sampleController(), initialModels: sampleModels()),
|
||||
brightness: Brightness.light,
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets('settings-light', (tester) async {
|
||||
I18n.language.value = 'zh-CN';
|
||||
await shoot(
|
||||
tester,
|
||||
'settings-light',
|
||||
SettingsPageView(controller: sampleController()),
|
||||
brightness: Brightness.light,
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
/// 只用于截图的 controller:不连后端,避免挂上重试定时器。
|
||||
class _StubShellController extends ShellController {
|
||||
@override
|
||||
Future<void> bootstrap() async {}
|
||||
}
|
||||
@@ -5,8 +5,81 @@
|
||||
#include "flutter_window.h"
|
||||
#include "utils.h"
|
||||
|
||||
namespace {
|
||||
|
||||
// Enable DPI awareness (Per-Monitor V2 when available).
|
||||
//
|
||||
// The runner.exe.manifest normally declares this, but the mingw/windres cross
|
||||
// build does not embed the manifest the way the Visual Studio generator does.
|
||||
// A DPI-unaware process gets bitmap-stretched by Windows on a 125% / 150%
|
||||
// scaled display, which makes the whole UI (especially small CJK text) look
|
||||
// blurry. Declaring it again before any window exists costs nothing and does
|
||||
// not depend on the manifest being present.
|
||||
//
|
||||
// Every API is resolved through GetProcAddress: it keeps the binary working on
|
||||
// older systems and does not require the current SDK / mingw headers to declare
|
||||
// DPI_AWARENESS_CONTEXT.
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4191) // FARPROC to typed function pointer, on purpose
|
||||
#endif
|
||||
|
||||
BOOL TryPerMonitorV2() {
|
||||
// DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 == (HANDLE)-4
|
||||
using Fn = BOOL(WINAPI*)(HANDLE);
|
||||
HMODULE user32 = ::GetModuleHandleW(L"user32.dll");
|
||||
if (user32 == nullptr) return FALSE;
|
||||
auto set_context = reinterpret_cast<Fn>(
|
||||
::GetProcAddress(user32, "SetProcessDpiAwarenessContext"));
|
||||
if (set_context == nullptr) return FALSE;
|
||||
// Cast through INT_PTR: plain -4 to pointer is C4312 at /W4.
|
||||
return set_context(reinterpret_cast<HANDLE>(static_cast<INT_PTR>(-4)));
|
||||
}
|
||||
|
||||
void TryPerMonitor() {
|
||||
// Windows 8.1+: PROCESS_PER_MONITOR_DPI_AWARE == 2
|
||||
using Fn = HRESULT(WINAPI*)(int);
|
||||
HMODULE shcore = ::LoadLibraryW(L"shcore.dll");
|
||||
if (shcore == nullptr) return;
|
||||
auto set_awareness =
|
||||
reinterpret_cast<Fn>(::GetProcAddress(shcore, "SetProcessDpiAwareness"));
|
||||
if (set_awareness != nullptr) {
|
||||
// E_ACCESSDENIED means the manifest already set awareness: still fine.
|
||||
set_awareness(2);
|
||||
}
|
||||
::FreeLibrary(shcore);
|
||||
}
|
||||
|
||||
void TrySystemDpiAware() {
|
||||
// Windows Vista+: system DPI awareness, better than nothing.
|
||||
using Fn = BOOL(WINAPI*)();
|
||||
HMODULE user32 = ::GetModuleHandleW(L"user32.dll");
|
||||
if (user32 == nullptr) return;
|
||||
auto set_aware =
|
||||
reinterpret_cast<Fn>(::GetProcAddress(user32, "SetProcessDPIAware"));
|
||||
if (set_aware != nullptr) set_aware();
|
||||
}
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
void EnableDpiAwareness() {
|
||||
// When the manifest already declared awareness, SetProcessDpiAwarenessContext
|
||||
// returns FALSE; fall back to the 8.1 and Vista entry points. All three
|
||||
// failing is harmless: the app still starts, it just scales blurrily.
|
||||
if (TryPerMonitorV2()) return;
|
||||
TryPerMonitor();
|
||||
TrySystemDpiAware();
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
|
||||
_In_ wchar_t *command_line, _In_ int show_command) {
|
||||
// Must run before the first window is created to take effect.
|
||||
EnableDpiAwareness();
|
||||
|
||||
// Attach to console when present (e.g., 'flutter run') or create a
|
||||
// new console when running with a debugger.
|
||||
if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) {
|
||||
|
||||
@@ -134,11 +134,27 @@ bool Win32Window::Create(const std::wstring& title,
|
||||
UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
|
||||
double scale_factor = dpi / 96.0;
|
||||
|
||||
// Cap the initial size to the monitor work area. 1280x720 logical is
|
||||
// 1920x1080 physical at 150% scaling, which no longer fits on a 1080p
|
||||
// screen; clamping keeps the window usable instead of hanging off-screen.
|
||||
int physical_width = Scale(size.width, scale_factor);
|
||||
int physical_height = Scale(size.height, scale_factor);
|
||||
MONITORINFO monitor_info{};
|
||||
monitor_info.cbSize = sizeof(MONITORINFO);
|
||||
if (::GetMonitorInfoW(monitor, &monitor_info)) {
|
||||
const int max_width =
|
||||
(monitor_info.rcWork.right - monitor_info.rcWork.left) * 92 / 100;
|
||||
const int max_height =
|
||||
(monitor_info.rcWork.bottom - monitor_info.rcWork.top) * 92 / 100;
|
||||
if (physical_width > max_width) physical_width = max_width;
|
||||
if (physical_height > max_height) physical_height = max_height;
|
||||
}
|
||||
|
||||
HWND window = CreateWindow(
|
||||
window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
|
||||
Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
|
||||
Scale(size.width, scale_factor), Scale(size.height, scale_factor),
|
||||
nullptr, nullptr, GetModuleHandle(nullptr), this);
|
||||
physical_width, physical_height, nullptr, nullptr,
|
||||
GetModuleHandle(nullptr), this);
|
||||
|
||||
if (!window) {
|
||||
return false;
|
||||
|
||||
@@ -8,12 +8,15 @@ namespace GC.Services;
|
||||
/// 运行目录约定(可执行文件旁边,不内置任何模型):
|
||||
/// <code>
|
||||
/// <安装目录>/
|
||||
/// GC(.exe | .app/...)
|
||||
/// GCL(.exe | .app/...)
|
||||
/// .GC/
|
||||
/// settings.json 设置与已安装版本记录
|
||||
/// bin/ 非本体文件(守护进程等,随包分发,更新时整目录替换)
|
||||
/// config/ 设置与已安装版本记录(settings.json)
|
||||
/// model/ 模型(启动时下载)
|
||||
/// cache/ 下载缓存 / 原子替换暂存
|
||||
/// update/ 待下次启动应用的启动器更新包
|
||||
/// safedog/ 更新守护进程的运行副本(首次启动从 .GC/bin 复制过来)
|
||||
/// logs/ 日志,按天分中英两份:gc-YYYYMMDD.log / .en.log
|
||||
/// </code>
|
||||
/// 开发态同样使用仓库根 .GC/model,并自动同步仓库 model/ 的可分发部分。
|
||||
/// EMS_MODELS / EMS_DATA / EMS_HOME 可显式覆盖。
|
||||
@@ -40,6 +43,12 @@ public sealed class AppPaths
|
||||
public string CacheRoot => Path.Combine(HomeRoot, "cache");
|
||||
public string UpdateRoot => Path.Combine(HomeRoot, "update");
|
||||
|
||||
/// <summary>日志目录:<c>.GC/logs</c>,里面按天放中英两份日志。</summary>
|
||||
public string LogsRoot => Path.Combine(HomeRoot, "logs");
|
||||
|
||||
/// <summary>守护进程目录:<c>.GC/safedog</c>(程序本体与用户数据分开)。</summary>
|
||||
public string SafedogRoot => Path.Combine(HomeRoot, "safedog");
|
||||
|
||||
/// <summary>用户配置目录(与可重建的缓存分开,删 cache 不会丢设置)。</summary>
|
||||
public string ConfigRoot => Path.Combine(HomeRoot, "config");
|
||||
|
||||
@@ -255,6 +264,8 @@ public sealed class AppPaths
|
||||
Directory.CreateDirectory(CacheRoot);
|
||||
Directory.CreateDirectory(ModelRoot);
|
||||
Directory.CreateDirectory(UpdateRoot);
|
||||
Directory.CreateDirectory(LogsRoot);
|
||||
Directory.CreateDirectory(SafedogRoot);
|
||||
|
||||
MigrateLegacySettings();
|
||||
|
||||
|
||||
@@ -61,6 +61,9 @@ public static class ContributorsService
|
||||
["2509_92447106"] = "Morris",
|
||||
["chenmoyuan1214@qq.com"] = "Morris",
|
||||
["morris@xhmcl.com"] = "Morris",
|
||||
// 早期提交用的是 xhgit 这个账号,展示名统一成 itxiaohui
|
||||
["xhgit"] = "itxiaohui",
|
||||
["itxiaohui"] = "itxiaohui",
|
||||
};
|
||||
|
||||
/// <summary>自动化提交(CI / 助手账号),不计入开发者。</summary>
|
||||
|
||||
@@ -115,7 +115,6 @@ public static class DownloadModuleHost
|
||||
public static class LauncherRuntimeInfo
|
||||
{
|
||||
private static string? _versionOverride;
|
||||
|
||||
public static string CurrentLauncherVersion
|
||||
{
|
||||
get
|
||||
@@ -155,3 +154,30 @@ public static class LauncherRuntimeInfo
|
||||
|
||||
public static void OverrideLauncherVersion(string? version) => _versionOverride = version;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 界面(Flutter)与后端(GC.UI.Server)之间的约定:端口、环境变量名。
|
||||
///
|
||||
/// 之前这个端口在 GC-BOOT、后端、Flutter 前端各写了一遍 17890,改一处就断链;
|
||||
/// 现在统一由这里定义,启动器选好端口后通过环境变量传给另外两边。
|
||||
/// </summary>
|
||||
public static class GcUiContract
|
||||
{
|
||||
/// <summary>默认端口(与历史版本保持一致,便于复用已在运行的后端)。</summary>
|
||||
public const int DefaultPort = 17890;
|
||||
|
||||
/// <summary>端口被占用时最多向后尝试几个。</summary>
|
||||
public const int PortScanRange = 10;
|
||||
|
||||
/// <summary>传给后端与前端的环境变量名。</summary>
|
||||
public const string PortEnvVar = "GC_UI_PORT";
|
||||
|
||||
/// <summary>读取环境变量里指定的端口;非法或未设置时返回 <see cref="DefaultPort"/>。</summary>
|
||||
public static int PortFromEnvironment()
|
||||
{
|
||||
var value = Environment.GetEnvironmentVariable(PortEnvVar);
|
||||
return int.TryParse(value, out var port) && port > 0 && port < 65536
|
||||
? port
|
||||
: DefaultPort;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
|
||||
namespace GC.Services;
|
||||
|
||||
/// <summary>
|
||||
/// 双语文件日志。
|
||||
///
|
||||
/// 每条记录同时写两个文件(都在 <c>.GC/logs</c> 下,按天滚动):
|
||||
/// <code>
|
||||
/// gc-20261118.log 中文
|
||||
/// gc-20261118.en.log 英文
|
||||
/// </code>
|
||||
/// 中英分开而不是写在一个文件里:用户排查时不用在一行里找自己看得懂的那半句;
|
||||
/// 也给反馈问题时直接发对应语言的文件即可。
|
||||
///
|
||||
/// 日志失败绝不影响主流程(磁盘满、只读目录都只是少一份日志)。
|
||||
/// </summary>
|
||||
public static class GcLog
|
||||
{
|
||||
private static readonly object Gate = new();
|
||||
private static string? _dir;
|
||||
private static string _day = "";
|
||||
private static string _zhPath = "";
|
||||
private static string _enPath = "";
|
||||
|
||||
public static bool Enabled
|
||||
{
|
||||
get { lock (Gate) return _dir != null; }
|
||||
}
|
||||
|
||||
/// <summary>绑定日志目录(通常是 <c>.GC/logs</c>)。重复调用会切到新目录。</summary>
|
||||
public static void Init(string dir)
|
||||
{
|
||||
try
|
||||
{
|
||||
Directory.CreateDirectory(dir);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// 目录都建不了就退化成只写控制台
|
||||
return;
|
||||
}
|
||||
|
||||
lock (Gate)
|
||||
{
|
||||
_dir = dir;
|
||||
_day = "";
|
||||
}
|
||||
}
|
||||
|
||||
public static void Info(string zh, string en) => Write("INFO ", zh, en);
|
||||
public static void Warn(string zh, string en) => Write("WARN ", zh, en);
|
||||
public static void Error(string zh, string en) => Write("ERROR", zh, en);
|
||||
|
||||
private static void Write(string level, string zh, string en)
|
||||
{
|
||||
var now = DateTime.Now;
|
||||
var prefix = $"{now:yyyy-MM-dd HH:mm:ss} [{level}] ";
|
||||
var lineZh = prefix + zh;
|
||||
var lineEn = prefix + en;
|
||||
|
||||
try { Console.WriteLine(lineZh); } catch { /* 无控制台 */ }
|
||||
|
||||
lock (Gate)
|
||||
{
|
||||
if (_dir == null) return;
|
||||
|
||||
var day = now.ToString("yyyyMMdd");
|
||||
if (day != _day)
|
||||
{
|
||||
_day = day;
|
||||
_zhPath = Path.Combine(_dir, $"gc-{day}.log");
|
||||
_enPath = Path.Combine(_dir, $"gc-{day}.en.log");
|
||||
}
|
||||
|
||||
Append(_zhPath, lineZh);
|
||||
Append(_enPath, lineEn);
|
||||
}
|
||||
}
|
||||
|
||||
private static void Append(string path, string line)
|
||||
{
|
||||
try
|
||||
{
|
||||
File.AppendAllText(path, line + Environment.NewLine, new UTF8Encoding(false));
|
||||
}
|
||||
catch
|
||||
{
|
||||
// 日志失败不能影响程序
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -9,10 +9,26 @@ namespace GC.Services;
|
||||
/// <summary>
|
||||
/// 本地模型库。启动器只**扫描 / 删除**模型包,不再解析或缓存任何场景数据 ——
|
||||
/// 场景、贴图、界面都由模型自己的程序集负责。
|
||||
///
|
||||
/// 扫描结果与目录体积都做短时缓存:前端(首页 / 下载页)会频繁轮询
|
||||
/// <c>/api/models</c>,而每个模型的体积要递归遍历整棵目录。没有缓存时
|
||||
/// 一次刷新就是成千上万次 stat,低配机器上会明显卡顿。
|
||||
/// </summary>
|
||||
public sealed class ModelRepository
|
||||
{
|
||||
/// <summary>扫描结果缓存时长:够挡住连点刷新,又不会让手动放进来的模型等太久。</summary>
|
||||
private static readonly TimeSpan ScanTtl = TimeSpan.FromSeconds(2);
|
||||
|
||||
/// <summary>目录体积缓存时长(目录 mtime 变了会提前失效)。</summary>
|
||||
private static readonly TimeSpan SizeTtl = TimeSpan.FromMinutes(1);
|
||||
|
||||
private readonly AppPaths _paths;
|
||||
private readonly object _gate = new();
|
||||
private readonly Dictionary<string, (long Size, DateTime Stamp, DateTime At)> _sizes =
|
||||
new(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
private List<ModelPackage>? _cache;
|
||||
private DateTime _cacheAt = DateTime.MinValue;
|
||||
|
||||
public ModelRepository(AppPaths paths) => _paths = paths;
|
||||
|
||||
@@ -20,7 +36,13 @@ public sealed class ModelRepository
|
||||
|
||||
public IReadOnlyList<ModelPackage> Scan()
|
||||
{
|
||||
lock (_gate)
|
||||
{
|
||||
if (_cache != null && DateTime.UtcNow - _cacheAt < ScanTtl) return _cache;
|
||||
}
|
||||
|
||||
_paths.WaitForDevelopmentModels();
|
||||
|
||||
var result = new List<ModelPackage>();
|
||||
foreach (var (manifest, dir) in ModelScanner.Scan(_paths.ModelRoot))
|
||||
{
|
||||
@@ -28,13 +50,20 @@ public sealed class ModelRepository
|
||||
{
|
||||
Manifest = manifest,
|
||||
Directory = dir,
|
||||
SizeBytes = ModelScanner.DirectorySize(dir)
|
||||
SizeBytes = SizeOf(dir)
|
||||
});
|
||||
}
|
||||
|
||||
lock (_gate)
|
||||
{
|
||||
_cache = result;
|
||||
_cacheAt = DateTime.UtcNow;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public ModelPackage? Find(string id) => Scan().FirstOrDefault(p => p.Id.Equals(id, StringComparison.OrdinalIgnoreCase));
|
||||
public ModelPackage? Find(string id)
|
||||
=> Scan().FirstOrDefault(p => p.Id.Equals(id, StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
public bool Delete(string id)
|
||||
{
|
||||
@@ -43,6 +72,7 @@ public sealed class ModelRepository
|
||||
try
|
||||
{
|
||||
Directory.Delete(package.Directory, true);
|
||||
Invalidate();
|
||||
Changed?.Invoke();
|
||||
return true;
|
||||
}
|
||||
@@ -53,5 +83,40 @@ public sealed class ModelRepository
|
||||
}
|
||||
}
|
||||
|
||||
public void NotifyChanged() => Changed?.Invoke();
|
||||
public void NotifyChanged()
|
||||
{
|
||||
Invalidate();
|
||||
Changed?.Invoke();
|
||||
}
|
||||
|
||||
/// <summary>清空缓存:模型被安装 / 删除 / 覆盖后必须调用。</summary>
|
||||
private void Invalidate()
|
||||
{
|
||||
lock (_gate)
|
||||
{
|
||||
_cache = null;
|
||||
_cacheAt = DateTime.MinValue;
|
||||
}
|
||||
lock (_sizes) _sizes.Clear();
|
||||
}
|
||||
|
||||
/// <summary>目录体积,按「目录 mtime + TTL」缓存。</summary>
|
||||
private long SizeOf(string dir)
|
||||
{
|
||||
DateTime stamp;
|
||||
try { stamp = Directory.GetLastWriteTimeUtc(dir); }
|
||||
catch { stamp = DateTime.MinValue; }
|
||||
|
||||
lock (_sizes)
|
||||
{
|
||||
if (_sizes.TryGetValue(dir, out var cached) &&
|
||||
cached.Stamp == stamp &&
|
||||
DateTime.UtcNow - cached.At < SizeTtl)
|
||||
return cached.Size;
|
||||
}
|
||||
|
||||
var size = ModelScanner.DirectorySize(dir);
|
||||
lock (_sizes) _sizes[dir] = (size, stamp, DateTime.UtcNow);
|
||||
return size;
|
||||
}
|
||||
}
|
||||
@@ -21,7 +21,7 @@ public sealed class ReleaseInfo
|
||||
public string Version => NormalizeVersion(TagName, Name);
|
||||
|
||||
private static readonly string[] VersionPrefixes =
|
||||
{ "v", "V", "GC-", "gc-", "release-", "Release-" };
|
||||
{ "v", "V", "GCL-", "gcl-", "GC-", "gc-", "release-", "Release-" };
|
||||
|
||||
private static readonly string[] PrereleaseTags =
|
||||
{ "alpha", "beta", "rc", "pre", "dev", "snapshot" };
|
||||
@@ -31,7 +31,7 @@ public sealed class ReleaseInfo
|
||||
var raw = !string.IsNullOrWhiteSpace(tag) ? tag : name;
|
||||
if (string.IsNullOrWhiteSpace(raw)) return "";
|
||||
raw = raw!.Trim();
|
||||
// "v1.0.1" / "GC-1.0.1" / "release-1.0.1" -> 取第一段像版本号的部分
|
||||
// "v1.0.1" / "GCL-1.0.1" / "GC-1.0.1" / "release-1.0.1" -> 取第一段像版本号的部分
|
||||
foreach (var prefix in VersionPrefixes)
|
||||
if (raw.StartsWith(prefix, StringComparison.Ordinal)) { raw = raw[prefix.Length..]; break; }
|
||||
// 形如 GC-1.0.1-Win-amd64 时只取版本段;但 2.3.0-beta 这类预发布串要保留完整。
|
||||
|
||||
@@ -0,0 +1,124 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
|
||||
namespace GC.Services;
|
||||
|
||||
/// <summary>
|
||||
/// 运行期目录准备:
|
||||
/// <list type="number">
|
||||
/// <item>创建 <c>.GC/logs</c> 与 <c>.GC/safedog</c>;</item>
|
||||
/// <item>把包内 <c>.GC/bin</c> 里的守护进程复制到 <c>.GC/safedog</c>(非本体文件不散落在安装目录);</item>
|
||||
/// <item>初始化双语日志并写一条启动记录。</item>
|
||||
/// </list>
|
||||
///
|
||||
/// 为什么要复制而不是直接用包里的:更新时会整目录替换程序文件,
|
||||
/// 正在运行的守护进程无法被覆盖。放到 .GC 后,整目录替换永远不碰它,
|
||||
/// 新版守护进程在下一次启动时复制进来即可。
|
||||
/// </summary>
|
||||
public static class RuntimeLayout
|
||||
{
|
||||
/// <summary>准备目录与日志,返回实际使用的守护进程路径(可能为 null)。</summary>
|
||||
public static string? Ensure(AppPaths paths)
|
||||
{
|
||||
try { Directory.CreateDirectory(paths.LogsRoot); } catch { }
|
||||
try { Directory.CreateDirectory(paths.SafedogRoot); } catch { }
|
||||
|
||||
GcLog.Init(paths.LogsRoot);
|
||||
|
||||
var safedog = InstallSafedog(paths);
|
||||
|
||||
GcLog.Info(
|
||||
$"启动 GC {LauncherRuntimeInfo.CurrentLauncherVersion}({LauncherRuntimeInfo.CurrentRid})," +
|
||||
$"数据目录 {paths.HomeRoot},守护进程 {(safedog == null ? "未找到" : Path.GetFileName(safedog))}",
|
||||
$"Starting GC {LauncherRuntimeInfo.CurrentLauncherVersion} ({LauncherRuntimeInfo.CurrentRid}), " +
|
||||
$"data directory {paths.HomeRoot}, safedog {(safedog == null ? "not found" : Path.GetFileName(safedog))}");
|
||||
|
||||
return safedog;
|
||||
}
|
||||
|
||||
/// <summary>把包内 <c>.GC/bin</c> 的守护进程同步到 <c>.GC/safedog</c>。已是最新则不动。</summary>
|
||||
private static string? InstallSafedog(AppPaths paths)
|
||||
{
|
||||
var name = SavedogFiles.ExecutableName;
|
||||
var target = Path.Combine(paths.SafedogRoot, name);
|
||||
|
||||
var source = FindPackaged(paths, name);
|
||||
if (source != null && NeedsCopy(source, target))
|
||||
{
|
||||
try
|
||||
{
|
||||
Directory.CreateDirectory(paths.SafedogRoot);
|
||||
File.Copy(source, target, overwrite: true);
|
||||
MarkExecutable(target);
|
||||
GcLog.Info($"已更新守护进程到 {target}", $"Safedog updated at {target}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
GcLog.Warn($"复制守护进程失败(继续使用已有版本):{ex.Message}",
|
||||
$"Failed to copy safedog (falling back to the existing one): {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
return File.Exists(target) ? target : source;
|
||||
}
|
||||
|
||||
private static string? FindPackaged(AppPaths paths, string name)
|
||||
{
|
||||
// 包内非本体文件统一收在 .GC/bin;后面几项兼容 1.0.10 及更早的包布局
|
||||
var candidates = new[]
|
||||
{
|
||||
Path.Combine(paths.HomeRoot, "bin", name),
|
||||
Path.Combine(paths.InstallDirectory, ".GC", "bin", name),
|
||||
Path.Combine(paths.InstallDirectory, "safedog", name),
|
||||
Path.Combine(paths.InstallDirectory, name),
|
||||
Path.Combine(paths.AppRoot, ".GC", "bin", name),
|
||||
Path.Combine(paths.AppRoot, "safedog", name),
|
||||
Path.Combine(paths.AppRoot, name),
|
||||
};
|
||||
|
||||
foreach (var candidate in candidates)
|
||||
{
|
||||
if (File.Exists(candidate)) return candidate;
|
||||
}
|
||||
|
||||
// macOS:可能在 .app/Contents/MacOS 里
|
||||
try
|
||||
{
|
||||
foreach (var app in Directory.GetDirectories(paths.InstallDirectory, "*.app"))
|
||||
{
|
||||
var inside = Path.Combine(app, "Contents", "MacOS", name);
|
||||
if (File.Exists(inside)) return inside;
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static bool NeedsCopy(string source, string target)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!File.Exists(target)) return true;
|
||||
var a = new FileInfo(source);
|
||||
var b = new FileInfo(target);
|
||||
return a.Length != b.Length || a.LastWriteTimeUtc > b.LastWriteTimeUtc;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
private static void MarkExecutable(string path)
|
||||
{
|
||||
if (OperatingSystem.IsWindows()) return;
|
||||
try
|
||||
{
|
||||
var mode = File.GetUnixFileMode(path);
|
||||
File.SetUnixFileMode(path, mode | UnixFileMode.UserExecute |
|
||||
UnixFileMode.GroupExecute | UnixFileMode.OtherExecute);
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,7 @@
|
||||
<TextBlock Classes="faint" Text="{Binding PlatformText}" />
|
||||
</StackPanel>
|
||||
|
||||
<Grid ColumnDefinitions="96,*" RowDefinitions="Auto,Auto">
|
||||
<Grid ColumnDefinitions="96,*" RowDefinitions="Auto,Auto,Auto">
|
||||
<TextBlock Classes="h3" Text="版本" />
|
||||
<TextBlock Grid.Column="1" Classes="muted" Text="{Binding VersionText}"
|
||||
FontWeight="SemiBold" />
|
||||
@@ -38,6 +38,10 @@
|
||||
HorizontalAlignment="Left" Padding="0"
|
||||
Command="{Binding OpenRepositoryCommand}"
|
||||
Content="{Binding RepositoryText}" />
|
||||
|
||||
<TextBlock Grid.Row="2" Classes="h3" Text="Git 服务" Margin="0,8,0,0" />
|
||||
<TextBlock Grid.Row="2" Grid.Column="1" Classes="muted" Text="itxiaohui"
|
||||
FontWeight="SemiBold" Margin="0,8,0,0" />
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
@@ -76,6 +80,22 @@
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<Border Background="{DynamicResource SurfaceAlt}"
|
||||
BorderBrush="{DynamicResource Line}" BorderThickness="1"
|
||||
CornerRadius="12" Padding="12,10" MinWidth="190">
|
||||
<StackPanel Orientation="Horizontal" Spacing="10">
|
||||
<Border Width="34" Height="34" CornerRadius="17"
|
||||
Background="{DynamicResource AccentSoft}">
|
||||
<TextBlock Text="◉" FontSize="15" Foreground="{DynamicResource Accent}"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center" />
|
||||
</Border>
|
||||
<StackPanel VerticalAlignment="Center" Spacing="1">
|
||||
<TextBlock Text="itxiaohui" FontSize="12.5" FontWeight="SemiBold" />
|
||||
<TextBlock Classes="faint" Text="Git 服务与部署支持" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
@@ -193,7 +193,9 @@ internal static class Program
|
||||
Console.WriteLine($"当前平台: {rid},启动器版本: {LauncherRuntimeInfo.CurrentLauncherVersion}");
|
||||
var stage = Path.Combine(tmp, "launcher-stage");
|
||||
Directory.CreateDirectory(stage);
|
||||
File.WriteAllText(Path.Combine(stage, "GC-9.9.9-" + LauncherUpdater.PlatformLabel + ".exe"),
|
||||
// Linux 的启动器没有扩展名,测试包名要跟着平台走
|
||||
var launcherExt = OperatingSystem.IsWindows() ? ".exe" : "";
|
||||
File.WriteAllText(Path.Combine(stage, "GCL-9.9.9-" + LauncherUpdater.PlatformLabel + launcherExt),
|
||||
"new launcher");
|
||||
var zip = Path.Combine(tmp, "GC-" + rid + ".zip");
|
||||
ZipFile.CreateFromDirectory(stage, zip);
|
||||
@@ -207,7 +209,7 @@ internal static class Program
|
||||
WriteSigned(remoteManifest, rv, signer);
|
||||
|
||||
// 造一个旧版在当前目录
|
||||
var oldName = "GC-1.0.0-" + LauncherUpdater.PlatformLabel + ".exe";
|
||||
var oldName = "GC-1.0.0-" + LauncherUpdater.PlatformLabel + launcherExt;
|
||||
File.WriteAllText(Path.Combine(paths.InstallDirectory, oldName), "old launcher");
|
||||
|
||||
var dl = Task.Run(() => LauncherUpdater.DownloadAsync(paths, updater.Remote, null))
|
||||
@@ -227,7 +229,8 @@ internal static class Program
|
||||
// 5) 校验标记文件与替换脚本(相对路径,无绝对路径)
|
||||
var marker = Path.Combine(paths.UpdateRoot, "update.txt");
|
||||
Check(File.Exists(marker), "写出更新标记 update.txt");
|
||||
var scheduled = LauncherUpdater.ScheduleApply(paths, dl.PackageName ?? "");
|
||||
// 只验证脚本内容,不真的执行(否则脚本会在临时目录被删掉后搬文件、刷错误)
|
||||
var scheduled = LauncherUpdater.ScheduleApply(paths, dl.PackageName ?? "", execute: false);
|
||||
var scriptPath = Path.Combine(paths.UpdateRoot,
|
||||
OperatingSystem.IsWindows() ? "apply.bat" : "apply.sh");
|
||||
Check(scheduled && File.Exists(scriptPath), "替换脚本可生成");
|
||||
@@ -235,14 +238,14 @@ internal static class Program
|
||||
{
|
||||
var script = File.ReadAllText(scriptPath);
|
||||
Check(!script.Contains(tmp), "脚本不含绝对路径");
|
||||
Check(script.Contains("GC-*.app") || script.Contains("GC-*"), "脚本按 GC-* 匹配删除");
|
||||
Check(script.Contains("GC-*") || script.Contains("GCL-*"), "脚本按 GC-*/GCL-* 匹配删除");
|
||||
}
|
||||
|
||||
// 5b) 只发产物、不发 Release:更新包只存在于仓库 dist/<系统>-<架构>/ 目录里。
|
||||
// 清单不写 url、不写 path,只给 dir + name + sha256,客户端要能自己找过去。
|
||||
var distDir = Path.Combine(remote, "dist", LauncherUpdater.PlatformLabel);
|
||||
Directory.CreateDirectory(distDir);
|
||||
var distName = "GC-9.9.10-" + LauncherUpdater.PlatformLabel + ".zip";
|
||||
var distName = "GCL-9.9.10-" + LauncherUpdater.PlatformLabel + ".zip";
|
||||
var distZip = Path.Combine(distDir, distName);
|
||||
File.Copy(zip, distZip, true);
|
||||
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
|
||||
- UI:C# + .NET 8(可切 .NET 10)+ Avalonia,跨平台
|
||||
- 模型加载:`AssemblyLoadContext` 加载模型自带 dll,契约与 Avalonia 走默认上下文,关窗即卸载
|
||||
- 目标平台:**macOS arm64 / Windows x64 / Windows arm64**(Linux 可自行编译,未列入发布矩阵)
|
||||
- 更新仓库:<https://gitcode.com/Morris_1/GC>,模型目录 <https://gitcode.com/Morris_1/GC/tree/main/model>
|
||||
- 目标平台:**Windows x64 / Windows arm64 / macOS arm64 / Linux x64**
|
||||
- 更新仓库:<https://git.xhmcl.com/Morris/GC>,模型目录 <https://git.xhmcl.com/Morris/GC/src/branch/main/model>
|
||||
|
||||
## GC-UI:前后端分离版(Flutter 前端)
|
||||
|
||||
@@ -59,16 +59,37 @@ Windows 用 `.\build.ps1`,参数相同(`build / check / models / stamp / run
|
||||
## 运行目录(发布包里就长这样)
|
||||
|
||||
```
|
||||
<安装目录>/
|
||||
GC.exe | GC.app/
|
||||
GC-SAVEDOG[.exe] 更新守护进程(与主程序同目录,macOS 在 .app/Contents/MacOS 内)
|
||||
.GC/
|
||||
config/settings.json 用户设置(与缓存分开:删 cache 不会丢配置)
|
||||
model/ 启动时下载的模型
|
||||
cache/ 下载暂存 / 原子替换
|
||||
update/ 待应用的启动器更新(apply-request.json + package.zip)
|
||||
<解压出来的目录>/ ← 压缩包里只有这一个文件夹
|
||||
GCL-<版本>-<平台>.exe 启动器(单文件:服务层 + 本地后端 + .NET 运行时都在里面)
|
||||
GC-UI.exe Flutter 前端
|
||||
flutter_windows.dll Flutter 引擎(引擎自带,不在 .NET 单文件里)
|
||||
data/app.so, data/flutter_assets/ Flutter 资源与 AOT 快照
|
||||
.GC/bin/GC-SAVEDOG[.exe] 非本体文件:更新守护进程
|
||||
```
|
||||
|
||||
就这些,没有一屏 dll。安装目录根只放 GC 本体,非本体文件(守护进程)一律收在 `.GC/bin`。
|
||||
macOS 是同一个单文件启动器,只是被放进 `GCL-<版本>-mac-arm64.app/Contents/MacOS/`,
|
||||
Flutter 前端作为 `GC-UI.app` 放在同一层;`.GC` 位置不变,仍在启动器同级
|
||||
(`.app/Contents/MacOS/`),守护进程同样收在 `.app/Contents/MacOS/.GC/bin/`。
|
||||
|
||||
首次启动后 `.GC` 补齐成:
|
||||
|
||||
```
|
||||
.GC/
|
||||
bin/ 非本体文件(随包分发,更新时按文件替换)
|
||||
config/settings.json 用户设置(与缓存分开:删 cache 不会丢配置)
|
||||
model/ 启动时下载的模型
|
||||
cache/ 下载暂存 / 原子替换
|
||||
update/ 待应用的启动器更新(apply-request.json + package.zip)
|
||||
safedog/GC-SAVEDOG[.exe] 守护进程的运行副本(首次启动从 .GC/bin 复制)
|
||||
logs/gc-YYYYMMDD.log 日志(中文)
|
||||
logs/gc-YYYYMMDD.en.log 日志(English)
|
||||
```
|
||||
|
||||
`.GC` 紧挨着主程序,装在哪都便携 —— 整个目录复制走,模型、设置、日志跟着走。
|
||||
守护进程「`.GC/bin` 放源、`.GC/safedog` 放运行副本」是因为更新要整目录替换:
|
||||
正在运行的 exe 在 Windows 上换不掉,所以跑副本、换源文件,下次启动再同步。
|
||||
|
||||
**发布包不含任何模型**。首次启动联网检查后把模型下载到 `.GC/model/` 并立刻显示;
|
||||
安装目录不可写时自动退回用户数据目录。`.GC/cache` 与 `.GC/model` 随时可删,程序会重新下载;
|
||||
`.GC/config/settings.json` 删掉等于恢复出厂设置。
|
||||
@@ -83,18 +104,23 @@ Windows 用 `.\build.ps1`,参数相同(`build / check / models / stamp / run
|
||||
启动器更新的完整流程:
|
||||
|
||||
```
|
||||
启动器下载 zip -> 校验 sha256 -> 写 apply-request.json -> 启动 GC-SAVEDOG -> 自己退出
|
||||
启动器下载 zip -> 校验 sha256 -> 写 apply-request.json -> 启动 .GC/safedog/GC-SAVEDOG -> 自己退出
|
||||
GC-SAVEDOG: 二次验签 -> 检查 zip 安全性 -> 解压到 .GC/update/stage
|
||||
-> 移入安装目录(绝不覆盖已有版本)
|
||||
-> 整目录替换:旧文件搬到 .GC/update/backup,新文件就位
|
||||
(.GC 只合并 bin/,config/model/cache/update/logs/safedog 原地不动)
|
||||
-> 启动新版,等 .GC/update/health.json
|
||||
-> 收到:删同平台旧版本,写 last-good.json
|
||||
-> 没收到/进程退出:删新版、重启旧版,写 state.json = rolledback
|
||||
-> 收到:删备份、写 last-good.json
|
||||
-> 没收到/进程退出:撤掉新文件、把备份搬回、重启旧版,写 state.json = rolledback
|
||||
```
|
||||
|
||||
发布包是**整目录**(启动器 + 后端运行时 + Flutter 前端资源),所以更新必须整目录替换:
|
||||
只替换一个 exe 会留下旧后端 / 旧界面,新前端调不通接口。替换只动程序文件,
|
||||
`.GC`(模型库、设置、日志、更新目录)和正在运行的 `GC-SAVEDOG.exe` 一律跳过。
|
||||
|
||||
也就是说:**新版本起不来,用户不会被卡死**。找不到 `GC-SAVEDOG` 的旧安装会退回脚本流程(过渡用)。
|
||||
|
||||
- 默认更新仓库写在 `.GC/config/settings.json` 的 `updateRepository`:
|
||||
`https://gitcode.com/Morris_1/GC`(也可换成自己的仓库或 `.../tree/main/model` 地址)
|
||||
`https://git.xhmcl.com/Morris/GC`(也可换成自己的仓库或 `.../src/branch/main/model` 地址)
|
||||
- 断网、仓库没推 `version.json`、下载失败:**一律保留本地模型,绝不清空模型库**,底部状态条说明原因
|
||||
- 首次启动断网且本地无模型:状态条会明确提示「去下载页重试 / 手动放入 `.GC/model/`」,不会白屏干等
|
||||
- 离线教室:把仓库(含 `version.json` + `model/`)拷到 U 盘,在 `settings.json` 填
|
||||
@@ -213,8 +239,8 @@ Repository/
|
||||
|
||||
| 方式 | 清单字段 | 说明 |
|
||||
| --- | --- | --- |
|
||||
| Release 附件(推荐) | `url` | `.../releases/download/v<版本>/GC-<版本>-<系统>-<架构>.zip` |
|
||||
| 仓库编译产物 | `path` / `dir` / `name` | `dist/<系统>-<架构>/GC-<版本>-<系统>-<架构>.zip` |
|
||||
| Release 附件(推荐) | `url` | `.../releases/download/<版本>/GCL-<版本>-<系统>-<架构>.zip` |
|
||||
| 仓库编译产物 | `path` / `dir` / `name` | `dist/<系统>-<架构>/GCL-<版本>-<系统>-<架构>.zip` |
|
||||
|
||||
下载端按 `url` → `path` → `dist/<系统>-<架构>/` 目录扫描的顺序尝试,
|
||||
**每个候选都必须与清单里的 `sha256` 一致**(`sha256` 由签名保护),
|
||||
@@ -240,15 +266,16 @@ Repository/
|
||||
|
||||
| 产物 | 平台 |
|
||||
| --- | --- |
|
||||
| `dist/mac-arm64/GC-<版本>-mac-arm64.zip` | macOS Apple Silicon 应用包(含 GC-SAVEDOG) |
|
||||
| `dist/win-amd64/GC-<版本>-win-amd64.zip` | Windows x64 单文件启动器 + `GC-SAVEDOG.exe` |
|
||||
| `dist/win-arm64/GC-<版本>-win-arm64.zip` | Windows on ARM 同上 |
|
||||
| `dist/mac-arm64/GCL-<版本>-mac-arm64.zip` | macOS Apple Silicon(单顶层 `GCL-….app`) |
|
||||
| `dist/win-amd64/GCL-<版本>-win-amd64.zip` | Windows x64(单顶层 `GCL-…/`,含 Flutter 前端,非本体文件在 `.GC/bin/`) |
|
||||
| `dist/win-arm64/GCL-<版本>-win-arm64.zip` | Windows on ARM 同上 |
|
||||
| `dist/linux-arm64/GCL-<版本>-linux-arm64.zip` | Linux ARM64 同上(启动器无扩展名;默认不构建,需 aarch64 主机 + `GC_BUILD_LINUX=1`) |
|
||||
|
||||
平台目录就是「该平台的编译产物目录」:打包完成后只留最终 zip(原始 `.app` / `.exe`
|
||||
会被挪到 `build/trash/`,下次构建时移出,不做递归删除)。
|
||||
|
||||
发新版:`./build.sh build -version=1.0.8` → 把 `dist/<平台>/GC-1.0.8-<平台>.zip`
|
||||
上传到 gitcode Release(tag `v1.0.8`),**或者**直接提交/上传到仓库的
|
||||
发新版:`./build.sh build` → 把 `dist/<平台>/GCL-<版本>-<平台>.zip`
|
||||
上传到 Gitea Release(tag `v1.0.8`),**或者**直接提交/上传到仓库的
|
||||
`dist/<平台>/` 目录 → 提交并推送 `version.json` / `model/version.json`。
|
||||
两种都能被客户端识别,客户端下次启动就会看到更新。
|
||||
|
||||
|
||||
@@ -324,8 +324,8 @@ function Invoke-FullBuild {
|
||||
|
||||
Start-BuildStep '版本戳'; Invoke-VersionStamp; Complete-BuildStep
|
||||
Start-BuildStep '编译 Mac'; Publish-Rid 'osx-arm64' 'dist/mac-arm64' $false; Complete-BuildStep
|
||||
Start-BuildStep '编译 Win-x64'; Publish-Rid 'win-x64' 'dist/win-amd64' $true; Complete-BuildStep
|
||||
Start-BuildStep '编译 Win-arm64'; Publish-Rid 'win-arm64' 'dist/win-arm64' $true; Complete-BuildStep
|
||||
Start-BuildStep '编译 Win-x64'; Publish-Rid 'win-x64' 'dist/win-amd64' $false; Complete-BuildStep
|
||||
Start-BuildStep '编译 Win-arm64'; Publish-Rid 'win-arm64' 'dist/win-arm64' $false; Complete-BuildStep
|
||||
|
||||
Start-BuildStep '运行骨架'
|
||||
New-MacAppBundle
|
||||
|
||||
+32
-12
@@ -3,7 +3,10 @@
|
||||
#
|
||||
# 目标平台按构建主机决定,每条产物都带 Flutter 前端:
|
||||
# macOS 主机 : mac-arm64(原生)+ win-amd64 / win-arm64(mingw 交叉)
|
||||
# Linux 主机 : linux-amd64(原生)+ win-amd64 / win-arm64(mingw 交叉)
|
||||
# Linux 主机 : win-amd64 / win-arm64(mingw 交叉)
|
||||
# Linux 产物默认不构建:目标为 linux-arm64,官方 Flutter 引擎只有
|
||||
# x64 产物,必须在 aarch64 主机上编。需要时用 GC_BUILD_LINUX=1 显式开启
|
||||
# (云端 aarch64 runner 就是这么用的)。
|
||||
# Windows 主机: win-amd64 / win-arm64(原生)
|
||||
#
|
||||
# 前端是默认必需项:flutter 缺失或编译失败一律中断,不再悄悄产出只带 Avalonia
|
||||
@@ -23,6 +26,28 @@ bs_build() {
|
||||
MINGW*|MSYS*|CYGWIN*) : ;; # Windows 主机只能编 Windows
|
||||
*) BUILD_LINUX=1 ;;
|
||||
esac
|
||||
# Linux 产物默认不出:目标平台是 linux-arm64,而官方 Flutter 引擎只发 x64 产物,
|
||||
# x64 主机上编出来的是 x64 二进制,装到 arm 机器上跑不起来。
|
||||
# 需要时显式开启(云端 aarch64 runner):GC_BUILD_LINUX=1 ./build.sh build
|
||||
if [ "$BUILD_LINUX" = 1 ]; then
|
||||
case "${GC_BUILD_LINUX:-0}" in
|
||||
1|true|yes)
|
||||
case "$(uname -m)" in
|
||||
aarch64|arm64) ;;
|
||||
*)
|
||||
BUILD_LINUX=0
|
||||
echo "!! 已请求 Linux 产物,但当前主机是 $(uname -m)"
|
||||
echo " (linux-arm64 需要有 aarch64 主机,Flutter 引擎只有 x64 官方产物)"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
BUILD_LINUX=0
|
||||
echo "==> 跳过 Linux 产物(默认不构建;需要时用 GC_BUILD_LINUX=1 显式开启)"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# 显式降级:允许在没有该平台 Flutter 宿主的情况下仍出 Avalonia 版包
|
||||
ALLOW_NO_UI="${GC_ALLOW_NO_UI:-0}"
|
||||
|
||||
@@ -67,8 +92,7 @@ bs_build() {
|
||||
|
||||
if [ "$BUILD_MAC" = 1 ]; then
|
||||
progress_step "编译 Mac"
|
||||
_run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" false || return 1
|
||||
publish_backend "osx-arm64" "dist/mac-arm64" || return 1
|
||||
_run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" true || return 1
|
||||
# Flutter 的 macOS 产物必须用 Xcode 在本机编,Linux 上无法替代
|
||||
build_flutter_ui macos "dist/mac-arm64" || {
|
||||
echo "!! macOS 前端编译失败。macOS 版 Flutter 只能在 macOS 上编。"
|
||||
@@ -76,24 +100,20 @@ bs_build() {
|
||||
}
|
||||
elif [ "$ALLOW_NO_UI" = 1 ]; then
|
||||
progress_step "编译 Mac"
|
||||
_run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" false || return 1
|
||||
publish_backend "osx-arm64" "dist/mac-arm64" || return 1
|
||||
_run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" true || return 1
|
||||
echo "!! --allow-no-ui:macOS 包内不含 Flutter 前端,启动器将回退 Avalonia"
|
||||
fi
|
||||
|
||||
progress_step "编译 Win-x64"
|
||||
_run_publish winx64 70 publish_rid "win-x64" "dist/win-amd64" true || return 1
|
||||
publish_backend "win-x64" "dist/win-amd64" || return 1
|
||||
|
||||
progress_step "编译 Win-arm64"
|
||||
_run_publish winarm 70 publish_rid "win-arm64" "dist/win-arm64" true || return 1
|
||||
publish_backend "win-arm64" "dist/win-arm64" || return 1
|
||||
|
||||
if [ "$BUILD_LINUX" = 1 ]; then
|
||||
progress_step "编译 Linux"
|
||||
_run_publish linux 70 publish_rid "linux-x64" "dist/linux-amd64" false || return 1
|
||||
publish_backend "linux-x64" "dist/linux-amd64" || return 1
|
||||
build_flutter_ui linux "dist/linux-amd64" || return 1
|
||||
_run_publish linux 70 publish_rid "linux-arm64" "dist/linux-arm64" true || return 1
|
||||
build_flutter_ui linux "dist/linux-arm64" || return 1
|
||||
fi
|
||||
|
||||
# Windows 前端:Windows 主机走官方 toolchain;Linux/macOS 主机用 mingw-w64 +
|
||||
@@ -116,7 +136,7 @@ bs_build() {
|
||||
prepare_runtime_layout "dist/win-amd64"
|
||||
prepare_runtime_layout "dist/win-arm64"
|
||||
if [ "$BUILD_LINUX" = 1 ]; then
|
||||
prepare_runtime_layout "dist/linux-amd64"
|
||||
prepare_runtime_layout "dist/linux-arm64"
|
||||
fi
|
||||
if [ -d "$ROOT_DIR/dist/mac-arm64/GC.app/Contents/MacOS" ]; then
|
||||
prepare_runtime_layout "dist/mac-arm64/GC.app/Contents/MacOS"
|
||||
@@ -128,5 +148,5 @@ bs_build() {
|
||||
progress_step "收尾"; progress_tick 100
|
||||
progress_done
|
||||
echo "==> 完成,产物:"
|
||||
ls -lh "$ROOT_DIR"/dist/*/GC-"$VERSION"-*.zip 2>/dev/null || true
|
||||
ls -lh "$ROOT_DIR"/dist/*/GCL-"$VERSION"-*.zip 2>/dev/null || true
|
||||
}
|
||||
@@ -44,6 +44,19 @@ string(REPLACE "#define VERSION_AS_STRING FLUTTER_VERSION"
|
||||
_rc_text "${_rc_text}")
|
||||
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc" "${_rc_text}")
|
||||
|
||||
# ★ DPI 清单必须自己嵌进去。
|
||||
#
|
||||
# windows/runner/CMakeLists.txt 把 runner.exe.manifest 当源文件列进 target,
|
||||
# Visual Studio 生成器会把它交给链接器(/MANIFESTINPUT)自动嵌入;
|
||||
# 但这里的交叉编译只用 windres 编 Runner.rc,CMake 不会做这一步,
|
||||
# 编出来的 GC-UI.exe 就完全没有清单 —— Windows 当它「DPI 不感知」,
|
||||
# 在 125% / 150% 缩放的屏幕上整体位图拉伸,界面全是糊的。
|
||||
#
|
||||
# 因此把清单直接写成资源条目:id 1 = CREATEPROCESS_MANIFEST_RESOURCE_ID,
|
||||
# type 24 = RT_MANIFEST。windres 不按相对路径解析,这里给绝对路径。
|
||||
file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc"
|
||||
"\n1 24 \"${RUN_DIR}/runner.exe.manifest\"\n")
|
||||
|
||||
add_executable(${BINARY_NAME} WIN32
|
||||
"${RUN_DIR}/main.cpp"
|
||||
"${RUN_DIR}/flutter_window.cpp"
|
||||
|
||||
+137
-77
@@ -65,48 +65,56 @@ build_models() {
|
||||
stamp_versions
|
||||
}
|
||||
|
||||
# 发布目录只放启动器 + 空的 .GC 运行骨架,绝不放模型
|
||||
# 发布目录只放程序本体:不预置 .GC,也不放模型。
|
||||
# .GC(config / model / cache / update / safedog / logs)一律在首次启动时
|
||||
# 由 AppPaths.EnsureCreated + RuntimeLayout 创建,压缩包里只有 GC 本体。
|
||||
prepare_runtime_layout() {
|
||||
REL="$1"
|
||||
DEST="$ROOT_DIR/$REL"
|
||||
[ -d "$DEST" ] || return 0
|
||||
rm -rf "$DEST/model" "$DEST/examples"
|
||||
mkdir -p "$DEST/.GC/model" "$DEST/.GC/cache" "$DEST/.GC/update" "$DEST/.GC/config"
|
||||
cat > "$DEST/.GC/model/README.txt" <<'TXT'
|
||||
模型库目录(.GC/model/)
|
||||
启动时程序会读取 GitCode 仓库的 version.json,把最新版模型下载到这里。
|
||||
离线使用也可以手动放入 <模型id>/<模型id>.json + <模型id>/<模型id>.model/。
|
||||
|
||||
运行目录:
|
||||
<可执行文件>
|
||||
GC-SAVEDOG 更新守护进程(验签 + 原子替换 + 失败回滚)
|
||||
.GC/config/settings.json 用户设置(删 .GC/cache 不会丢配置)
|
||||
.GC/model/ 本目录(下载的模型)
|
||||
.GC/cache/ 下载暂存
|
||||
.GC/update/ 待下次启动应用的启动器更新
|
||||
TXT
|
||||
if [ ! -f "$DEST/.GC/config/settings.json" ]; then
|
||||
cat > "$DEST/.GC/config/settings.json" <<'JSON'
|
||||
{
|
||||
"language": "auto",
|
||||
"theme": "light",
|
||||
"renderFps": 30,
|
||||
"memoryMb": 2048,
|
||||
"autoUpdateOnStartup": true,
|
||||
"requireSignedManifest": true,
|
||||
"updateRepository": "https://git.xhmcl.com/Morris/GC",
|
||||
"updateManifestUrl": "",
|
||||
"updateLocalRoot": "",
|
||||
"installedModelVersions": {},
|
||||
"launcherVersion": "",
|
||||
"pendingLauncherVersion": "",
|
||||
"lastUpdateCheck": "",
|
||||
"sources": [],
|
||||
"recentModels": []
|
||||
rm -rf "$DEST/model" "$DEST/examples" "$DEST/.GC"
|
||||
echo " 运行目录 -> $REL(首次启动后生成 .GC/:config model cache update safedog logs)"
|
||||
}
|
||||
JSON
|
||||
fi
|
||||
echo " 运行目录 -> $REL/.GC (config/settings.json + model/ + cache/ + update/)"
|
||||
|
||||
# 剔除与目标平台无关 / 只在调试诊断时才会加载的组件。
|
||||
# 判定依据:Windows 包用 Kestrel 自托管,不经过 IIS/HttpSys;Avalonia 在 Windows
|
||||
# 上只用 Win32 后端;DAC/DBI/DiaSymReader 只有调试器与读 PDB 时才需要,
|
||||
# 而发布包 DebugType=none、不带 PDB。全都不在启动与正常运行路径上。
|
||||
prune_package() {
|
||||
DEST="$1"; PLAT="$2"
|
||||
[ -d "$DEST" ] || return 0
|
||||
case "$PLAT" in
|
||||
win)
|
||||
# ProjectReference 会把后端 exe 的 runtimeconfig 一起拷过来;后端已编入启动器,
|
||||
# 这些残留没有用。
|
||||
rm -f "$DEST"/GC.UI.Server.exe "$DEST"/GC.UI.Server.dll \
|
||||
"$DEST"/GC.UI.Server.deps.json "$DEST"/GC.UI.Server.runtimeconfig.json
|
||||
rm -f "$DEST"/mscordaccore*.dll \
|
||||
"$DEST"/mscordbi.dll \
|
||||
"$DEST"/Microsoft.DiaSymReader.Native*.dll \
|
||||
"$DEST"/web.config \
|
||||
"$DEST"/aspnetcorev2_inprocess.dll \
|
||||
"$DEST"/Microsoft.AspNetCore.Server.IIS.dll \
|
||||
"$DEST"/Microsoft.AspNetCore.Server.IISIntegration.dll \
|
||||
"$DEST"/Microsoft.AspNetCore.Server.HttpSys.dll \
|
||||
"$DEST"/Avalonia.X11.dll \
|
||||
"$DEST"/Avalonia.Native.dll \
|
||||
"$DEST"/Avalonia.FreeDesktop.dll \
|
||||
"$DEST"/Tmds.DBus.Protocol.dll
|
||||
;;
|
||||
linux)
|
||||
rm -f "$DEST"/mscordaccore*.dll \
|
||||
"$DEST"/mscordbi.dll \
|
||||
"$DEST"/Microsoft.DiaSymReader.Native*.dll \
|
||||
"$DEST"/web.config \
|
||||
"$DEST"/aspnetcorev2_inprocess.dll \
|
||||
"$DEST"/Microsoft.AspNetCore.Server.IIS.dll \
|
||||
"$DEST"/Microsoft.AspNetCore.Server.IISIntegration.dll \
|
||||
"$DEST"/Microsoft.AspNetCore.Server.HttpSys.dll \
|
||||
"$DEST"/Avalonia.Win32.dll \
|
||||
"$DEST"/Avalonia.Win32.Automation.dll
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# $1=RID $2=输出目录 $3=singlefile(true/false)
|
||||
@@ -124,15 +132,18 @@ publish_rid() {
|
||||
-p:DebugType=none \
|
||||
-p:PublishSingleFile="$SINGLE" \
|
||||
-p:IncludeNativeLibrariesForSelfExtract="$SINGLE" \
|
||||
-p:EnableCompressionInSingleFile="$SINGLE" \
|
||||
-p:PublishTrimmed=false \
|
||||
-o "$ROOT_DIR/$OUT"
|
||||
-o "$ROOT_DIR/$OUT" || return 1
|
||||
|
||||
# 更新守护进程:与主程序同目录(macOS 打包时会被一起移入 Contents/MacOS)
|
||||
if [ -n "${SAVEDOG_PROJ:-}" ] && [ -f "$ROOT_DIR/$SAVEDOG_PROJ" ]; then
|
||||
echo "==> 编译 GC-SAVEDOG (${RID}) -> ${OUT}(裁剪单文件)"
|
||||
echo "==> 编译 GC-SAVEDOG (${RID}) -> ${OUT}(裁剪 + 压缩单文件)"
|
||||
# 守护进程不引用 Avalonia,可以安全裁剪:70MB -> 14MB。
|
||||
# 前提是 JSON 全部走源生成上下文(GC-SAVEDOG/SavedogJson.cs),新增 JSON 类型
|
||||
# 忘了注册只会在发布产物里炸,所以 update-test 会跑一次真实 apply 兜底。
|
||||
# EnableCompressionInSingleFile:运行时不常驻,启动时解压一次即可,
|
||||
# 换来包内少 4MB 左右,对「下载一次、只在更新时跑」的守护进程很划算。
|
||||
dotnet publish "$SAVEDOG_PROJ" \
|
||||
-c Release \
|
||||
-r "$RID" \
|
||||
@@ -141,6 +152,7 @@ publish_rid() {
|
||||
-p:DebugType=none \
|
||||
-p:PublishSingleFile=true \
|
||||
-p:IncludeNativeLibrariesForSelfExtract=true \
|
||||
-p:EnableCompressionInSingleFile=true \
|
||||
-p:PublishTrimmed=true \
|
||||
-p:TrimMode=full \
|
||||
-p:JsonSerializerIsReflectionEnabledByDefault=false \
|
||||
@@ -161,12 +173,14 @@ pack_models() {
|
||||
du -sh "$ZIP"
|
||||
}
|
||||
|
||||
# 启动器更新包:只包含程序文件,排除 .GC(否则会覆盖用户已下载的模型与设置)
|
||||
# 启动器更新包:安装目录根只放 GC 本体;非本体文件(守护进程等)收进 .GC/bin。
|
||||
# .GC 下的用户数据(config / model / cache / update / logs / safedog)不进包。
|
||||
#
|
||||
# 产物落点遵循「仓库 dist/<系统>-<架构>/」布局:
|
||||
# dist/mac-arm64/GC-<版本>-mac-arm64.zip
|
||||
# dist/win-amd64/GC-<版本>-win-amd64.zip
|
||||
# dist/win-arm64/GC-<版本>-win-arm64.zip
|
||||
# dist/mac-arm64/GCL-<版本>-mac-arm64.zip
|
||||
# dist/win-amd64/GCL-<版本>-win-amd64.zip
|
||||
# dist/win-arm64/GCL-<版本>-win-arm64.zip
|
||||
# dist/linux-arm64/GCL-<版本>-linux-arm64.zip
|
||||
# 启动器更新时既可以从 Release 附件下载,也会到这些目录里找编译产物
|
||||
# (见 GC-DOWNLOAD/LauncherArtifacts.cs),所以两种发布方式都能用。
|
||||
#
|
||||
@@ -185,7 +199,9 @@ publish_backend() {
|
||||
--self-contained true \
|
||||
-p:Version="$VERSION" \
|
||||
-p:DebugType=none \
|
||||
-p:PublishSingleFile=false \
|
||||
-p:PublishSingleFile=true \
|
||||
-p:IncludeNativeLibrariesForSelfExtract=true \
|
||||
-p:EnableCompressionInSingleFile=true \
|
||||
-p:PublishTrimmed=false \
|
||||
-o "$ROOT_DIR/$OUT" || return 1
|
||||
}
|
||||
@@ -224,8 +240,28 @@ build_flutter_ui() {
|
||||
cp -R "$UI_SRC/build/macos/Build/Products/Release/GC-UI.app" "$ROOT_DIR/$DEST/"
|
||||
;;
|
||||
linux)
|
||||
# bundle/ 里是 GC-UI、lib/*.so 与 data/,整体铺到包的根目录
|
||||
cp -R "$UI_SRC/build/linux/x64/release/bundle/." "$ROOT_DIR/$DEST/"
|
||||
# bundle/ 里是 GC-UI、lib/*.so 与 data/,整体铺到包的根目录。
|
||||
# 目录名跟着目标架构走:aarch64 主机在 build/linux/arm64/,x64 在 build/linux/x64/。
|
||||
BUNDLE=""
|
||||
for cand in "$UI_SRC/build/linux/arm64/release/bundle" \
|
||||
"$UI_SRC/build/linux/x64/release/bundle"; do
|
||||
[ -d "$cand" ] && BUNDLE="$cand" && break
|
||||
done
|
||||
if [ -z "$BUNDLE" ]; then
|
||||
echo "!! 找不到 Flutter Linux bundle(期望 build/linux/{arm64,x64}/release/bundle)"
|
||||
return 1
|
||||
fi
|
||||
# 目标包是 arm64,却只编出 x64 bundle:说明主机架构不对,宁可失败也不出坏包
|
||||
case "$BUNDLE" in
|
||||
*/arm64/*) ;;
|
||||
*)
|
||||
if [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "arm64" ]; then
|
||||
echo "!! Linux 包目标为 arm64,但当前主机 $(uname -m) 只能编出 x64 前端"
|
||||
return 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
cp -R "$BUNDLE/." "$ROOT_DIR/$DEST/"
|
||||
;;
|
||||
*)
|
||||
echo "!! 不支持的 Flutter 目标平台:$PLAT"
|
||||
@@ -265,7 +301,7 @@ build_flutter_ui_cross() {
|
||||
}
|
||||
|
||||
pack_launcher() {
|
||||
echo "==> 生成启动器产物(GC-<版本>-<系统>-<架构>)"
|
||||
echo "==> 生成启动器产物(GCL-<版本>-<系统>-<架构>)"
|
||||
|
||||
# --- Windows:启动器 + 守护进程 + UI 后端 + Flutter 前端,整目录打包 ---
|
||||
for pair in "win-x64:win-amd64" "win-arm64:win-arm64"; do
|
||||
@@ -279,51 +315,67 @@ pack_launcher() {
|
||||
[ -f "$EXE" ] || EXE=$(ls "$SRC"/*.exe 2>/dev/null | grep -v 'GC-SAVEDOG\|GC.UI.Server\|GC-UI' | head -1)
|
||||
[ -n "$EXE" ] || continue
|
||||
|
||||
# 包内只有一个顶层目录(GCL-<版本>-<平台>),解压后不会散落一屏 dll。
|
||||
TMP="$ROOT_DIR/dist/.winpkg-$LABEL"
|
||||
rm -rf "$TMP"; mkdir -p "$TMP"
|
||||
cp -R "$SRC"/. "$TMP"/
|
||||
rm -f "$TMP"/*.zip
|
||||
mv "$TMP/$(basename "$EXE")" "$TMP/GC-${VERSION}-${LABEL}.exe"
|
||||
chmod +x "$TMP/GC-${VERSION}-${LABEL}.exe" 2>/dev/null || true
|
||||
if [ ! -f "$TMP/GC-SAVEDOG.exe" ]; then
|
||||
PKGNAME="GCL-${VERSION}-${LABEL}"
|
||||
PKG="$TMP/$PKGNAME"
|
||||
rm -rf "$TMP"; mkdir -p "$PKG"
|
||||
cp -R "$SRC"/. "$PKG"/
|
||||
rm -f "$PKG"/*.zip
|
||||
prune_package "$PKG" win
|
||||
mv "$PKG/$(basename "$EXE")" "$PKG/$PKGNAME.exe"
|
||||
chmod +x "$PKG/$PKGNAME.exe" 2>/dev/null || true
|
||||
if [ ! -f "$PKG/GC-SAVEDOG.exe" ]; then
|
||||
echo " !! 缺少 GC-SAVEDOG.exe,该平台将退回旧脚本更新"
|
||||
else
|
||||
# 非本体文件统一收进 .GC/bin:安装目录根只留 GC 本体。
|
||||
# 首次启动复制到 .GC/safedog 再运行,所以这里的源文件更新时可安全替换。
|
||||
mkdir -p "$PKG/.GC/bin"
|
||||
mv "$PKG/GC-SAVEDOG.exe" "$PKG/.GC/bin/"
|
||||
fi
|
||||
if [ ! -f "$TMP/GC-UI.exe" ]; then
|
||||
if [ ! -f "$PKG/GC-UI.exe" ]; then
|
||||
echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面"
|
||||
fi
|
||||
|
||||
ZIP="$ROOT_DIR/dist/$LABEL/GC-${VERSION}-${LABEL}.zip"
|
||||
ZIP="$ROOT_DIR/dist/$LABEL/$PKGNAME.zip"
|
||||
rm -f "$ZIP"
|
||||
( cd "$TMP" && zip -qr "$ZIP" . )
|
||||
( cd "$TMP" && zip -qr "$ZIP" "$PKGNAME" )
|
||||
rm -rf "$TMP"
|
||||
echo " -> dist/$LABEL/GC-${VERSION}-${LABEL}.zip"
|
||||
echo " -> dist/$LABEL/$PKGNAME.zip"
|
||||
done
|
||||
|
||||
# --- Linux:整目录打包(启动器 + 守护 + 后端 + Flutter 前端)---
|
||||
SRC="$ROOT_DIR/dist/linux-amd64"
|
||||
SRC="$ROOT_DIR/dist/linux-arm64"
|
||||
if [ -d "$SRC" ]; then
|
||||
TMP="$ROOT_DIR/dist/.linuxpkg"
|
||||
rm -rf "$TMP"; mkdir -p "$TMP"
|
||||
cp -R "$SRC"/. "$TMP"/
|
||||
rm -f "$TMP"/*.zip
|
||||
if [ -f "$TMP/GC" ]; then
|
||||
mv "$TMP/GC" "$TMP/GC-${VERSION}-linux-amd64"
|
||||
chmod +x "$TMP/GC-${VERSION}-linux-amd64" 2>/dev/null || true
|
||||
PKGNAME="GCL-${VERSION}-linux-arm64"
|
||||
PKG="$TMP/$PKGNAME"
|
||||
rm -rf "$TMP"; mkdir -p "$PKG"
|
||||
cp -R "$SRC"/. "$PKG"/
|
||||
rm -f "$PKG"/*.zip
|
||||
prune_package "$PKG" linux
|
||||
if [ -f "$PKG/GC" ]; then
|
||||
mv "$PKG/GC" "$PKG/$PKGNAME"
|
||||
chmod +x "$PKG/$PKGNAME" 2>/dev/null || true
|
||||
fi
|
||||
if [ ! -f "$TMP/GC-UI" ]; then
|
||||
if [ -f "$PKG/GC-SAVEDOG" ]; then
|
||||
mkdir -p "$PKG/.GC/bin"
|
||||
mv "$PKG/GC-SAVEDOG" "$PKG/.GC/bin/"
|
||||
fi
|
||||
if [ ! -f "$PKG/GC-UI" ]; then
|
||||
echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面"
|
||||
fi
|
||||
ZIP="$ROOT_DIR/dist/linux-amd64/GC-${VERSION}-linux-amd64.zip"
|
||||
ZIP="$ROOT_DIR/dist/linux-arm64/$PKGNAME.zip"
|
||||
rm -f "$ZIP"
|
||||
( cd "$TMP" && zip -qry "$ZIP" . )
|
||||
( cd "$TMP" && zip -qry "$ZIP" "$PKGNAME" )
|
||||
rm -rf "$TMP"
|
||||
echo " -> dist/linux-amd64/GC-${VERSION}-linux-amd64.zip"
|
||||
echo " -> dist/linux-arm64/$PKGNAME.zip"
|
||||
fi
|
||||
|
||||
# --- macOS:先得到真实 .app 目录(改名 + 同步 Info.plist)---
|
||||
MACAPP="$ROOT_DIR/dist/mac-arm64/GC.app"
|
||||
if [ -d "$MACAPP" ]; then
|
||||
FINAL="$ROOT_DIR/dist/GC-${VERSION}-mac-arm64.app"
|
||||
FINAL="$ROOT_DIR/dist/GCL-${VERSION}-mac-arm64.app"
|
||||
rm -rf "$FINAL"
|
||||
mv "$MACAPP" "$FINAL"
|
||||
chmod +x "$FINAL/Contents/MacOS/GC" 2>/dev/null || true
|
||||
@@ -332,19 +384,26 @@ pack_launcher() {
|
||||
/usr/libexec/PlistBuddy -c "Set :CFBundleName Morris GC" "$PLIST" 2>/dev/null || true
|
||||
/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName Morris GC" "$PLIST" 2>/dev/null || true
|
||||
fi
|
||||
# 非本体文件收进 .GC/bin(与 Windows 布局一致):.GC 位置不变,仍在启动器同级
|
||||
# (也就是 .app/Contents/MacOS/),首次启动复制到 .GC/safedog 再运行。
|
||||
if [ -f "$FINAL/Contents/MacOS/GC-SAVEDOG" ]; then
|
||||
mkdir -p "$FINAL/Contents/MacOS/.GC/bin"
|
||||
mv "$FINAL/Contents/MacOS/GC-SAVEDOG" "$FINAL/Contents/MacOS/.GC/bin/"
|
||||
chmod +x "$FINAL/Contents/MacOS/.GC/bin/GC-SAVEDOG" 2>/dev/null || true
|
||||
fi
|
||||
xattr -cr "$FINAL" 2>/dev/null || true
|
||||
echo " -> $(basename "$FINAL")/"
|
||||
fi
|
||||
|
||||
# --- 统一压缩:每个产物都打成同名 .zip,放进自己的平台目录 ---
|
||||
# GC-1.0.3-mac-arm64.app -> dist/mac-arm64/GC-1.0.3-mac-arm64.zip
|
||||
# GCL-1.0.3-mac-arm64.app -> dist/mac-arm64/GCL-1.0.3-mac-arm64.zip
|
||||
# 客户端下载时按「原名去掉扩展名 + .zip」取包,再解压回原名。
|
||||
echo "==> 压缩为 zip"
|
||||
for art in "$ROOT_DIR"/dist/GC-"$VERSION"-*.exe "$ROOT_DIR"/dist/GC-"$VERSION"-*.app; do
|
||||
for art in "$ROOT_DIR"/dist/GCL-"$VERSION"-*.exe "$ROOT_DIR"/dist/GCL-"$VERSION"-*.app; do
|
||||
[ -e "$art" ] || continue
|
||||
base=$(basename "$art")
|
||||
name="${base%.*}" # 去掉 .exe / .app
|
||||
label="${name#GC-${VERSION}-}" # mac-arm64 / win-amd64
|
||||
label="${name#GCL-${VERSION}-}" # mac-arm64 / win-amd64
|
||||
ZIP="$ROOT_DIR/dist/${label}/${name}.zip"
|
||||
mkdir -p "$ROOT_DIR/dist/${label}"
|
||||
rm -f "$ZIP"
|
||||
@@ -366,7 +425,7 @@ pack_launcher() {
|
||||
# 一次性删除又慢又不可逆,先挪走更安全(暂存区在下次构建开始时挪出 dist)。
|
||||
TRASH="$ROOT_DIR/build/trash"
|
||||
mkdir -p "$TRASH"
|
||||
for leftover in "$ROOT_DIR"/dist/GC-"$VERSION"-*.exe "$ROOT_DIR"/dist/GC-"$VERSION"-*.app; do
|
||||
for leftover in "$ROOT_DIR"/dist/GCL-"$VERSION"-*.exe "$ROOT_DIR"/dist/GCL-"$VERSION"-*.app; do
|
||||
[ -e "$leftover" ] || continue
|
||||
mv "$leftover" "$TRASH/$(basename "$leftover")-$(date +%s)" 2>/dev/null || true
|
||||
done
|
||||
@@ -375,15 +434,15 @@ pack_launcher() {
|
||||
stamp_launcher_only
|
||||
echo ""
|
||||
echo "==> dist 里可发布的 zip:"
|
||||
ls -lh "$ROOT_DIR"/dist/*/GC-"$VERSION"-*.zip 2>/dev/null || true
|
||||
ls -lh "$ROOT_DIR"/dist/*/GCL-"$VERSION"-*.zip 2>/dev/null || true
|
||||
}
|
||||
|
||||
# 删除 publish 过程中的中间目录:平台目录里只留最终 zip
|
||||
strip_intermediate_dirs() {
|
||||
for d in win-amd64 win-x64 win-arm64 mac-arm64; do
|
||||
for d in win-amd64 win-x64 win-arm64 mac-arm64 linux-arm64 linux-x64; do
|
||||
[ -d "$ROOT_DIR/dist/$d" ] || continue
|
||||
find "$ROOT_DIR/dist/$d" -mindepth 1 -maxdepth 1 \
|
||||
! -name "GC-${VERSION}-*.zip" -exec rm -rf {} + 2>/dev/null || true
|
||||
! -name "GCL-${VERSION}-*.zip" -exec rm -rf {} + 2>/dev/null || true
|
||||
done
|
||||
find "$ROOT_DIR/dist" -name ".DS_Store" -delete 2>/dev/null || true
|
||||
}
|
||||
@@ -437,7 +496,8 @@ PLIST
|
||||
fi
|
||||
fi
|
||||
|
||||
# 发布包不带 .GC 运行骨架(用户首次启动自行创建),避免覆盖用户数据
|
||||
# 清掉模板类 .GC(config / model / cache / update / logs):首次启动自行创建,
|
||||
# 包里只保留 .GC/bin 这一个由 pack_launcher 补上的非本体文件目录。
|
||||
rm -rf "$APP/Contents/MacOS/.GC"
|
||||
chmod +x "$APP/Contents/MacOS/GC"
|
||||
echo "==> 已打包 $APP"
|
||||
|
||||
@@ -151,7 +151,7 @@ var packages = new Dictionary<string, Dictionary<string, object>>();
|
||||
// 不发 Release、只提交产物也能更新(用户明确要求支持这种布局)。
|
||||
// 两种都写:url 只是「去哪儿找」,真正的完整性凭据是下面的 sha256(受签名保护)。
|
||||
var releaseBase = $"{Repository}/releases/download/{launcherVersion}";
|
||||
foreach (var rid in new[] { "win-x64", "win-arm64", "osx-arm64", "osx-x64", "linux-x64" })
|
||||
foreach (var rid in new[] { "win-x64", "win-arm64", "osx-arm64", "osx-x64", "linux-arm64" })
|
||||
{
|
||||
var label = LauncherArtifacts.LabelOf(rid);
|
||||
var fileName = LauncherArtifacts.PackageFileName(launcherVersion, rid);
|
||||
|
||||
+31
-33
@@ -1,48 +1,46 @@
|
||||
{
|
||||
"schema": 1,
|
||||
"generated": "2026-11-18T10:16:41Z",
|
||||
"generated": "2026-11-18T13:05:57Z",
|
||||
"repository": "https://git.xhmcl.com/Morris/GC",
|
||||
"branch": "main",
|
||||
"modelDir": "model",
|
||||
"launcher": {
|
||||
"version": "1.0.9",
|
||||
"version": "1.1.0",
|
||||
"revision": "",
|
||||
"packages": {
|
||||
"win-x64": {
|
||||
"path": "dist/win-amd64/GC-1.0.9-win-amd64.zip",
|
||||
"path": "dist/win-amd64/GCL-1.1.0-win-amd64.zip",
|
||||
"dir": "dist/win-amd64",
|
||||
"name": "GC-1.0.9-win-amd64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-win-amd64.zip",
|
||||
"sha256": "0807f1005e2d8bd54316529670cf1c3c89a2df07bd39297145f21c9a0aae5f04",
|
||||
"size": 114372206
|
||||
"name": "GCL-1.1.0-win-amd64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-win-amd64.zip",
|
||||
"sha256": "adfdca03bd84ad1a831da4925795dd4ee5b9f79f654a7a8208abcb6f3dbc4f3b",
|
||||
"size": 74984771
|
||||
},
|
||||
"win-arm64": {
|
||||
"path": "dist/win-arm64/GC-1.0.9-win-arm64.zip",
|
||||
"path": "dist/win-arm64/GCL-1.1.0-win-arm64.zip",
|
||||
"dir": "dist/win-arm64",
|
||||
"name": "GC-1.0.9-win-arm64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-win-arm64.zip",
|
||||
"sha256": "ffdc37f8ea5041d69be88ffbcbf9ba5d80f7fb97c6b3debc5a918ff89f9e7f60",
|
||||
"size": 110425463
|
||||
"name": "GCL-1.1.0-win-arm64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-win-arm64.zip",
|
||||
"sha256": "2ef3f657a4ff61d9cc62100daed8d399ad0635f120c5f38589a4efd3a8e76d9a",
|
||||
"size": 72527477
|
||||
},
|
||||
"osx-arm64": {
|
||||
"path": "dist/mac-arm64/GC-1.0.9-mac-arm64.zip",
|
||||
"path": "dist/mac-arm64/GCL-1.1.0-mac-arm64.zip",
|
||||
"dir": "dist/mac-arm64",
|
||||
"name": "GC-1.0.9-mac-arm64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-mac-arm64.zip",
|
||||
"sha256": "e62bbc8c9925d8158f850440600b5d16af7539c85651a5ebcc5f9a85d4c9bb01",
|
||||
"size": 60066040
|
||||
"name": "GCL-1.1.0-mac-arm64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-mac-arm64.zip"
|
||||
},
|
||||
"osx-x64": {
|
||||
"path": "dist/mac-x64/GC-1.0.9-mac-x64.zip",
|
||||
"path": "dist/mac-x64/GCL-1.1.0-mac-x64.zip",
|
||||
"dir": "dist/mac-x64",
|
||||
"name": "GC-1.0.9-mac-x64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-mac-x64.zip"
|
||||
"name": "GCL-1.1.0-mac-x64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-mac-x64.zip"
|
||||
},
|
||||
"linux-x64": {
|
||||
"path": "dist/linux-amd64/GC-1.0.9-linux-amd64.zip",
|
||||
"dir": "dist/linux-amd64",
|
||||
"name": "GC-1.0.9-linux-amd64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-linux-amd64.zip"
|
||||
"linux-arm64": {
|
||||
"path": "dist/linux-arm64/GCL-1.1.0-linux-arm64.zip",
|
||||
"dir": "dist/linux-arm64",
|
||||
"name": "GCL-1.1.0-linux-arm64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-linux-arm64.zip"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -51,7 +49,7 @@
|
||||
"id": "contour-map",
|
||||
"version": "1.1",
|
||||
"build": "773ab2161d",
|
||||
"manifestSha256": "f86a3f83d5953cafc333585da3009d8846448f6a8a9df13b39cde57b36037733",
|
||||
"manifestSha256": "f673521f7462324a2a461253ed975c9f89abc4df34b937cad70a2a134623456d",
|
||||
"filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699",
|
||||
"files": 5,
|
||||
"dir": "model/contour-map"
|
||||
@@ -60,7 +58,7 @@
|
||||
"id": "earth-geography",
|
||||
"version": "1.9",
|
||||
"build": "cc68b8863b",
|
||||
"manifestSha256": "448f050fded46d7bfc8f0c3856e741c4a4f82523c8e012dd846ddcd400ff394a",
|
||||
"manifestSha256": "89e3afa8843fb080c81e062967790cddba54665b182e4a0819c8c1fd737d5189",
|
||||
"filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95",
|
||||
"files": 11,
|
||||
"dir": "model/earth-geography"
|
||||
@@ -69,7 +67,7 @@
|
||||
"id": "earth-revolution",
|
||||
"version": "1.7",
|
||||
"build": "53b7a0fbc3",
|
||||
"manifestSha256": "c69fc53f50213c6ab7658e1a761a20d2c55a7a344beb3c75a30393c26fa40167",
|
||||
"manifestSha256": "31f20837131573957101f7fba9a653c8785f6dbda5fd678862148a9f7f87e841",
|
||||
"filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1",
|
||||
"files": 7,
|
||||
"dir": "model/earth-revolution"
|
||||
@@ -78,7 +76,7 @@
|
||||
"id": "earth-rotation",
|
||||
"version": "1.7",
|
||||
"build": "ecd52665f9",
|
||||
"manifestSha256": "cbf12a47747a331c9980260f39169b1813bb4b52a8916995fda05755267bddca",
|
||||
"manifestSha256": "caa89497a70b29db87e67d35cd7d3e27a18306646209b2178cfb71b73cfca8ba",
|
||||
"filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e",
|
||||
"files": 7,
|
||||
"dir": "model/earth-rotation"
|
||||
@@ -87,7 +85,7 @@
|
||||
"id": "scale-calculator",
|
||||
"version": "1.6",
|
||||
"build": "105653737d",
|
||||
"manifestSha256": "fc6f7deb1efb076cc0bbee732e7de8f007ed74bc837dba2268be1e0adc1839d3",
|
||||
"manifestSha256": "952d2529f3b62f6703456ae9bc6f867edac148b7ec9963444c426d26aa35208d",
|
||||
"filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604",
|
||||
"files": 6,
|
||||
"dir": "model/scale-calculator"
|
||||
@@ -96,8 +94,8 @@
|
||||
"signature": {
|
||||
"alg": "ECDSA-P256-SHA256",
|
||||
"keyId": "gc-2026-12",
|
||||
"value": "A2jaSxRK1B43k8uOWmC/8diYG6JYUncGgjXW8B1ntO5Ag5rsG7Pb2gMz5ad6AcwjZ9zs8qtsSxJv8vLsUNXtWw==",
|
||||
"contentSha256": "3bf738a164537e5d575e75c314f0ac01af1cb5d4d7cb882489d8dedeb73f51e9",
|
||||
"signedAt": "2026-11-18T10:18:01Z"
|
||||
"value": "A/A7GQ2muXgqhtG+HVKkAvs0cAX90TXDgXOtxWCr8VTQW10FPUUroUSdmp4x5FUT7KNnrs1wIoz4/YSJspv9oQ==",
|
||||
"contentSha256": "84488b35a9f45f44c3b6c21c400f6c0d0a26b5f0f045a696afd889cf5af6f2f1",
|
||||
"signedAt": "2026-11-18T14:46:36Z"
|
||||
}
|
||||
}
|
||||
+31
-33
@@ -1,48 +1,46 @@
|
||||
{
|
||||
"schema": 1,
|
||||
"generated": "2026-11-18T10:16:41Z",
|
||||
"generated": "2026-11-18T13:05:57Z",
|
||||
"repository": "https://git.xhmcl.com/Morris/GC",
|
||||
"branch": "main",
|
||||
"modelDir": "model",
|
||||
"launcher": {
|
||||
"version": "1.0.9",
|
||||
"version": "1.1.0",
|
||||
"revision": "",
|
||||
"packages": {
|
||||
"win-x64": {
|
||||
"path": "dist/win-amd64/GC-1.0.9-win-amd64.zip",
|
||||
"path": "dist/win-amd64/GCL-1.1.0-win-amd64.zip",
|
||||
"dir": "dist/win-amd64",
|
||||
"name": "GC-1.0.9-win-amd64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-win-amd64.zip",
|
||||
"sha256": "0807f1005e2d8bd54316529670cf1c3c89a2df07bd39297145f21c9a0aae5f04",
|
||||
"size": 114372206
|
||||
"name": "GCL-1.1.0-win-amd64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-win-amd64.zip",
|
||||
"sha256": "adfdca03bd84ad1a831da4925795dd4ee5b9f79f654a7a8208abcb6f3dbc4f3b",
|
||||
"size": 74984771
|
||||
},
|
||||
"win-arm64": {
|
||||
"path": "dist/win-arm64/GC-1.0.9-win-arm64.zip",
|
||||
"path": "dist/win-arm64/GCL-1.1.0-win-arm64.zip",
|
||||
"dir": "dist/win-arm64",
|
||||
"name": "GC-1.0.9-win-arm64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-win-arm64.zip",
|
||||
"sha256": "ffdc37f8ea5041d69be88ffbcbf9ba5d80f7fb97c6b3debc5a918ff89f9e7f60",
|
||||
"size": 110425463
|
||||
"name": "GCL-1.1.0-win-arm64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-win-arm64.zip",
|
||||
"sha256": "2ef3f657a4ff61d9cc62100daed8d399ad0635f120c5f38589a4efd3a8e76d9a",
|
||||
"size": 72527477
|
||||
},
|
||||
"osx-arm64": {
|
||||
"path": "dist/mac-arm64/GC-1.0.9-mac-arm64.zip",
|
||||
"path": "dist/mac-arm64/GCL-1.1.0-mac-arm64.zip",
|
||||
"dir": "dist/mac-arm64",
|
||||
"name": "GC-1.0.9-mac-arm64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-mac-arm64.zip",
|
||||
"sha256": "e62bbc8c9925d8158f850440600b5d16af7539c85651a5ebcc5f9a85d4c9bb01",
|
||||
"size": 60066040
|
||||
"name": "GCL-1.1.0-mac-arm64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-mac-arm64.zip"
|
||||
},
|
||||
"osx-x64": {
|
||||
"path": "dist/mac-x64/GC-1.0.9-mac-x64.zip",
|
||||
"path": "dist/mac-x64/GCL-1.1.0-mac-x64.zip",
|
||||
"dir": "dist/mac-x64",
|
||||
"name": "GC-1.0.9-mac-x64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-mac-x64.zip"
|
||||
"name": "GCL-1.1.0-mac-x64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-mac-x64.zip"
|
||||
},
|
||||
"linux-x64": {
|
||||
"path": "dist/linux-amd64/GC-1.0.9-linux-amd64.zip",
|
||||
"dir": "dist/linux-amd64",
|
||||
"name": "GC-1.0.9-linux-amd64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-linux-amd64.zip"
|
||||
"linux-arm64": {
|
||||
"path": "dist/linux-arm64/GCL-1.1.0-linux-arm64.zip",
|
||||
"dir": "dist/linux-arm64",
|
||||
"name": "GCL-1.1.0-linux-arm64.zip",
|
||||
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.0/GCL-1.1.0-linux-arm64.zip"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -51,7 +49,7 @@
|
||||
"id": "contour-map",
|
||||
"version": "1.1",
|
||||
"build": "773ab2161d",
|
||||
"manifestSha256": "f86a3f83d5953cafc333585da3009d8846448f6a8a9df13b39cde57b36037733",
|
||||
"manifestSha256": "f673521f7462324a2a461253ed975c9f89abc4df34b937cad70a2a134623456d",
|
||||
"filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699",
|
||||
"files": 5,
|
||||
"dir": "model/contour-map"
|
||||
@@ -60,7 +58,7 @@
|
||||
"id": "earth-geography",
|
||||
"version": "1.9",
|
||||
"build": "cc68b8863b",
|
||||
"manifestSha256": "448f050fded46d7bfc8f0c3856e741c4a4f82523c8e012dd846ddcd400ff394a",
|
||||
"manifestSha256": "89e3afa8843fb080c81e062967790cddba54665b182e4a0819c8c1fd737d5189",
|
||||
"filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95",
|
||||
"files": 11,
|
||||
"dir": "model/earth-geography"
|
||||
@@ -69,7 +67,7 @@
|
||||
"id": "earth-revolution",
|
||||
"version": "1.7",
|
||||
"build": "53b7a0fbc3",
|
||||
"manifestSha256": "c69fc53f50213c6ab7658e1a761a20d2c55a7a344beb3c75a30393c26fa40167",
|
||||
"manifestSha256": "31f20837131573957101f7fba9a653c8785f6dbda5fd678862148a9f7f87e841",
|
||||
"filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1",
|
||||
"files": 7,
|
||||
"dir": "model/earth-revolution"
|
||||
@@ -78,7 +76,7 @@
|
||||
"id": "earth-rotation",
|
||||
"version": "1.7",
|
||||
"build": "ecd52665f9",
|
||||
"manifestSha256": "cbf12a47747a331c9980260f39169b1813bb4b52a8916995fda05755267bddca",
|
||||
"manifestSha256": "caa89497a70b29db87e67d35cd7d3e27a18306646209b2178cfb71b73cfca8ba",
|
||||
"filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e",
|
||||
"files": 7,
|
||||
"dir": "model/earth-rotation"
|
||||
@@ -87,7 +85,7 @@
|
||||
"id": "scale-calculator",
|
||||
"version": "1.6",
|
||||
"build": "105653737d",
|
||||
"manifestSha256": "fc6f7deb1efb076cc0bbee732e7de8f007ed74bc837dba2268be1e0adc1839d3",
|
||||
"manifestSha256": "952d2529f3b62f6703456ae9bc6f867edac148b7ec9963444c426d26aa35208d",
|
||||
"filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604",
|
||||
"files": 6,
|
||||
"dir": "model/scale-calculator"
|
||||
@@ -96,8 +94,8 @@
|
||||
"signature": {
|
||||
"alg": "ECDSA-P256-SHA256",
|
||||
"keyId": "gc-2026-12",
|
||||
"value": "A2jaSxRK1B43k8uOWmC/8diYG6JYUncGgjXW8B1ntO5Ag5rsG7Pb2gMz5ad6AcwjZ9zs8qtsSxJv8vLsUNXtWw==",
|
||||
"contentSha256": "3bf738a164537e5d575e75c314f0ac01af1cb5d4d7cb882489d8dedeb73f51e9",
|
||||
"signedAt": "2026-11-18T10:18:01Z"
|
||||
"value": "A/A7GQ2muXgqhtG+HVKkAvs0cAX90TXDgXOtxWCr8VTQW10FPUUroUSdmp4x5FUT7KNnrs1wIoz4/YSJspv9oQ==",
|
||||
"contentSha256": "84488b35a9f45f44c3b6c21c400f6c0d0a26b5f0f045a696afd889cf5af6f2f1",
|
||||
"signedAt": "2026-11-18T14:46:36Z"
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user