一、UI
- 主界面删除「已注册 yuncang://(网页可叫醒本软件)」整行(`ProtocolText`),
行定义 4→3(标题 / 查询 / 日志);删除 `UpdateProtocolState()` 及其调用。
协议对用户是内部实现,不展示;注册由 MSI 完成、卸载自动删除、启动自动校正。
二、修复(本次测试暴露的真实缺陷)
1. **更新检查提前到登录之前**(`App.OnStartup`):
原来放在 `ShowMainWindow()` 之后,一旦本地令牌失效/未登录,软件停在登录窗,
**永远不会检查更新**(实测 1.0.7 → 1.0.8 卡在登录窗 180s 未更新)。
2. **`ApiClient.MeAsync` 不再把网络错误当成"令牌失效"**:
原来 catch(ApiException) → return null,调用方据此 `SessionStore.Clear()`,
后端启动中/一时连不上就会**误删 session.json**(本次就丢了登录态)。
现在只有 401/403 返回 null;超时/连不上/5xx 抛异常 → 登录窗保留令牌并提示,
下次启动仍可自动登录。
三、验证(标准流程:打包 → 启动旧版 → 自动更新)
- 打包 1.0.9(含修复)并安装(旧版 1.0.7 因缺陷无法自更新,只能手工升级一次);
- 打包 1.0.10 → `test-update.ps1`:
当前安装 1.0.9(**处于登录窗,未登录**)→ 后端目标 1.0.10
[4s] 1.0.9 → [10s] 1.0.10
✔ 自动更新完成:1.0.9 → 1.0.10(耗时 10.1s)
✔ 本机服务 17300 有响应(HTTP 401)
✔ 软件进程已恢复
证明「未登录也能检测并完成更新」。
四、待用户操作:本次测试中 session.json 被旧逻辑误删,需要**重新登录一次**;
之后的版本不会因为网络抖动再丢登录态。
193 lines
7.1 KiB
C#
193 lines
7.1 KiB
C#
using System;
|
||
using System.Net;
|
||
using System.Net.Http;
|
||
using System.Text;
|
||
using System.Text.Json;
|
||
using System.Threading;
|
||
using System.Threading.Tasks;
|
||
|
||
namespace YuncangTrace.LocalService.Services;
|
||
|
||
/// <summary>接口调用失败(能拿到后端的 message 就透出去)</summary>
|
||
public sealed class ApiException : Exception
|
||
{
|
||
public ApiException(string message, int statusCode = 0) : base(message)
|
||
{
|
||
StatusCode = statusCode;
|
||
}
|
||
|
||
/// <summary>HTTP 状态码(网络层失败为 0)</summary>
|
||
public int StatusCode { get; }
|
||
}
|
||
|
||
/// <summary>登录用户(后端 `/api/web/auth/login` 返回的 user 子集)</summary>
|
||
public sealed record ApiUser(int Id, string? Username, string? Nickname)
|
||
{
|
||
/// <summary>界面显示名</summary>
|
||
public string DisplayName =>
|
||
!string.IsNullOrWhiteSpace(Nickname) ? Nickname!
|
||
: !string.IsNullOrWhiteSpace(Username) ? Username!
|
||
: $"#{Id}";
|
||
}
|
||
|
||
/// <summary>
|
||
/// 后端接口客户端(只用到登录 + 校验令牌,够桌面端跑起来)
|
||
///
|
||
/// 契约见 frontend/README:成功 `{ ok:true, data }`,失败 `{ ok:false, message }`。
|
||
/// </summary>
|
||
public sealed class ApiClient
|
||
{
|
||
private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromSeconds(15) };
|
||
|
||
private static readonly JsonSerializerOptions Json = new()
|
||
{
|
||
Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
|
||
};
|
||
|
||
public ApiClient(string serverBaseUrl)
|
||
{
|
||
BaseUrl = AppSettings.Normalize(serverBaseUrl);
|
||
}
|
||
|
||
/// <summary>后端根地址(已去掉末尾斜杠)</summary>
|
||
public string BaseUrl { get; }
|
||
|
||
/// <summary>
|
||
/// 账号密码登录(`POST /api/web/auth/login`)
|
||
/// </summary>
|
||
/// <exception cref="ApiException">账号密码错 / 网络不通 / 返回格式不对</exception>
|
||
public async Task<(Session Session, ApiUser User)> LoginAsync(
|
||
string account, string password, CancellationToken ct = default)
|
||
{
|
||
var body = JsonSerializer.Serialize(new { account, password }, Json);
|
||
|
||
using var content = new StringContent(body, Encoding.UTF8, "application/json");
|
||
using var response = await SendAsync(
|
||
() => new HttpRequestMessage(HttpMethod.Post, $"{BaseUrl}/api/web/auth/login") { Content = content },
|
||
"登录", ct).ConfigureAwait(false);
|
||
|
||
var text = await response.Content.ReadAsStringAsync(ct).ConfigureAwait(false);
|
||
var (data, message) = ReadEnvelope(response, text);
|
||
if (data is null)
|
||
{
|
||
throw new ApiException(message, (int)response.StatusCode);
|
||
}
|
||
|
||
var token = GetString(data.Value, "token")
|
||
?? throw new ApiException("登录返回里没有令牌");
|
||
var user = ReadUser(data.Value);
|
||
|
||
var session = new Session
|
||
{
|
||
Token = token,
|
||
UserId = user.Id,
|
||
DisplayName = user.DisplayName,
|
||
ServerBaseUrl = BaseUrl,
|
||
};
|
||
return (session, user);
|
||
}
|
||
|
||
/// <summary>
|
||
/// 校验令牌是否还有效(`GET /api/web/me`)。
|
||
/// </summary>
|
||
/// <returns>令牌有效返回用户;**401/403 返回 null**(真失效,调用方可以清掉本地令牌)</returns>
|
||
/// <exception cref="ApiException">网络不通 / 超时 / 服务端 5xx —— 不能当成“登录失效”,否则会误删令牌</exception>
|
||
public async Task<ApiUser?> MeAsync(string token, CancellationToken ct = default)
|
||
{
|
||
using var response = await SendAsync(() =>
|
||
{
|
||
var request = new HttpRequestMessage(HttpMethod.Get, $"{BaseUrl}/api/web/me");
|
||
request.Headers.TryAddWithoutValidation("Authorization", $"Bearer {token}");
|
||
return request;
|
||
}, "校验登录态", ct).ConfigureAwait(false);
|
||
|
||
// 只有 401/403 才是「令牌真失效」;5xx / 网关错误不应该让客户端把登录态抹掉
|
||
if (response.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
|
||
{
|
||
return null;
|
||
}
|
||
|
||
if (!response.IsSuccessStatusCode)
|
||
{
|
||
throw new ApiException(
|
||
$"校验登录态失败(HTTP {(int)response.StatusCode})",
|
||
(int)response.StatusCode);
|
||
}
|
||
|
||
var text = await response.Content.ReadAsStringAsync(ct).ConfigureAwait(false);
|
||
var (data, _) = ReadEnvelope(response, text);
|
||
return data is null ? null : ReadUser(data.Value);
|
||
}
|
||
|
||
/// <summary>发请求:连不上时翻成「无法连接服务器」这种能看懂的提示</summary>
|
||
private async Task<HttpResponseMessage> SendAsync(
|
||
Func<HttpRequestMessage> createRequest, string action, CancellationToken ct)
|
||
{
|
||
try
|
||
{
|
||
using var request = createRequest();
|
||
return await Http.SendAsync(request, ct).ConfigureAwait(false);
|
||
}
|
||
catch (TaskCanceledException)
|
||
{
|
||
throw new ApiException("连接服务器超时,请检查服务器地址或网络");
|
||
}
|
||
catch (HttpRequestException ex)
|
||
{
|
||
throw new ApiException($"无法连接服务器({BaseUrl}):{ex.Message}");
|
||
}
|
||
}
|
||
|
||
/// <summary>
|
||
/// 解析 `{ ok, data, message }`:成功返回 data(JSON 片段),失败返回 message
|
||
/// </summary>
|
||
private static (JsonElement? Data, string Message) ReadEnvelope(HttpResponseMessage response, string text)
|
||
{
|
||
JsonDocument document;
|
||
try
|
||
{
|
||
document = JsonDocument.Parse(string.IsNullOrWhiteSpace(text) ? "{}" : text);
|
||
}
|
||
catch (JsonException)
|
||
{
|
||
return (null, $"服务器返回了非 JSON 内容(HTTP {(int)response.StatusCode})");
|
||
}
|
||
|
||
using (document)
|
||
{
|
||
var root = document.RootElement;
|
||
|
||
var ok = root.TryGetProperty("ok", out var okElement)
|
||
&& okElement.ValueKind == JsonValueKind.True;
|
||
|
||
if (ok && root.TryGetProperty("data", out var dataElement))
|
||
{
|
||
// 复制一份出来(document 释放后就失效了)
|
||
return (dataElement.Clone(), "ok");
|
||
}
|
||
|
||
var message = GetString(root, "message")
|
||
?? $"请求失败(HTTP {(int)response.StatusCode})";
|
||
return (null, message);
|
||
}
|
||
}
|
||
|
||
private static ApiUser ReadUser(JsonElement data)
|
||
{
|
||
// 登录接口是 { token, user },/api/web/me 是直接一个 user
|
||
var userElement = data.TryGetProperty("user", out var nested) ? nested : data;
|
||
|
||
var id = userElement.TryGetProperty("id", out var idElement) && idElement.TryGetInt32(out var value) ? value : 0;
|
||
var username = GetString(userElement, "username");
|
||
var nickname = GetString(userElement, "nickname");
|
||
return new ApiUser(id, username, nickname);
|
||
}
|
||
|
||
private static string? GetString(JsonElement element, string property)
|
||
{
|
||
return element.TryGetProperty(property, out var value) && value.ValueKind == JsonValueKind.String
|
||
? value.GetString()
|
||
: null;
|
||
}
|
||
}
|