From 156b40cadbf14db0cee16e9744fee24b6fa7d080 Mon Sep 17 00:00:00 2001 From: dhhheee Date: Fri, 20 Nov 2026 19:05:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=BE=E5=AE=BD=20CodeArts=20?= =?UTF-8?q?=E6=8D=A2=E8=AF=81=E8=AF=BB=E5=93=8D=E5=BA=94=E9=A2=84=E7=AE=97?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=BC=B1=E7=BD=91=E4=B8=8B=E8=AF=AF?= =?UTF-8?q?=E5=88=A4=E6=9C=AA=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、把换证「发送 → 读完响应」的硬编码 25s 提取为 EXCHANGE_BUDGET 并放宽到 40s 2、40s 由插件关闭窗口 55s 与管理面单请求 60s 两个既有上限反推,给出口冻结和落库留余量 3、超时仍按未确认处理,不重发、不重占槽、不沿用旧值 --- .../wasm/codearts_refresh/worker.rs | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/desktop-tauri/src-tauri/server/src/server/core/plugin_host/wasm/codearts_refresh/worker.rs b/desktop-tauri/src-tauri/server/src/server/core/plugin_host/wasm/codearts_refresh/worker.rs index 0012ac996..e559b2e6e 100644 --- a/desktop-tauri/src-tauri/server/src/server/core/plugin_host/wasm/codearts_refresh/worker.rs +++ b/desktop-tauri/src-tauri/server/src/server/core/plugin_host/wasm/codearts_refresh/worker.rs @@ -18,6 +18,24 @@ use crate::server::core::{ const MAX_WORKERS: usize = 64; +/// 「发送 → 读完响应」的总预算。 +/// +/// 原值硬编码 25s,对弱网过紧:token 端点抖动时响应会超过 25s,一旦卡到上限 +/// 就被判「未确认」——一次性 Pending 被封成 Blocked,账号只能重新登录,此后 +/// 巡检把它当「无需刷新」永久跳过。 +/// +/// 取值受两个既有上限约束,不能只按「越大越稳」来定: +/// - 插件关闭窗口 `lifecycle::shutdown::TIMEOUT` = 55s:worker 持着 Runtime, +/// 在途读超过它会让 `finish_shutdown` 判超时、保留旧实例(插件替换失败); +/// - 管理面单请求 60s(`POST /api/accounts/refresh`):预算之外还有出口冻结与 +/// 换证落库,45s 才留得下余量。 +/// +/// 放宽的只是「等多久算超时」,不改变「超时即未确认、不重发」的判定。 +/// +/// 与关闭窗口的账:出口冻结上限 5s + 本预算 40s + `block()`/落库(单条 sqlite +/// 事务)≈ 45s,留在 55s 内;取 45s 时余量只剩 5s,留给主机抖动不够。 +const EXCHANGE_BUDGET: Duration = Duration::from_secs(40); + struct Job { handle: Option>, waiting: bool, @@ -163,7 +181,7 @@ async fn run(owner: &mut Ownership) -> Result { } let request = owner.request.take().ok_or_else(unknown)?; let client = owner.client.as_ref().ok_or_else(unknown)?; - let deadline = call.deadline().min(Instant::now() + Duration::from_secs(25)); + let deadline = call.deadline().min(Instant::now() + EXCHANGE_BUDGET); let read = tokio::time::timeout_at(deadline, async { let mut response = client.client().map_err(|_| unknown())?.execute(request).await.map_err(|_| unknown())?; let status = response.status().as_u16();