修复审计发现的问题,默认构建即带 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
@@ -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}";
|
||||
}
|
||||
|
||||
@@ -127,6 +127,17 @@ app.Use(async (context, next) =>
|
||||
{
|
||||
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),
|
||||
@@ -135,8 +146,7 @@ app.Use(async (context, next) =>
|
||||
if (bucket.Count > 40)
|
||||
{
|
||||
context.Response.StatusCode = StatusCodes.Status429TooManyRequests;
|
||||
await context.Response.WriteAsJsonAsync(
|
||||
new LaunchResultDto(false, "请求过于频繁,请稍后再试"));
|
||||
await context.Response.WriteAsJsonAsync(ErrorDto.Of("请求过于频繁,请稍后再试"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -158,12 +168,16 @@ app.MapGet("/api/health", () => Results.Ok(new HealthDto(
|
||||
app.MapGet("/api/models", () =>
|
||||
Results.Ok(services.Models.Scan().Select(ToModelDto).ToList()));
|
||||
|
||||
app.MapGet("/api/models/{id}/preview", (string id) =>
|
||||
app.MapGet("/api/models/{id}/preview", (string id, HttpResponse response) =>
|
||||
{
|
||||
if (!IsSafeId(id)) return Results.BadRequest();
|
||||
if (!IsSafeId(id)) return Results.BadRequest(ErrorDto.Of("模型标识无效"));
|
||||
var package = services.Models.Find(id);
|
||||
if (package == null || !File.Exists(package.PreviewPath)) return Results.NotFound();
|
||||
return Results.File(package.PreviewPath, "image/png");
|
||||
|
||||
// 封面是静态图,允许前端缓存:默认全局中间件写的 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) =>
|
||||
@@ -188,12 +202,12 @@ app.MapPost("/api/models/{id}/launch", async (string id) =>
|
||||
|
||||
app.MapDelete("/api/models/{id}", (string id) =>
|
||||
{
|
||||
if (!IsSafeId(id)) return Results.BadRequest(new LaunchResultDto(false, "模型标识无效"));
|
||||
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(new LaunchResultDto(false, $"没有找到模型 {id}"));
|
||||
: Results.NotFound(ErrorDto.Of($"没有找到模型 {id}"));
|
||||
});
|
||||
|
||||
// ---- 设置 -----------------------------------------------------------------
|
||||
@@ -202,17 +216,17 @@ app.MapGet("/api/settings", () => Results.Ok(ToSettingsDto()));
|
||||
|
||||
app.MapPost("/api/settings", (SettingsPatch? patch) =>
|
||||
{
|
||||
if (patch == null) return Results.BadRequest(new LaunchResultDto(false, "缺少设置内容"));
|
||||
if (patch == null) return Results.BadRequest(ErrorDto.Of("缺少设置内容"));
|
||||
|
||||
// 白名单校验:设置项会写进磁盘并被前端直接使用,不接受任意字符串。
|
||||
if (patch.Language != null && !allowedLanguages.Contains(patch.Language))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "不支持的界面语言"));
|
||||
return Results.BadRequest(ErrorDto.Of("不支持的界面语言"));
|
||||
if (patch.Theme != null && !allowedThemes.Contains(patch.Theme))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "不支持的主题"));
|
||||
return Results.BadRequest(ErrorDto.Of("不支持的主题"));
|
||||
if (patch.AccentColor != null && !accentHexRegex.IsMatch(patch.AccentColor))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "主题色需为 #RRGGBB"));
|
||||
return Results.BadRequest(ErrorDto.Of("主题色需为 #RRGGBB"));
|
||||
if (patch.UpdateRepository != null && !IsAllowedRepository(patch.UpdateRepository))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "更新仓库地址不受信任"));
|
||||
return Results.BadRequest(ErrorDto.Of("更新仓库地址不受信任"));
|
||||
|
||||
services.Settings.Apply(s =>
|
||||
{
|
||||
@@ -255,14 +269,14 @@ app.MapPost("/api/sources/select", async (ForceRequest? request) =>
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[sources] 切换模型源失败: {ex}");
|
||||
return Results.Json(new LaunchResultDto(false, "模型源切换失败"), statusCode: 503);
|
||||
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(new LaunchResultDto(false, "没有可用的模型源"));
|
||||
if (source == null) return Results.NotFound(ErrorDto.Of("没有可用的模型源"));
|
||||
|
||||
var index = await services.Sources.FetchAsync(source, force, null, CancellationToken.None);
|
||||
var installed = services.Models.Scan()
|
||||
@@ -291,16 +305,16 @@ app.MapGet("/api/remote/models", async (string? sourceId, bool force) =>
|
||||
app.MapPost("/api/download", async (DownloadRequest? request) =>
|
||||
{
|
||||
if (request == null || string.IsNullOrWhiteSpace(request.ModelId))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "缺少 modelId"));
|
||||
return Results.BadRequest(ErrorDto.Of("缺少 modelId"));
|
||||
|
||||
var source = ResolveSource(request.SourceId);
|
||||
if (source == null) return Results.NotFound(new LaunchResultDto(false, "没有可用的模型源"));
|
||||
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(new LaunchResultDto(false, $"源里没有模型 {request.ModelId}"));
|
||||
return Results.NotFound(ErrorDto.Of($"源里没有模型 {request.ModelId}"));
|
||||
|
||||
var job = services.Downloads.Enqueue(model);
|
||||
return Results.Ok(ToJobDto(job));
|
||||
@@ -409,11 +423,11 @@ app.MapPost("/api/shell/open-folder", (PathRequest? request) =>
|
||||
{
|
||||
var path = request?.Path;
|
||||
if (string.IsNullOrWhiteSpace(path))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "缺少 path"));
|
||||
return Results.BadRequest(ErrorDto.Of("缺少 path"));
|
||||
|
||||
// 只允许打开启动器自己的目录,避免前端被当成任意路径执行器
|
||||
if (!IsInsideKnownRoot(path!))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "只允许打开启动器自己的目录"));
|
||||
return Results.BadRequest(ErrorDto.Of("只允许打开启动器自己的目录"));
|
||||
|
||||
Shell.OpenFolder(path!);
|
||||
return Results.Ok(new LaunchResultDto(true, "已打开目录"));
|
||||
@@ -424,13 +438,13 @@ 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 无效"));
|
||||
return Results.BadRequest(ErrorDto.Of("URL 无效"));
|
||||
|
||||
if (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps)
|
||||
return Results.BadRequest(new LaunchResultDto(false, "只允许 http/https 链接"));
|
||||
return Results.BadRequest(ErrorDto.Of("只允许 http/https 链接"));
|
||||
|
||||
if (!string.IsNullOrEmpty(uri.UserInfo))
|
||||
return Results.BadRequest(new LaunchResultDto(false, "URL 不允许携带账号密码"));
|
||||
return Results.BadRequest(ErrorDto.Of("URL 不允许携带账号密码"));
|
||||
|
||||
Shell.OpenUrl(url!);
|
||||
return Results.Ok(new LaunchResultDto(true, "已打开链接"));
|
||||
@@ -450,7 +464,8 @@ app.Run();
|
||||
|
||||
static int ResolvePort(string[] args)
|
||||
{
|
||||
var env = Environment.GetEnvironmentVariable("GC_UI_PORT");
|
||||
// 优先用启动器传来的端口(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++)
|
||||
@@ -465,7 +480,7 @@ static int ResolvePort(string[] args)
|
||||
return inline;
|
||||
}
|
||||
|
||||
return 17890;
|
||||
return GcUiContract.DefaultPort;
|
||||
}
|
||||
|
||||
static void WriteEndpointFile(AppServices services, int port)
|
||||
@@ -491,8 +506,18 @@ static void WriteEndpointFile(AppServices services, int port)
|
||||
}
|
||||
}
|
||||
|
||||
ModelDto ToModelDto(ModelPackage package) => new(
|
||||
package.Id,
|
||||
/// <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,
|
||||
@@ -565,10 +590,10 @@ ModelSource? ResolveSource(string? sourceId)
|
||||
|
||||
IResult ActOnJob(string id, Action<IDownloadJob> action)
|
||||
{
|
||||
if (!IsSafeId(id)) return Results.BadRequest(new LaunchResultDto(false, "任务标识无效"));
|
||||
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(new LaunchResultDto(false, $"没有找到任务 {id}"));
|
||||
if (job == null) return Results.NotFound(ErrorDto.Of($"没有找到任务 {id}"));
|
||||
|
||||
action(job);
|
||||
return Results.Ok(ToJobDto(job));
|
||||
|
||||
Reference in new issue
Block a user