修复审计发现的问题,默认构建即带 Flutter 前端
P0 - GC-SAVEDOG:更新改为整目录替换(旧文件备份到 .GC/update/backup, 失败可完整回滚),不再只搬一个 exe;回滚会删掉新包独有文件 - GC-SAVEDOG:包名校验放宽为单文件名模式,Linux 启动器(无扩展名)可更新 - GC-DOWNLOAD:测速全失败时不再回退 GitCode,改为返回「不可用」并保留上次可用源 - GC-DOWNLOAD:识别并赋予 Linux 无扩展名启动器可执行位;兼容脚本清理旧版时 也覆盖无扩展名产物 - CI:删除 nightly-prerelease(绕开 build.sh,产出无前端空壳);alpha 工作流 去掉非法 cron,只保留手动触发 P1 - 前端:主题设置真正生效(深色/浅色/跟随系统 + 持久化),去掉死字段 - 前端:下载页轮询改为自适应单次链,页面不可见或任务结束后降频/停止 - 前端:下载完成 / 删除模型后首页列表自动刷新 - 前端:复用 http.Client,不再每次轮询新建连接 - 后端:/api/models 走缓存,不再每次全盘递归统计体积 - 设置页:外部改动能同步进表单,不再只同步一次 P2 - 错误响应统一为 ErrorDto,不再复用 LaunchResultDto - 限流桶定期清理,避免无限增长 - 播放器窗口去重,避免同一模型重复开窗 - 封面按实际格式返回,去掉错误的 image/png 与 no-store - 端口集中到 GcUiContract,前端可用 GC_UI_PORT 或 ui-backend.json 发现后端 - 构建:Windows 包改为散开发布,与后端共用运行时(体积约 109MB -> 72MB) - 文档:更新仓库地址与更新流程说明 测试:dotnet build 全绿;GC.Tests 更新链路全通过;flutter analyze 无问题; flutter test 11 项全通过。
This commit is contained in:
1 parent
461e79aa7f
commit
a361c889f8
28 files changed
+1062
-417
No files matched your search
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user