diff --git a/android/java/cc/codroid/A11y.java b/android/java/cc/codroid/A11y.java index eab78e50..d7345eb4 100644 --- a/android/java/cc/codroid/A11y.java +++ b/android/java/cc/codroid/A11y.java @@ -142,27 +142,34 @@ static JSONObject read(boolean all) throws Exception { for (AccessibilityWindowInfo w : s.getWindows()) if (w.isActive() && w.getTitle() != null) { r.put("window", w.getTitle().toString()); break; } StringBuilder out = new StringBuilder(); - synchronized (LOCK) { - nodes.clear(); sigs.clear(); - walk(root, 0, all, out); - } + List localNodes = new ArrayList<>(); + List localSigs = new ArrayList<>(); + walk(root, 0, all, out, localNodes, localSigs); // 网页(WebView / 浏览器)在无障碍刚打开时还没生成内容树,只露出一个空壳:等一下再读一次 - if (nodes.size() <= 2 && out.indexOf("WebView") >= 0) { + if (localNodes.size() <= 2 && out.indexOf("WebView") >= 0) { Thread.sleep(800); root.refresh(); out.setLength(0); - synchronized (LOCK) { nodes.clear(); sigs.clear(); walk(root, 0, all, out); } + localNodes.clear(); localSigs.clear(); + walk(root, 0, all, out, localNodes, localSigs); + } + int count; + synchronized (LOCK) { + nodes.clear(); nodes.addAll(localNodes); + sigs.clear(); sigs.addAll(localSigs); + count = nodes.size(); } Rect sc = new Rect(); root.getBoundsInScreen(sc); r.put("screen", sc.width() + "x" + sc.height()); - r.put("count", nodes.size()); + r.put("count", count); String txt = out.toString(); if (txt.length() > 60000) txt = txt.substring(0, 60000) + "\n…(" + Tr.t("太长,截断了") + ")"; return r.put("tree", txt); } - private static void walk(AccessibilityNodeInfo n, int depth, boolean all, StringBuilder out) { - if (n == null || nodes.size() >= 800) return; + private static void walk(AccessibilityNodeInfo n, int depth, boolean all, StringBuilder out, + List localNodes, List localSigs) { + if (n == null || localNodes.size() >= 800) return; if (!n.isVisibleToUser()) return; CharSequence text = n.getText(), desc = n.getContentDescription(); // 密码框的内容不交给模型:有的应用 getText 给的是明文,不是圆点,也有把明文放进描述的,两样都不读 @@ -174,9 +181,9 @@ private static void walk(AccessibilityNodeInfo n, int depth, boolean all, String || (text != null && text.length() > 0) || (desc != null && desc.length() > 0); int nextDepth = depth; if (useful) { - int id = nodes.size(); - nodes.add(n); - sigs.add(sig(n)); + int id = localNodes.size(); + localNodes.add(n); + localSigs.add(sig(n)); Rect b = new Rect(); n.getBoundsInScreen(b); for (int i = Math.min(depth, 12); i > 0; i--) out.append(" "); out.append('[').append(id).append("] "); @@ -198,7 +205,7 @@ private static void walk(AccessibilityNodeInfo n, int depth, boolean all, String out.append('\n'); nextDepth = depth + 1; } - for (int i = 0; i < n.getChildCount(); i++) walk(n.getChild(i), nextDepth, all, out); + for (int i = 0; i < n.getChildCount(); i++) walk(n.getChild(i), nextDepth, all, out, localNodes, localSigs); } /** 编号的指纹:模型从屏幕树里认这个元素靠的那几样。输入框的文字会随输入变,不算;密码框的内容本来就不读 */ @@ -214,17 +221,14 @@ private static String clip(CharSequence c) { return s.length() > 160 ? s.substring(0, 160) + "…" : s; } - /** 上一次 node() 为什么没给出节点:编号已经不在 / 元素换了内容 */ - private static String miss = ""; - - private static AccessibilityNodeInfo node(int id) { + private static AccessibilityNodeInfo node(int id, String[] missOut) { synchronized (LOCK) { - miss = Tr.t("找不到这个编号的元素:界面变了,先重新 screen_read"); + if (missOut != null && missOut.length > 0) missOut[0] = Tr.t("找不到这个编号的元素:界面变了,先重新 screen_read"); if (id < 0 || id >= nodes.size()) return null; AccessibilityNodeInfo n = nodes.get(id); if (!n.refresh()) return null; if (!sig(n).equals(sigs.get(id))) { - miss = Tr.t("这个编号上的元素已经换了内容(列表滚动或刷新过),没有动手:按新屏幕重新选"); + if (missOut != null && missOut.length > 0) missOut[0] = Tr.t("这个编号上的元素已经换了内容(列表滚动或刷新过),没有动手:按新屏幕重新选"); return null; } return n; @@ -236,23 +240,28 @@ private static AccessibilityNodeInfo node(int id) { // notificationTimeout 平时是 1000(系统攒一秒才推一次),等的时候临时压到 50,不然首个事件就要晚一秒 static final int EVT_SETTLE = AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED | AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED | AccessibilityEvent.TYPE_WINDOWS_CHANGED | AccessibilityEvent.TYPE_VIEW_SCROLLED; + private static final java.util.concurrent.atomic.AtomicInteger armCount = new java.util.concurrent.atomic.AtomicInteger(); - /** 动作前调用:临时多订事件。返回动作前的事件计数,交给 settle */ + /** 动作前调用:临时多订事件(引用计数,并发动作不提前撤订)。返回动作前的事件计数,交给 settle */ static int arm() { - A11y s = self; - if (s != null) try { - AccessibilityServiceInfo i = s.getServiceInfo(); - if (i != null) { i.eventTypes = EVT_SETTLE; i.notificationTimeout = 50; s.setServiceInfo(i); } - } catch (Throwable t) { Log.w(TAG, "settle arm", t); } + if (armCount.incrementAndGet() == 1) { + A11y s = self; + if (s != null) try { + AccessibilityServiceInfo i = s.getServiceInfo(); + if (i != null) { i.eventTypes = EVT_SETTLE; i.notificationTimeout = 50; s.setServiceInfo(i); } + } catch (Throwable t) { Log.w(TAG, "settle arm", t); } + } return evts; } static void disarm() { - A11y s = self; - if (s != null) try { - AccessibilityServiceInfo i = s.getServiceInfo(); - if (i != null) { i.eventTypes = AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED; i.notificationTimeout = 1000; s.setServiceInfo(i); } - } catch (Throwable t) { Log.w(TAG, "settle disarm", t); } + if (armCount.updateAndGet(v -> v > 0 ? v - 1 : 0) == 0) { + A11y s = self; + if (s != null) try { + AccessibilityServiceInfo i = s.getServiceInfo(); + if (i != null) { i.eventTypes = AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED; i.notificationTimeout = 1000; s.setServiceInfo(i); } + } catch (Throwable t) { Log.w(TAG, "settle disarm", t); } + } } /** 等界面静下来;返回等了多少毫秒 */ @@ -283,8 +292,9 @@ static JSONObject tap(JSONObject a) throws Exception { touch(); boolean lng = a.optBoolean("long", false); if (a.has("node")) { - AccessibilityNodeInfo n = node(a.getInt("node")); - if (n == null) return fail(miss); + String[] miss = new String[1]; + AccessibilityNodeInfo n = node(a.getInt("node"), miss); + if (n == null) return fail(miss[0]); int act = lng ? AccessibilityNodeInfo.ACTION_LONG_CLICK : AccessibilityNodeInfo.ACTION_CLICK; // 文字本身不可点时,往上找第一个可点的父节点(列表项常见) for (AccessibilityNodeInfo p = n; p != null; p = p.getParent()) @@ -300,8 +310,9 @@ static JSONObject tap(JSONObject a) throws Exception { static JSONObject swipe(JSONObject a) throws Exception { touch(); if (a.has("node")) { - AccessibilityNodeInfo n = node(a.getInt("node")); - if (n == null) return fail(miss); + String[] miss = new String[1]; + AccessibilityNodeInfo n = node(a.getInt("node"), miss); + if (n == null) return fail(miss[0]); boolean back = "backward".equals(a.optString("direction", "forward")); int act = back ? AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD : AccessibilityNodeInfo.ACTION_SCROLL_FORWARD; for (AccessibilityNodeInfo p = n; p != null; p = p.getParent()) @@ -315,7 +326,7 @@ static JSONObject swipe(JSONObject a) throws Exception { static JSONObject type(JSONObject a) throws Exception { touch(); AccessibilityNodeInfo n = null; - if (a.has("node")) { n = node(a.getInt("node")); if (n == null) return fail(miss); } + if (a.has("node")) { String[] miss = new String[1]; n = node(a.getInt("node"), miss); if (n == null) return fail(miss[0]); } else { A11y s = self; if (s == null) return fail(Tr.t("无障碍没开。到 设置 → 设备工具 里打开(要先激活 Shizuku),或自己去系统的无障碍设置里打开 cccodroid")); diff --git a/android/java/cc/codroid/BrowserPane.java b/android/java/cc/codroid/BrowserPane.java index 9498d574..70985e18 100644 --- a/android/java/cc/codroid/BrowserPane.java +++ b/android/java/cc/codroid/BrowserPane.java @@ -396,7 +396,13 @@ private void injectDevtools() { public void restoreState(Bundle b) { web.restoreState(b); } public void pause() { web.onPause(); CookieManager.getInstance().flush(); } public void resume() { web.onResume(); } - public void destroy() { web.stopLoading(); web.setWebChromeClient(null); web.destroy(); } + public void destroy() { + pickStop(); + if (fileCb != null) { fileCb.onReceiveValue(null); fileCb = null; } + web.stopLoading(); + web.setWebChromeClient(null); + web.destroy(); + } private TextView btn(String label, int fg, String desc) { TextView t = new TextView(act); diff --git a/android/java/cc/codroid/Consent.java b/android/java/cc/codroid/Consent.java index 262ed7f4..a3da9978 100644 --- a/android/java/cc/codroid/Consent.java +++ b/android/java/cc/codroid/Consent.java @@ -77,19 +77,33 @@ private static java.security.cert.X509Certificate attested(Context c, KeyStore k return x[0]; } + private static final java.util.Map BAD_SIG = new java.util.concurrent.ConcurrentHashMap<>(); + /** 当前值;没同意过(或签名验不过)返回 null */ static String get(Context c, String name) { String v = MEM.get(name); if (v != null) return v; + SharedPreferences p = sp(c); + String val = p.getString("v." + name, null), sig = p.getString("s." + name, null); + if (val == null || sig == null) return null; + String token = val + "\0" + sig; + if (token.equals(BAD_SIG.get(name))) return null; + // 认证链与 KeyStore 验签放在锁外,避免后台状态轮询持 LOCK 阻塞主线程 showWeb()/onResume() + if (!verify(c, name, val, sig)) { + BAD_SIG.put(name, token); + Log.w(TAG, name + " 的签名验不过,当作没同意"); + return null; + } synchronized (LOCK) { - v = MEM.get(name); - if (v != null) return v; - SharedPreferences p = sp(c); - String val = p.getString("v." + name, null), sig = p.getString("s." + name, null); - if (val == null || sig == null) return null; - if (!verify(c, name, val, sig)) { Log.w(TAG, name + " 的签名验不过,当作没同意"); return null; } - MEM.put(name, val); - return val; + String cur = MEM.get(name); + if (cur != null) return cur; + // 复核验签期间未被 revoke/修改 + SharedPreferences p2 = sp(c); + if (val.equals(p2.getString("v." + name, null)) && sig.equals(p2.getString("s." + name, null))) { + MEM.put(name, val); + return val; + } + return null; } } static boolean on(Context c, String name) { return get(c, name) != null; } @@ -128,7 +142,10 @@ static void revoke(Context c, String name) { } private static void dropSaved(Context c, String name) { - sp(c).edit().remove("v." + name).remove("s." + name).commit(); + BAD_SIG.remove(name); + SharedPreferences p = sp(c); + if (!p.contains("v." + name) && !p.contains("s." + name)) return; // 本就没存档:主线程 showWeb() 不白做 commit + KeyStore IPC + p.edit().remove("v." + name).remove("s." + name).commit(); try { KeyStore ks = KeyStore.getInstance("AndroidKeyStore"); ks.load(null); ks.deleteEntry(ALIAS + name); } catch (Exception e) { Log.w(TAG, "删钥匙失败 " + name, e); } } @@ -176,58 +193,70 @@ private static void runNext0(Activity a) { running = true; } final String name = job[0], value = job[1]; - Signature s; - try { - KeyPairGenerator g = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, "AndroidKeyStore"); - g.initialize(new KeyGenParameterSpec.Builder(ALIAS + name, KeyProperties.PURPOSE_SIGN | KeyProperties.PURPOSE_VERIFY) - .setDigests(KeyProperties.DIGEST_SHA256) - .setUserAuthenticationRequired(true) - .setUserAuthenticationParameters(0, KeyProperties.AUTH_BIOMETRIC_STRONG | KeyProperties.AUTH_DEVICE_CREDENTIAL) - .setInvalidatedByBiometricEnrollment(false) - .setAttestationChallenge(challenge(a, name, value)) - .build()); - PrivateKey k = g.generateKeyPair().getPrivate(); - // 先验一遍认证链:这台设备做不了(没有 Google 根等)的话,存了下次也认不了,别让用户白验 - KeyStore ks = KeyStore.getInstance("AndroidKeyStore"); ks.load(null); - if (attested(a, ks, name, value) == null) { - try { ks.deleteEntry(ALIAS + name); } catch (Exception ignored) {} - done(a, Tr.f("这台设备做不了硬件密钥认证,「{0}」只在这次运行有效", label(name, value))); + // 硬件密钥生成与认证链核对放到后台线程,完成后回主线程弹 BiometricPrompt,避免 StrongBox 机型主线程卡顿 0.5–3s + new Thread(() -> { + final Signature s; + try { + KeyPairGenerator g = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, "AndroidKeyStore"); + g.initialize(new KeyGenParameterSpec.Builder(ALIAS + name, KeyProperties.PURPOSE_SIGN | KeyProperties.PURPOSE_VERIFY) + .setDigests(KeyProperties.DIGEST_SHA256) + .setUserAuthenticationRequired(true) + .setUserAuthenticationParameters(0, KeyProperties.AUTH_BIOMETRIC_STRONG | KeyProperties.AUTH_DEVICE_CREDENTIAL) + .setInvalidatedByBiometricEnrollment(false) + .setAttestationChallenge(challenge(a, name, value)) + .build()); + PrivateKey k = g.generateKeyPair().getPrivate(); + KeyStore ks = KeyStore.getInstance("AndroidKeyStore"); ks.load(null); + if (attested(a, ks, name, value) == null) { + try { ks.deleteEntry(ALIAS + name); } catch (Exception ignored) {} + a.runOnUiThread(() -> done(a, Tr.f("这台设备做不了硬件密钥认证,「{0}」只在这次运行有效", label(name, value)))); + return; + } + s = Signature.getInstance("SHA256withECDSA"); + s.initSign(k); + } catch (Exception e) { + Log.w(TAG, "生成签名钥匙失败", e); + a.runOnUiThread(() -> done(a, Tr.f("没能保存「{0}」,只在这次运行有效:", label(name, value)) + e.getMessage())); return; } - s = Signature.getInstance("SHA256withECDSA"); - s.initSign(k); - } catch (Exception e) { - Log.w(TAG, "生成签名钥匙失败", e); - done(a, Tr.f("没能保存「{0}」,只在这次运行有效:", label(name, value)) + e.getMessage()); - return; - } - BiometricPrompt bp = new BiometricPrompt.Builder(a) - .setTitle(Tr.t("用锁屏验证保存这项设置")) - .setSubtitle(label(name, value)) - .setDescription(Tr.t("验证后,重启 cccodroid 也会保持打开。不验证的话只在这次运行有效。这样别的程序就改不了这项设置。")) - .setAllowedAuthenticators(BiometricManager.Authenticators.BIOMETRIC_STRONG | BiometricManager.Authenticators.DEVICE_CREDENTIAL) - .build(); - try { - bp.authenticate(new BiometricPrompt.CryptoObject(s), new CancellationSignal(), a.getMainExecutor(), new BiometricPrompt.AuthenticationCallback() { - @Override public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult r) { - try { - Signature sg = r.getCryptoObject().getSignature(); - sg.update(msg(a, name, value)); - String sig = Base64.encodeToString(sg.sign(), Base64.NO_WRAP); - synchronized (LOCK) { - // 验证期间用户又把它关了:别存 - if (value.equals(MEM.get(name))) sp(a).edit().putString("v." + name, value).putString("s." + name, sig).commit(); + a.runOnUiThread(() -> { + if (a.isDestroyed() || a.isFinishing()) { synchronized (LOCK) { running = false; } return; } + BiometricPrompt bp = new BiometricPrompt.Builder(a) + .setTitle(Tr.t("用锁屏验证保存这项设置")) + .setSubtitle(label(name, value)) + .setDescription(Tr.t("验证后,重启 cccodroid 也会保持打开。不验证的话只在这次运行有效。这样别的程序就改不了这项设置。")) + .setAllowedAuthenticators(BiometricManager.Authenticators.BIOMETRIC_STRONG | BiometricManager.Authenticators.DEVICE_CREDENTIAL) + .build(); + try { + bp.authenticate(new BiometricPrompt.CryptoObject(s), new CancellationSignal(), a.getMainExecutor(), new BiometricPrompt.AuthenticationCallback() { + @Override public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult r) { + try { + Signature sg = r.getCryptoObject().getSignature(); + sg.update(msg(a, name, value)); + String sig = Base64.encodeToString(sg.sign(), Base64.NO_WRAP); + synchronized (LOCK) { + if (value.equals(MEM.get(name))) { + BAD_SIG.remove(name); + sp(a).edit().putString("v." + name, value).putString("s." + name, sig).commit(); + } + } + done(a, Tr.f("已保存「{0}」", label(name, value))); + } catch (Exception e) { + Log.w(TAG, "签名失败", e); + done(a, Tr.f("签名失败,「{0}」只在这次运行有效", label(name, value))); + } } - Log.i(TAG, "已保存 " + name); - done(a, Tr.f("已保存:{0}", label(name, value))); - } catch (Exception e) { done(a, Tr.t("保存失败,只在这次运行有效:") + e.getMessage()); } - } - @Override public void onAuthenticationError(int code, CharSequence m) { - done(a, Tr.f("没有验证,「{0}」只在这次运行有效", label(name, value))); + @Override public void onAuthenticationError(int code, CharSequence err) { + Log.i(TAG, "锁屏验证取消/出错 " + code + ": " + err); + done(a, Tr.f("没有保存,「{0}」只在这次运行有效", label(name, value))); + } + }); + } catch (Exception e) { + Log.w(TAG, "弹锁屏验证失败", e); + done(a, Tr.f("没能弹出锁屏验证,「{0}」只在这次运行有效", label(name, value))); } }); - } catch (java.lang.SecurityException e) { done(a, Tr.t("弹不出锁屏验证(缺少生物识别权限),只在这次运行有效:") + e.getMessage()); } - catch (Exception e) { done(a, Tr.t("弹不出锁屏验证,只在这次运行有效:") + e.getMessage()); } + }, "consent-keygen").start(); } private static void done(Activity a, String toast) { synchronized (LOCK) { running = false; } diff --git a/android/java/cc/codroid/DeviceTools.java b/android/java/cc/codroid/DeviceTools.java index 2575918e..7c2ec8cb 100644 --- a/android/java/cc/codroid/DeviceTools.java +++ b/android/java/cc/codroid/DeviceTools.java @@ -53,7 +53,7 @@ final class DeviceTools { static final String CH = "agent"; static final String[] BASIC = {"device_status", "notify", "clipboard_read", "clipboard_write", "open", "share_file", "app_list"}; static final String[] SCREEN = {"screen_read", "screen_tap", "screen_swipe", "screen_type", "screen_key", "screenshot"}; - private static int noteId = 600; + private static final java.util.concurrent.atomic.AtomicInteger noteId = new java.util.concurrent.atomic.AtomicInteger(600); /** 用户在原生对话框里确认过开读屏(MainActivity.confirmA11y)。总开关和读屏模式存在 Consent 里(锁屏签名), * 不再是同 uid 脚本改一下 prefs 就能伪造的明文(11-03 审查 H-2) */ @@ -239,7 +239,7 @@ private static JSONObject notify(Context c, JSONObject a) throws Exception { NotificationManager nm = c.getSystemService(NotificationManager.class); PendingIntent pi = PendingIntent.getActivity(c, 60, new Intent(c, MainActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); - int id = noteId++; + int id = noteId.getAndIncrement(); nm.notify(id, new Notification.Builder(c, CH) .setSmallIcon(android.R.drawable.stat_notify_chat) .setContentTitle(title.isEmpty() ? "Claude" : clip(title, 200)) @@ -430,8 +430,8 @@ private static JSONObject launch(Context c, Intent i, String what) throws Except // 通知被系统 / 用户关掉时 notify 不抛异常、只是不显示:以前照样回「已发通知」,用户什么也看不到(BUG-A04) JSONObject blocked = notifyBlocked(c); if (blocked != null) return fail(Tr.t("cccodroid 在后台,安卓不让直接弹出界面;系统里通知又被关掉了,打开请求送不到你面前。请先打开应用再试,或在系统设置里允许通知")); - PendingIntent pi = PendingIntent.getActivity(c, 700 + (noteId % 50), i, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); - int id = noteId++; + int id = noteId.getAndIncrement(); + PendingIntent pi = PendingIntent.getActivity(c, 700 + Math.floorMod(id, 50), i, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); c.getSystemService(NotificationManager.class).notify(id, new Notification.Builder(c, CH) .setSmallIcon(android.R.drawable.ic_menu_send) .setContentTitle(Tr.t("Claude 想打开:")) diff --git a/android/java/cc/codroid/Env.java b/android/java/cc/codroid/Env.java index c9911e63..27772281 100644 --- a/android/java/cc/codroid/Env.java +++ b/android/java/cc/codroid/Env.java @@ -105,8 +105,15 @@ static java.net.HttpURLConnection gateway(String method, String path, byte[] bod // ── 核身份(审查 S1):端口全机共享,交出令牌之前先确认对面是真网关。协议见 gateway/gw/access.mjs 的 proof ── private static final Object BOOT_LOCK = new Object(); private static final Object PROOF_FLIGHT_LOCK = new Object(); - private static boolean proofInFlight; - private static String proofFlightResult; + private static final class ProofFlight { + final long epoch; + final String keySnap; + boolean done; + String result; + ProofFlight(long epoch, String keySnap) { this.epoch = epoch; this.keySnap = keySnap; } + } + private static ProofFlight proofFlight; + private static long bootEpoch; private static volatile long provedAt; private static volatile String boot = ""; /** 网关换了一个(启动号变了)时回调,参数是这次的 Cookie 值;MainActivity 拿去种进 WebView */ @@ -114,7 +121,8 @@ static java.net.HttpURLConnection gateway(String method, String path, byte[] bod /** 忘掉上次核到的启动号:下一次核身份一定回调 onBoot(界面刚接上 onBoot 时用,不然后台服务先核过了,Cookie 就种不上) */ static void resetBoot() { - synchronized (BOOT_LOCK) { boot = ""; provedAt = 0; } + synchronized (BOOT_LOCK) { boot = ""; provedAt = 0; bootEpoch++; } + synchronized (PROOF_FLIGHT_LOCK) { proofFlight = null; } } /** 网关作证应答的签名(gateway/gw/access.mjs witnessMac):按启动随机数派生的钥匙、核到的启动号、监听地址 */ @@ -133,48 +141,62 @@ static boolean witnessOk(String n, int anc, int top, String tok, String mac) { /** force:不吃 3 秒缓存。界面的 /api 请求前要用这一版(0.6.10 审计 199-1-04): * 页面加载完以后网关被杀、端口被别的应用占住的空档里,3 秒缓存正好能放过冒牌的一两个请求 —— * 里面可能就是用户刚敲的话。多跑一趟本机请求(几毫秒),换来每个 /api 都当场核一次。 - * 并发 /api/* 同毫秒撞进来时复用正在进行的同一趟实时 /__proof(单飞,不缓存过期结果),避免并发下载时把探活踩成 502。 */ + * 并发 /api/* 同毫秒撞进来时复用同一代次的在途实时 /__proof(独立 Flight 对象 + 单调钟总截止时间), + * 避免跨 flight 串结果、resetBoot() 漏种 Cookie 或旧钥匙回写污染新网关。 */ static boolean proveGateway(boolean force) { return proveBoot(force) != null; } /** 核身份并返回本次核到的启动号(原子快照,防 resetBoot 与并发写 provedAt/boot 撕裂导致签名带空 boot 吃 403) */ private static String proveBoot(boolean force) { - if (!force) { - synchronized (BOOT_LOCK) { - if (!boot.isEmpty() && System.currentTimeMillis() - provedAt < 3000) return boot; // 刚核过:别每个请求都多跑一趟 - } + long curEpoch; + synchronized (BOOT_LOCK) { + curEpoch = bootEpoch; + if (!force && !boot.isEmpty() && System.currentTimeMillis() - provedAt < 3000) return boot; // 刚核过:别每个请求都多跑一趟 } - boolean leader = false; + String keySnap = key(); + if (keySnap.isEmpty()) return null; + final ProofFlight flight; + final boolean leader; synchronized (PROOF_FLIGHT_LOCK) { - if (proofInFlight) { - while (proofInFlight) { - try { PROOF_FLIGHT_LOCK.wait(4500); } + if (proofFlight != null && proofFlight.epoch == curEpoch && keySnap.equals(proofFlight.keySnap)) { + flight = proofFlight; + leader = false; + } else { + flight = new ProofFlight(curEpoch, keySnap); + proofFlight = flight; + leader = true; + } + } + if (!leader) { + long deadline = System.nanoTime() + 4500_000_000L; + synchronized (flight) { + while (!flight.done) { + long remMs = (deadline - System.nanoTime()) / 1_000_000L; + if (remMs <= 0) return null; + try { flight.wait(remMs); } catch (InterruptedException ie) { Thread.currentThread().interrupt(); return null; } } - return proofFlightResult; + return flight.result; } - proofInFlight = true; - proofFlightResult = null; - leader = true; } String res = null; try { - res = proveBootOnce(); + res = proveBootOnce(flight.epoch, flight.keySnap); return res; } finally { - if (leader) { - synchronized (PROOF_FLIGHT_LOCK) { - proofFlightResult = res; - proofInFlight = false; - PROOF_FLIGHT_LOCK.notifyAll(); - } + synchronized (PROOF_FLIGHT_LOCK) { + if (proofFlight == flight) proofFlight = null; + } + synchronized (flight) { + flight.result = res; + flight.done = true; + flight.notifyAll(); } } } - private static String proveBootOnce() { - String t = key(); + private static String proveBootOnce(long epoch, String t) { if (t.isEmpty()) return null; try { byte[] nb = new byte[16]; @@ -196,6 +218,7 @@ private static String proveBootOnce() { if (!java.security.MessageDigest.isEqual(want.getBytes(), p[1].getBytes())) return null; String cookieVal = null; synchronized (BOOT_LOCK) { + if (epoch != bootEpoch || !t.equals(key())) return null; if (!p[0].equals(boot)) { boot = p[0]; cookieVal = hmac(t, "cookie:" + boot); @@ -223,16 +246,22 @@ static android.webkit.WebResourceResponse fetchStatic(String pq) { new java.security.SecureRandom().nextBytes(nb); String n = hex(nb); java.net.HttpURLConnection c = openLoopback("http://" + HOST + ":" + PORT + pq); - c.setConnectTimeout(2000); c.setReadTimeout(15000); c.setInstanceFollowRedirects(false); c.setUseCaches(false); + c.setConnectTimeout(1000); c.setReadTimeout(5000); c.setInstanceFollowRedirects(false); c.setUseCaches(false); c.setRequestProperty("X-CC-Nonce", n); c.setRequestProperty("Accept-Encoding", "identity"); try { int code = c.getResponseCode(); + if (code == 404 || code == 403 || code == 304 || code == 204) { + java.util.Map h = new java.util.HashMap<>(); + h.put("Cache-Control", "no-store"); + String reason = code == 404 ? "Not Found" : code == 403 ? "Forbidden" : code == 304 ? "Not Modified" : "No Content"; + return new android.webkit.WebResourceResponse("text/plain", "utf-8", code, reason, h, new java.io.ByteArrayInputStream(new byte[0])); + } if (code != 200) return null; java.io.ByteArrayOutputStream bo = new java.io.ByteArrayOutputStream(); try (java.io.InputStream in = c.getInputStream()) { byte[] buf = new byte[1 << 16]; - for (int k; (k = in.read(buf)) > 0; ) { bo.write(buf, 0, k); if (bo.size() > (64 << 20)) return null; } + for (int k; (k = in.read(buf)) > 0; ) { bo.write(buf, 0, k); if (bo.size() > (16 << 20)) return null; } } byte[] body = bo.toByteArray(); String got = c.getHeaderField("X-CC-Mac"); diff --git a/android/java/cc/codroid/GatewayService.java b/android/java/cc/codroid/GatewayService.java index aa28d05e..9998eb70 100644 --- a/android/java/cc/codroid/GatewayService.java +++ b/android/java/cc/codroid/GatewayService.java @@ -29,17 +29,30 @@ public class GatewayService extends Service { /** 系统闹钟叫醒(SchedAlarm):跑完到点的任务就自己退,不常驻(0.6.9 审计 13-01) */ static final String ACTION_ALARM = "cc.codroid.ALARM"; - /** 替换工具包期间停住网关(它跑的 node 就在要被换掉的目录里) */ + /** 替换工具包期间停住网关(引用计数:多个并发暂停方都放开才恢复,且 pause(true) 递增 lifeGen 阻断在途 spawnGateway) */ + private static final Object PAUSE_LOCK = new Object(); + private static int pauseCount; private static volatile boolean paused; private static volatile GatewayService self; /** 停住期间通知栏上写什么;null 按更新工具包说 */ private static volatile String pauseWhy; static void pause(boolean on) { pause(on, null); } static void pause(boolean on, String why) { - pauseWhy = on ? why : null; - paused = on; GatewayService s = self; - if (on && s != null) s.killGateway(); + synchronized (PAUSE_LOCK) { + if (on) { + pauseCount++; + pauseWhy = why; + paused = true; + } else { + if (pauseCount > 0) pauseCount--; + if (pauseCount == 0) { paused = false; pauseWhy = null; } + } + } + if (on && s != null) { + synchronized (s.life) { s.lifeGen++; } + s.killGateway(); + } } private Env env; @@ -152,11 +165,15 @@ private void watchFreeze() { if (idleGrace > 0) { idleGrace--; idle = 0; } else idle = closeWhenIdle && !busy() ? idle + 1 : 0; if (idle >= 3) { + final long seen; + synchronized (life) { seen = startSeq; } // 标记文件可能没写上(存储满)或没来得及更新:真要停之前直接问一次网关。 // 问不到(网关没起来)才算空闲;网关起着说还有轮次 / 排队,就接着保活(0.6.9 审计 13-03) if (Updater.gatewayBusy()) { idle = 0; continue; } - // 问的这几秒里用户可能又把界面打开了:那就不算「划掉」 - if (closeWhenIdle && !MainActivity.appForeground()) { Log.i(TAG, "划掉时在跑的任务跑完了,停止服务"); shutdown(); break; } + // 问的这几秒里用户可能又把界面打开了或新闹钟/启动请求到达:带 seen 复核(BUG-A02) + if (closeWhenIdle && !MainActivity.appForeground()) { + if (shutdownIfIdle(seen)) { Log.i(TAG, "划掉时在跑的任务跑完了,停止服务"); break; } + } idle = 0; } long gap = android.os.SystemClock.uptimeMillis() - t0 - 2000; @@ -191,11 +208,11 @@ private void watchFreeze() { // 只认自己通知里那个「停止」:服务是导出的,有跨用户权限的进程(shell、别的拿了 Shizuku 的应用)也能发;对不上就当普通启动(审查 v0.5.9 B5) String ik = i == null ? null : i.getStringExtra(MainActivity.IK); boolean mine = ik != null && java.security.MessageDigest.isEqual(ik.getBytes(), MainActivity.intentKey(this).getBytes()); - if (i != null && ACTION_STOP.equals(i.getAction()) && mine) { shutdown(); return START_NOT_STICKY; } + if (i != null && ACTION_STOP.equals(i.getAction()) && mine) { shutdownAsync(); return START_NOT_STICKY; } // 系统把被杀的服务带空 intent 重建:没任务在跑就不起了。用户在最近任务里划掉、ROM 只杀进程不强停时, // 粘性重建出来的服务紧接着又被冻住,通知卡在「正在启动…」(红魔,11-03 用户反馈)。 // 定时任务不靠这个:到点由系统闹钟(SchedAlarm)拉起;下次打开界面也会拉起 - if (i == null && !busy()) { Log.i(TAG, "粘性重建时没有任务在跑,不再拉起"); shutdown(); return START_NOT_STICKY; } + if (i == null && !busy()) { Log.i(TAG, "粘性重建时没有任务在跑,不再拉起"); shutdownAsync(); return START_NOT_STICKY; } // 有人明确要服务(打开界面、闹钟、开机):划掉时记的「跑完就停」作罢。口令对不上的 STOP 不算(服务是导出的,审查 0601b) if (i != null && !ACTION_STOP.equals(i.getAction())) closeWhenIdle = false; // 系统闹钟叫醒的、系统粘性重建的,都不是用户在盯着界面:跑到点该跑的任务就自己退,不常驻、不占着 WakeLock。 @@ -251,6 +268,21 @@ private void watchFreeze() { private void shutdown() { shutdownIfIdle(null); } + /** 主线程停机入口(ACTION_STOP / 粘性重建无任务):立即异步杀网关并收尾,避免主线程 waitFor(5s) 触发 ANR */ + private void shutdownAsync() { + final int myStartId; + synchronized (life) { + myStartId = lastStartId; + lifeGen++; + stopping = true; + } + killGatewayAsync(); + ShizukuSetup.get(this).onExit(); + stopForeground(true); + if (myStartId > 0) stopSelfResult(myStartId); + else stopSelf(); + } + /** 停机;给了 seenSeq(划掉后的空闲查询)就先在锁里复核用户没回来、服务没被重新拉起,不能停就返回 false。 * 代次和 stopping 在锁里定,退出锁才去杀进程 / 停前台:别让等这把锁的主线程跟着等网关收尾的 5 秒 */ private boolean shutdownIfIdle(Long seenSeq) { @@ -280,7 +312,7 @@ private boolean shutdownIfIdle(Long seenSeq) { synchronized (life) { lifeGen++; stopping = true; } Updater.get(this).stopLoop(); Notify.get(this).stop(); - killGateway(); + killGatewayAsync(); if (wake != null && wake.isHeld()) wake.release(); super.onDestroy(); } @@ -329,6 +361,7 @@ private void supervise() { int rc = waitGatewayExit(); if (stopping) break; Env.resetBoot(); // 网关没了:上一次核身份的缓存作废,别在 3 秒内把签名请求交给接手端口的人 + if (paused) { backoff = 1000; continue; } // 主动暂停(更新工具包/部署资源):不算崩溃,不走退避 why = exitWhy(rc); Log.w(TAG, "网关退出 rc=" + rc + (why != null ? ":" + why : "")); } catch (Cancelled e) { @@ -496,10 +529,23 @@ public void bytes(long d, long t) { private void killGateway() { Process p; - synchronized (life) { p = proc; } + synchronized (life) { p = proc; proc = null; } if (p != null) terminate(p); } + /** 原子取出 proc 并在后台等待收尾:主线程只发 SIGTERM,绝不 waitFor(5s) 卡死主线程触发 ANR */ + private void killGatewayAsync() { + final Process p; + synchronized (life) { p = proc; proc = null; } + if (p == null) return; + p.destroy(); + Thread t = new Thread(() -> { + try { if (!p.waitFor(5, java.util.concurrent.TimeUnit.SECONDS)) p.destroyForcibly(); } catch (InterruptedException ignored) {} + }, "gateway-reap"); + t.setDaemon(true); + t.start(); + } + /** SIGTERM 让网关自己收尾(它会连带杀掉正在跑的 claude 进程树),5 秒不退再强杀 */ private static void terminate(Process p) { p.destroy(); diff --git a/android/java/cc/codroid/GwRuntime.java b/android/java/cc/codroid/GwRuntime.java index eecdb90f..8e0e6468 100644 --- a/android/java/cc/codroid/GwRuntime.java +++ b/android/java/cc/codroid/GwRuntime.java @@ -225,11 +225,12 @@ private void fetchBase(java.util.List missing, Say say) throws Excepti JSONObject pinGz = dp.optJSONObject("gz"); String pinSha = pinGz == null ? "" : pinGz.optString("sha256", ""); String instSha = env.devkitInfo().optString("sha256", ""); - // 工具包还没升级到当前钉住的版本时,把刚下好并核过 sha256 的基础模块包留给 Updater / Installer 复用,省掉重下 + // 工具包还没升级到当前钉住的版本时,把刚下好并核过 sha256 的基础模块包留给 Updater / Installer 复用; + // 若目标文件或 .part 已存在(Updater 正在下/已下好),不动它避免并发覆盖竞态 File reuse = new File(env.files, file); - if (shouldKeepBaseForUpdater(pinSha, instSha, ok)) { - if (reuse.exists() && !reuse.delete()) got.delete(); - else if (!got.renameTo(reuse)) got.delete(); + File reusePart = new File(env.files, file + ".part"); + if (shouldKeepBaseForUpdater(pinSha, instSha, ok) && !reuse.exists() && !reusePart.exists()) { + if (!got.renameTo(reuse)) got.delete(); } else { got.delete(); } diff --git a/android/java/cc/codroid/Installer.java b/android/java/cc/codroid/Installer.java index ddd8204f..36a3ddf2 100644 --- a/android/java/cc/codroid/Installer.java +++ b/android/java/cc/codroid/Installer.java @@ -320,18 +320,34 @@ private void fetchSegmented(String url, File part, File segF, long size) throws try (java.io.RandomAccessFile raf = new java.io.RandomAccessFile(part, "rw")) { raf.setLength(size); } final long[][] S = segs; final IOException[] err = new IOException[1]; - Thread[] ts = new Thread[S.length]; + final java.util.concurrent.atomic.AtomicBoolean aborted = new java.util.concurrent.atomic.AtomicBoolean(); + final HttpURLConnection[] conns = new HttpURLConnection[S.length]; + final Thread[] ts = new Thread[S.length]; + Runnable cancelAll = () -> { + aborted.set(true); + for (int j = 0; j < conns.length; j++) { + HttpURLConnection cj; + synchronized (conns) { cj = conns[j]; } + if (cj != null) try { cj.disconnect(); } catch (Exception ignored) {} + } + for (Thread tj : ts) if (tj != null) tj.interrupt(); + }; for (int i = 0; i < S.length; i++) { + final int idx = i; final long[] sg = S[i]; ts[i] = new Thread(() -> { - for (int a = 0; !Thread.currentThread().isInterrupted(); a++) { + for (int a = 0; !aborted.get() && !Thread.currentThread().isInterrupted(); a++) { long done, total; synchronized (S) { done = sg[2]; total = sg[1] - sg[0] + 1; } if (done >= total) break; - try { fetchPiece(url, part, sg, S); } + try { fetchPiece(url, part, sg, S, conns, idx, aborted); } catch (IOException e) { - if (Thread.currentThread().isInterrupted()) return; - if (a >= 2) { synchronized (err) { if (err[0] == null) err[0] = e; } return; } + if (aborted.get() || Thread.currentThread().isInterrupted()) return; + if (a >= 2) { + synchronized (err) { if (err[0] == null) err[0] = e; } + cancelAll.run(); + return; + } try { Thread.sleep(2000L * (a + 1)); } catch (InterruptedException ie) { return; } } } @@ -341,14 +357,14 @@ private void fetchSegmented(String url, File part, File segF, long size) throws try { for (boolean alive = true; alive; ) { alive = false; - for (Thread t : ts) { t.join(1000); alive |= t.isAlive(); } + for (Thread t : ts) { t.join(300); alive |= t.isAlive(); } saveSegs(segF, S); long left = 0; synchronized (S) { for (long[] sg : S) left += sg[1] - sg[0] + 1 - sg[2]; } ui.bytes(size - left, size); } } catch (InterruptedException e) { - for (Thread t : ts) t.interrupt(); + cancelAll.run(); for (Thread t : ts) { try { t.join(500); } catch (InterruptedException ignored) {} } Thread.currentThread().interrupt(); throw new IOException(e); @@ -364,11 +380,13 @@ private static void saveSegs(File f, long[][] segs) { } /** 下一段:从 sg 已下的位置接着要到段尾,按偏移写进 part */ - private static void fetchPiece(String url, File part, long[] sg, Object lock) throws IOException { + private static void fetchPiece(String url, File part, long[] sg, Object lock, HttpURLConnection[] conns, int idx, java.util.concurrent.atomic.AtomicBoolean aborted) throws IOException { long start, end, done; synchronized (lock) { start = sg[0]; end = sg[1]; done = sg[2]; } long total = end - start + 1; HttpURLConnection c = open(url); + synchronized (conns) { conns[idx] = c; } + if (aborted.get()) { c.disconnect(); throw new IOException("aborted"); } c.setRequestProperty("Range", "bytes=" + (start + done) + "-" + end); try { if (code(c, url) != 206) throw new IOException("HTTP " + c.getResponseCode()); @@ -377,7 +395,7 @@ private static void fetchPiece(String url, File part, long[] sg, Object lock) th byte[] buf = new byte[1 << 16]; Slow slow = new Slow(); for (int r; (r = in.read(buf)) > 0; ) { - if (Thread.currentThread().isInterrupted()) throw new IOException("interrupted"); + if (aborted.get() || Thread.currentThread().isInterrupted()) throw new IOException("interrupted"); slow.add(r); long room = total - done; int n = (int) Math.min(r, room); @@ -389,7 +407,10 @@ private static void fetchPiece(String url, File part, long[] sg, Object lock) th } } if (done < total) throw new IOException(Tr.t("连接提前结束")); - } finally { c.disconnect(); } + } finally { + synchronized (conns) { if (conns[idx] == c) conns[idx] = null; } + c.disconnect(); + } } /** 从 part 现有长度续传到结束;服务器不认 Range(回 200)就从头写 */ @@ -1120,17 +1141,24 @@ int run(String... cmd) throws IOException { pb.directory(env.home); pb.redirectErrorStream(true); Process p = pb.start(); - BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8)); - for (String l; (l = r.readLine()) != null; ) { - // 脚本用 "@progress 已下 总量" 报进度:画进度条,不进日志 - if (l.startsWith("@progress ")) { - String[] p2 = l.split(" "); - try { ui.bytes(Long.parseLong(p2[1]), Long.parseLong(p2[2])); } catch (Exception ignored) {} - continue; + try (BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) { + for (String l; (l = r.readLine()) != null; ) { + // 脚本用 "@progress 已下 总量" 报进度:画进度条,不进日志 + if (l.startsWith("@progress ")) { + String[] p2 = l.split(" "); + try { ui.bytes(Long.parseLong(p2[1]), Long.parseLong(p2[2])); } catch (Exception ignored) {} + continue; + } + ui.step(l); } - ui.step(l); + return p.waitFor(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new IOException(e); + } finally { + try { p.getOutputStream().close(); } catch (IOException ignored) {} + if (p.isAlive()) p.destroyForcibly(); } - try { return p.waitFor(); } catch (InterruptedException e) { throw new IOException(e); } } // ── tar(ustar + GNU 长名 + pax)──────────────────────────────────── diff --git a/android/java/cc/codroid/MainActivity.java b/android/java/cc/codroid/MainActivity.java index 80e9f1ad..9b86841b 100644 --- a/android/java/cc/codroid/MainActivity.java +++ b/android/java/cc/codroid/MainActivity.java @@ -49,18 +49,23 @@ public class MainActivity extends Activity { // 但口令无论如何不写回磁盘。旧版本存在 shared_prefs 里的明文 k 启动时删掉 static final String IK = "cc.ik"; private static final String IK_ALIAS = "cc-ik"; + private static final Object IK_LOCK = new Object(); private static volatile String ikCache; static String intentKey(android.content.Context c) { - if (ikCache != null) return ikCache; - android.content.SharedPreferences sp = c.getSharedPreferences("intent", MODE_PRIVATE); - if (sp.contains("k")) sp.edit().remove("k").commit(); // 旧版的明文口令作废 - String k = ikFromKeystore(); - if (k == null) { - byte[] b = new byte[24]; new java.security.SecureRandom().nextBytes(b); - StringBuilder h = new StringBuilder(); for (byte x : b) h.append(String.format("%02x", x & 0xff)); - k = h.toString(); + String cached = ikCache; + if (cached != null) return cached; + synchronized (IK_LOCK) { + if (ikCache != null) return ikCache; + android.content.SharedPreferences sp = c.getSharedPreferences("intent", MODE_PRIVATE); + if (sp.contains("k")) sp.edit().remove("k").commit(); // 旧版的明文口令作废 + String k = ikFromKeystore(); + if (k == null) { + byte[] b = new byte[24]; new java.security.SecureRandom().nextBytes(b); + StringBuilder h = new StringBuilder(); for (byte x : b) h.append(String.format("%02x", x & 0xff)); + k = h.toString(); + } + return ikCache = k; } - return ikCache = k; } /** 从 Keystore 的 HMAC 密钥派生口令;设备不支持 / 密钥损坏时返回 null,由调用方退回内存随机 */ private static String ikFromKeystore() { @@ -1174,33 +1179,36 @@ private boolean installLocal(Installer ins, Uri uri, boolean replacing) throws E /** 更新卡片的「从本地文件安装」:选好文件后切到进度页,认身份、替换,装完回到界面 */ private void applyLocalDevkitUi(Uri uri) { Updater upd = Updater.get(this); + if (!DEVKIT_APPLYING.compareAndSet(false, true)) return; new Thread(() -> { - if (Updater.gatewayBusy() || upd.devkitMoving()) { - ui.post(() -> android.widget.Toast.makeText(this, Tr.t("有任务正在跑,等它结束再更新开发工具包"), android.widget.Toast.LENGTH_LONG).show()); - return; - } - CountDownLatch shown = new CountDownLatch(1); - ui.post(() -> { - if (web != null) { web.destroy(); web = null; } - booted = false; - buildSetupUi(); - shown.countDown(); - }); try { - if (!awaitShown(shown)) return; - say(Tr.t("从本地文件安装开发工具包…")); - boolean done = installLocal(new Installer(env, new Installer.Progress() { - public void step(String m) { say(m); } - public void bytes(long d, long t) { progress(d, t); } - }), uri, true); - if (done) say(Tr.t("✓ 开发工具包已更新,等待网关…")); - } catch (Exception e) { - say("✗ " + e.getMessage()); - say(Tr.t("(旧的工具包已经不在了的话,划掉应用重新打开会重新安装)")); - try { Thread.sleep(4000); } catch (InterruptedException ignored) {} - } - try { waitGateway(true); } catch (InterruptedException ignored) {} - ui.post(() -> { if (!isDestroyed()) { showWeb(); booted = true; } }); + if (Updater.gatewayBusy() || upd.devkitMoving()) { + ui.post(() -> android.widget.Toast.makeText(this, Tr.t("有任务正在跑,等它结束再更新开发工具包"), android.widget.Toast.LENGTH_LONG).show()); + return; + } + CountDownLatch shown = new CountDownLatch(1); + ui.post(() -> { + if (web != null) { web.destroy(); web = null; } + booted = false; + buildSetupUi(); + shown.countDown(); + }); + try { + if (!awaitShown(shown)) return; + say(Tr.t("从本地文件安装开发工具包…")); + boolean done = installLocal(new Installer(env, new Installer.Progress() { + public void step(String m) { say(m); } + public void bytes(long d, long t) { progress(d, t); } + }), uri, true); + if (done) say(Tr.t("✓ 开发工具包已更新,等待网关…")); + } catch (Exception e) { + say("✗ " + e.getMessage()); + say(Tr.t("(旧的工具包已经不在了的话,划掉应用重新打开会重新安装)")); + try { Thread.sleep(4000); } catch (InterruptedException ignored) {} + } + try { waitGateway(true); } catch (InterruptedException ignored) {} + ui.post(() -> { if (!isDestroyed()) { showWeb(); booted = true; } }); + } finally { DEVKIT_APPLYING.set(false); } }, "devkit-local").start(); } @@ -1231,26 +1239,32 @@ private void uninstallUi(String item) { } return; } - CountDownLatch shown = new CountDownLatch(1); - ui.post(() -> { - if (web != null) { web.destroy(); web = null; } - booted = false; - buildSetupUi(); - shown.countDown(); - }); - try { - if (!awaitShown(shown)) return; - say(Tr.t("卸载开发工具包…")); - GatewayService.pause(true); - try { ins.uninstallDevkit(); } - finally { GatewayService.pause(false); } - Ledger.add(env, "uninstall", true, Tr.t("卸载开发工具包"), null); - say(Tr.t("✓ 已卸载。接下来重新安装开发工具包:")); - } catch (Exception e) { - Ledger.add(env, "uninstall", false, e.getMessage(), null); - say("✗ " + e.getMessage()); + if (!DEVKIT_APPLYING.compareAndSet(false, true)) { + toast(Tr.t("有任务正在跑,等它结束再卸载")); + return; } - ui.post(() -> { if (!isDestroyed()) boot(); }); + try { + CountDownLatch shown = new CountDownLatch(1); + ui.post(() -> { + if (web != null) { web.destroy(); web = null; } + booted = false; + buildSetupUi(); + shown.countDown(); + }); + try { + if (!awaitShown(shown)) return; + say(Tr.t("卸载开发工具包…")); + GatewayService.pause(true); + try { ins.uninstallDevkit(); } + finally { GatewayService.pause(false); } + Ledger.add(env, "uninstall", true, Tr.t("卸载开发工具包"), null); + say(Tr.t("✓ 已卸载。接下来重新安装开发工具包:")); + } catch (Exception e) { + Ledger.add(env, "uninstall", false, e.getMessage(), null); + say("✗ " + e.getMessage()); + } + ui.post(() -> { if (!isDestroyed()) boot(); }); + } finally { DEVKIT_APPLYING.set(false); } }, "uninstall").start(); } @@ -1309,9 +1323,12 @@ private void applyDevkitRun(Updater upd) { * show:把取回的进度显示在启动页上,并说明断了会续传、别关应用 */ private void waitGateway(boolean show) throws InterruptedException { String shown = null; - for (int i = 0; i < 120 && !ping(); ) { + long elapsedMs = 0; + long lastTick = android.os.SystemClock.elapsedRealtime(); + while (elapsedMs < 60_000L && GatewayService.gwBlocked == null && !isDestroyed() && !ping()) { + long now = android.os.SystemClock.elapsedRealtime(); String st = GatewayService.gwFetchStep; - if (st == null) i++; + if (st == null) elapsedMs += Math.max(0, now - lastTick); else if (show) { if (!st.equals(shown)) { if (shown == null) say(Tr.t("网关自己的运行库和安装包对不上,正在联网取回(下载断了会接着下,请别关掉应用)")); @@ -1320,6 +1337,8 @@ else if (show) { long d = GatewayService.gwFetchDone, t = GatewayService.gwFetchTotal; if (t > 0) progress(d, t); } + lastTick = now; + if (elapsedMs >= 60_000L || GatewayService.gwBlocked != null || isDestroyed()) break; Thread.sleep(500); } } @@ -1809,7 +1828,7 @@ private void showWeb() { if (p == null || p.isEmpty()) p = "/"; if (!p.startsWith("/api/")) { android.webkit.WebResourceResponse r = Env.fetchStatic(p + (u.getEncodedQuery() != null ? "?" + u.getEncodedQuery() : "")); - if (r != null) { + if (r != null && (!req.isForMainFrame() || r.getStatusCode() == 200)) { if (req.isForMainFrame()) waitingShown = false; // 真页面到了:等待页的状态可以清掉 return r; } @@ -2023,17 +2042,29 @@ private void showWeb() { jsDialog(fromPage(url, msg), true, def == null ? "" : def, r, r); return true; } }); - // 网关换了一个(重启、崩溃重拉):它只认按新启动号派生的 Cookie,这里种上,界面的事件总线重连时就接上了(审查 S1) - Env.onBoot = myOnBoot = (v) -> ui.post(() -> { + // 网关换了一个(重启、崩溃重拉):它只认按新启动号派生的 Cookie,这里当场同步入库,避免放行首个 /api/* 时还带着旧 Cookie 吃 401(审查 S1) + Env.onBoot = myOnBoot = (v) -> { android.webkit.CookieManager cm = android.webkit.CookieManager.getInstance(); - cm.setCookie("http://" + Env.HOST + ":" + Env.PORT, "cc_t_" + Env.PORT + "=" + v + "; Path=/; HttpOnly; SameSite=Strict"); - // 旧版种在另一个界面地址上的那份清掉:网关已经不认了,留着只会被别的端口收走。 - // 回退设备上界面就在 127.0.0.1(Env.checkHost),清的是旧版留在 127.0.0.2 上的死值(复核报告发现 #2) - cm.setCookie("http://" + ("127.0.0.1".equals(Env.HOST) ? "127.0.0.2" : "127.0.0.1") + ":" + Env.PORT, "cc_t_" + Env.PORT + "=; Path=/; Max-Age=0"); - cm.flush(); - // loadUi() 自己跑 proveGateway() 也会触发 onBoot:在途时由 loadUi() 收口,避免在 waitingShown 清零前自递归双加载 - if ((squatShown || waitingShown) && !uiLoading) { squatShown = false; waitingShown = false; loadUi(); } - }); + String mainUrl = "http://" + Env.HOST + ":" + Env.PORT; + String oldUrl = "http://" + ("127.0.0.1".equals(Env.HOST) ? "127.0.0.2" : "127.0.0.1") + ":" + Env.PORT; + String mainCookie = "cc_t_" + Env.PORT + "=" + v + "; Path=/; HttpOnly; SameSite=Strict"; + String oldCookie = "cc_t_" + Env.PORT + "=; Path=/; Max-Age=0"; + if (android.os.Looper.myLooper() == android.os.Looper.getMainLooper()) { + cm.setCookie(mainUrl, mainCookie); + cm.setCookie(oldUrl, oldCookie); + cm.flush(); + } else { + java.util.concurrent.CountDownLatch latch = new java.util.concurrent.CountDownLatch(1); + cm.setCookie(oldUrl, oldCookie, null); + cm.setCookie(mainUrl, mainCookie, ok -> latch.countDown()); + try { latch.await(300, java.util.concurrent.TimeUnit.MILLISECONDS); } catch (InterruptedException ie) { Thread.currentThread().interrupt(); } + ui.post(cm::flush); + } + ui.post(() -> { + if (uiLoading) { bootSeenWhileLoading = true; return; } + if (squatShown || waitingShown) { squatShown = false; waitingShown = false; loadUi(); } + }); + }; // 守护线程核过 /proc、确认端口被别的应用占着:正开着的界面(或等待页)换成说明页;网关起来后(onBoot)再接回界面 GatewayService.onSquat = mySquat = () -> ui.post(() -> { if (web != null && !squatShown && (waitingShown || isOwnGateway(web.getUrl()))) showSquatted(); }); loadUi(); @@ -2184,12 +2215,14 @@ private void bounceBack() { private final java.util.concurrent.atomic.AtomicInteger uiLoadGen = new java.util.concurrent.atomic.AtomicInteger(); private volatile boolean uiLoading; + private volatile boolean bootSeenWhileLoading; /** 打开界面。地址里带着令牌和桥口令,先在后台核网关身份,过了才交出去(审查 S1); * 端口上没人在听就照旧打开(只会显示连不上,什么也漏不出去);有人在听却证明不了自己,换成一页说明 */ private void loadUi() { final int gen = uiLoadGen.incrementAndGet(); uiLoading = true; + bootSeenWhileLoading = false; new Thread(() -> { Env.resetBoot(); // 这一次核身份一定回调 onBoot,种好 Cookie 再加载(onBoot 的 post 排在下面 loadUrl 前面) boolean proved = Env.proveGateway(); @@ -2198,7 +2231,8 @@ private void loadUi() { if (gen != uiLoadGen.get()) return; uiLoading = false; if (web == null) return; - if (decision == UI_LOAD) { squatShown = false; waitingShown = false; web.loadUrl(Env.uiUrl()); return; } + if (decision == UI_LOAD) { bootSeenWhileLoading = false; squatShown = false; waitingShown = false; web.loadUrl(Env.uiUrl()); return; } + if (bootSeenWhileLoading && decision != UI_SQUAT) { bootSeenWhileLoading = false; loadUi(); return; } // 运行库对不上:原因已经确定,直接给说明页 if (decision == UI_SQUAT) { showSquatted(); return; } // 端口上有人答话、但这次启动证明不了它:先停在「等待网关」。 diff --git a/android/java/cc/codroid/Notify.java b/android/java/cc/codroid/Notify.java index 00fcd7b8..7ce358d0 100644 --- a/android/java/cc/codroid/Notify.java +++ b/android/java/cc/codroid/Notify.java @@ -108,7 +108,15 @@ private void spawn() { loop.start(); } - synchronized void stop() { stopping = true; } + private volatile HttpURLConnection activeConn; + + synchronized void stop() { + stopping = true; + HttpURLConnection c = activeConn; + if (c != null) try { c.disconnect(); } catch (Exception ignored) {} + Thread t = loop; + if (t != null) t.interrupt(); + } /** 界面回到前台:确认通知都撤掉(卡片就在眼前) */ void onForeground() { clearAsks(); } @@ -133,6 +141,7 @@ private void run() { HttpURLConnection c = null; try { c = Env.gateway("/api/events"); + activeConn = c; c.setConnectTimeout(3000); c.setReadTimeout(45_000); // 网关每 15 秒一个心跳,45 秒没动静就当断了 if (lastId != null) c.setRequestProperty("Last-Event-ID", lastId); @@ -152,9 +161,10 @@ private void run() { } catch (Exception e) { // 网关还没起来 / 正在重启:安静地等,别刷日志 } finally { + if (activeConn == c) activeConn = null; if (c != null) c.disconnect(); } - sleep(2000); + if (!stopping) sleep(2000); } synchronized (this) { if (!stopping && loop == Thread.currentThread()) spawn(); } } @@ -163,6 +173,8 @@ private void onEvent(String json) { try { JSONObject ev = new JSONObject(json); String type = ev.optString("type"); + boolean doSchedFromFile = false; + Long schedNextAt = null; synchronized (this) { if ("hello".equals(type) || "state".equals(type)) { if ("hello".equals(type)) { @@ -170,15 +182,18 @@ private void onEvent(String json) { String boot = ev.optString("boot"); if (gatewayChanged(boot, lastBoot)) runText.clear(); lastBoot = boot; + doSchedFromFile = true; } onState(ev); } else if ("run_start".equals(type)) runText.put(ev.optString("runId"), clip(ev.optString("text"), RUN_TEXT_CHARS)); else if ("run_end".equals(type)) onRunEnd(ev); else if ("sched_note".equals(type)) onSchedNote(ev); - else if ("sched_next".equals(type)) SchedAlarm.set(ctx, ev.optLong("at")); - if ("hello".equals(type)) SchedAlarm.fromFile(ctx); // 事件流(重)连上:按文件补定一次闹钟 + else if ("sched_next".equals(type)) schedNextAt = ev.optLong("at"); } + // 磁盘读取与 AlarmManager Binder IPC 放到 Notify 锁外,避免阻塞主线程 onResume/onPause + if (schedNextAt != null) SchedAlarm.set(ctx, schedNextAt); + if (doSchedFromFile) SchedAlarm.fromFile(ctx); } catch (Exception e) { Log.w(TAG, "通知:事件解析失败", e); } diff --git a/android/java/cc/codroid/Priv.java b/android/java/cc/codroid/Priv.java index d97552f8..523c293b 100644 --- a/android/java/cc/codroid/Priv.java +++ b/android/java/cc/codroid/Priv.java @@ -120,20 +120,68 @@ static boolean granted() { */ private static volatile long verifiedAt; private static volatile boolean verifiedOk; + private static final Object VERIFY_LOCK = new Object(); + private static boolean verifyInFlight; static boolean verified() { if (!granted()) return false; if (System.currentTimeMillis() - verifiedAt < 10_000) return verifiedOk; - boolean ok; + synchronized (VERIFY_LOCK) { + if (System.currentTimeMillis() - verifiedAt < 10_000) return verifiedOk; + if (verifyInFlight) { + long deadline = System.nanoTime() + 3500_000_000L; + while (verifyInFlight) { + long rem = (deadline - System.nanoTime()) / 1_000_000L; + if (rem <= 0) return false; + try { VERIFY_LOCK.wait(rem); } catch (InterruptedException ie) { Thread.currentThread().interrupt(); return false; } + } + return verifiedOk; + } + verifyInFlight = true; + } + boolean ok = false; try { - java.lang.Process p = newProcess(new String[]{"id", "-u"}, null, "/"); - p.getOutputStream().close(); - String out = new String(readAll(p.getInputStream()), StandardCharsets.UTF_8).trim(); - ok = p.waitFor() == 0 && (out.equals("2000") || out.equals("0")); + String[] r = runProcessWithTimeout(new String[]{"id", "-u"}, 3000); + ok = "0".equals(r[0]) && (r[1].equals("2000") || r[1].equals("0")); } catch (Throwable t) { ok = false; } - verifiedOk = ok; verifiedAt = System.currentTimeMillis(); + finally { + verifiedOk = ok; verifiedAt = System.currentTimeMillis(); + synchronized (VERIFY_LOCK) { verifyInFlight = false; VERIFY_LOCK.notifyAll(); } + } return ok; } + /** 带超时的短命令执行并确保流关闭与僵死进程回收,防止 Shizuku 僵死时线程/FD 泄漏 */ + private static String[] runProcessWithTimeout(String[] argv, long timeoutMs) { + java.lang.Process p = null; + try { + p = newProcess(argv, null, "/"); + try { p.getOutputStream().close(); } catch (IOException ignored) {} + final java.lang.Process fp = p; + final String[] out = { "" }; + Thread rd = new Thread(() -> { + try (InputStream in = fp.getInputStream()) { + out[0] = new String(readAll(in), StandardCharsets.UTF_8).trim(); + } catch (Throwable ignored) {} + }, "priv-read"); + rd.setDaemon(true); + rd.start(); + boolean finished = p.waitFor(timeoutMs, java.util.concurrent.TimeUnit.MILLISECONDS); + if (!finished) { + p.destroyForcibly(); + try { p.getInputStream().close(); } catch (IOException ignored) {} + try { p.getErrorStream().close(); } catch (IOException ignored) {} + rd.join(500); + return new String[]{"-", "timeout"}; + } + rd.join(1000); + try { p.getErrorStream().close(); } catch (IOException ignored) {} + return new String[]{String.valueOf(p.exitValue()), out[0]}; + } catch (Throwable t) { + if (p != null) { try { p.destroyForcibly(); } catch (Throwable ignored) {} } + return new String[]{"-", String.valueOf(t)}; + } + } + private static int safeUid() { try { return Shizuku.getUid(); } catch (Throwable t) { return -1; } } static JSONObject status() throws Exception { @@ -199,16 +247,9 @@ static String run(String cmd) { String[] r = runRc(cmd); return r[0].equals("0") ? r[1] : r[0].equals("-") ? Tr.t("[失败] ") + r[1] : "[rc=" + r[0] + "] " + r[1]; } - /** 同上,退出码单独给:{退出码(起不来是 "-"), 输出} */ + /** 同上,退出码单独给:{退出码(起不来或超时是 "-"), 输出} */ static String[] runRc(String cmd) { - try { - java.lang.Process p = newProcess(new String[]{"/system/bin/sh", "-c", cmd + " 2>&1"}, null, "/"); - p.getOutputStream().close(); - String out = new String(readAll(p.getInputStream()), StandardCharsets.UTF_8).trim(); - return new String[]{String.valueOf(p.waitFor()), out}; - } catch (Throwable t) { - return new String[]{"-", String.valueOf(t)}; - } + return runProcessWithTimeout(new String[]{"/system/bin/sh", "-c", cmd + " 2>&1"}, 15_000); } static final String STAGE_LOG = "/data/local/tmp/cccodroid-update.log"; @@ -905,7 +946,10 @@ else if (risky && !ask(text, who, a + "\0" + req.optString("cwd", "/") + "\0" + inT.setDaemon(true); inT.start(); int rc = p.waitFor(); - o1.join(); o2.join(); + // 子进程已退出但孙进程继承管道时不无限阻塞 frameExit(最多等 2 秒收尾) + o1.join(2000); o2.join(2000); + try { p.getInputStream().close(); } catch (IOException ignored) {} + try { p.getErrorStream().close(); } catch (IOException ignored) {} audit(t0, who, req, rc, System.currentTimeMillis() - t0); frameExit(out, rc); return inT; @@ -972,11 +1016,15 @@ private static Thread pump(InputStream src, DataOutputStream out, int type, java Thread t = new Thread(() -> { byte[] buf = new byte[16384]; int n; - while (true) { - try { if ((n = src.read(buf)) <= 0) return; } catch (IOException e) { return; } - // 输出送不回去 = 客户端已经走了:同上,停掉还在跑的命令 - try { synchronized (out) { out.writeByte(type); out.writeInt(n); out.write(buf, 0, n); out.flush(); } } - catch (IOException e) { stopIfAlive(p, "输出送不回客户端"); return; } + try { + while (true) { + try { if ((n = src.read(buf)) <= 0) return; } catch (IOException e) { return; } + // 输出送不回去 = 客户端已经走了:同上,停掉还在跑的命令 + try { synchronized (out) { out.writeByte(type); out.writeInt(n); out.write(buf, 0, n); out.flush(); } } + catch (IOException e) { stopIfAlive(p, "输出送不回客户端"); return; } + } + } finally { + try { src.close(); } catch (IOException ignored) {} } }, "priv-out" + type); t.start(); diff --git a/android/java/cc/codroid/SchedAlarm.java b/android/java/cc/codroid/SchedAlarm.java index 5802dd6f..87b394e8 100644 --- a/android/java/cc/codroid/SchedAlarm.java +++ b/android/java/cc/codroid/SchedAlarm.java @@ -101,7 +101,8 @@ private static void wakeUser(Context c, long at) { /** 网关写的 home/ccapp-sched-next(服务启动、事件流重连时补一次,免得漏掉事件) */ static void fromFile(Context c) { try { - File f = new File(new Env(c).home, "ccapp-sched-next"); + // 直接定位 home/ccapp-sched-next,不再构造 new Env(c) 避免触发多 MB ld.so 读盘 + File f = new File(new File(c.getFilesDir(), "home"), "ccapp-sched-next"); if (!f.exists()) return; // 只认正常大小的普通文件:旧版是直接覆盖写,断电 / 崩溃留下半截时,半个数字也会 parse 成 // 一个过去的时刻,立刻叫醒一次;FIFO / 目录更会卡住读取(0.6.9 审计 13-11) @@ -123,26 +124,30 @@ static void fromFile(Context c) { // 闹钟叫醒的服务跑完就退,不常驻(0.6.9 审计 13-01) boolean started = false; try { started = GatewayService.startAlarm(c); } catch (Exception e) { Log.w(TAG, "定时任务闹钟:拉起服务失败", e); } - // targetSdk 31+ 没给精确闹钟时响的是非精确闹钟,从后台不许起前台服务:网关起不来,任务就没人执行。 - // 发通知请用户点开应用(界面在前台就能起服务;下面这段 tick 最多试 50 秒,用户快点开还能赶上) + // targetSdk 31+ 没给精确闹钟时响的是非精确闹钟,从后台不许起前台服务:发通知请用户点开应用 if (!started) wakeUser(c, at); - // 挂住广播(后台广播最多约 60 秒):等网关能接请求了让它立刻查一遍;网关刚启动的话它 5 秒后也会自己查 + // 严格限制 goAsync() 总墙钟时间(≤8 秒,最多 3 轮;服务未拉起且网关不在时只探 1 次),防止广播 ANR + final boolean tryMore = started || GatewayService.serviceUp(); final byte[] payload = ("{\"at\":" + at + "}").getBytes(java.nio.charset.StandardCharsets.UTF_8); - PendingResult pr = goAsync(); + final PendingResult pr = goAsync(); new Thread(() -> { + long deadline = android.os.SystemClock.elapsedRealtime() + 8000L; try { - for (int n = 0; n < 20; n++) { + int maxTries = tryMore ? 3 : 1; + for (int n = 0; n < maxTries; n++) { try { HttpURLConnection h = Env.gateway("POST", "/api/sched/tick", payload); try { - h.setConnectTimeout(2000); h.setReadTimeout(5000); + h.setConnectTimeout(1500); h.setReadTimeout(2500); h.setDoOutput(true); try (java.io.OutputStream o = h.getOutputStream()) { o.write(payload); } int code = h.getResponseCode(); if (code == 200) { Log.i(TAG, "定时任务闹钟:网关已查过"); return; } } finally { h.disconnect(); } } catch (Exception ignored) {} - try { Thread.sleep(2500); } catch (InterruptedException e) { return; } + long rem = deadline - android.os.SystemClock.elapsedRealtime(); + if (n + 1 >= maxTries || rem <= 0) return; + try { Thread.sleep(Math.min(2000L, rem)); } catch (InterruptedException e) { return; } } } finally { pr.finish(); } }, "sched-alarm").start(); diff --git a/android/java/cc/codroid/Share.java b/android/java/cc/codroid/Share.java index 94857fec..129d6ea5 100644 --- a/android/java/cc/codroid/Share.java +++ b/android/java/cc/codroid/Share.java @@ -217,7 +217,8 @@ static File bundleLogs(Context c) throws Exception { File dir = new File(env.files, "cache/share"); dir.mkdirs(); File[] old = dir.listFiles(); - if (old != null) for (File o : old) if (o.getName().startsWith("cccodroid-logs-")) o.delete(); + long cutoff = System.currentTimeMillis() - 10 * 60_000L; + if (old != null) for (File o : old) if (o.getName().startsWith("cccodroid-logs-") && o.lastModified() < cutoff) o.delete(); String stamp = new SimpleDateFormat("yyyyMMdd-HHmmss-SSS", Locale.ROOT).format(new Date()); File out = new File(dir, "cccodroid-logs-" + stamp + ".zip"); JSONObject parts = new JSONObject(); @@ -333,8 +334,23 @@ private static String probeHost(Env env, File curl, String host) { pb.directory(env.home); pb.redirectErrorStream(true); p = pb.start(); - String out = readAll(p.getInputStream()).trim().replace('\n', ' '); - if (!p.waitFor(12, java.util.concurrent.TimeUnit.SECONDS)) { p.destroyForcibly(); p.waitFor(2, java.util.concurrent.TimeUnit.SECONDS); return r.append(" curl 卡住").toString(); } + final Process fp = p; + final String[] outBuf = { "" }; + Thread rd = new Thread(() -> { + try (InputStream in = fp.getInputStream()) { outBuf[0] = readAll(in).trim().replace('\n', ' '); } + catch (Exception ignored) {} + }, "probe-read"); + rd.setDaemon(true); + rd.start(); + if (!p.waitFor(12, java.util.concurrent.TimeUnit.SECONDS)) { + p.destroyForcibly(); + try { p.getInputStream().close(); } catch (IOException ignored) {} + p.waitFor(2, java.util.concurrent.TimeUnit.SECONDS); + rd.join(500); + return r.append(" curl 卡住").toString(); + } + rd.join(1000); + String out = outBuf[0]; r.append(" curl rc=").append(p.exitValue()).append(' ').append(out.length() > 200 ? out.substring(0, 200) : out); } catch (Exception e) { r.append(" curl 起不来:").append(e.getMessage()); @@ -345,12 +361,29 @@ private static String probeHost(Env env, File curl, String host) { /** 本进程能读到的只有自己的日志(安卓 4.1 起),正好 */ private static String logcat() { + Process p = null; try { - Process p = new ProcessBuilder("logcat", "-d", "-v", "time", "-t", "8000").redirectErrorStream(true).start(); - String s = readAll(p.getInputStream()); - p.waitFor(); - return s; - } catch (Exception e) { return "(读不到 logcat:" + e + ")"; } + p = new ProcessBuilder("logcat", "-d", "-v", "time", "-t", "8000").redirectErrorStream(true).start(); + final Process fp = p; + final String[] out = { "" }; + Thread rd = new Thread(() -> { + try (InputStream in = fp.getInputStream()) { out[0] = readAll(in); } + catch (Exception ignored) {} + }, "logcat-read"); + rd.setDaemon(true); + rd.start(); + if (!p.waitFor(10, java.util.concurrent.TimeUnit.SECONDS)) { + p.destroyForcibly(); + try { p.getInputStream().close(); } catch (IOException ignored) {} + rd.join(500); + return out[0].isEmpty() ? "(读 logcat 超时)" : out[0]; + } + rd.join(1000); + return out[0]; + } catch (Exception e) { + if (p != null) p.destroyForcibly(); + return "(读不到 logcat:" + e + ")"; + } } private static String tail(File f, int max) throws IOException { diff --git a/android/java/cc/codroid/ShizukuSetup.java b/android/java/cc/codroid/ShizukuSetup.java index d822dee0..2bdf0b42 100644 --- a/android/java/cc/codroid/ShizukuSetup.java +++ b/android/java/cc/codroid/ShizukuSetup.java @@ -142,8 +142,8 @@ private void flushStaleNote(Context c) { private static final String EXTRA_PROGRESS = "cc.codroid.progress"; - /** 用户退出应用:收起配对 / 激活通知,不然常驻通知会一直挂着 */ - void onExit() { cancelNote(); } + /** 用户退出应用:收起配对 / 激活通知并注销 NSD 配对监听,避免后台泄漏 */ + void onExit() { stopPairDiscovery(); cancelNote(); } SharedPreferences prefs() { return ctx.getSharedPreferences("shz", Context.MODE_PRIVATE); } boolean hasWss() { return ctx.checkSelfPermission(WSS) == PackageManager.PERMISSION_GRANTED; } @@ -187,6 +187,8 @@ void install(boolean thenActivate) { startInstall(thenActivate); } /** 调用方已经占着 busy:下载安装线程接手,跑完由它放掉 */ + private volatile File stagedShizukuApk; + private void startInstall(boolean thenActivate) { activateAfterInstall = thenActivate; new Thread(() -> { @@ -197,7 +199,7 @@ private void startInstall(boolean thenActivate) { JSONObject a = null; for (int i = 0; i < as.length(); i++) if (as.getJSONObject(i).optString("name").endsWith(".apk")) { a = as.getJSONObject(i); break; } if (a == null) throw new Exception(Tr.f("Shizuku {0} 里没有 APK", rel.optString("tag_name"))); - File f = new File(env.files, "updates/shizuku.apk"); + File f = new File(env.files, "updates/shizuku-" + System.currentTimeMillis() + ".apk"); done = 0; total = a.optLong("size"); set("downloading", Tr.f("下载 Shizuku {0}…", rel.optString("tag_name"))); new Installer(env, new Installer.Progress() { @@ -207,6 +209,7 @@ private void startInstall(boolean thenActivate) { PackageInfo p = Apk.archiveInfo(ctx, f); if (p == null || !Priv.MANAGER.equals(p.packageName)) { f.delete(); throw new Exception(Tr.t("下载的不是 Shizuku 安装包")); } if (!PIN.equals(Apk.signer(p))) { f.delete(); throw new Exception(Tr.t("Shizuku 安装包的签名不是官方的,拒绝安装")); } + stagedShizukuApk = f; set("installing", Tr.t("在系统弹窗里点「安装」(第一次需要先允许 cccodroid 安装应用)")); Apk.install(ctx, f, "shizuku"); } catch (Exception e) { @@ -220,6 +223,9 @@ private void startInstall(boolean thenActivate) { } void onInstalled(boolean ok, String msg) { + File staged = stagedShizukuApk; + stagedShizukuApk = null; + if (staged != null) staged.delete(); new File(env.files, "updates/shizuku.apk").delete(); if (!ok) { set("error", Tr.t("没装上:") + msg); return; } set("idle", Tr.t("✓ Shizuku 已安装")); @@ -715,22 +721,26 @@ private List probeLocalAdb() throws Exception { java.util.concurrent.ExecutorService pool = java.util.concurrent.Executors.newFixedThreadPool(64); List hits = Collections.synchronizedList(new ArrayList<>()); java.util.concurrent.atomic.AtomicInteger next = new java.util.concurrent.atomic.AtomicInteger(1024); - for (int t = 0; t < 64; t++) pool.execute(() -> { - for (int p; (p = next.getAndIncrement()) <= 65535; ) { - if (p == Env.PORT || p == 5037) continue; - try (java.net.Socket so = new java.net.Socket()) { - so.connect(new java.net.InetSocketAddress("127.0.0.1", p), 200); - so.setSoTimeout(800); - so.getOutputStream().write(cnxn()); - byte[] h = new byte[4]; - int n = so.getInputStream().read(h); - if (n == 4 && (h[0] == 'S' && h[1] == 'T' && h[2] == 'L' && h[3] == 'S')) hits.add(p); - } catch (Exception ignored) {} - } - }); - pool.shutdown(); - pool.awaitTermination(60, TimeUnit.SECONDS); - return new ArrayList<>(hits); + try { + for (int t = 0; t < 64; t++) pool.execute(() -> { + for (int p; !Thread.currentThread().isInterrupted() && (p = next.getAndIncrement()) <= 65535; ) { + if (p == Env.PORT || p == 5037) continue; + try (java.net.Socket so = new java.net.Socket(java.net.Proxy.NO_PROXY)) { + so.connect(new java.net.InetSocketAddress("127.0.0.1", p), 200); + so.setSoTimeout(800); + so.getOutputStream().write(cnxn()); + byte[] h = new byte[4]; + int n = so.getInputStream().read(h); + if (n == 4 && (h[0] == 'S' && h[1] == 'T' && h[2] == 'L' && h[3] == 'S')) hits.add(p); + } catch (Exception ignored) {} + } + }); + pool.shutdown(); + pool.awaitTermination(60, TimeUnit.SECONDS); + return new ArrayList<>(hits); + } finally { + pool.shutdownNow(); + } } /** ADB 协议的 CNXN 消息:24 字节头(小端)+ "host::\0" */ diff --git a/android/java/cc/codroid/Updater.java b/android/java/cc/codroid/Updater.java index 7944f4b0..70171451 100644 --- a/android/java/cc/codroid/Updater.java +++ b/android/java/cc/codroid/Updater.java @@ -440,8 +440,10 @@ static String tagOf(String base) { // ── 检查 ─────────────────────────────────────────────────────────── /** 后台线程里跑。manual=true:用户点的"检查更新"——只查不自动装大件;auto 模式下顺带按规则自动下载/安装 */ void checkAsync(boolean manual) { - if (checking) return; - checking = true; + synchronized (this) { + if (checking) return; + checking = true; + } new Thread(() -> { try { check(manual); } finally { checking = false; } }, "upd-check").start(); @@ -591,11 +593,13 @@ private void checkDevkit(JSONArray rels) throws Exception { return; } } - devkit.latest = best; - // 正在下、正在装、正在校验,或者已下好一份等着装:别动它的文件与哈希(文件名各版本相同,换了哈希就和落盘的那份对不上) - String st0 = devkit.state; - if ("verifying".equals(st0)) { recheckDevkit = true; return; } // 校验完再补查(见 verifyAsync) - if ("downloading".equals(st0) || "installing".equals(st0) || "ready".equals(st0)) return; + synchronized (this) { + devkit.latest = best; + // 正在下、正在装、正在校验,或者已下好一份等着装:别动它的文件与哈希(文件名各版本相同,换了哈希就和落盘的那份对不上) + String st0 = devkit.state; + if ("verifying".equals(st0)) { recheckDevkit = true; return; } // 校验完再补查(见 verifyAsync) + if ("downloading".equals(st0) || "installing".equals(st0) || "ready".equals(st0)) return; + } String base = "https://github.com/" + REPO + "/releases/download/" + best + "/"; // 最新的就是 APK 钉的那版(常态:新工具包跟着新 APK 走):校验值用 APK 自带的,不联网 —— // 国内连不上 github.com 时,以前这里取 devkit.lock.json 失败,整行报错(群友 10-22) @@ -609,34 +613,52 @@ private void checkDevkit(JSONArray rels) throws Exception { lock = new JSONObject(new String(lockBytes, StandardCharsets.UTF_8)); } if (!ctx.getPackageName().equals(lock.optString("target")) || lock.optInt("compat", 1) != DEVKIT_COMPAT) { - devkit.set("uptodate", Tr.f("{0} 需要更新版本的 cccodroid", best)); return; + synchronized (this) { + if (!devkitMoving() && !"verifying".equals(devkit.state) && !"ready".equals(devkit.state)) + devkit.set("uptodate", Tr.f("{0} 需要更新版本的 cccodroid", best)); + } + return; } JSONObject gz = lock.getJSONObject("gz"); String sha = gz.getString("sha256"); String have = installedDevkitSha(); if (!have.isEmpty() && have.equals(sha)) { - devkit.current = best; - if (!"damaged".equals(devkit.state)) devkit.set("uptodate", ""); // 自检查出坏了:同一版本,等用户点修复 + synchronized (this) { + devkit.current = best; + if (!"damaged".equals(devkit.state) && !devkitMoving() && !"verifying".equals(devkit.state) && !"ready".equals(devkit.state)) + devkit.set("uptodate", ""); // 自检查出坏了:同一版本,等用户点修复 + } return; } JSONObject tar = lock.optJSONObject("tar"); - devkit.base = base; devkit.sha = sha; devkit.size = gz.getLong("bytes"); - devkit.tarSha = tar != null ? tar.optString("sha256", null) : null; - devkit.need = tar != null ? tar.optLong("bytes") : devkit.size * 4; - devkit.url = base + gz.getString("file"); - devkit.alt = devkitMirror(base, gz.getString("file")); - devkit.file = new File(env.files, gz.getString("file")); - devkit.modules = null; devkit.modSha = null; devkit.moduleIds = null; - planModules(base); - // 整包清单只靠 TLS 不够(装了根证书的代理、仓库被攻破都能换掉整个工具包 —— 审查 H3): - // 不是 APK 钉的那份、又没有验得过的 .sig,就只许按块装(modules.json 验过签);按块的没核实成就报错,不再静默退回整包 - if (devkit.modules == null && lock != pin && !lockSigned(base, lockBytes)) { - // 上面已经把这份没核实的清单填进了 devkit:清掉,不然出错后点「重试」会照着它下载安装(审查 A5) - dropDevkitPlan(); + long nextSize = gz.getLong("bytes"); + String nextTarSha = tar != null ? tar.optString("sha256", null) : null; + long nextNeed = tar != null ? tar.optLong("bytes") : nextSize * 4; + String nextUrl = base + gz.getString("file"); + String nextAlt = devkitMirror(base, gz.getString("file")); + File nextFile = new File(env.files, gz.getString("file")); + // 先在局部变量完成全部网络拉取与验签,再持锁原子提交,避免并发 apply 读到半截未验签计划或覆写在途任务 + ModPlan mp = computeModulesPlan(base); + if (mp != null) { + nextSize = mp.size; nextNeed = mp.need; nextFile = mp.file; + } else if (lock != pin && !lockSigned(base, lockBytes)) { throw new IOException(Tr.f("{0} 的工具包清单没核实成(签名对不上或没取到);过会儿再检查更新", best)); } - String mb = String.format(java.util.Locale.ROOT, "%.0f MB", devkit.size / 1048576.0); - devkit.set("available", have.isEmpty() && env.devkitReady() ? mb + Tr.t(" · 无法确认已装的是哪一版,建议更新一次") : mb); + String mb = String.format(java.util.Locale.ROOT, "%.0f MB", nextSize / 1048576.0); + String msg = have.isEmpty() && env.devkitReady() ? mb + Tr.t(" · 无法确认已装的是哪一版,建议更新一次") : mb; + synchronized (this) { + String stNow = devkit.state; + if ("verifying".equals(stNow)) { recheckDevkit = true; return; } + if ("downloading".equals(stNow) || "installing".equals(stNow) || "ready".equals(stNow)) return; + devkit.latest = best; + devkit.base = base; devkit.sha = sha; devkit.size = nextSize; + devkit.tarSha = nextTarSha; devkit.need = nextNeed; + devkit.url = nextUrl; devkit.alt = nextAlt; devkit.file = nextFile; + devkit.modules = mp != null ? mp.modules : null; + devkit.modSha = mp != null ? mp.modSha : null; + devkit.moduleIds = mp != null ? mp.moduleIds : null; + devkit.set("available", msg); + } } /** 清掉待下载的工具包(地址、哈希、文件):清单没核实成时用 */ @@ -684,32 +706,44 @@ private boolean pinnedInstalled() { * modules.json 要带签名(modules.json.sig,和组件索引同一把 ed25519 钥匙):里面有每块的 sha256,签名对不上就不信它,退回整包。 * 首装不走这里 —— 那时 modules.json 按 APK 钉的 sha256 核 */ - private void planModules(String base) { + private static final class ModPlan { + final byte[] modules; final String modSha; final java.util.List moduleIds; final long size, need; final File file; + ModPlan(byte[] m, String s, java.util.List ids, long sz, long nd, File f) { + modules = m; modSha = s; moduleIds = ids; size = sz; need = nd; file = f; + } + } + + private ModPlan computeModulesPlan(String base) { try { byte[][] got = new byte[1][]; fetchDevkitFile(base, "modules.json", got); byte[] b = got[0]; fetchDevkitFile(base, "modules.json.sig", got); String sig = new String(got[0], StandardCharsets.UTF_8); - if (!Ed25519.verifyIndex(b, sig)) { Log.w(TAG, "planModules: modules.json 签名对不上,按整包装"); return; } + if (!Ed25519.verifyIndex(b, sig)) { Log.w(TAG, "planModules: modules.json 签名对不上,按整包装"); return null; } JSONObject mj = new JSONObject(new String(b, StandardCharsets.UTF_8)); - if (!ctx.getPackageName().equals(mj.optString("target")) || mj.optInt("compat", 1) != DEVKIT_COMPAT) return; - // 签名只说明是我们发的,不说明是哪一版:旧版清单连签名搬到新 tag 下能冒充新版(审查 10-29 第六份 中1)。 - // 新清单带 release 字段,要和下载地址的 tag 一致;没带的老清单只认 APK 钉的那份 + if (!ctx.getPackageName().equals(mj.optString("target")) || mj.optInt("compat", 1) != DEVKIT_COMPAT) return null; String sha = Installer.hex(java.security.MessageDigest.getInstance("SHA-256").digest(b)); if (mj.has("release")) { - if (!mj.optString("release").equals(tagOf(base))) { Log.w(TAG, "planModules: modules.json 属于 " + mj.optString("release") + ",不是 " + tagOf(base)); return; } + if (!mj.optString("release").equals(tagOf(base))) { Log.w(TAG, "planModules: modules.json 属于 " + mj.optString("release") + ",不是 " + tagOf(base)); return null; } } else { JSONObject pin = devkitPin(ctx), pm = pin == null ? null : pin.optJSONObject("modules"); - if (pm == null || !sha.equals(pm.optString("sha256"))) { Log.w(TAG, "planModules: modules.json 没写 release、也不是钉的那份"); return; } + if (pm == null || !sha.equals(pm.optString("sha256"))) { Log.w(TAG, "planModules: modules.json 没写 release、也不是钉的那份"); return null; } } java.util.List ids = installedModuleIds(mj); long dl = 0, need = 0; for (JSONObject m : Installer.moduleOrder(mj, ids)) { dl += m.getJSONObject("gz").optLong("bytes"); need += m.getJSONObject("tar").optLong("bytes"); } - devkit.modules = b; devkit.modSha = sha; - devkit.moduleIds = ids; devkit.size = dl; devkit.need = need; - devkit.file = new File(env.files, "modules-" + tagOf(base) + ".json"); - } catch (Exception e) { Log.i(TAG, "planModules: 按整包装(" + e + ")"); } + return new ModPlan(b, sha, ids, dl, need, new File(env.files, "modules-" + tagOf(base) + ".json")); + } catch (Exception e) { Log.i(TAG, "planModules: 按整包装(" + e + ")"); return null; } + } + + private void planModules(String base) { + ModPlan mp = computeModulesPlan(base); + if (mp != null) { + devkit.modules = mp.modules; devkit.modSha = mp.modSha; + devkit.moduleIds = mp.moduleIds; devkit.size = mp.size; devkit.need = mp.need; + devkit.file = mp.file; + } } /** 现在装着哪些模块:模块化工具包按各块的 .ok;整包工具包 = 新清单里整包本来就有的模块(full,升级后一样不少,不用的再到扩展页卸) */ @@ -950,7 +984,10 @@ private void download(Item it, boolean user) { if (it.modules != null) st.put("modSha", it.modSha).put("moduleIds", new JSONArray(it.moduleIds)); prefs().edit().putString("devkitStaged", st.toString()).apply(); } - it.set("ready", via != null ? Tr.f("从 {0} 下载", via) : ""); + synchronized (this) { + it.set("ready", via != null ? Tr.f("从 {0} 下载", via) : ""); + if (it == app && user) app.set("installing", ""); + } if (it == app) { if (user) installApp(); else maybeSilentInstallApp(); } else if (user) startDevkitApply(); else { notifyReady(it); releaseApp(); } @@ -959,8 +996,11 @@ private void download(Item it, boolean user) { if (it.file != null) it.file.delete(); prefs().edit().remove("appStaged").apply(); } - it.set("error", e.getMessage()); - if (it == devkit) { repairing = false; releaseApp(); } + synchronized (this) { + it.set("error", e.getMessage()); + if (it == devkit) repairing = false; + } + if (it == devkit) releaseApp(); } } @@ -1012,8 +1052,8 @@ private static long versionCode(PackageInfo pi) { /** 工具包正在下载 / 替换:这时装 APK 会把它拦腰截断 */ boolean devkitMoving() { return "downloading".equals(devkit.state) || "installing".equals(devkit.state); } - /** 推迟 APK,等工具包这一步走完 */ - private boolean deferApp(boolean user) { + /** 推迟 APK,等工具包这一步走完(synchronized 防与 releaseApp 丢唤醒) */ + private synchronized boolean deferApp(boolean user) { if (!devkitMoving()) return false; appWaiting = true; appWaitingUser |= user; app.set("ready", ("installing".equals(devkit.state) ? Tr.t("等开发工具包装完再装,免得把它打断") : Tr.t("等开发工具包下完再装,免得把它打断"))); @@ -1021,11 +1061,14 @@ private boolean deferApp(boolean user) { } /** 工具包这一步走完(下完 / 装完 / 出错):放行等着的 APK */ private void releaseApp() { - if (!appWaiting || devkitMoving()) return; - boolean user = appWaitingUser; - appWaiting = false; appWaitingUser = false; - if (!"ready".equals(app.state)) return; - app.set("ready", ""); + boolean user; + synchronized (this) { + if (!appWaiting || devkitMoving()) return; + user = appWaitingUser; + appWaiting = false; appWaitingUser = false; + if (!"ready".equals(app.state)) return; + app.set(user ? "installing" : "ready", ""); + } if (user) installApp(); else maybeSilentInstallApp(); } @@ -1207,10 +1250,13 @@ JSONObject verifyAsync(boolean full) { JSONObject r = new JSONObject(); try { if (!env.devkitReady()) return r.put("ok", false).put("message", Tr.t("开发工具包还没装好")); - if (devkitMoving() || "verifying".equals(devkit.state)) return r.put("ok", true).put("message", Tr.t("进行中")); - String prev = devkit.state, prevMsg = devkit.message; - devkit.set("verifying", full ? Tr.t("逐个文件核对哈希") : ""); - devkit.done = 0; devkit.total = 0; + final String prev, prevMsg; + synchronized (this) { + if (devkitMoving() || "verifying".equals(devkit.state)) return r.put("ok", true).put("message", Tr.t("进行中")); + prev = devkit.state; prevMsg = devkit.message; + devkit.set("verifying", full ? Tr.t("逐个文件核对哈希") : ""); + devkit.done = 0; devkit.total = 0; + } new Thread(() -> { try { JSONObject v = installer(devkit).verifyDevkit(full); diff --git a/gateway/gw/archiver.mjs b/gateway/gw/archiver.mjs index 5ef45b94..2b6a18d9 100644 --- a/gateway/gw/archiver.mjs +++ b/gateway/gw/archiver.mjs @@ -41,7 +41,7 @@ function run7z(args, { cwd, password, stdin, onStdout, signal } = {}) { return new Promise((resolve, reject) => { const c = spawn(bin, args, { cwd, stdio: [stdin ? "pipe" : password != null ? "pipe" : "ignore", "pipe", "pipe"], signal, env: { ...process.env, LANG: "C.UTF-8" } }); let out = [], err = "", outLen = 0; - c.stdout.on("data", (d) => { if (onStdout) onStdout(d); else if (outLen < 256 << 20) { out.push(d); outLen += d.length; } }); + c.stdout.on("data", (d) => { if (onStdout) onStdout(d, c); else if (outLen < 256 << 20) { out.push(d); outLen += d.length; } }); c.stderr.on("data", (d) => { if (err.length < 65536) err += d; }); if (stdin) stdin.pipe(c.stdin); else if (password != null) { c.stdin.on("error", () => {}); c.stdin.end(password + "\n"); } @@ -88,9 +88,11 @@ export async function archiveList(file, { enc = "auto", password } = {}) { if (!r && TAR_OUTER.test(file)) { // 外层解到标准输出,直接喂给内层列 tar(不落临时文件) const outer = spawnOuter(file); - const inner = await run7z(["l", "-slt", "-ba", "-si", "-ttar", "-sccUTF-8"], { stdin: outer.stdout }); - const oc = await outer.done; - if (inner.code === 0 && oc === 0) r = { kind: "tar2", type: "tar", entries: parseSlt(inner.out), encrypted: false }; + try { + const inner = await run7z(["l", "-slt", "-ba", "-si", "-ttar", "-sccUTF-8"], { stdin: outer.stdout }); + const oc = await outer.done; + if (inner.code === 0 && oc === 0) r = { kind: "tar2", type: "tar", entries: parseSlt(inner.out), encrypted: false }; + } finally { outer.kill(); } } if (!r) { const x = await run7z(["l", "-slt", "-sccUTF-8", "-y", file], { password: password ?? null }); @@ -102,8 +104,10 @@ export async function archiveList(file, { enc = "auto", password } = {}) { // 单流压缩(.gz、.xz…)里面恰好是一个 tar:当成 tar.* 展开(扩展名没写成 .tar.gz 的) if (ents.length === 1 && /\.tar$/i.test(ents[0].path) && /^(gzip|bzip2|xz|zstd|lzma|Z)$/i.test(r.type)) { const outer = spawnOuter(file); - const inner = await run7z(["l", "-slt", "-ba", "-si", "-ttar", "-sccUTF-8"], { stdin: outer.stdout }); - if (inner.code === 0 && (await outer.done) === 0) r = { kind: "tar2", type: "tar", entries: parseSlt(inner.out), encrypted: false }; + try { + const inner = await run7z(["l", "-slt", "-ba", "-si", "-ttar", "-sccUTF-8"], { stdin: outer.stdout }); + if (inner.code === 0 && (await outer.done) === 0) r = { kind: "tar2", type: "tar", entries: parseSlt(inner.out), encrypted: false }; + } finally { outer.kill(); } } } r.total = r.entries.length; @@ -157,6 +161,7 @@ function pick(list, sel) { } // ── 单个文件解到缓存(查看器直接打开) ─────────────────────────────── +const PREV_INFLIGHT = new Map(); export async function previewEntry(file, entry, { enc, password } = {}) { const list = await archiveList(file, { enc, password }); if (list.needPassword) return { needPassword: true, wrongPassword: !!list.wrongPassword }; @@ -169,19 +174,25 @@ export async function previewEntry(file, entry, { enc, password } = {}) { const key = crypto.createHash("sha1").update(`${file}|${st.size}|${st.mtimeMs}|${st.ino}|${st.ctimeMs}|${want}|${list.encoding || ""}`).digest("hex").slice(0, 20); const dir = path.join(PREV_DIR(), key), out = path.join(dir, path.basename(want)); if (fs.existsSync(out)) { const n = new Date(); try { fs.utimesSync(dir, n, n); } catch {} return { path: out, size: fs.statSync(out).size }; } - fs.mkdirSync(PREV_DIR(), { recursive: true }); - checkSpace(PREV_DIR(), e.size); - const tmp = dir + ".part-" + process.pid + "-" + Date.now(); - fs.mkdirSync(tmp, { recursive: true }); - const tout = path.join(tmp, path.basename(want)); - try { - if (list.kind === "zip" && zipNative(e)) await zipExtract(file, e, tout); - else await extractOne(file, list, e, tout, password); - fs.rmSync(dir, { recursive: true, force: true }); - fs.renameSync(tmp, dir); - } catch (err) { fs.rmSync(tmp, { recursive: true, force: true }); throw err; } - prunePreview(); - return { path: out, size: fs.statSync(out).size }; + if (PREV_INFLIGHT.has(key)) return PREV_INFLIGHT.get(key); + const run = (async () => { + if (fs.existsSync(out)) { const n = new Date(); try { fs.utimesSync(dir, n, n); } catch {} return { path: out, size: fs.statSync(out).size }; } + fs.mkdirSync(PREV_DIR(), { recursive: true }); + checkSpace(PREV_DIR(), e.size); + const tmp = dir + ".part-" + process.pid + "-" + Date.now() + "-" + crypto.randomBytes(4).toString("hex"); + fs.mkdirSync(tmp, { recursive: true }); + const tout = path.join(tmp, path.basename(want)); + try { + if (list.kind === "zip" && zipNative(e)) await zipExtract(file, e, tout); + else await extractOne(file, list, e, tout, password); + await fs.promises.rm(dir, { recursive: true, force: true }); + fs.renameSync(tmp, dir); + } catch (err) { await fs.promises.rm(tmp, { recursive: true, force: true }).catch(() => {}); throw err; } + prunePreview(); + return { path: out, size: fs.statSync(out).size }; + })().finally(() => { if (PREV_INFLIGHT.get(key) === run) PREV_INFLIGHT.delete(key); }); + PREV_INFLIGHT.set(key, run); + return run; } /** 7-Zip 解一条到 out:-so 写标准输出。条目名用清单文件交(-i@,-spd 关掉通配符),名字里的 * ? @ - 都不会被当成参数 */ @@ -189,15 +200,35 @@ async function extractOne(file, list, e, out, password) { const lst = out + ".list"; fs.writeFileSync(lst, e.path + "\n"); const ws = fs.createWriteStream(out, { flags: "wx", mode: 0o644 }); - let n = 0, over = false, outer = null; + let n = 0, over = false, outer = null, wsErr = null, curChild = null; + ws.on("error", (er) => { + wsErr = er; + if (curChild) try { curChild.kill("SIGKILL"); } catch {} + if (outer) try { outer.kill(); } catch {} + }); try { let r; - const onStdout = (d) => { n += d.length; if (n > e.size + 1024 && e.size > 0) over = true; if (!over) ws.write(d); }; + const onStdout = (d, child) => { + curChild = child; + if (wsErr || over) return; + n += d.length; + if (n > e.size + 1024 && e.size > 0) { + over = true; + try { child.kill("SIGKILL"); } catch {} + if (outer) try { outer.kill(); } catch {} + return; + } + if (!ws.write(d)) { + child.stdout.pause(); + ws.once("drain", () => { if (!child.stdout.destroyed && !over && !wsErr) child.stdout.resume(); }); + } + }; if (list.kind === "tar2") { outer = spawnOuter(file); r = await run7z(["e", "-so", "-si", "-ttar", "-spd", "-scsUTF-8", "-i@" + lst], { stdin: outer.stdout, onStdout }); } else r = await run7z(["e", "-so", "-y", "-spd", "-scsUTF-8", "-i@" + lst, file], { password: password ?? (e.enc ? "" : null), onStdout }); - await new Promise((res) => ws.end(res)); + if (!wsErr) await new Promise((res) => { ws.once("error", () => res()); ws.end(res); }); + if (wsErr) throw wsErr; if (over) throw new Error("entry larger than declared"); if (wrongPw(r)) throw Object.assign(new Error("wrong password"), { status: 401, wrongPassword: true }); if (r.code !== 0) throw new Error((r.err.trim().split("\n").pop() || `7-Zip exit ${r.code}`).slice(0, 200)); @@ -257,9 +288,9 @@ export function startExtract(file, { dest, entries, enc, password }) { const native = list.kind === "zip" && items.every((e) => e.dir || zipNative(e) || e.link); if (native) await extractZipNative(file, items, stage, j); else await extract7z(file, list, items, entries, stage, password, j); - sanitizeTree(stage); + await sanitizeTree(stage); mergeInto(stage, dest); - } finally { fs.rmSync(stage, { recursive: true, force: true }); } + } finally { await fs.promises.rm(stage, { recursive: true, force: true }).catch(() => {}); } log(`[压缩包] 解压 ${file} → ${dest}(${j.files} 个文件)`); })().then(() => finish(j), (e) => finish(j, e)); return j; @@ -306,20 +337,24 @@ async function extract7z(file, list, items, sel, stage, password, j) { } } -/** 解出来的东西里:指向临时目录外面的软链删掉,特殊文件(FIFO、设备)删掉 */ -function sanitizeTree(root) { +/** 解出来的东西里:指向临时目录外面的软链删掉,特殊文件(FIFO、设备)删掉(异步分批让出事件循环) */ +async function sanitizeTree(root) { const realRoot = fs.realpathSync(root); - const walk = (d) => { - for (const n of fs.readdirSync(d)) { - const f = path.join(d, n), st = fs.lstatSync(f); + let n = 0; + const walk = async (d) => { + let ds; try { ds = await fs.promises.readdir(d); } catch { return; } + for (const name of ds) { + if ((++n & 255) === 0) await new Promise((ok) => setImmediate(ok)); + const f = path.join(d, name); + let st; try { st = await fs.promises.lstat(f); } catch { continue; } if (st.isSymbolicLink()) { - let t = null; try { t = fs.realpathSync(f); } catch {} - if (!t || !(t === realRoot || t.startsWith(realRoot + path.sep))) fs.rmSync(f, { force: true }); - } else if (st.isDirectory()) walk(f); - else if (!st.isFile()) fs.rmSync(f, { force: true }); + let t = null; try { t = await fs.promises.realpath(f); } catch {} + if (!t || !(t === realRoot || t.startsWith(realRoot + path.sep))) await fs.promises.rm(f, { force: true }).catch(() => {}); + } else if (st.isDirectory()) await walk(f); + else if (!st.isFile()) await fs.promises.rm(f, { force: true }).catch(() => {}); } }; - walk(root); + await walk(root); } /** 临时目录里的东西挪进 dest:dest 不存在就整个改名过去;存在就逐个挪,同名的新来者改成「名字 (2)」 */ @@ -349,23 +384,24 @@ const SECRET_DIR_RE = /(^|\/)(\.ssh|\.gnupg|\.aws|\.config\/gcloud)$/i; /** 扫描待压缩条目里的大小写变体凭据路径(/sdcard 不区分大小写,7zz 默认 -xr! 区分大小写; * 不传全局 -ssc-,否则 ext4 同目录有 foo.txt 与 Foo.txt 时 7zz 会报 Duplicate filename) */ -function collectSecretExcludes(items) { +async function collectSecretExcludes(items) { const out = []; let seen = 0; - const walk = (abs, rel) => { + const walk = async (abs, rel) => { if (seen > 200000) return; - let st; try { st = fs.lstatSync(abs); } catch { return; } + let st; try { st = await fs.promises.lstat(abs); } catch { return; } if (st.isSymbolicLink()) return; const base = path.basename(abs).toLowerCase(); if (SECRET_NAMES.has(base) || SECRET_DIR_RE.test(rel)) { out.push(rel); return; } if (!st.isDirectory()) return; - let ds; try { ds = fs.readdirSync(abs); } catch { return; } + let ds; try { ds = await fs.promises.readdir(abs); } catch { return; } for (const n of ds) { if (++seen > 200000) return; - walk(path.join(abs, n), rel + "/" + n); + if ((seen & 255) === 0) await new Promise((ok) => setImmediate(ok)); + await walk(path.join(abs, n), rel + "/" + n); } }; - for (const f of items) walk(f, path.basename(f)); + for (const f of items) await walk(f, path.basename(f)); return out; } @@ -377,7 +413,7 @@ export function startCreate({ items, dest, format, level, password, encryptNames const lv = Math.max(0, Math.min(9, Number.isFinite(+level) ? +level : 5)); const names = items.map((f) => "./" + path.basename(f)); const common = ["-y", "-bsp1", "-bso0", "-spd", "-scsUTF-8", ...EXCLUDE_DIRS.map((x) => "-xr!" + x), ...[...SECRET_NAMES].map((x) => "-xr!" + x)]; - const extraEx = collectSecretExcludes(items); + const extraEx = await collectSecretExcludes(items); let exFile = null; if (extraEx.length) { exFile = tmp + ".ex"; diff --git a/gateway/gw/bigfile.mjs b/gateway/gw/bigfile.mjs index 9d9f4e47..de394f1b 100644 --- a/gateway/gw/bigfile.mjs +++ b/gateway/gw/bigfile.mjs @@ -109,7 +109,18 @@ const dosDate = (d) => (((d.getFullYear() - 1980) << 9) | ((d.getMonth() + 1) << export async function zipToFile(file, entries, fd0) { const fd = fd0 ?? fs.openSync(file, "w"); let off = 0; - const put = (b) => { writeAll(fd, b); off += b.length; }; + const writeChunkAsync = (b) => new Promise((resolve, reject) => { + const step = (pos) => { + if (pos >= b.length) return resolve(); + fs.write(fd, b, pos, b.length - pos, null, (err, n) => { + if (err) return reject(err); + if (!n) return reject(new Error("short write")); + step(pos + n); + }); + }; + step(0); + }); + const put = async (b) => { await writeChunkAsync(b); off += b.length; }; const now = new Date(), central = []; try { for (const e of entries) { @@ -117,17 +128,17 @@ export async function zipToFile(file, entries, fd0) { const h = Buffer.alloc(30); h.writeUInt32LE(0x04034b50, 0); h.writeUInt16LE(20, 4); h.writeUInt16LE(0x0808, 6); h.writeUInt16LE(8, 8); h.writeUInt16LE(dosTime(now), 10); h.writeUInt16LE(dosDate(now), 12); h.writeUInt16LE(name.length, 26); - put(h); put(name); + await put(h); await put(name); let crc = 0, usize = 0, csize = 0; const src = e.file ? fs.createReadStream(e.file, { highWaterMark: CHUNK }) : [Buffer.from(e.data)]; await pipeline(src, new Transform({ transform(c, _e, cb) { crc = zlib.crc32(c, crc); usize += c.length; cb(null, c); } }), zlib.createDeflateRaw({ level: 6 }), - new Writable({ write(c, _e, cb) { put(c); csize += c.length; cb(); } })); + new Writable({ write(c, _e, cb) { put(c).then(() => { csize += c.length; cb(); }, cb); } })); if (usize > ZIP32 || off > ZIP32) throw new Error(tz("会话包超过 4 GB,分几次导出")); const dd = Buffer.alloc(16); dd.writeUInt32LE(0x08074b50, 0); dd.writeUInt32LE(crc >>> 0, 4); dd.writeUInt32LE(csize, 8); dd.writeUInt32LE(usize, 12); - put(dd); + await put(dd); const c = Buffer.alloc(46); c.writeUInt32LE(0x02014b50, 0); c.writeUInt16LE(20, 4); c.writeUInt16LE(20, 6); c.writeUInt16LE(0x0808, 8); c.writeUInt16LE(8, 10); c.writeUInt16LE(dosTime(now), 12); c.writeUInt16LE(dosDate(now), 14); @@ -137,11 +148,11 @@ export async function zipToFile(file, entries, fd0) { } const cd = Buffer.concat(central), cdAt = off; if (cdAt + cd.length > ZIP32 || entries.length > 0xffff) throw new Error(tz("会话包超过 4 GB,分几次导出")); - put(cd); + await put(cd); const end = Buffer.alloc(22); end.writeUInt32LE(0x06054b50, 0); end.writeUInt16LE(entries.length, 8); end.writeUInt16LE(entries.length, 10); end.writeUInt32LE(cd.length, 12); end.writeUInt32LE(cdAt, 16); - put(end); + await put(end); return off; } catch (err) { try { fs.closeSync(fd); } catch {} fs.rmSync(file, { force: true }); throw err; } finally { try { fs.closeSync(fd); } catch {} } diff --git a/gateway/gw/claudeseal.mjs b/gateway/gw/claudeseal.mjs index 200db19d..f9ac3b71 100644 --- a/gateway/gw/claudeseal.mjs +++ b/gateway/gw/claudeseal.mjs @@ -36,12 +36,23 @@ const fpFor = (bin) => { const d = path.dirname(bin); return fpOf(bin, path.join function fpOf(...files) { return files.map((f) => { try { const s = fs.statSync(f); return `${f}:${s.size}:${s.mtimeMs}:${s.ctimeMs}:${s.ino}`; } catch { return f + ":-"; } }).join("|"); } -function sha256(f) { - const h = crypto.createHash("sha256"), fd = fs.openSync(f, "r"), b = Buffer.alloc(4 << 20); - try { let n; while ((n = fs.readSync(fd, b, 0, b.length)) > 0) h.update(b.subarray(0, n)); } finally { fs.closeSync(fd); } +async function sha256Async(f) { + const h = crypto.createHash("sha256"); + const fh = await fs.promises.open(f, "r"); + const b = Buffer.alloc(2 << 20); + try { + let pos = 0; + while (true) { + const { bytesRead } = await fh.read(b, 0, b.length, pos); + if (!bytesRead) break; + h.update(b.subarray(0, bytesRead)); + pos += bytesRead; + } + } finally { await fh.close().catch(() => {}); } return h.digest("hex"); } +const SEAL_INFLIGHT = new Map(); /** * { ok: true } 核过 / { ok: false, why } 对不上(别起)/ { ok: null, why } 核不了(开发版照常起)。 * 发行版没有签名清单时是 { ok: false, why, pending: true }:不算篡改,补核取到清单后自动放行 @@ -57,37 +68,43 @@ export async function claudeSeal(bin0 = PATHS.claude, { force = false, home = CF let fresh = false; try { fresh = Date.now() - fs.statSync(bin).ctimeMs <= 2000; } catch {} if (cache.fp === fp && cache.res && !fresh) return cache.res; - let res; - const ROOT = path.join(home, ".local", "share", "cccodroid", "claude"); - let m = null, sig = null, root = ROOT; - try { root = fs.realpathSync(ROOT); } catch {} - try { m = fs.readFileSync(mf); sig = fs.readFileSync(sf, "utf8"); } catch {} - if ((path.dirname(dir) !== root || !isVer(path.basename(dir)) || path.basename(bin) !== "claude")) - res = { ok: false, why: "not an installed version under " + ROOT }; - else if (fs.existsSync(path.join(dir, ".mismatch"))) res = { ok: false, why: "recheck found it doesn't match the official manifest" }; - else if (!m || !sig) res = sealed.has(dir) ? { ok: false, why: "signed manifest removed after it was verified" } - : editionSealed() ? { ok: false, why: "no signed manifest", pending: true } : { ok: null, why: "no signed manifest" }; - else { - try { - const { verifyDetached, ANTHROPIC_KEYS } = await loadPgp(); - verifyDetached(m, sig, ANTHROPIC_KEYS); - const j = JSON.parse(m.toString("utf8")), p = j && j.platforms && j.platforms[PLATFORM]; - if (!p || !/^[a-f0-9]{64}$/.test(p.checksum || "")) res = { ok: false, why: "signed manifest has no " + PLATFORM + " entry" }; - else if (j.version !== path.basename(dir)) res = { ok: false, why: `manifest is for ${j.version}, directory is ${path.basename(dir)}` }; - else if (sha256(bin) !== p.checksum) res = { ok: false, why: "binary does not match the signed manifest" }; - else { res = { ok: true, version: j.version }; sealed.add(dir); } - } catch (e) { - // 验签模块缺了(files/app 有核对还原,正常不会):发行版照样不起 - res = /pgp\.mjs not found/.test(e.message) && !editionSealed() ? { ok: null, why: e.message } : { ok: false, why: "manifest signature: " + e.message }; + const flightKey = `${bin}|${home}|${fp}|${force ? 1 : 0}`; + if (SEAL_INFLIGHT.has(flightKey)) return SEAL_INFLIGHT.get(flightKey); + const run = (async () => { + let res; + const ROOT = path.join(home, ".local", "share", "cccodroid", "claude"); + let m = null, sig = null, root = ROOT; + try { root = fs.realpathSync(ROOT); } catch {} + try { m = await fs.promises.readFile(mf); sig = await fs.promises.readFile(sf, "utf8"); } catch {} + if ((path.dirname(dir) !== root || !isVer(path.basename(dir)) || path.basename(bin) !== "claude")) + res = { ok: false, why: "not an installed version under " + ROOT }; + else if (fs.existsSync(path.join(dir, ".mismatch"))) res = { ok: false, why: "recheck found it doesn't match the official manifest" }; + else if (!m || !sig) res = sealed.has(dir) ? { ok: false, why: "signed manifest removed after it was verified" } + : editionSealed() ? { ok: false, why: "no signed manifest", pending: true } : { ok: null, why: "no signed manifest" }; + else { + try { + const { verifyDetached, ANTHROPIC_KEYS } = await loadPgp(); + verifyDetached(m, sig, ANTHROPIC_KEYS); + const j = JSON.parse(m.toString("utf8")), p = j && j.platforms && j.platforms[PLATFORM]; + if (!p || !/^[a-f0-9]{64}$/.test(p.checksum || "")) res = { ok: false, why: "signed manifest has no " + PLATFORM + " entry" }; + else if (j.version !== path.basename(dir)) res = { ok: false, why: `manifest is for ${j.version}, directory is ${path.basename(dir)}` }; + else if ((await sha256Async(bin)) !== p.checksum) res = { ok: false, why: "binary does not match the signed manifest" }; + else { res = { ok: true, version: j.version }; sealed.add(dir); } + } catch (e) { + // 验签模块缺了(files/app 有核对还原,正常不会):发行版照样不起 + res = /pgp\.mjs not found/.test(e.message) && !editionSealed() ? { ok: null, why: e.message } : { ok: false, why: "manifest signature: " + e.message }; + } } - } - const again = cache.res && cache.res.ok === res.ok && cache.res.why === res.why; - if (res.pending) { if (!again) log(`[Claude Code 核验] ${path.basename(dir)} 还没有签名清单,补核拿到之前不起`); } - else if (res.ok === false && !(cache.res && cache.res.ok === false && cache.fp === fp)) { - log(`⚠️ [Claude Code 核验] ${bin}:${res.why}`); - tamperRecord("claude", [`${path.basename(dir)}/claude: ${res.why}`]); - } else if (res.ok === null && cache.res?.ok !== null) log(`[Claude Code 核验] 核不了(${res.why}),照常起;连得上官方时会补存签名清单`); - if (res.why === "no signed manifest") try { askRecheck?.(); } catch {} - cache = { fp, res }; - return res; + const again = cache.res && cache.res.ok === res.ok && cache.res.why === res.why; + if (res.pending) { if (!again) log(`[Claude Code 核验] ${path.basename(dir)} 还没有签名清单,补核拿到之前不起`); } + else if (res.ok === false && !(cache.res && cache.res.ok === false && cache.fp === fp)) { + log(`⚠️ [Claude Code 核验] ${bin}:${res.why}`); + tamperRecord("claude", [`${path.basename(dir)}/claude: ${res.why}`]); + } else if (res.ok === null && cache.res?.ok !== null) log(`[Claude Code 核验] 核不了(${res.why}),照常起;连得上官方时会补存签名清单`); + if (res.why === "no signed manifest") try { askRecheck?.(); } catch {} + cache = { fp, res }; + return res; + })().finally(() => { if (SEAL_INFLIGHT.get(flightKey) === run) SEAL_INFLIGHT.delete(flightKey); }); + SEAL_INFLIGHT.set(flightKey, run); + return run; } diff --git a/gateway/gw/components.mjs b/gateway/gw/components.mjs index 4ca7b362..ba7ed9f6 100644 --- a/gateway/gw/components.mjs +++ b/gateway/gw/components.mjs @@ -9,7 +9,7 @@ import { termEnv } from "./terminal.mjs"; import { SKILLS_DIR, addMcp, removeMcp, skillMeta } from "./extensions.mjs"; import { modulesMissingFor } from "./modules.mjs"; import { ghProxy, pget } from "./pget.mjs"; -import { retireManagedBridge } from "./managed-bridge.mjs"; +import { clearComponentRemovedRecoveryLock, hasManagedBridgeRegistration, retireManagedBridge, warmManagedBridge } from "./managed-bridge.mjs"; import { clearBridgeConfigMapping, handleBridgeConfig, handleBridgeModels, handleBridgeRepair } from "./bridge-config.mjs"; import { archiveProblem, parseTarListing } from "./archive-check.mjs"; import { baseOwnedPaths } from "./orphans.mjs"; @@ -76,26 +76,39 @@ const compRecFile = (id) => path.join(COMP_DIR, id + ".json"); * 这里没有用 statefile 的 loadState:它读坏了会把原文件改名成 .bad-*, * 列表按 .json 就再也找不到这个组件,正好落回 Z.11 的老毛病。 * rec 只做「是个普通对象」这层形状检查,逐字段校验仍由各调用方按自己的用途做(compRemovalRecord 等)。 */ +const COMP_REC_CACHE = new Map(); export function compRecordInfo(id) { const f = compRecFile(id); let st; - try { st = fs.lstatSync(f); } - catch (e) { return { rec: null, missing: e.code === "ENOENT", bad: e.code !== "ENOENT" }; } - if (!st.isFile()) return { rec: null, missing: false, bad: true }; // 软链 / 目录 / 设备文件 + try { st = fs.lstatSync(f, { bigint: true }); } + catch (e) { COMP_REC_CACHE.delete(id); return { rec: null, missing: e.code === "ENOENT", bad: e.code !== "ENOENT" }; } + if (!st.isFile()) { COMP_REC_CACHE.delete(id); return { rec: null, missing: false, bad: true }; } // 软链 / 目录 / 设备文件 + // 仅对大记录(> 4 KB,通常为含上千文件清单的真实组件记录)做 stat 签名缓存,避免短时间同 tick 原地覆写小记录误命中 + const cacheable = st.size > 4096n; + const sig = cacheable ? `${st.dev}:${st.ino}:${st.mtimeNs}:${st.ctimeNs}:${st.size}` : ""; + if (cacheable) { + const hit = COMP_REC_CACHE.get(id); + if (hit && hit.sig === sig) return hit.info; + } else { + COMP_REC_CACHE.delete(id); + } // 记录上限放 8 MB:共享清单大的组件(melt 的 x11 闭包 19k 条共享文件)记录会过 1 MB, // 默认上限会把自家刚写好的记录判成坏记录,界面永远「已损坏」(2026-11-16 真机验证发现) const t = readSmall(f, 8 << 20); - if (t == null) return { rec: null, missing: false, bad: true }; // 超过 1 MB / 读不了 + if (t == null) { const info = { rec: null, missing: false, bad: true }; if (cacheable) COMP_REC_CACHE.set(id, { sig, info }); return info; } try { const j = JSON.parse(t); - if (!j || typeof j !== "object" || Array.isArray(j)) return { rec: null, missing: false, bad: true }; - return { rec: j, missing: false, bad: false }; - } catch { return { rec: null, missing: false, bad: true }; } + if (!j || typeof j !== "object" || Array.isArray(j)) { const info = { rec: null, missing: false, bad: true }; if (cacheable) COMP_REC_CACHE.set(id, { sig, info }); return info; } + const info = { rec: j, missing: false, bad: false }; + if (cacheable) COMP_REC_CACHE.set(id, { sig, info }); + return info; + } catch { const info = { rec: null, missing: false, bad: true }; if (cacheable) COMP_REC_CACHE.set(id, { sig, info }); return info; } } export function compRecord(id) { return compRecordInfo(id).rec; } /** 写组件记录:临时文件 + fsync + 换名(statefile.mjs 的 writeAtomic),失败返回 false, * 由调用方如实回给界面——以前是直接覆盖写,掉电 / 写满就留下半截 JSON,整条记录报废(195-Z.10) */ function compWriteRecord(id, rec) { + COMP_REC_CACHE.delete(id); return writeAtomic(compRecFile(id), JSON.stringify(rec, null, 1)); } export const _compForTest = { compWriteRecord, compRecordInfo, compRecFile, compDropDanglingDocs, compSweepDanglingDocs, @@ -308,8 +321,14 @@ function compOnDevkit(rec, dk = devkitIdentity()) { } /** 已装的组件里,requires 了 id 的那些(卸载 id 会把它们弄坏)。 * 装在旧工具包上的记录不算:它的文件已经不在,卸 id 不会再弄坏一个本来就要重装的组件 */ -function compUsers(id) { - const out = [], dk = devkitIdentity(); +function compUsers(id, dk = devkitIdentity(), recMap = null) { + const out = []; + if (recMap) { + for (const [oid, r] of recMap) { + if (oid !== id && compOnDevkit(r, dk) && (r.requires || []).includes(id)) out.push(oid); + } + return out; + } try { for (const f of fs.readdirSync(COMP_DIR)) { if (!f.endsWith(".json") || f === id + ".json") continue; @@ -323,13 +342,21 @@ function compUsers(id) { async function compList(force) { if (!PREFIX) return { supported: false }; const dk = devkitIdentity(); - compHealSkills(); const ix = await compIndex(force); const comps = (ix.data && ix.data.components) || {}; const ids = new Set([...Object.keys(comps)]); - try { for (const f of fs.readdirSync(COMP_DIR)) if (f.endsWith(".json")) ids.add(f.slice(0, -5)); } catch {} + const recMap = new Map(); + try { + for (const f of fs.readdirSync(COMP_DIR)) { + if (!f.endsWith(".json")) continue; + const cid = f.slice(0, -5); + ids.add(cid); + const r = compRecord(cid); + if (r) recMap.set(cid, r); + } + } catch {} const items = [...ids].map((id) => { - const e = comps[id] || null, b = e && compBuildFor(e, dk), rec = compRecord(id), job = COMP_JOBS.get(id); + const e = comps[id] || null, b = e && compBuildFor(e, dk), rec = recMap.get(id) || null, job = COMP_JOBS.get(id); return { id, name: e ? e.name : { zh: id, en: id }, desc: e ? e.desc : null, version: b ? b.version : null, bytes: b ? b.bytes : 0, installed: b ? b.installed : 0, @@ -350,7 +377,7 @@ async function compList(force) { // 模块化工具包:还没装的模块也算没满足的依赖(界面同样置灰安装按钮、写明先装哪个) ...(b ? modulesMissingFor(b.baseDeps).map((m) => ({ id: "module:" + m.id, name: m.name, ok: false })) : []), ], - usedBy: rec ? compUsers(id).map((rid) => ({ id: rid, name: compName(rid, comps) })) : [], + usedBy: rec ? compUsers(id, dk, recMap).map((rid) => ({ id: rid, name: compName(rid, comps) })) : [], unsupported: compUnsupported(e), }; }); @@ -725,23 +752,35 @@ async function compStart(id) { const needMods = modulesMissingFor(b.baseDeps); if (needMods.length) return { ok: false, needModules: needMods.map((m) => m.id), message: tz("要先装工具包模块:{names}(扩展页上方「工具包模块」)", { names: needMods.map((m) => m.name.zh || m.id).join("、") }) }; // 空间:压缩包 + 解开后的大小,再留 10%。上次失败特意留下的压缩包(大小对得上)已经占着空间了, - // 不再重复索要;上次失败留下的解包树分批清掉,别同步 rmSync 堵死事件循环(0.6.9 审计 #186 / 195-I.2) - const stageRoot = path.join(COMP_DIR, ".staging"), stageTree = path.join(stageRoot, id), stageGz = path.join(stageRoot, `${id}-${b.sha256.slice(0, 12)}.tar.gz`); - if (fs.existsSync(stageTree)) { try { await rmTreeBatched(stageTree); } catch {} } - const pending2 = COMP_JOBS.get(id); - if (pending2 && !pending2.finished) return { ok: false, message: "busy" }; - let reuse = 0; try { if (fs.statSync(stageGz).size === b.bytes) reuse = b.bytes; } catch {} - try { - const sf = fs.statfsSync(path.dirname(PREFIX)); - const need = (b.bytes - reuse + b.installed) * 1.1; - if (sf.bavail * sf.bsize < need) return { ok: false, message: tz("存储空间不够:需要约 {n} MB", { n: Math.ceil(need / 1048576) }) }; - } catch {} - // baseDeps 记在 job 上:下载、校验那几分钟里卸工具包模块,要知道这个在装的组件也在用(#134,见 modules.mjs modDependents) + // 不再重复索要;先占 COMP_JOBS 槽再分批清解包树,防并发重试互相把对方刚解包进 stageTree 的文件删掉 const job = { phase: "downloading", done: 0, total: b.bytes, error: "", child: null, cancelled: false, finished: false, baseDeps: (Array.isArray(b.baseDeps) ? b.baseDeps : []).map((d) => (typeof d === "string" ? d : d && d.name)).filter(Boolean) }; COMP_JOBS.set(id, job); + const stageRoot = path.join(COMP_DIR, ".staging"), stageTree = path.join(stageRoot, id), stageGz = path.join(stageRoot, `${id}-${b.sha256.slice(0, 12)}.tar.gz`); + try { + if (fs.existsSync(stageTree)) { try { await rmTreeBatched(stageTree); } catch {} } + let reuse = 0; try { if (fs.statSync(stageGz).size === b.bytes) reuse = b.bytes; } catch {} + try { + const sf = fs.statfsSync(path.dirname(PREFIX)); + const need = (b.bytes - reuse + b.installed) * 1.1; + if (sf.bavail * sf.bsize < need) { + if (COMP_JOBS.get(id) === job) COMP_JOBS.delete(id); + return { ok: false, message: tz("存储空间不够:需要约 {n} MB", { n: Math.ceil(need / 1048576) }) }; + } + } catch {} + } catch (e) { + if (COMP_JOBS.get(id) === job) COMP_JOBS.delete(id); + throw e; + } job.done = compRunInstall(id, b, job).then( - () => { job.finished = true; log(`[comp] ${id} ${b.version} 装好了`); }, + () => { + job.finished = true; + log(`[comp] ${id} ${b.version} 装好了`); + if (id === "openai-bridge") { + if (clearComponentRemovedRecoveryLock()) log("[comp] openai-bridge 已清除工具包切换遗留的停用故障锁"); + warmManagedBridge().catch(() => {}); + } + }, async (e) => { // 取消、校验失败都走这里:解包树(chromium 约 1GB)分批清理避免卡死事件循环,压缩包留着重试不用重下 if (/^[a-z0-9][a-z0-9-]*$/.test(id)) try { await rmTreeBatched(path.join(COMP_DIR, ".staging", id)); } catch {} @@ -1350,7 +1389,9 @@ export async function compRemove(id) { // 所以记录等退役完、进锁之后再读,不拿退役前的旧快照删文件(196-供应链.1) const retired = await retireManagedBridge(id); stage = "clear-app-mapping"; - const unmapped = clearBridgeConfigMapping(id); + // 若因工具包切换组件文件已不在而保留了注册与运行目录,同时保留 App 侧映射,重装后自动复接 + const unmapped = (id === "openai-bridge" && !retired && hasManagedBridgeRegistration()) + ? false : clearBridgeConfigMapping(id); let mcpName = ""; const out = await compFsExclusive(async () => { stage = "read-record"; diff --git a/gateway/gw/custom.mjs b/gateway/gw/custom.mjs index ff99f608..2ccfd036 100644 --- a/gateway/gw/custom.mjs +++ b/gateway/gw/custom.mjs @@ -1,6 +1,9 @@ import fs from "node:fs"; import path from "node:path"; import zlib from "node:zlib"; +import { promisify } from "node:util"; +import { Transform } from "node:stream"; +import { pipeline } from "node:stream/promises"; import { spawn } from "node:child_process"; import crypto from "node:crypto"; import { CFG, GLIBC_PRELOAD, PATHS, PREFIX, glibcEnv, loadPgp, log, tz } from "./config.mjs"; @@ -114,6 +117,18 @@ function openDirs(p) { let ds = []; try { ds = fs.readdirSync(p); } catch {} for (const d of ds) openDirs(path.join(p, d)); } +const gunzipAsync = promisify(zlib.gunzip); +async function openDirsAsync(p) { + let st; try { st = await fs.promises.lstat(p); } catch { return; } + if (!st.isDirectory()) return; + if ((st.mode & 0o700) !== 0o700) try { await fs.promises.chmod(p, (st.mode & 0o7777) | 0o700); } catch {} + let ds = []; try { ds = await fs.promises.readdir(p); } catch {} + for (const d of ds) await openDirsAsync(path.join(p, d)); +} +async function rmTreeAsync(p) { + try { await fs.promises.rm(p, { recursive: true, force: true }); return; } catch {} + try { await openDirsAsync(p); await fs.promises.rm(p, { recursive: true, force: true }); } catch (e) { log(`[custom] 删不掉 ${p}:${e.code || e.message}`); } +} /** 删目录:删不动(只读目录)就先放开权限再删;还删不掉只记日志,不抛(11-04 报告 六-9) */ function rmTree(p) { try { fs.rmSync(p, { recursive: true, force: true }); return; } catch {} @@ -187,42 +202,48 @@ const GZ_MAX = 256 << 20, DEB_MAX = 512 << 20; // Termux glibc 仓库的 Contents(文件 → 包)与 Packages(包 → 下载地址、sha256),缓存一天。 // 先用 Termux 自动构建钥验 Release 的签名,再按 Release 里的 SHA256 核 Contents 和 Packages: // 以前只信 TLS,镜像或中间人给一份自洽的 Packages 就能塞进任意 .so(11-03 审查 M-5,同 devkit.mjs 的 loadRepo) +let glibcRepoInFlight = null; async function glibcRepoIndex(fresh = false) { - const cache = path.join(CUSTOM_DIR, ".cache"); fs.mkdirSync(cache, { recursive: true }); - const get = async (name, url) => { - const f = path.join(cache, name), part = f + "." + crypto.randomBytes(3).toString("hex") + ".part"; - try { if (!fresh && Date.now() - fs.statSync(f).mtimeMs < 86400000) return fs.readFileSync(f); } catch {} - const r = await runP(path.join(PREFIX, "bin", "curl"), ["-fsSL", "--max-time", "120", "--retry", "2", "-o", part, url]); - if (r.code) { fs.rmSync(part, { force: true }); if (fs.existsSync(f)) return fs.readFileSync(f); throw new Error(tz("取不到 glibc 仓库索引:{msg}", { msg: r.err.trim().split("\n").pop() })); } - fs.renameSync(part, f); return fs.readFileSync(f); - }; - const { TERMUX_KEYS, verifyDetached } = await loadPgp(); - const rel = await get("Release-glibc", GLIBC_REPO + "dists/glibc/Release"); - verifyDetached(rel, (await get("Release-glibc.gpg", GLIBC_REPO + "dists/glibc/Release.gpg")).toString(), TERMUX_KEYS); - const sums = new Map(); - for (const l of (rel.toString().split("SHA256:")[1] || "").split("\n")) { const m = /^ ([0-9a-f]{64})\s+\d+\s+(\S+)$/.exec(l); if (m) sums.set(m[2], m[1]); else if (l && !l.startsWith(" ")) break; } - const checked = async (name, rp) => { - const b = await get(name, GLIBC_REPO + "dists/glibc/" + rp); - if (sums.get(rp) === crypto.createHash("sha256").update(b).digest("hex")) return b; - if (!fresh) throw Object.assign(new Error("stale"), { stale: true }); // 缓存和新的 Release 对不上:整套重取一次 - throw new Error(tz("glibc 仓库的 {f} 和签过名的 Release 对不上", { f: rp })); - }; - let contentsGz, pkgsBuf; - try { contentsGz = await checked("Contents-glibc.gz", "Contents-aarch64.gz"); pkgsBuf = await checked("Packages-glibc", "stable/binary-aarch64/Packages"); } - catch (e) { if (e.stale) return glibcRepoIndex(true); throw e; } - const contents = zlib.gunzipSync(contentsGz, { maxOutputLength: GZ_MAX }).toString(); - const lib = new Map(); - for (const l of contents.split("\n")) { - if (!l.startsWith(GLIBC_REPO_LIB)) continue; - const sp = l.lastIndexOf(" "), p = l.slice(GLIBC_REPO_LIB.length, sp).trim(); - if (!p.includes("/")) lib.set(p, l.slice(sp + 1).split(",")[0].replace(/^.*\//, "")); - } - const pk = new Map(); - for (const blk of pkgsBuf.toString().split("\n\n")) { - const f = Object.fromEntries(blk.split("\n").map((x) => [x.slice(0, x.indexOf(":")), x.slice(x.indexOf(":") + 1).trim()])); - if (f.Package) pk.set(f.Package, { version: f.Version, file: f.Filename, sha256: f.SHA256, size: +f.Size || 0 }); - } - return { lib, pk }; + if (!fresh && glibcRepoInFlight) return glibcRepoInFlight; + const run = (async () => { + const cache = path.join(CUSTOM_DIR, ".cache"); fs.mkdirSync(cache, { recursive: true }); + const get = async (name, url) => { + const f = path.join(cache, name), part = f + "." + crypto.randomBytes(3).toString("hex") + ".part"; + try { if (!fresh && Date.now() - (await fs.promises.stat(f)).mtimeMs < 86400000) return await fs.promises.readFile(f); } catch {} + const r = await runP(path.join(PREFIX, "bin", "curl"), ["-fsSL", "--max-time", "120", "--retry", "2", "-o", part, url]); + if (r.code) { fs.rmSync(part, { force: true }); if (fs.existsSync(f)) return await fs.promises.readFile(f); throw new Error(tz("取不到 glibc 仓库索引:{msg}", { msg: r.err.trim().split("\n").pop() })); } + fs.renameSync(part, f); return await fs.promises.readFile(f); + }; + const { TERMUX_KEYS, verifyDetached } = await loadPgp(); + const rel = await get("Release-glibc", GLIBC_REPO + "dists/glibc/Release"); + verifyDetached(rel, (await get("Release-glibc.gpg", GLIBC_REPO + "dists/glibc/Release.gpg")).toString(), TERMUX_KEYS); + const sums = new Map(); + for (const l of (rel.toString().split("SHA256:")[1] || "").split("\n")) { const m = /^ ([0-9a-f]{64})\s+\d+\s+(\S+)$/.exec(l); if (m) sums.set(m[2], m[1]); else if (l && !l.startsWith(" ")) break; } + const checked = async (name, rp) => { + const b = await get(name, GLIBC_REPO + "dists/glibc/" + rp); + if (sums.get(rp) === crypto.createHash("sha256").update(b).digest("hex")) return b; + if (!fresh) throw Object.assign(new Error("stale"), { stale: true }); // 缓存和新的 Release 对不上:整套重取一次 + throw new Error(tz("glibc 仓库的 {f} 和签过名的 Release 对不上", { f: rp })); + }; + let contentsGz, pkgsBuf; + try { contentsGz = await checked("Contents-glibc.gz", "Contents-aarch64.gz"); pkgsBuf = await checked("Packages-glibc", "stable/binary-aarch64/Packages"); } + catch (e) { if (e.stale) return glibcRepoIndex(true); throw e; } + const contents = (await gunzipAsync(contentsGz, { maxOutputLength: GZ_MAX })).toString(); + const lib = new Map(); + for (const l of contents.split("\n")) { + if (!l.startsWith(GLIBC_REPO_LIB)) continue; + const sp = l.lastIndexOf(" "), p = l.slice(GLIBC_REPO_LIB.length, sp).trim(); + if (!p.includes("/")) lib.set(p, l.slice(sp + 1).split(",")[0].replace(/^.*\//, "")); + } + const pk = new Map(); + for (const blk of pkgsBuf.toString().split("\n\n")) { + const f = Object.fromEntries(blk.split("\n").map((x) => [x.slice(0, x.indexOf(":")), x.slice(x.indexOf(":") + 1).trim()])); + if (f.Package) pk.set(f.Package, { version: f.Version, file: f.Filename, sha256: f.SHA256, size: +f.Size || 0 }); + } + return { lib, pk }; + })().finally(() => { if (glibcRepoInFlight === run) glibcRepoInFlight = null; }); + if (!fresh) glibcRepoInFlight = run; + return run; } /** 一个目录里所有 ELF 的「能提供的库名」(文件名 + SONAME) */ @@ -255,7 +276,7 @@ async function customAnalyze(src, displayName) { const ownStaging = (p) => p === CUSTOM_DIR || p.startsWith(CUSTOM_DIR + path.sep); if (!ownStaging(sp) && pathBlocked(sp)) return { ok: false, message: tz("这个位置不能读") }; if (!st.isFile()) return { ok: false, message: tz("要选一个文件(程序本身或压缩包)") }; - for (const [k, v] of CUSTOM_STAGES) if (Date.now() - v.at > 3600000) { rmTree(v.dir); CUSTOM_STAGES.delete(k); } + for (const [k, v] of CUSTOM_STAGES) if (Date.now() - v.at > 3600000) { await rmTreeAsync(v.dir); CUSTOM_STAGES.delete(k); } // 盘上的也扫:暂存表只在内存里,网关重启后表空了,没装也没丢弃的 .stage-* 就永远留着(0.6.9 审计 196-供应链.2)。 // 不能见一个删一个:一小时内的还能读回来接着装(195-J.4),正在分析的目录也是新的。按 report.json 的时刻、没有就按目录时间算 try { @@ -265,7 +286,7 @@ async function customAnalyze(src, displayName) { let at = 0; try { at = Number(JSON.parse(fs.readFileSync(path.join(d, "report.json"), "utf8")).at) || 0; } catch {} if (!at) try { at = fs.lstatSync(d).mtimeMs; } catch { continue; } - if (Date.now() - at > 3600000) rmTree(d); + if (Date.now() - at > 3600000) await rmTreeAsync(d); } } catch {} const stage = crypto.randomBytes(6).toString("hex"); @@ -274,13 +295,13 @@ async function customAnalyze(src, displayName) { // 上传落盘用的是 ASCII 化的临时名(带随机前缀):显示名、默认 ID 要用用户原来的文件名, // 不能把「工具-1.2.zip」变成「a1b2c3d4-______.zip」(195-J.3) const base = path.basename(String(displayName || "").trim()) || path.basename(sp), warnings = []; - const fail = (m) => { rmTree(dir); return { ok: false, message: m }; }; + const fail = async (m) => { await rmTreeAsync(dir); return { ok: false, message: m }; }; const isTar = /\.(tar\.(gz|xz|bz2|zst)|tgz|txz|tbz2?|tar)$/i.test(base), isZip = /\.zip$/i.test(base); if (isTar || isZip) { // 先拷进私有暂存区再查、再解:查和解是两次打开,源文件在共享存储上,中间能被换成另一个包(11-03 审查 L-5) // 暂存文件名用随机串:显示名可能很长或是中文,直接拼进文件名会超 255 字节 const own = path.join(dir, "src-" + crypto.randomBytes(4).toString("hex") + path.extname(sp).slice(0, 16).replace(/[^\w.]/g, "")); - try { fs.copyFileSync(sp, own); } catch (e) { return fail(tz("拷不进暂存区:{msg}", { msg: e.code || e.message })); } + try { await fs.promises.copyFile(sp, own); } catch (e) { return fail(tz("拷不进暂存区:{msg}", { msg: e.code || e.message })); } sp = own; const n = await unpackedSize(sp, isZip); if (n == null) return fail(tz("读不出压缩包的目录,可能已损坏")); @@ -406,58 +427,63 @@ async function customAnalyze(src, displayName) { async function customFetchLibs(want, deps, have, log2) { const ix = await glibcRepoIndex(); const cache = path.join(CUSTOM_DIR, ".cache"), got = []; + // 每次补库独立工作目录,避免并发 customInstall 结束时互删 .cache/*.deb + const runDir = path.join(cache, "run-" + crypto.randomBytes(4).toString("hex")); // 仓库里找不到、或包里没有这个文件的:一路记着,最后报「还缺」。以前每轮把 want 清空,补进来的库自己缺的二级依赖找不到就悄悄丢了(#104 05-011) const miss = new Set(); fs.mkdirSync(deps, { recursive: true }); - for (let round = 0; want.size && round < 6; round++) { - const byPkg = new Map(); - for (const n of want) { if (have.has(n)) continue; const p = ix.lib.get(n); if (p && ix.pk.has(p)) (byPkg.get(p) || byPkg.set(p, []).get(p)).push(n); else miss.add(n); } - want = new Set(); - for (const [pkg, names] of byPkg) { - const m = ix.pk.get(pkg), deb = path.join(cache, path.basename(m.file)); - if (!(m.size > 0 && m.size <= DEB_MAX) || !/^[0-9a-f]{64}$/.test(m.sha256 || "")) throw new Error(tz("{pkg} 的索引条目不对", { pkg })); - let ok = false; try { ok = (await sha256File(deb)) === m.sha256; } catch {} - if (!ok) { - const part = deb + "." + crypto.randomBytes(3).toString("hex") + ".part"; - log2(tz("下载 {pkg}({mb} MB)", { pkg, mb: Math.max(1, Math.round(m.size / 1048576)) })); - const r = await runP(path.join(PREFIX, "bin", "curl"), ["-fsSL", "--max-time", "900", "--retry", "2", "-o", part, GLIBC_REPO + m.file]); - if (r.code) { fs.rmSync(part, { force: true }); throw new Error(tz("下载 {pkg} 失败:{msg}", { pkg, msg: r.err.trim().split("\n").pop() })); } - if ((await sha256File(part)) !== m.sha256) { fs.rmSync(part, { force: true }); throw new Error(tz("{pkg} 校验不对", { pkg })); } - fs.renameSync(part, deb); - } - // .deb 是 ar 包:找 data.tar.*,用工具包的 tar 解到临时目录 - const buf = fs.readFileSync(deb); let off = 8, member = null; - while (off + 60 <= buf.length) { - const nm = buf.toString("latin1", off, off + 16).trim().replace(/\/$/, ""), size = parseInt(buf.toString("latin1", off + 48, off + 58), 10); - if (nm.startsWith("data.tar")) { member = { nm, data: buf.subarray(off + 60, off + 60 + size) }; break; } - off += 60 + size + (size & 1); - } - if (!member) throw new Error(tz("{pkg} 的包结构不对", { pkg })); - const tmp = path.join(cache, "x-" + pkg + "-" + crypto.randomBytes(3).toString("hex")); fs.rmSync(tmp, { recursive: true, force: true }); fs.mkdirSync(tmp, { recursive: true }); - const tf = path.join(tmp, member.nm); fs.writeFileSync(tf, member.data); - // 解之前看目录:条目跳出包外、或经过包里的软链的,整包不解(同导入程序时的检查) - const ls = await runP(path.join(PREFIX, "bin", "tar"), ["-tv", "--quoting-style=c", "-f", tf], { maxBuffer: 64 << 20 }); - let bad = ls.code ? { name: "?" } : null; - try { if (!bad) bad = archiveProblem(parseTarListing(ls.out)); } catch { bad = { name: "?" }; } - if (bad) { fs.rmSync(tmp, { recursive: true, force: true }); throw new Error(tz("{pkg} 里有条目会写到包外面,不解开", { pkg })); } - const r = await runP(path.join(PREFIX, "bin", "tar"), ["-xf", tf, "-C", tmp, "--no-same-owner", "./" + GLIBC_REPO_LIB]); - if (r.code) { fs.rmSync(tmp, { recursive: true, force: true }); throw new Error(tz("解开 {pkg} 失败:{msg}", { pkg, msg: r.err.trim().split("\n").pop() })); } - const libd = path.join(tmp, GLIBC_REPO_LIB); - for (const n of names) { - if (have.has(n)) continue; - let real; try { real = fs.realpathSync(path.join(libd, n)); } catch { miss.add(n); continue; } - if (!real.startsWith(tmp + path.sep)) { miss.add(n); continue; } - fs.copyFileSync(real, path.join(deps, n)); fs.chmodSync(path.join(deps, n), 0o755); - have.add(n); got.push({ soname: n, pkg, version: m.version }); - const e = elfInfo(path.join(deps, n)); - for (const d of (e && e.needed) || []) if (!have.has(d)) want.add(d); + fs.mkdirSync(runDir, { recursive: true }); + try { + for (let round = 0; want.size && round < 6; round++) { + const byPkg = new Map(); + for (const n of want) { if (have.has(n)) continue; const p = ix.lib.get(n); if (p && ix.pk.has(p)) (byPkg.get(p) || byPkg.set(p, []).get(p)).push(n); else miss.add(n); } + want = new Set(); + for (const [pkg, names] of byPkg) { + const m = ix.pk.get(pkg), deb = path.join(runDir, path.basename(m.file)); + if (!(m.size > 0 && m.size <= DEB_MAX) || !/^[0-9a-f]{64}$/.test(m.sha256 || "")) throw new Error(tz("{pkg} 的索引条目不对", { pkg })); + let ok = false; try { ok = (await sha256File(deb)) === m.sha256; } catch {} + if (!ok) { + const part = deb + "." + crypto.randomBytes(3).toString("hex") + ".part"; + log2(tz("下载 {pkg}({mb} MB)", { pkg, mb: Math.max(1, Math.round(m.size / 1048576)) })); + const r = await runP(path.join(PREFIX, "bin", "curl"), ["-fsSL", "--max-time", "900", "--retry", "2", "-o", part, GLIBC_REPO + m.file]); + if (r.code) { fs.rmSync(part, { force: true }); throw new Error(tz("下载 {pkg} 失败:{msg}", { pkg, msg: r.err.trim().split("\n").pop() })); } + if ((await sha256File(part)) !== m.sha256) { fs.rmSync(part, { force: true }); throw new Error(tz("{pkg} 校验不对", { pkg })); } + fs.renameSync(part, deb); + } + // .deb 是 ar 包:找 data.tar.*,用工具包的 tar 解到临时目录 + const buf = await fs.promises.readFile(deb); let off = 8, member = null; + while (off + 60 <= buf.length) { + const nm = buf.toString("latin1", off, off + 16).trim().replace(/\/$/, ""), size = parseInt(buf.toString("latin1", off + 48, off + 58), 10); + if (nm.startsWith("data.tar")) { member = { nm, data: buf.subarray(off + 60, off + 60 + size) }; break; } + off += 60 + size + (size & 1); + } + if (!member) throw new Error(tz("{pkg} 的包结构不对", { pkg })); + const tmp = path.join(runDir, "x-" + pkg + "-" + crypto.randomBytes(3).toString("hex")); await rmTreeAsync(tmp); fs.mkdirSync(tmp, { recursive: true }); + const tf = path.join(tmp, member.nm); await fs.promises.writeFile(tf, member.data); + // 解之前看目录:条目跳出包外、或经过包里的软链的,整包不解(同导入程序时的检查) + const ls = await runP(path.join(PREFIX, "bin", "tar"), ["-tv", "--quoting-style=c", "-f", tf], { maxBuffer: 64 << 20 }); + let bad = ls.code ? { name: "?" } : null; + try { if (!bad) bad = archiveProblem(parseTarListing(ls.out)); } catch { bad = { name: "?" }; } + if (bad) { await rmTreeAsync(tmp); throw new Error(tz("{pkg} 里有条目会写到包外面,不解开", { pkg })); } + const r = await runP(path.join(PREFIX, "bin", "tar"), ["-xf", tf, "-C", tmp, "--no-same-owner", "./" + GLIBC_REPO_LIB]); + if (r.code) { await rmTreeAsync(tmp); throw new Error(tz("解开 {pkg} 失败:{msg}", { pkg, msg: r.err.trim().split("\n").pop() })); } + const libd = path.join(tmp, GLIBC_REPO_LIB); + for (const n of names) { + if (have.has(n)) continue; + let real; try { real = fs.realpathSync(path.join(libd, n)); } catch { miss.add(n); continue; } + if (!real.startsWith(tmp + path.sep)) { miss.add(n); continue; } + await fs.promises.copyFile(real, path.join(deps, n)); await fs.promises.chmod(path.join(deps, n), 0o755); + have.add(n); got.push({ soname: n, pkg, version: m.version }); + const e = elfInfo(path.join(deps, n)); + for (const d of (e && e.needed) || []) if (!have.has(d)) want.add(d); + } + await rmTreeAsync(tmp); } - fs.rmSync(tmp, { recursive: true, force: true }); } + return { got, still: [...new Set([...miss, ...want])].filter((n) => !have.has(n)) }; // 6 轮还没补完的也算缺 + } finally { + await rmTreeAsync(runDir); } - // 下载的 .deb 只是中转(gcc-libs 就 20 多 MB),用完删掉;索引留着 - for (const f of fs.readdirSync(cache)) if (f.endsWith(".deb")) fs.rmSync(path.join(cache, f), { force: true }); - return { got, still: [...new Set([...miss, ...want])].filter((n) => !have.has(n)) }; // 6 轮还没补完的也算缺 } // patchelf 写进程序的解释器:一律用工具包里的 ld.so —— 路径固定。PATHS.loader 在「经加载器」时是 APK 里那份, @@ -729,11 +755,19 @@ async function handleCustom(req, res, p, u) { const MAX = 2 * 1024 ** 3; if (+req.headers["content-length"] > MAX) return sendJson(res, 413, { ok: false, message: "file too large (max 2 GB)" }); try { - await new Promise((resolve, reject) => { - const w = fs.createWriteStream(out); let n = 0; - req.on("data", (c) => { n += c.length; if (n > MAX) { req.unpipe(w); w.destroy(); req.destroy(); reject(Object.assign(new Error("file too large (max 2 GB)"), { big: true })); } }); - req.pipe(w); w.on("finish", resolve); w.on("error", reject); req.on("error", reject); - }); + let n = 0; + await pipeline( + req, + new Transform({ + transform(c, _e, cb) { + n += c.length; + if (n > MAX) return cb(Object.assign(new Error("file too large (max 2 GB)"), { big: true })); + cb(null, c); + }, + }), + fs.createWriteStream(out), + ); + if (req.aborted || !req.complete) throw new Error("upload aborted"); } catch (e) { fs.rmSync(out, { force: true }); return sendJson(res, e.big ? 413 : 500, { ok: false, message: e.message }); } const r = await customAnalyze(out, shown); fs.rmSync(out, { force: true }); diff --git a/gateway/gw/devside.mjs b/gateway/gw/devside.mjs index 86788fc2..02afa9fd 100644 --- a/gateway/gw/devside.mjs +++ b/gateway/gw/devside.mjs @@ -147,11 +147,15 @@ if (!PREFIX) { if (PREFIX && process.env.CCAPP_BIN) { const dest = path.join(CFG.home, ".local", "share", "cccodroid", "claude"); const script = path.join(process.env.CCAPP_BIN, "..", "scripts", "install-claude.mjs"); + let rechecking = false; const recheck = () => { + if (rechecking) return; let pending = false; try { pending = fs.readdirSync(dest).some((d) => /^\d/.test(d) && fs.existsSync(path.join(dest, d, "claude")) && (fs.existsSync(path.join(dest, d, ".npm-only")) || fs.existsSync(path.join(dest, d, ".mismatch")) || !fs.existsSync(path.join(dest, d, "manifest.json.sig")))); } catch {} if (!pending || !fs.existsSync(script)) return; + rechecking = true; execFile(path.join(PREFIX, "bin", "node"), [script, "--recheck"], { env: termEnv(), timeout: 600000 }, (e, out) => { + rechecking = false; const msg = String(out || "").trim(); if (msg) log("[claude 补核] " + msg.replace(/\n/g, ";")); if (e && e.code === 3) ledger("verify", false, "Claude Code 与官方清单不符(npm 来源)", msg); @@ -217,28 +221,34 @@ async function devApp(op, b) { // 官方和两个镜像都取不到时留空,不拿 npm 的 dist-tags 顶(两边是否始终同步没核实过)。 // 装哪一版都由 install-claude.mjs 按官方清单 / PGP / npm 签名把关 let ccVersions = { at: 0, data: null }; +let ccVersionsInFlight = null; async function claudeVersions(force) { if (!force && ccVersions.data && Date.now() - ccVersions.at < 600e3) return ccVersions.data; - const get = async (u, ms = 12000) => { const r = await fetch(u, { signal: AbortSignal.timeout(ms), headers: { Accept: "application/vnd.npm.install-v1+json" } }); if (!r.ok) throw new Error("HTTP " + r.status); return r.text(); }; - const channel = async (ch) => { - for (const b of ["https://downloads.claude.ai/claude-code-releases", "https://cccodroid.net/claude-code", "https://dl.cccodroid.net/claude-code"]) { - try { const v = (await get(`${b}/${ch}`, 8000)).trim(); if (/^\d+\.\d+\.\d+/.test(v)) return v; } catch {} + if (ccVersionsInFlight) return ccVersionsInFlight; + const run = (async () => { + const get = async (u, ms = 12000) => { const r = await fetch(u, { signal: AbortSignal.timeout(ms), headers: { Accept: "application/vnd.npm.install-v1+json" } }); if (!r.ok) throw new Error("HTTP " + r.status); return r.text(); }; + const channel = async (ch) => { + for (const b of ["https://downloads.claude.ai/claude-code-releases", "https://cccodroid.net/claude-code", "https://dl.cccodroid.net/claude-code"]) { + try { const v = (await get(`${b}/${ch}`, 8000)).trim(); if (/^\d+\.\d+\.\d+/.test(v)) return v; } catch {} + } + return ""; + }; + let versions = [], err = ""; + for (const reg of ["https://registry.npmmirror.com", "https://registry.npmjs.org"]) { + try { + const j = JSON.parse(await get(`${reg}/@anthropic-ai%2fclaude-code-linux-arm64`, 20000)); + versions = Object.keys(j.versions || {}).filter((v) => /^\d+\.\d+\.\d+$/.test(v)); + if (versions.length) break; + } catch (e) { err = e.message; } } - return ""; - }; - let versions = [], err = ""; - for (const reg of ["https://registry.npmmirror.com", "https://registry.npmjs.org"]) { - try { - const j = JSON.parse(await get(`${reg}/@anthropic-ai%2fclaude-code-linux-arm64`, 20000)); - versions = Object.keys(j.versions || {}).filter((v) => /^\d+\.\d+\.\d+$/.test(v)); - if (versions.length) break; - } catch (e) { err = e.message; } - } - versions.sort((a, b) => cmpVer(b, a)); - const [stable, latest] = await Promise.all([channel("stable"), channel("latest")]); - const data = { ok: versions.length > 0 || !!stable, versions, stable, latest, message: versions.length ? "" : tz("取不到版本列表:{err}", { err }) }; - if (data.ok) ccVersions = { at: Date.now(), data }; - return data; + versions.sort((a, b) => cmpVer(b, a)); + const [stable, latest] = await Promise.all([channel("stable"), channel("latest")]); + const data = { ok: versions.length > 0 || !!stable, versions, stable, latest, message: versions.length ? "" : tz("取不到版本列表:{err}", { err }) }; + if (data.ok) ccVersions = { at: Date.now(), data }; + return data; + })().finally(() => { if (ccVersionsInFlight === run) ccVersionsInFlight = null; }); + ccVersionsInFlight = run; + return run; } // /api/app/* 各操作收哪些字段(对照 Priv.java、Updater.set、Notify.set、DeviceTools.set) diff --git a/gateway/gw/extensions.mjs b/gateway/gw/extensions.mjs index 175dc09f..bc43e17f 100644 --- a/gateway/gw/extensions.mjs +++ b/gateway/gw/extensions.mjs @@ -21,8 +21,19 @@ import { RETENTION_DAYS } from "./retention.mjs"; // 格式随 claude 版本变,自己写迟早写坏。技能目录(~/.claude/skills)例外:它就是一堆文件夹,没有命令。 // 同一时刻只跑一个改配置的命令,免得两个安装同时写 settings.json。 let EXT_LOCK = Promise.resolve(); -function extRun(args, timeoutMs = 180000) { - const job = EXT_LOCK.then(() => claudeBlocked()).then((blocked) => blocked ? { code: -1, out: "", err: blocked } : new Promise((resolve) => { +function withExtLock(fn) { + const job = EXT_LOCK.then(fn); + EXT_LOCK = job.catch(() => {}); + return job; +} +function extExecRaw(args, timeoutMs = 180000) { + const writes = ["plugin", "mcp"].includes(args[0]) && !args.includes("list") && !args.includes("get"); + const appWrote = (ucb) => { + if (!writes) return; + if (args[0] === "mcp") ucAppWrote([".claude.json"], ucb); + else ucAppWrote([".claude/settings.json", ".claude/plugins/"], ucb, { ".claude/settings.json": ["enabledPlugins", "extraKnownMarketplaces"] }); + }; + return Promise.resolve().then(() => claudeBlocked()).then((blocked) => blocked ? { code: -1, out: "", err: blocked } : new Promise((resolve) => { const [cmd0, args0] = claudeCmd(args); const ucb = writes ? ucAppBegin() : null; const child = spawn(cmd0, args0, { @@ -36,16 +47,9 @@ function extRun(args, timeoutMs = 180000) { child.on("close", (code) => { clearTimeout(t); appWrote(code === 0 ? ucb : null); resolve({ code, out, err }); }); child.on("error", (e) => { clearTimeout(t); resolve({ code: -1, out, err: err + e.message }); }); })); - // 装卸插件、加删 MCP 是应用替用户做的:这次命令改到的当场认下,别下一轮反过来问他(见 userconf.mjs)。命令失败的不认,下一轮照问。 - // 只认对应的地方:插件只动 plugins/ 和设置里的 enabledPlugins / extraKnownMarketplaces,MCP 只动 .claude.json - const writes = ["plugin", "mcp"].includes(args[0]) && !args.includes("list") && !args.includes("get"); - const appWrote = (ucb) => { - if (!writes) return; - if (args[0] === "mcp") ucAppWrote([".claude.json"], ucb); - else ucAppWrote([".claude/settings.json", ".claude/plugins/"], ucb, { ".claude/settings.json": ["enabledPlugins", "extraKnownMarketplaces"] }); - }; - EXT_LOCK = job.catch(() => {}); - return job; +} +function extRun(args, timeoutMs = 180000) { + return withExtLock(() => extExecRaw(args, timeoutMs)); } const lastJson = (s) => { const lines = String(s).trim().split("\n").reverse(); @@ -57,14 +61,20 @@ const lastJson = (s) => { const cliMsg = (r) => (r.err || r.out || "").replace(/\x1b\[[0-9;]*m/g, "").trim().slice(-600); let PLUGIN_CATALOG = null; // 可安装清单有三千多条,缓存 10 分钟,搜索在网关这边做 +let PLUGIN_STATE_FLIGHT = null; async function pluginState(withAvailable) { - const fresh = PLUGIN_CATALOG && Date.now() - PLUGIN_CATALOG.at < 600000; - const r = await extRun(["plugin", "list", "--json", ...(withAvailable && !fresh ? ["--available"] : [])], 120000); - const j = lastJson(r.out); - if (!j) throw new Error(cliMsg(r) || "claude plugin list 没有输出"); - const installed = Array.isArray(j) ? j : j.installed || []; - if (!Array.isArray(j) && j.available) PLUGIN_CATALOG = { at: Date.now(), list: j.available }; - return installed; + if (PLUGIN_STATE_FLIGHT && (!withAvailable || PLUGIN_STATE_FLIGHT.withAvailable)) return PLUGIN_STATE_FLIGHT.p; + const p = withExtLock(async () => { + const fresh = PLUGIN_CATALOG && Date.now() - PLUGIN_CATALOG.at < 600000; + const r = await extExecRaw(["plugin", "list", "--json", ...(withAvailable && !fresh ? ["--available"] : [])], 120000); + const j = lastJson(r.out); + if (!j) throw new Error(cliMsg(r) || "claude plugin list 没有输出"); + const installed = Array.isArray(j) ? j : j.installed || []; + if (!Array.isArray(j) && j.available) PLUGIN_CATALOG = { at: Date.now(), list: j.available }; + return installed; + }).finally(() => { if (PLUGIN_STATE_FLIGHT && PLUGIN_STATE_FLIGHT.p === p) PLUGIN_STATE_FLIGHT = null; }); + PLUGIN_STATE_FLIGHT = { withAvailable: !!withAvailable, p }; + return p; } async function listPlugins(q, offset, withAvailable) { @@ -574,28 +584,32 @@ const mcpTarget = (d) => { return (String(d.url || [d.command, ...(Array.isArray(d.args) ? d.args : [])].filter((x) => x != null).join(" ")).slice(0, 300) + (env ? ` [env: ${env}]` : "") + (hdr ? ` [headers: ${hdr}]` : "")).slice(0, 500); }; -/** 停用 = 先把定义存进停用名单,再用 claude mcp remove 拿掉;remove 失败就把名单退回去 */ -async function disableMcp(name) { - if (!extIdOk(name) || badArg(name)) return { ok: false, message: tz("名字格式不对") }; - const def = userMcpDef(name); - if (!def) return { ok: false, message: tz("只能停用你自己加的(用户级)MCP 服务器") }; - const off = extOff(); - off.mcp[name] = def; - if (!saveExtOff(off)) return { ok: false, message: tz("停用名单写不进去") }; - const r = await extRun(["mcp", "remove", "-s", "user", name], 60000); - if (r.code !== 0) { const o2 = extOff(); delete o2.mcp[name]; saveExtOff(o2); return { ok: false, message: cliMsg(r) }; } - log(`MCP ${name} 已停用`); - return { ok: true }; +/** 停用 = 先把定义存进停用名单,再用 claude mcp remove 拿掉;remove 失败就把名单退回去(整段在单把锁内原子化) */ +function disableMcp(name) { + if (!extIdOk(name) || badArg(name)) return Promise.resolve({ ok: false, message: tz("名字格式不对") }); + return withExtLock(async () => { + const def = userMcpDef(name); + if (!def) return { ok: false, message: tz("只能停用你自己加的(用户级)MCP 服务器") }; + const off = extOff(); + off.mcp[name] = def; + if (!saveExtOff(off)) return { ok: false, message: tz("停用名单写不进去") }; + const r = await extExecRaw(["mcp", "remove", "-s", "user", name], 60000); + if (r.code !== 0) { const o2 = extOff(); delete o2.mcp[name]; saveExtOff(o2); return { ok: false, message: cliMsg(r) }; } + log(`MCP ${name} 已停用`); + return { ok: true }; + }); } -/** 启用 = claude mcp add-json 把存着的定义加回去,成功了才从名单里删 */ -async function enableMcp(name) { - const off = extOff(), def = extIdOk(name) ? off.mcp[name] : null; - if (!def) return { ok: false, message: tz("停用名单里没有它") }; - const r = await extRun(["mcp", "add-json", "-s", "user", name, JSON.stringify(def)], 60000); - if (r.code !== 0) return { ok: false, message: cliMsg(r) }; - const o2 = extOff(); delete o2.mcp[name]; saveExtOff(o2); - log(`MCP ${name} 已启用`); - return { ok: true }; +/** 启用 = claude mcp add-json 把存着的定义加回去,成功了才从名单里删(整段在单把锁内原子化) */ +function enableMcp(name) { + return withExtLock(async () => { + const off = extOff(), def = extIdOk(name) ? off.mcp[name] : null; + if (!def) return { ok: false, message: tz("停用名单里没有它") }; + const r = await extExecRaw(["mcp", "add-json", "-s", "user", name, JSON.stringify(def)], 60000); + if (r.code !== 0) return { ok: false, message: cliMsg(r) }; + const o2 = extOff(); delete o2.mcp[name]; saveExtOff(o2); + log(`MCP ${name} 已启用`); + return { ok: true }; + }); } /** 停用着的 MCP 直接删掉(不再加回) */ function forgetMcp(name) { @@ -643,6 +657,8 @@ function deleteSkill(dir) { // 只读公开目录;装卸都落在用户自己的 ~/.claude:技能拷进 skills/,MCP 走 claude mcp add(见 addMcp)。 const SKILL_REPO = "anthropics/skills"; let skillCat = null; // { at, sha, items }:一小时内复用,GitHub 未登录的 API 一小时只给 60 次 +let skillCatFlight = null; +const SKILL_INSTALLING = new Set(); const ghGet = async (url, json) => { const r = await fetch(url, { headers: { "User-Agent": "cccodroid", ...(json ? { Accept: "application/vnd.github+json" } : {}) }, signal: AbortSignal.timeout(20000) }); if (!r.ok) throw new Error(`${r.status} ${r.statusText}`); @@ -650,19 +666,31 @@ const ghGet = async (url, json) => { }; async function skillCatalog(force) { if (!force && skillCat && Date.now() - skillCat.at < 3600e3) return skillCat; - const tree = await ghGet(`https://api.github.com/repos/${SKILL_REPO}/git/trees/HEAD?recursive=1`, true); - const blobs = (tree.tree || []).filter((e) => e.type === "blob"); - const names = [...new Set(blobs.map((e) => /^skills\/([^/]+)\/SKILL\.md$/.exec(e.path)?.[1]).filter((n) => n && SID_RE.test(n)))].sort(); - const items = await Promise.all(names.map(async (n) => { - const files = blobs.filter((e) => e.path.startsWith(`skills/${n}/`)).map((e) => ({ path: e.path.slice(`skills/${n}/`.length), size: e.size || 0 })); - let meta = { name: n, description: "" }; - try { - const md = String(await ghGet(`https://raw.githubusercontent.com/${SKILL_REPO}/${tree.sha}/skills/${n}/SKILL.md`)).slice(0, 4000); - meta = { name: fmField(md, "name") || n, description: fmField(md, "description").slice(0, 300) }; - } catch {} - return { dir: n, ...meta, files, bytes: files.reduce((a, x) => a + x.size, 0), license: files.some((x) => /^LICENSE/i.test(x.path)) }; - })); - return (skillCat = { at: Date.now(), sha: tree.sha, items }); + if (skillCatFlight) return skillCatFlight; + const run = (async () => { + const tree = await ghGet(`https://api.github.com/repos/${SKILL_REPO}/git/trees/HEAD?recursive=1`, true); + const blobs = (tree.tree || []).filter((e) => e.type === "blob"); + const names = [...new Set(blobs.map((e) => /^skills\/([^/]+)\/SKILL\.md$/.exec(e.path)?.[1]).filter((n) => n && SID_RE.test(n)))].sort(); + // 限制并发数(5 路),避免未认证 GitHub API 突发并发撞限流或拖慢事件循环 + const items = new Array(names.length); + let idx = 0; + const worker = async () => { + while (idx < names.length) { + const i = idx++, n = names[i]; + const files = blobs.filter((e) => e.path.startsWith(`skills/${n}/`)).map((e) => ({ path: e.path.slice(`skills/${n}/`.length), size: e.size || 0 })); + let meta = { name: n, description: "" }; + try { + const md = String(await ghGet(`https://raw.githubusercontent.com/${SKILL_REPO}/${tree.sha}/skills/${n}/SKILL.md`)).slice(0, 4000); + meta = { name: fmField(md, "name") || n, description: fmField(md, "description").slice(0, 300) }; + } catch {} + items[i] = { dir: n, ...meta, files, bytes: files.reduce((a, x) => a + x.size, 0), license: files.some((x) => /^LICENSE/i.test(x.path)) }; + } + }; + await Promise.all(Array.from({ length: Math.min(5, names.length || 1) }, worker)); + return (skillCat = { at: Date.now(), sha: tree.sha, items }); + })().finally(() => { if (skillCatFlight === run) skillCatFlight = null; }); + skillCatFlight = run; + return run; } const skillSource = (dir) => { try { const raw = readSmallFile(path.join(SKILLS_DIR, dir, ".cc-source.json"), 64 << 10); return raw == null ? null : JSON.parse(raw); } catch { return null; } }; async function listSkillCatalog(force) { @@ -672,30 +700,34 @@ async function listSkillCatalog(force) { installed: fs.existsSync(path.join(SKILLS_DIR, x.dir, "SKILL.md")), official: (skillSource(x.dir) || {}).repo === SKILL_REPO })) }; } catch (e) { return { ok: false, message: tz("取不到官方技能目录:{err}", { err: e.message }) }; } } -/** 装一个官方技能:按目录树逐个下载到临时目录,齐了再改名就位(不会留下半截);超过 50 MB 不装 */ +/** 装一个官方技能:按目录树逐个下载到随机临时目录,齐了再改名就位(不会留下半截);超过 50 MB 不装 */ async function installCatalogSkill(dir) { if (!SID_RE.test(dir)) return { ok: false, message: "bad name" }; - const c = await skillCatalog().catch((e) => null); - const it = c && c.items.find((x) => x.dir === dir); - if (!it) return { ok: false, message: tz("官方目录里没有这个技能") }; - const dest = path.join(SKILLS_DIR, dir); - if (fs.existsSync(dest)) return { ok: false, message: tz("已经有同名技能,先删掉再装") }; - if (it.bytes > 50 << 20) return { ok: false, message: tz("太大了(超过 50 MB)") }; - const tmp = path.join(SKILLS_DIR, `.tmp-${dir}-${process.pid}`); - const ucb = ucAppBegin(); - fs.rmSync(tmp, { recursive: true, force: true }); + if (SKILL_INSTALLING.has(dir)) return { ok: false, message: "busy" }; + SKILL_INSTALLING.add(dir); try { - for (const f of it.files) { - const out = path.resolve(tmp, f.path); - if (!out.startsWith(tmp + path.sep)) throw new Error("bad path " + f.path); - fs.mkdirSync(path.dirname(out), { recursive: true }); - fs.writeFileSync(out, await ghGet(`https://raw.githubusercontent.com/${SKILL_REPO}/${c.sha}/skills/${dir}/${f.path.split("/").map(encodeURIComponent).join("/")}`)); - } - fs.writeFileSync(path.join(tmp, ".cc-source.json"), JSON.stringify({ repo: SKILL_REPO, sha: c.sha, path: "skills/" + dir, at: new Date().toISOString() }) + "\n"); - fs.renameSync(tmp, dest); - ucAppWrote([dest, tmp], ucb); - return { ok: true }; - } catch (e) { fs.rmSync(tmp, { recursive: true, force: true }); return { ok: false, message: e.message }; } + const c = await skillCatalog().catch(() => null); + const it = c && c.items.find((x) => x.dir === dir); + if (!it) return { ok: false, message: tz("官方目录里没有这个技能") }; + const dest = path.join(SKILLS_DIR, dir); + if (fs.existsSync(dest)) return { ok: false, message: tz("已经有同名技能,先删掉再装") }; + if (it.bytes > 50 << 20) return { ok: false, message: tz("太大了(超过 50 MB)") }; + const tmp = path.join(SKILLS_DIR, `.tmp-${dir}-${process.pid}-${crypto.randomBytes(4).toString("hex")}`); + const ucb = ucAppBegin(); + await fs.promises.rm(tmp, { recursive: true, force: true }).catch(() => {}); + try { + for (const f of it.files) { + const out = path.resolve(tmp, f.path); + if (!out.startsWith(tmp + path.sep)) throw new Error("bad path " + f.path); + fs.mkdirSync(path.dirname(out), { recursive: true }); + await fs.promises.writeFile(out, await ghGet(`https://raw.githubusercontent.com/${SKILL_REPO}/${c.sha}/skills/${dir}/${f.path.split("/").map(encodeURIComponent).join("/")}`)); + } + await fs.promises.writeFile(path.join(tmp, ".cc-source.json"), JSON.stringify({ repo: SKILL_REPO, sha: c.sha, path: "skills/" + dir, at: new Date().toISOString() }) + "\n"); + fs.renameSync(tmp, dest); + ucAppWrote([dest, tmp], ucb); + return { ok: true }; + } catch (e) { await fs.promises.rm(tmp, { recursive: true, force: true }).catch(() => {}); return { ok: false, message: e.message }; } + } finally { SKILL_INSTALLING.delete(dir); } } // MCP 注册表:任何人都能发布,没人审 —— 界面写明,装 npm 包前把命令亮给人看。 diff --git a/gateway/gw/files.mjs b/gateway/gw/files.mjs index 63acec44..38b045f8 100644 --- a/gateway/gw/files.mjs +++ b/gateway/gw/files.mjs @@ -396,7 +396,7 @@ export async function routeFiles(req, res, u, p) { if (path.dirname(target) === target || zoneOf(dir) === "private" || SECRET_NAMES.has(name.toLowerCase()) || SECRET_RE.test(target) || (!st.isSymbolicLink() && pathBlocked(target))) return sendJson(res, 403, { error: "forbidden" }); if (st.isDirectory() && holdsPrivate(target)) return sendJson(res, 403, { error: "forbidden", message: tz("这个文件夹装着应用自己的目录或工作区,不能删") }); - try { fs.rmSync(target, { recursive: st.isDirectory(), force: false }); } + try { await fs.promises.rm(target, { recursive: st.isDirectory(), force: false }); } catch (e) { return sendJson(res, e.code === "EACCES" || e.code === "EPERM" ? 403 : 500, { error: e.code || e.message, message: e.message }); } log(`[file] 删除${st.isDirectory() ? "目录" : ""} ${target}`); return sendJson(res, 200, { ok: true }); diff --git a/gateway/gw/fonts.mjs b/gateway/gw/fonts.mjs index 68bc02da..cfc805fd 100644 --- a/gateway/gw/fonts.mjs +++ b/gateway/gw/fonts.mjs @@ -93,6 +93,45 @@ function woff2Name(buf) { const all = zlib.brotliDecompressSync(buf.subarray(p, p + csize), { maxOutputLength: 64 << 20 }); return parseName(all.subarray(nameAt, nameAt + nameLen)); } +async function woffNameAsync(buf) { + const n = buf.readUInt16BE(12); + for (let i = 0; i < n; i++) { + const r = 44 + i * 20; if (r + 20 > buf.length) break; + if (buf.toString("latin1", r, r + 4) !== "name") continue; + const off = buf.readUInt32BE(r + 4), clen = buf.readUInt32BE(r + 8), olen = buf.readUInt32BE(r + 12); + const raw = buf.subarray(off, off + clen); + const dec = clen < olen ? await new Promise((res, rej) => zlib.inflate(raw, { maxOutputLength: 16 << 20 }, (e, b) => (e ? rej(e) : res(b)))) : raw; + return parseName(dec); + } + return ""; +} +async function woff2NameAsync(buf) { + const n = buf.readUInt16BE(12), csize = buf.readUInt32BE(20); + let p = 48, at = 0, nameAt = -1, nameLen = 0; + const base128 = () => { let v = 0; for (let i = 0; i < 5; i++) { const b = buf[p++]; v = v * 128 + (b & 0x7f); if (!(b & 0x80)) return v; } throw new Error("bad base128"); }; + const TAGS_NAME = 5; + for (let i = 0; i < n; i++) { + const flags = buf[p++], tagIdx = flags & 0x3f, xf = (flags >> 6) & 3; + let tag = ""; + if (tagIdx === 63) { tag = buf.toString("latin1", p, p + 4); p += 4; } + const orig = base128(); + const isGL = tagIdx === 10 || tagIdx === 11; + const len = (isGL ? xf === 0 : xf !== 0) ? base128() : orig; + if (tagIdx === TAGS_NAME || tag === "name") { nameAt = at; nameLen = len; } + at += len; + } + if (nameAt < 0) return ""; + const all = await new Promise((res, rej) => zlib.brotliDecompress(buf.subarray(p, p + csize), { maxOutputLength: 64 << 20 }, (e, b) => (e ? rej(e) : res(b)))); + return parseName(all.subarray(nameAt, nameAt + nameLen)); +} +async function fontNameAsync(buf, fmt) { + try { + if (fmt === "ttf" || fmt === "otf") return sfntName(buf); + if (fmt === "woff") return await woffNameAsync(buf); + if (fmt === "woff2") return await woff2NameAsync(buf); + } catch {} + return ""; +} export function fontName(buf, fmt) { try { if (fmt === "ttf" || fmt === "otf") return sfntName(buf); @@ -129,17 +168,19 @@ export async function routeFonts(req, res, u, p) { return sendJson(res, 400, { error: "bad format", message: ttc ? "这是字体集合(.ttc),浏览器用不了;请换成单个的 ttf / otf" : "不是能用的字体文件,只支持 ttf、otf、woff、woff2" }); } const sha = crypto.createHash("sha256").update(buf).digest("hex"); - // 清单在读完上传之后再取:上传那几秒里别的导入 / 删除已经改过它,用开头那份会互相覆盖、把删掉的写回来(审查 B21)。 - // 从这里到 save 没有 await,不会再交错 - const list = load(); - if (list.length >= FONT_COUNT) return sendJson(res, 400, { error: "too many", message: "最多导入 10 个字体,先删掉一个再导入" }); - const dup = list.find((f) => f.sha === sha); - if (dup) return sendJson(res, 200, { ok: true, font: pub(dup), dup: true }); const raw = path.basename(u.searchParams.get("name") || "").slice(0, 120); const stem = raw.replace(/\.[^.]+$/, "") || "font"; - const f = { id: sha.slice(0, 12), name: fontName(buf, fmt) || stem, file: raw || `${stem}.${fmt}`, fmt, size: buf.length, sha, at: Date.now() }; + const parsedName = (await fontNameAsync(buf, fmt)) || stem; + const id = sha.slice(0, 12); + const target = path.join(DIR, `${id}.${fmt}`); fs.mkdirSync(DIR, { recursive: true }); - fs.writeFileSync(fileOf(f), buf); + await fs.promises.writeFile(target, buf); + // 清单在异步解析和写盘之后再取:避免交错覆盖(审查 B21) + const list = load(); + if (list.length >= FONT_COUNT) { try { fs.unlinkSync(target); } catch {} return sendJson(res, 400, { error: "too many", message: "最多导入 10 个字体,先删掉一个再导入" }); } + const dup = list.find((f) => f.sha === sha); + if (dup) return sendJson(res, 200, { ok: true, font: pub(dup), dup: true }); + const f = { id, name: parsedName, file: raw || `${stem}.${fmt}`, fmt, size: buf.length, sha, at: Date.now() }; list.push(f); save(list); log(`[fonts] 导入 ${f.file}(${f.name},${fmt},${buf.length}B)→ ${f.id}`); return sendJson(res, 200, { ok: true, font: pub(f) }); @@ -160,10 +201,15 @@ export async function routeFonts(req, res, u, p) { if (req.method === "GET" && m) { const f = load().find((x) => x.id === m[1]); if (!f) return sendJson(res, 404, { error: "not found" }); - let data; try { data = fs.readFileSync(fileOf(f)); } catch { return sendJson(res, 404, { error: "not found" }); } - // 内容按哈希定了 id,可以放心长缓存;换字体就是换 id - res.writeHead(200, { "content-type": MIME[f.fmt], "content-length": data.length, "cache-control": "private, max-age=31536000, immutable", "x-content-type-options": "nosniff" }); - return res.end(data); + const fp = fileOf(f); + let st; try { st = await fs.promises.stat(fp); } catch { return sendJson(res, 404, { error: "not found" }); } + // 内容按哈希定了 id,可以放心长缓存;换字体就是换 id;流式下发避免 40 MB 同步读盘阻塞事件循环 + res.writeHead(200, { "content-type": MIME[f.fmt], "content-length": st.size, "cache-control": "private, max-age=31536000, immutable", "x-content-type-options": "nosniff" }); + const rs = fs.createReadStream(fp); + rs.on("error", () => { try { res.destroy(); } catch {} }); + res.on("close", () => rs.destroy()); + rs.pipe(res); + return; } return NEXT; } diff --git a/gateway/gw/goal.mjs b/gateway/gw/goal.mjs index e1a5e22e..b65f0a1f 100644 --- a/gateway/gw/goal.mjs +++ b/gateway/gw/goal.mjs @@ -84,7 +84,7 @@ function scanGoal(file, size) { return { ...base, active: true, setAt, checks, reason: last.sentinel ? "" : String(last.reason || "").slice(0, 600) }; } } -// 跑着的时候每 4 秒看一眼(只看有会话号的轮),变了才推;每轮结束再补看一次(见 endRun),最后那次达成不会漏 +// 跑着的时候每 4 秒异步分块看一眼(防重叠 + 不堵事件循环),变了才推;每轮结束再补看一次(见 endRun),最后那次达成不会漏 const GOAL_SEEN = new Map(); // 会话号 → 上次推出去的 JSON export function goalCheck(sid) { const f = sid && findSessionFile(sid); @@ -95,7 +95,74 @@ export function goalCheck(sid) { if (GOAL_SEEN.size > 200) GOAL_SEEN.delete(GOAL_SEEN.keys().next().value); publish({ type: "goal", sessionId: sid, goal: g }); } -if (LIVE) setInterval(() => { for (const r of RUNS.values()) { goalCheck(r.sessionId); tasksCheck(r.sessionId); } }, 4000).unref?.(); +async function scanGoalAsync(file, size) { + let last = null, lastAt = 0, setAt = null, checks = 0, done = false, cleared = false; + const step = (l) => { + if (!l.includes("goal")) return false; + let e; try { e = JSON.parse(l); } catch { return false; } + if (!last && e.type === "user" && typeof e.message?.content === "string") { + const m = e.message.content.match(/\/goal<\/command-name>[\s\S]*?([\s\S]*?)<\/command-args>/); + if (m && GOAL_CLEAR.has(m[1].trim().toLowerCase())) { cleared = true; return true; } + } + const a = e.type === "attachment" && e.attachment?.type === "goal_status" ? e.attachment : null; + if (!a) return false; + if (!last) { last = a; lastAt = Date.parse(e.timestamp) || 0; if (a.met || a.failed) return true; } + if (a.condition !== last.condition) return true; + if (a.sentinel) { setAt = Date.parse(e.timestamp) || null; return true; } + if (!a.met) checks++; + return false; + }; + let fh; try { fh = await fs.promises.open(file, "r"); } catch { return null; } + try { + const chunkMax = Math.min(GOAL_CHUNK, 2 << 20); + let pos = size, carry = Buffer.alloc(0), read = 0; + while (pos > 0 && !done) { + if (read >= GOAL_SCAN_MAX) break; + const n = Math.min(chunkMax, pos); pos -= n; read += n; + const b = Buffer.alloc(n); + const { bytesRead } = await fh.read(b, 0, n, pos); + const slice = bytesRead === n ? b : b.subarray(0, bytesRead); + const buf = carry.length ? Buffer.concat([slice, carry]) : slice; + let end = buf.length; + for (let k = buf.length - 1; k >= 0 && !done; k--) { + if (buf[k] !== 10) continue; + if (step(buf.toString("utf8", k + 1, end))) done = true; + end = k; + } + carry = buf.subarray(0, end); + await new Promise((ok) => setImmediate(ok)); + } + if (!done && pos === 0 && carry.length && step(carry.toString("utf8"))) done = true; + if (!done && pos > 0) return last ? result() : undefined; + } catch { return null; } finally { await fh.close().catch(() => {}); } + return cleared || !last ? null : result(); + function result() { + const base = { condition: String(last.condition || "").slice(0, 600), at: lastAt }; + if (last.met || last.failed) return { ...base, done: true, met: !!last.met, failed: !!last.failed, reason: String(last.reason || "").slice(0, 600), + iterations: last.iterations ?? null, durationMs: last.durationMs ?? null, tokens: last.tokens ?? null }; + return { ...base, active: true, setAt, checks, reason: last.sentinel ? "" : String(last.reason || "").slice(0, 600) }; + } +} +async function goalCheckAsync(sid) { + const f = sid && findSessionFile(sid); + if (!f) return; + let st; try { st = await fs.promises.stat(f.file); } catch { return; } + const g = st.size <= GOAL_CHUNK ? goalStateOf(f.file) : await scanGoalAsync(f.file, st.size); + if (g === undefined) return; + const j = JSON.stringify(g); + if (GOAL_SEEN.get(sid) === j) return; + GOAL_SEEN.set(sid, j); + if (GOAL_SEEN.size > 200) GOAL_SEEN.delete(GOAL_SEEN.keys().next().value); + publish({ type: "goal", sessionId: sid, goal: g }); +} +let goalTicking = false; +if (LIVE) setInterval(() => { + if (goalTicking) return; + goalTicking = true; + (async () => { + for (const r of [...RUNS.values()]) { await goalCheckAsync(r.sessionId); tasksCheck(r.sessionId); } + })().catch(() => {}).finally(() => { goalTicking = false; }); +}, 4000).unref?.(); // 任务清单(TaskCreate / TaskUpdate):claude 存在 ~/.claude/tasks/<会话号>/<编号>.json,--resume 沿用同一会话号,所以每轮换进程也接得上 const TASKS_DIR = path.join(CFG.home, ".claude", "tasks"); diff --git a/gateway/gw/integrity.mjs b/gateway/gw/integrity.mjs index 30d09d5b..d0811848 100644 --- a/gateway/gw/integrity.mjs +++ b/gateway/gw/integrity.mjs @@ -100,6 +100,65 @@ function hashOf(file, mark = -1) { } catch { return null; } finally { try { fs.closeSync(fd); } catch {} } } +async function hashOfAsync(file, mark = -1) { + let fh; try { fh = await fs.promises.open(file, "r"); } catch { return null; } + try { + const size = (await fh.stat()).size, h = crypto.createHash("sha256"), buf = Buffer.allocUnsafe(1 << 20); + const feed = async (from, to) => { + for (let p = from; p < to;) { + const { bytesRead } = await fh.read(buf, 0, Math.min(buf.length, to - p), p); + if (bytesRead <= 0) break; + h.update(buf.subarray(0, bytesRead)); + p += bytesRead; + } + }; + if (mark >= 0 && mark <= size) { + await feed(0, mark); + const prefix = h.copy().digest("hex"); + await feed(mark, size); + return { hash: h.digest("hex"), prefix }; + } + await feed(0, size); + return mark >= 0 ? { hash: h.digest("hex"), prefix: null } : h.digest("hex"); + } catch { return null; } finally { await fh.close().catch(() => {}); } +} + +/** 起进程紧前给会话文件拍的底(异步不阻塞事件循环) */ +export async function sessionAnchorAsync(file) { + if (!file) return null; + let size; try { size = (await fs.promises.stat(file)).size; } catch { return null; } + const hash = await hashOfAsync(file); + return hash ? { size, hash } : null; +} + +export async function sealSessionAsync(sid, file, { flag, clear = false, base = null } = {}) { + if (!sid || !file) return; + let size; try { size = (await fs.promises.stat(file)).size; } catch { return; } + const r = await hashOfAsync(file, base ? base.size : -1); + if (!r) return; + const hash = base ? r.hash : r; + if (base && r.prefix !== base.hash) { + flag = "edited"; clear = false; + log(`[封签] 会话 ${String(sid).slice(0, 8)} 的记录在这一轮运行期间被改了前面的内容,下一轮提醒模型`); + } + const keep = flag || (clear ? null : seals()[sid]?.flag); + seals()[sid] = { size, hash, at: Date.now(), ...(keep ? { flag: keep } : {}) }; + saveSeals(); +} + +export async function checkSessionAsync(sid, file) { + if (!sid) return null; + const rec = seals()[sid]; + if (!rec) return null; + if (rec.flag) return rec.flag; + if (!file) return null; + let size; try { size = (await fs.promises.stat(file)).size; } catch { return null; } + if (size === rec.size && (await hashOfAsync(file)) === rec.hash) return null; + rec.flag = "edited"; saveSeals(); + log(`[封签] 会话 ${String(sid).slice(0, 8)} 的记录在应用外被改过,下一轮提醒模型`); + return "edited"; +} + /** 起进程紧前给会话文件拍的底(大小 + 哈希):收尾时核这一轮只是往后追加(见 sealSession 的 base) */ export function sessionAnchor(file) { if (!file) return null; diff --git a/gateway/gw/login.mjs b/gateway/gw/login.mjs index dee784a8..48d575a9 100644 --- a/gateway/gw/login.mjs +++ b/gateway/gw/login.mjs @@ -122,30 +122,36 @@ function statusJson(text) { } return cands.find((x) => typeof x.loggedIn === "boolean") || cands[0] || null; } +let authInFlight = null; export async function authStatus(force) { if (!force && AUTH_CACHE && Date.now() - AUTH_CACHE.at < 30000) return AUTH_CACHE.v; - const r = await runAuth(["status"]); - // 状态 JSON 走 stdout;stderr 只用于没解析出 loggedIn 时的「未登录」判断和错误提示 - let j = statusJson(r.stdout) || statusJson(r.out) || {}; - // 只转出界面要显示的几项;令牌之类的东西它本来也不报 - // 问不出结果(claude 起不来、超时、输出解析不了):不能当成「未登录」—— 有上次问出的就沿用并标明是旧的, - // 没有就标「不知道」,把原因带给界面(#102 04-010) - // 退出码是 0 也一样:解析不出 loggedIn 就不算知道(DeepSeek 复核 #2);只有输出明说没登录才给确定的 false - if (typeof j.loggedIn !== "boolean" && !/not logged in|not authenticated/i.test(r.out || "")) { - const error = String(r.out || "").trim().split("\n").pop().slice(0, 300) || "exit " + r.code; - const v = AUTH_GOOD ? { ...AUTH_GOOD, stale: true, error } : { loggedIn: false, authMethod: "none", email: null, org: null, plan: null, unknown: true, error }; - AUTH_CACHE = { at: Date.now(), v }; + if (authInFlight) return authInFlight; + const run = (async () => { + const r = await runAuth(["status"]); + // 状态 JSON 走 stdout;stderr 只用于没解析出 loggedIn 时的「未登录」判断和错误提示 + let j = statusJson(r.stdout) || statusJson(r.out) || {}; + // 只转出界面要显示的几项;令牌之类的东西它本来也不报 + // 问不出结果(claude 起不来、超时、输出解析不了):不能当成「未登录」—— 有上次问出的就沿用并标明是旧的, + // 没有就标「不知道」,把原因带给界面(#102 04-010) + // 退出码是 0 也一样:解析不出 loggedIn 就不算知道(DeepSeek 复核 #2);只有输出明说没登录才给确定的 false + if (typeof j.loggedIn !== "boolean" && !/not logged in|not authenticated/i.test(r.out || "")) { + const error = String(r.out || "").trim().split("\n").pop().slice(0, 300) || "exit " + r.code; + const v = AUTH_GOOD ? { ...AUTH_GOOD, stale: true, error } : { loggedIn: false, authMethod: "none", email: null, org: null, plan: null, unknown: true, error }; + AUTH_CACHE = { at: Date.now(), v }; + return v; + } + const v = { + loggedIn: !!j.loggedIn, authMethod: j.authMethod || "none", + email: j.email || j.account?.email || null, + org: j.orgName || j.organization?.name || null, + plan: j.subscriptionType || j.plan || null, + }; + AUTH_CACHE = { at: Date.now(), v }; AUTH_GOOD = v; + noteLoggedIn(v.loggedIn); return v; - } - const v = { - loggedIn: !!j.loggedIn, authMethod: j.authMethod || "none", - email: j.email || j.account?.email || null, - org: j.orgName || j.organization?.name || null, - plan: j.subscriptionType || j.plan || null, - }; - AUTH_CACHE = { at: Date.now(), v }; AUTH_GOOD = v; - noteLoggedIn(v.loggedIn); - return v; + })().finally(() => { if (authInFlight === run) authInFlight = null; }); + authInFlight = run; + return run; } // ── 路由:/api/login/start /api/login/status /api/login/cancel /api/login/logout ── diff --git a/gateway/gw/managed-bridge.mjs b/gateway/gw/managed-bridge.mjs index fc642858..a2781e7d 100644 --- a/gateway/gw/managed-bridge.mjs +++ b/gateway/gw/managed-bridge.mjs @@ -75,6 +75,10 @@ function registrationExists() { catch (error) { if (error.code === "ENOENT") return false; throw fail("retire-lock"); } } +export function hasManagedBridgeRegistration() { + try { return registrationExists(); } catch { return false; } +} + const readRegistration = () => withRegistryFile((file) => jsonSnapshot(file)); function inspectRegistration(file) { @@ -188,13 +192,17 @@ function endpointOf(value) { return m && Number(m[1]) >= 1024 && Number(m[1]) <= 65535 ? "http://127.0.0.1:" + m[1] : ""; } +function validRegistrationShape(r) { + const endpoint = endpointOf(r?.endpoint); + return object(r) && r.schema === 1 && r.id === ID && !!endpoint && r.endpoint === endpoint && + typeof r.runtimeDir === "string" && path.isAbsolute(r.runtimeDir) && !r.runtimeDir.includes("\0") && + path.resolve(r.runtimeDir) === r.runtimeDir && typeof r.instanceId === "string" && /^[0-9a-f]{32}$/.test(r.instanceId) && + Object.keys(r).length === 5 && !Object.keys(r).some((k) => !["schema", "id", "endpoint", "runtimeDir", "instanceId"].includes(k)); +} + function installedBinding(stored) { const r = stored.value; - const endpoint = endpointOf(r?.endpoint); - if (!object(r) || r.schema !== 1 || r.id !== ID || !endpoint || r.endpoint !== endpoint || - typeof r.runtimeDir !== "string" || !path.isAbsolute(r.runtimeDir) || r.runtimeDir.includes("\0") || - path.resolve(r.runtimeDir) !== r.runtimeDir || typeof r.instanceId !== "string" || !/^[0-9a-f]{32}$/.test(r.instanceId) || - Object.keys(r).length !== 5 || Object.keys(r).some((k) => !["schema", "id", "endpoint", "runtimeDir", "instanceId"].includes(k))) throw fail(); + if (!validRegistrationShape(r)) throw fail(); const component = path.join(PREFIX, ENTRY); try { const record = jsonSnapshot(path.join(path.dirname(PREFIX), "components", ID + ".json"), 4 << 20); @@ -469,6 +477,52 @@ export async function warmManagedBridge() { catch { return false; } } +/** + * 新工具包切换时会替换 $PREFIX,导致运行中的看护(watchdog.sh)因临时找不到 component.cjs 而写下 + * recovery.failed="component removed or disabled\n",重装组件后若不清掉,界面会永久误报「本地桥已停用」。 + * 仅在组件已重新安装且通过 installedBinding 校验、无 disabled 停用标记、且 recovery.failed 精确为该内容时 + * 改名留证并清掉预算;其它崩溃故障锁和用户主动停用一律不动。 + */ +export function clearComponentRemovedRecoveryLock() { + if (!PREFIX || retiring || configuring.size) return false; + let stored, r; + try { + stored = readRegistration(); + const endpoint = endpointOf(stored.value?.endpoint); + if (!endpoint) return false; + r = binding(endpoint); + if (!r) return false; + try { if (fs.lstatSync(path.join(r.runtimeDir, "disabled"))) return false; } + catch (error) { if (error.code !== "ENOENT") return false; } + } catch { return false; } + let fd; + try { + fd = fs.openSync(r.runtimeDir, fs.constants.O_RDONLY | fs.constants.O_DIRECTORY); + for (const name of ["runtime-home", ".claude-code-router"]) { + const next = fs.openSync(`/proc/self/fd/${fd}/${name}`, + fs.constants.O_RDONLY | fs.constants.O_DIRECTORY | fs.constants.O_NOFOLLOW); + fs.closeSync(fd); + fd = next; + if (fs.fstatSync(fd).uid !== process.getuid()) return false; + } + const state = `/proc/self/fd/${fd}`, lock = state + "/recovery.failed", attempts = state + "/recovery.attempts"; + const s = snapshot(lock, 128); + const st = fs.lstatSync(lock); + if (!st.isFile() || st.isSymbolicLink() || st.uid !== process.getuid()) return false; + if (s.data.toString("utf8") !== "component removed or disabled\n") return false; + const suffix = ".prev-" + Date.now() + "-" + crypto.randomBytes(4).toString("hex"); + try { + const ast = fs.lstatSync(attempts); + if (ast.isFile() && !ast.isSymbolicLink() && ast.uid === process.getuid()) fs.renameSync(attempts, attempts + suffix); + } catch (error) { if (error.code !== "ENOENT") return false; } + fs.renameSync(lock, lock + suffix); + ready = null; + failures.clear(); + return true; + } catch { return false; } + finally { if (fd !== undefined) fs.closeSync(fd); } +} + /** * false = 非本组件/无可安全清除的注册;true = 已停用,或只清理固定残留注册并跳过脚本。 * 固定 uninstall 或注册锁失败会拒绝(静态 code/stage),让组件管理器保包。 @@ -491,6 +545,14 @@ export function retireManagedBridge(id) { const expected = inspectRegistration(file); try { return { r: installedBinding(expected.stored), original: expected }; } catch { + // 升级新工具包换掉 $PREFIX 后,component.cjs 已经不在,但用户私有运行目录与合法注册文件仍完好配对: + // 若此刻卸载降级把注册文件删掉、运行目录却留着,重装后组件会因「目录在而注册缺」永久报 RUNTIME_CONFLICT。 + // 仅对这类合法注册 + 运行目录仍在 + 入口缺失的场景保留注册,重装即可无缝复接(坏注册/缺失目录仍按旧规则清理)。 + const storedVal = expected.stored?.value; + if (validRegistrationShape(storedVal) && !fs.existsSync(path.join(PREFIX, ENTRY)) && fs.existsSync(storedVal.runtimeDir)) { + log("[comp] openai-bridge 组件文件已不在,保留运行实例与服务注册待重装后复接"); + return { cleared: false }; + } log("[comp] openai-bridge 卸载降级(stage=retire-binding)"); return { cleared: clearRegistration(file, expected) }; } diff --git a/gateway/gw/models.mjs b/gateway/gw/models.mjs index f85f86d4..50c4a626 100644 --- a/gateway/gw/models.mjs +++ b/gateway/gw/models.mjs @@ -283,8 +283,9 @@ function withCatalog(list, p) { // 清空 / 让它过期:别的模块改不了这几个变量(ES 模块的导入是只读的),走这两个函数 // 代次:接口配置一改就加一。改之前发出去、改之后才回来的清单请求只交给当时的调用方,不再写回缓存(#77) let CACHE_GEN = 0, REQ_SEQ = 0; -export function dropModelCache() { CACHE_GEN++; MODELS = null; MODELS_AT = 0; MODELS_FOR = null; CACHE.clear(); } -export function expireModelCache() { CACHE_GEN++; MODELS_AT = 0; for (const c of CACHE.values()) c.at = 0; } // 在途的旧结果别把过期的又续上(复核 L1) +const MODELS_INFLIGHT = new Map(); +export function dropModelCache() { CACHE_GEN++; MODELS = null; MODELS_AT = 0; MODELS_FOR = null; CACHE.clear(); MODELS_INFLIGHT.clear(); } +export function expireModelCache() { CACHE_GEN++; MODELS_AT = 0; for (const c of CACHE.values()) c.at = 0; MODELS_INFLIGHT.clear(); } // 在途的旧结果别把过期的又续上(复核 L1) /** p:哪家(缺省 = 全局生效的)。按家各缓存 10 分钟;全局那家的结果同时放进 MODELS。 * guess:自定义端口没填清单地址时去猜 /models。只在用户打开清单(面板、/model)时猜:开跑前要等清单, @@ -304,63 +305,67 @@ async function fetchModelsOf(p, force, guess) { return list; }; if (!force && c && c.at && Date.now() - c.at < 600000) return c.list; - if (p.local) return keep(localModels(), false); // 端侧:模型目录里有什么就是什么(每次现扫,刚放进去的文件马上能选) if (isLoginMode(p)) return keep((p.fallbackModels && p.fallbackModels.length) ? p.fallbackModels : LOGIN_MODELS); + const fkey = `${p.id}|${sig}|${guess ? 1 : 0}|${gen}`; + if (!force && MODELS_INFLIGHT.has(fkey)) return MODELS_INFLIGHT.get(fkey); + const run = (async () => { + // 写在配置里的内嵌清单(data:application/json,…):本地解析,不发请求、不带密钥,网络那边的同主机限制不用放宽(#57) + const inline = inlineModels(p.modelsUrl); + if (inline) { + const list = withCatalog(withConfigured(mergeKnown(inline, p.fallbackModels, true), p), p); + if (list.length) return keep(list); + } - // 写在配置里的内嵌清单(data:application/json,…):本地解析,不发请求、不带密钥,网络那边的同主机限制不用放宽(#57) - const inline = inlineModels(p.modelsUrl); - if (inline) { - const list = withCatalog(withConfigured(mergeKnown(inline, p.fallbackModels, true), p), p); - if (list.length) return keep(list); - } - - const key = keyOf(p); - // 一次拉取:头按 modelsAuth 配;拉到像样的清单返回 list,否则 null(失败原因记日志) - const pull = async (url) => { - try { - const headers = {}; - if (key) { - if (p.modelsAuth === "x-api-key") { - headers["x-api-key"] = key; - headers["anthropic-version"] = "2023-06-01"; - } else if (p.modelsAuth !== "none") { - headers.Authorization = `Bearer ${key}`; + const key = keyOf(p); + // 一次拉取:头按 modelsAuth 配;拉到像样的清单返回 list,否则 null(失败原因记日志) + const pull = async (url) => { + try { + const headers = {}; + if (key) { + if (p.modelsAuth === "x-api-key") { + headers["x-api-key"] = key; + headers["anthropic-version"] = "2023-06-01"; + } else if (p.modelsAuth !== "none") { + headers.Authorization = `Bearer ${key}`; + } } - } - const r = await fetchKeyed(url, { headers, signal: AbortSignal.timeout(15000) }); - if (r.ok) { - const list = withCatalog(withConfigured(mergeKnown(normalizeModels(await morePages(url, headers, await fetchJsonCapped(r))), p.fallbackModels), p), p); - if (list.length) { - log(`[${p.id}] 模型清单:${list.map((m) => m.id).join(", ")}`); - return list; + const r = await fetchKeyed(url, { headers, signal: AbortSignal.timeout(15000) }); + if (r.ok) { + const list = withCatalog(withConfigured(mergeKnown(normalizeModels(await morePages(url, headers, await fetchJsonCapped(r))), p.fallbackModels), p), p); + if (list.length) { + log(`[${p.id}] 模型清单:${list.map((m) => m.id).join(", ")}`); + return list; + } } + log(`[${p.id}] 拉模型清单失败 HTTP ${r.status}${url !== p.modelsUrl ? `(试 ${url})` : ""}`); + } catch (e) { + log(`[${p.id}] 拉模型清单出错: ${e.message}${url !== p.modelsUrl ? `(试 ${url})` : ""}`); } - log(`[${p.id}] 拉模型清单失败 HTTP ${r.status}${url !== p.modelsUrl ? `(试 ${url})` : ""}`); - } catch (e) { - log(`[${p.id}] 拉模型清单出错: ${e.message}${url !== p.modelsUrl ? `(试 ${url})` : ""}`); - } - return null; - }; - // 不带密钥(modelsAuth:"none")也一样要过 modelsUrlOk:配置能分享导入,不能让它拿网关当跳板,每轮去敲内网地址(v0513b 中-2) - if (p.modelsUrl && (key || p.modelsAuth === "none") && modelsUrlOk(p)) { - const list = await pull(p.modelsUrl); - if (list) return keep(list); - } else if (!p.modelsUrl && p.custom && key && (guess || GUESSED.has(sig))) { - // 自定义端口没填清单地址:按接口地址猜几个同主机的 /models(第三方端口多半同时开着 OpenAI 形状的清单)。 - // 只试和接口同主机同端口的地址(照样过 modelsUrlOk),密钥不会被带去别处;猜中的记在这份配置名下,下次直接用 - const hit = GUESSED.get(sig); - for (const url of hit ? [hit] : guessModelsUrls(p.baseUrl)) { - if (!modelsUrlOk({ baseUrl: p.baseUrl, modelsUrl: url })) continue; - const list = await pull(url); - if (list) { GUESSED.set(sig, url); return keep(list); } + return null; + }; + // 不带密钥(modelsAuth:"none")也一样要过 modelsUrlOk:配置能分享导入,不能让它拿网关当跳板,每轮去敲内网地址(v0513b 中-2) + if (p.modelsUrl && (key || p.modelsAuth === "none") && modelsUrlOk(p)) { + const list = await pull(p.modelsUrl); + if (list) return keep(list); + } else if (!p.modelsUrl && p.custom && key && (guess || GUESSED.has(sig))) { + // 自定义端口没填清单地址:按接口地址猜几个同主机的 /models(第三方端口多半同时开着 OpenAI 形状的清单)。 + // 只试和接口同主机同端口的地址(照样过 modelsUrlOk),密钥不会被带去别处;猜中的记在这份配置名下,下次直接用 + const hit = GUESSED.get(sig); + for (const url of hit ? [hit] : guessModelsUrls(p.baseUrl)) { + if (!modelsUrlOk({ baseUrl: p.baseUrl, modelsUrl: url })) continue; + const list = await pull(url); + if (list) { GUESSED.set(sig, url); return keep(list); } + } + if (hit) GUESSED.delete(sig); } - if (hit) GUESSED.delete(sig); - } - // 该猜而这次没猜(开跑前那次):先用兜底清单,但不记 10 分钟,用户打开清单时照样去猜 - const skipped = !p.modelsUrl && p.custom && key && !guess && !GUESSED.has(sig); - return keep(c && c.list ? c.list - : withConfigured((p.fallbackModels || []).map((m) => ({ context_window: 0, max_output_tokens: 0, input_modalities: ["text"], effort: null, ...m })), p), !skipped); + // 该猜而这次没猜(开跑前那次):先用兜底清单,但不记 10 分钟,用户打开清单时照样去猜 + const skipped = !p.modelsUrl && p.custom && key && !guess && !GUESSED.has(sig); + return keep(c && c.list ? c.list + : withConfigured((p.fallbackModels || []).map((m) => ({ context_window: 0, max_output_tokens: 0, input_modalities: ["text"], effort: null, ...m })), p), !skipped); + })().finally(() => { if (MODELS_INFLIGHT.get(fkey) === run) MODELS_INFLIGHT.delete(fkey); }); + if (!force) MODELS_INFLIGHT.set(fkey, run); + return run; } // 自定义端口猜中的清单地址(按配置指纹记;改了配置指纹就变,重新猜) const GUESSED = new Map(); diff --git a/gateway/gw/modules.mjs b/gateway/gw/modules.mjs index 34f3ae3e..5e573fc7 100644 --- a/gateway/gw/modules.mjs +++ b/gateway/gw/modules.mjs @@ -22,6 +22,7 @@ import { archiveProblem, parseTarListing } from "./archive-check.mjs"; const DK = PREFIX ? path.join(PREFIX, "libexec/devkit") : ""; const STAGE = PREFIX ? path.join(path.dirname(PREFIX), "devkit-stage") : ""; const MOD_JOBS = new Map(); // id → { phase, done, total, via, error, child, cancelled, finished, queue } +let modStarting = false; // 覆盖 await rmTreeBatched 窗口,防止并发 modStart/modRemove 绕过 MOD_JOBS 忙检查 const DEVKIT_MIRROR = "https://dl.cccodroid.net/devkit/"; /** modules.json 同 uid 可改:dir 只认 $PREFIX 内的普通相对路径 —— 卸载时会对 dirOf(m) 整个 rmSync(196-供应链.3) */ @@ -159,6 +160,7 @@ async function modStart(id, repair) { if (!mj) return { ok: false, message: tz("当前是整包工具包,没有模块可装") }; const m = blockOf(mj, id); if (!m) return { ok: false, message: tz("没有这个模块:{id}", { id }) }; + if (modStarting) return { ok: false, message: tz("另一个模块正在装,等它结束再试") }; for (const j of MOD_JOBS.values()) if (!j.finished) return { ok: false, message: tz("另一个模块正在装,等它结束再试") }; let chain; try { chain = missingChain(mj, id); } catch (e) { return { ok: false, message: e.message }; } @@ -166,23 +168,28 @@ async function modStart(id, repair) { if (!chain.length) return { ok: true, already: true }; const dk = devkitIdentity() || {}; if (!dk.base) return { ok: false, message: tz("工具包是从本地文件装的,不知道该去哪个 Release 下载模块。请先在设置里更新一次工具包") }; - // 空间:压缩包 + 解开后的大小(暂存区与目标在同一分区,搬进去是换名不占双份),再留 10%。 - // 上次失败留下的、大小对得上的压缩包已经占着空间,不再重复要;上次失败留下的解包树先清掉, - // 不然重试先被自己留下的残留挡住(0.6.9 审计 #186 / 195-I.2) + // 先校验所有块的下载信息,再加占位锁清理暂存树,避免 await 间隙并发 modStart 双装踩踏 $PREFIX for (const c of chain) { const b = blockOf(mj, c); if (!b.gz || !Number.isFinite(b.gz.bytes) || typeof b.gz.sha256 !== "string" || !b.gz.sha256) return { ok: false, message: tz("这个模块的下载信息不完整,先更新一次工具包") }; - try { await rmTreeBatched(path.join(STAGE, c)); } catch {} } - const need = modSpaceNeed(mj, chain); - try { const st = fs.statfsSync(path.dirname(PREFIX)); const free = st.bavail * st.bsize; if (free < need) return { ok: false, message: tz("存储空间不够:需要约 {need} MB,只剩 {free} MB", { need: Math.ceil(need / 1048576), free: Math.floor(free / 1048576) }) }; } catch {} - const job = { phase: "downloading", done: 0, total: 0, queue: chain, current: chain[0], finished: false }; - for (const c of chain) MOD_JOBS.set(c, job); - job.done = (async () => { - try { - for (const c of chain) { job.current = c; await modRunInstall(mj, blockOf(mj, c), dk.base, job); } - log(`[mod] 已装:${chain.join(" → ")}`); - } catch (e) { + modStarting = true; + try { + // 空间:压缩包 + 解开后的大小(暂存区与目标在同一分区,搬进去是换名不占双份),再留 10%。 + // 上次失败留下的、大小对得上的压缩包已经占着空间,不再重复要;上次失败留下的解包树先清掉, + // 不然重试先被自己留下的残留挡住(0.6.9 审计 #186 / 195-I.2) + for (const c of chain) { + try { await rmTreeBatched(path.join(STAGE, c)); } catch {} + } + const need = modSpaceNeed(mj, chain); + try { const st = fs.statfsSync(path.dirname(PREFIX)); const free = st.bavail * st.bsize; if (free < need) return { ok: false, message: tz("存储空间不够:需要约 {need} MB,只剩 {free} MB", { need: Math.ceil(need / 1048576), free: Math.floor(free / 1048576) }) }; } catch {} + const job = { phase: "downloading", done: 0, total: 0, queue: chain, current: chain[0], finished: false }; + for (const c of chain) MOD_JOBS.set(c, job); + job.done = (async () => { + try { + for (const c of chain) { job.current = c; await modRunInstall(mj, blockOf(mj, c), dk.base, job); } + log(`[mod] 已装:${chain.join(" → ")}`); + } catch (e) { job.error = e.message === "cancelled" ? "" : e.message; // 失败的解包树(可能几百 MB)以前一直留在 devkit-stage,只有下次重装才会被开头那句清掉; // 用户不再重试就没有入口删。这里当场清掉。压缩包按组件安装的做法留着,重试时大小对得上就不重下(196-供应链.2) @@ -193,8 +200,11 @@ async function modStart(id, repair) { // 成功的块不留 job(状态看 .ok);失败的那块留着 error 给面板看 for (const c of chain) if (!job.error || c !== job.current) MOD_JOBS.delete(c); } - })(); - return { r: { ok: true, chain }, job }; + })(); + return { r: { ok: true, chain }, job }; + } finally { + modStarting = false; + } } /** 模块安装 / 卸载心跳:与 components.mjs 同目录同字段,看门狗(GatewayService.installingBeat)据此放宽探活时限, @@ -426,6 +436,7 @@ async function modRemove(id) { if (!m) return { ok: false, message: tz("没有这个模块:{id}", { id }) }; if (m.required) return { ok: false, message: tz("基础模块不能卸载") }; if (m.kind === "shared") return { ok: false, message: tz("共享运行库跟着用它的模块走,不能单独卸载") }; + if (modStarting) return { ok: false, message: tz("有模块正在安装,等它结束再试") }; for (const j of MOD_JOBS.values()) if (!j.finished) return { ok: false, message: tz("有模块正在安装,等它结束再试") }; if (!modInstalled(mj, id)) return { ok: false, message: "not installed" }; const dep = modDependents(mj, id); diff --git a/gateway/gw/projects.mjs b/gateway/gw/projects.mjs index b3d7bd0f..e73512f6 100644 --- a/gateway/gw/projects.mjs +++ b/gateway/gw/projects.mjs @@ -185,9 +185,11 @@ export function moveSession(sid, projectId) { } // ── 路由:/api/projects ── +const CLONING_DIRS = new Set(); +const DELETING_PROJS = new Set(); function freeDir(name) { let base = path.join(CFG.workspace, slugName(name)), n = 2; - while (fs.existsSync(base)) base = path.join(CFG.workspace, slugName(name) + "-" + n++); + while (fs.existsSync(base) || CLONING_DIRS.has(base)) base = path.join(CFG.workspace, slugName(name) + "-" + n++); return base; } @@ -227,7 +229,9 @@ export async function routeProjects(req, res, u, p) { if (b.mode === "git") { const url = String(b.url || "").trim(); if (!/^(https?:\/\/|git@|ssh:\/\/)/.test(url)) return sendJson(res, 400, { error: tz("仓库地址要以 https:// 或 git@ 开头") }); + CLONING_DIRS.add(dir); try { await gitClone(url, dir); } catch (e) { return sendJson(res, 400, { error: tz("克隆失败:{msg}", { msg: e.message }) }); } + finally { CLONING_DIRS.delete(dir); } } else fs.mkdirSync(dir, { recursive: true }); } if (PROJECTS.some((x) => real(x.path) === real(dir))) return sendJson(res, 409, { error: tz("这个目录已经是一个项目了") }); @@ -268,35 +272,39 @@ export async function routeProjects(req, res, u, p) { return sendJson(res, 200, { ok: true, project: proj }); } if (!sub && req.method === "DELETE") { - const withDir = u.searchParams.get("withDir") === "1"; - if (withDir) { - const r = real(proj.path); - // 先判断能不能删,再动会话(原来先把会话收进回收站、后面才拦)。拦这些(审查 10-29 低6): - // 工作区 / home 本身及其上级、App 私有目录里工作区以外的地方(令牌、工具包、网关本体)、存储根和它下面一级(Download、DCIM…)、太浅的路径 - // 私有目录按目录身份判(gw/pathguard.mjs):以前按字符串拼保护表,还拼错了(拼成 /data/data/files), - // 应用数据根和它的别名都没进表,能递归删掉 shared_prefs 甚至整个 home(0.6.9 审计 P0-2) - if (r.split("/").length < 4 || holdsPrivate(r) || isPrivate(r) - || /^\/storage\/(emulated\/\d+|[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}|self\/primary)(\/[^/]+)?$/.test(r) || /^\/sdcard(\/[^/]+)?$/.test(r)) - return sendJson(res, 400, { error: tz("这个目录不能删") }); - const inDir = (s) => s.cwd && (real(s.cwd) === r || real(s.cwd).startsWith(r + "/")); - // 有会话正在这个目录里跑:先别删(目录删了它还在往里写,对话也收不进回收站) - if (listSessions(5000).some((s) => inDir(s) && runOfSession(s.id))) return sendJson(res, 409, { error: "busy", message: tz("这个项目里有会话正在生成,等它结束再删。") }); - // 删目录前先把对话收进回收站(可恢复)。有一条没收进去就不删目录:以前吞掉错误照删(0.6.9 审计 195 第二批 R2/R5)。 - // 会话不只看最近 5000 条(更早的也在这个目录里) - const failed = []; - for (const s of listSessions(1e6)) if (inDir(s)) { - try { - const r = trashSession(s.id); - if (!r.ok) failed.push(`${s.id.slice(0, 8)}: ${r.message || r.error}`); - } catch (e) { failed.push(`${s.id.slice(0, 8)}: ${e.message}`); } + if (DELETING_PROJS.has(proj.id)) return sendJson(res, 409, { error: "busy" }); + DELETING_PROJS.add(proj.id); + try { + const withDir = u.searchParams.get("withDir") === "1"; + if (withDir) { + const r = real(proj.path); + // 先判断能不能删,再动会话(原来先把会话收进回收站、后面才拦)。拦这些(审查 10-29 低6): + // 工作区 / home 本身及其上级、App 私有目录里工作区以外的地方(令牌、工具包、网关本体)、存储根和它下面一级(Download、DCIM…)、太浅的路径 + // 私有目录按目录身份判(gw/pathguard.mjs):以前按字符串拼保护表,还拼错了(拼成 /data/data/files), + // 应用数据根和它的别名都没进表,能递归删掉 shared_prefs 甚至整个 home(0.6.9 审计 P0-2) + if (r.split("/").length < 4 || holdsPrivate(r) || isPrivate(r) + || /^\/storage\/(emulated\/\d+|[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}|self\/primary)(\/[^/]+)?$/.test(r) || /^\/sdcard(\/[^/]+)?$/.test(r)) + return sendJson(res, 400, { error: tz("这个目录不能删") }); + const inDir = (s) => s.cwd && (real(s.cwd) === r || real(s.cwd).startsWith(r + "/")); + // 有会话正在这个目录里跑:先别删(目录删了它还在往里写,对话也收不进回收站) + if (listSessions(5000).some((s) => inDir(s) && runOfSession(s.id))) return sendJson(res, 409, { error: "busy", message: tz("这个项目里有会话正在生成,等它结束再删。") }); + // 删目录前先把对话收进回收站(可恢复)。有一条没收进去就不删目录:以前吞掉错误照删(0.6.9 审计 195 第二批 R2/R5)。 + // 会话不只看最近 5000 条(更早的也在这个目录里) + const failed = []; + for (const s of listSessions(1e6)) if (inDir(s)) { + try { + const tr = trashSession(s.id); + if (!tr.ok) failed.push(`${s.id.slice(0, 8)}: ${tr.message || tr.error}`); + } catch (e) { failed.push(`${s.id.slice(0, 8)}: ${e.message}`); } + } + if (failed.length) return sendJson(res, 500, { error: "trash_failed", message: tz("有 {n} 个对话没能移进回收站,目录没删:{why}", { n: failed.length, why: failed.slice(0, 3).join(";") }) }); + try { await fs.promises.rm(r, { recursive: true, force: true }); } catch (e) { return sendJson(res, 500, { error: e.message }); } } - if (failed.length) return sendJson(res, 500, { error: "trash_failed", message: tz("有 {n} 个对话没能移进回收站,目录没删:{why}", { n: failed.length, why: failed.slice(0, 3).join(";") }) }); - try { fs.rmSync(r, { recursive: true, force: true }); } catch (e) { return sendJson(res, 500, { error: e.message }); } - } - PROJECTS = PROJECTS.filter((x) => x.id !== proj.id); - if (!save()) return sendJson(res, 500, SAVE_FAIL()); - log(`📁 删除项目「${proj.name}」${withDir ? "(连目录)" : ""}`); - return sendJson(res, 200, { ok: true }); + PROJECTS = PROJECTS.filter((x) => x.id !== proj.id); + if (!save()) return sendJson(res, 500, SAVE_FAIL()); + log(`📁 删除项目「${proj.name}」${withDir ? "(连目录)" : ""}`); + return sendJson(res, 200, { ok: true }); + } finally { DELETING_PROJS.delete(proj.id); } } // 指令 = 项目目录里的 CLAUDE.md。读写都不跟软链:克隆来的仓库可以把它做成指向密钥文件 / 设置文件的软链, // 读出来就进了界面,保存就把那个文件盖掉(审查 v0513b 低-13) diff --git a/gateway/gw/run.mjs b/gateway/gw/run.mjs index a48690e7..e0446dbe 100644 --- a/gateway/gw/run.mjs +++ b/gateway/gw/run.mjs @@ -20,7 +20,7 @@ import { TASKS_HINT, contextWindowOf, toolsHint, translate, hookBlocked } from " import { archiveHint } from "./archive.mjs"; import { autoTitle } from "./autotitle.mjs"; import { SUBAGENT_HINT, agentBook, takeAgentNote, putAgentNote, onShared, privateAgentsBase } from "./agents.mjs"; -import { findSessionFile, peekSession } from "./sessions.mjs"; +import { findSessionFile, isSessionRewinding, peekSession } from "./sessions.mjs"; import { projectById, projectDefaults, projectOfDir } from "./projects.mjs"; import { sessLostProvider, sessModel, sessProvider, setSessModel } from "./sessmodel.mjs"; import { noteManaged } from "./sessmanaged.mjs"; @@ -29,7 +29,7 @@ import { pathWatch, previewHint, putPathNote, settlePathNote, takePathNote } fro import { claudeSeal, sealStillValid } from "./claudeseal.mjs"; import { gwRuntimeBlocked } from "./gwpin.mjs"; import { tamperNote, tamperRecord, tamperRetell } from "./tamper.mjs"; -import { SPOOF_NOTE, checkSession, integrityHint, integrityNote, neutralizeMarkers, sealSession, sessionAnchor } from "./integrity.mjs"; +import { SPOOF_NOTE, checkSessionAsync, integrityHint, integrityNote, neutralizeMarkers, sealSessionAsync, sessionAnchorAsync } from "./integrity.mjs"; import { ruleblockHint } from "./ruleblock.mjs"; import { recordExtra } from "./lineage-store.mjs"; import { refNote, refNoteSync } from "./merge.mjs"; @@ -440,7 +440,12 @@ export async function startRun(item) { // 会话封签(见 integrity.mjs):上一轮之后记录在应用外被改过、或是导入的,这一轮告诉模型别把那段历史当成自己说过的。 // 起进程前核对:claude --resume 一起来就可能往文件里写 const sfile = () => run.sessionId ? findSessionFile(String(run.sessionId), run.cwd)?.file : null; // 按这一轮的目录找(F8) - let integ = checkSession(run.sessionId, sfile()); + if (isSessionRewinding(run.sessionId)) { + const msg = tr(LAST_LANG, tz("这个会话正在生成中。")); + emit({ type: "error", message: msg }); + return endRun(run, { failed: true, finalText: msg }); + } + let integ = await checkSessionAsync(run.sessionId, sfile()); let integNote = isCmd || P.local ? "" : integrityNote(integ); // 消息里提到档号(0ab2·61):附上那一章的压缩摘要(见 merge.mjs refNote)。读不出来就算了,不挡这一轮 const refN = isCmd || P.local ? "" : await refNote(message, run.sessionId).catch((e) => { log("档号引用失败: " + e.message); return ""; }); @@ -541,8 +546,8 @@ export async function startRun(item) { } // 会话封签起进程紧前再核一次:上面等卡片、核程序可能等很久,这期间记录被改了,这一轮就该带提醒(199-S-04)。 // 同时拍底,收尾时核这一轮只是往后追加 - if (!integ) { integ = checkSession(run.sessionId, sfile()); if (integ) integNote = isCmd || P.local ? "" : integrityNote(integ); } - run.sealBase = run.sessionId ? { sid: run.sessionId, ...sessionAnchor(sfile()) } : null; + if (!integ) { integ = await checkSessionAsync(run.sessionId, sfile()); if (integ) integNote = isCmd || P.local ? "" : integrityNote(integ); } + run.sealBase = run.sessionId ? { sid: run.sessionId, ...(await sessionAnchorAsync(sfile())) } : null; if (run.sealBase) saveRunMark(); // 底要进运行标记:这一轮被系统结束时,下次启动凭它重新封签(195-A.8) if (run.aborted || run.ended) { log("⏹ 起进程前已停止"); return endRun(run, { durationMs: 0 }); } try { promptFiles(argv, run.id, appendPrompt, subPrompt); } @@ -1045,7 +1050,7 @@ export async function startRun(item) { }; run.requeuePending = requeuePending; - const finish = (code, signal) => { + const finish = async (code, signal) => { if (buf.trim()) feed(buf.trim()); buf = ""; noteSessionFile("finish"); // 记录只在退出前才落盘的情况:收尾前再核一次 @@ -1053,7 +1058,7 @@ export async function startRun(item) { try { run.agents?.close(); } catch (e) { log(`${runTag(run)} 子代理收尾出错: ${e.message}`); } // claude 已经退出,这时的记录就是下一轮的基准;提醒这一轮已经交出去(正常答完)才清掉标记 if (!lastResult || lastResult.is_error) run.giveNotesBack?.(); - try { sealSession(run.sessionId, sfile(), { clear: !!integNote && !run.aborted && !!lastResult && !lastResult.is_error, base: run.sealBase?.sid === run.sessionId && run.sealBase.hash ? run.sealBase : null }); } catch (e) { log(`${runTag(run)} [封签] ${e.message}`); } + try { await sealSessionAsync(run.sessionId, sfile(), { clear: !!integNote && !run.aborted && !!lastResult && !lastResult.is_error, base: run.sealBase?.sid === run.sessionId && run.sealBase.hash ? run.sealBase : null }); } catch (e) { log(`${runTag(run)} [封签] ${e.message}`); } run.inputOpen = false; run.perms.clear(); // 卡片随 run_end 一起作废(前端按 run_end 收起) requeuePending(); @@ -1121,8 +1126,8 @@ export async function startRun(item) { const finishSafe = (code, signal) => { if (closed) return; closed = true; - try { finish(code, signal); } - catch (e) { log(`${runTag(run)} ⚠️ 收尾出错: ${(e && e.stack) || e}`); try { endRun(run, { failed: true }); } catch {} } + Promise.resolve().then(() => finish(code, signal)) + .catch((e) => { log(`${runTag(run)} ⚠️ 收尾出错: ${(e && e.stack) || e}`); try { endRun(run, { failed: true }); } catch {} }); }; // 管道关不掉的兜底(queue.abortRun 5+2 秒后调):走和正常退出同一条 finish —— 封签、账本、权限卡、未送达消息都要收, // 以前直接 endRun 把这些全跳过了(FIND-002)。进程树由调用方负责杀,这里只把管道拆掉 diff --git a/gateway/gw/sched.mjs b/gateway/gw/sched.mjs index e3524da0..8ae7f134 100644 --- a/gateway/gw/sched.mjs +++ b/gateway/gw/sched.mjs @@ -6,7 +6,7 @@ // 闹钟也没叫醒(被强行停止、厂商拦截)而错过的,下次启动按每个任务的「错过了」处理,不偷偷补跑。存储:home/ccapp-sched.json(任务 + 设置)、home/ccapp-sched-runs.json(运行记录,留最近 500 条)。 import fs from "node:fs"; import path from "node:path"; -import { execFileSync } from "node:child_process"; +import { execFile, execFileSync } from "node:child_process"; import { CFG, LIVE, log, tz } from "./config.mjs"; import { isObj, loadState, saveState, writeAtomic } from "./statefile.mjs"; import { guarded } from "./crashguard.mjs"; @@ -26,7 +26,7 @@ import { providerById, usdCny } from "./providers.mjs"; // node 在安卓上可能没拿到时区(TZ 没设就是 UTC):「每天 09:00」必须按本地时间算 // 按系统设置取的就要跟着系统变:出差、手动改时区后,每天 09:00 要按新时区的 09:00(#107 06-012)。tick 里隔几分钟再问一次 const sysTz = () => { try { return execFileSync("getprop", ["persist.sys.timezone"], { encoding: "utf8", timeout: 2000 }).trim(); } catch { return ""; } }; -let TZ_FROM_PROP = false, TZ_CHECKED = 0; +let TZ_FROM_PROP = false, TZ_CHECKED = 0, TZ_CHECKING = false; // 以前只在「node 解析成 UTC」时才记下系统时区并开启跟随:本机解析对了 Asia/Shanghai,followSysTz 就永远不执行, // 出差 / 手动改时区后「每天 09:00」还按旧时区跑(197-5.2)。拿到 getprop 的值就跟随,启动时 TZ 没设的顺手设上 { @@ -34,13 +34,18 @@ let TZ_FROM_PROP = false, TZ_CHECKED = 0; if (z) { if (!process.env.TZ) process.env.TZ = z; TZ_FROM_PROP = true; } } function followSysTz(now) { - if (!TZ_FROM_PROP || now - TZ_CHECKED < 5 * 60000) return; + if (!TZ_FROM_PROP || TZ_CHECKING || now - TZ_CHECKED < 5 * 60000) return; TZ_CHECKED = now; - const z = sysTz(); - if (!z || z === process.env.TZ) return; - log(`⏰ 系统时区 ${process.env.TZ} → ${z},重排定时任务`); - process.env.TZ = z; // node 见到 TZ 被改会重读时区 - for (const t of DB.tasks) if (t.on && t.nextAt != null && t.nextAt > now) refreshNext(t, now); // 已到点的照常跑,跑完自然按新时区排 + TZ_CHECKING = true; + execFile("getprop", ["persist.sys.timezone"], { encoding: "utf8", timeout: 2000 }, (err, out) => { + TZ_CHECKING = false; + const z = !err ? String(out || "").trim() : ""; + if (!z || z === process.env.TZ) return; + log(`⏰ 系统时区 ${process.env.TZ} → ${z},重排定时任务`); + process.env.TZ = z; // node 见到 TZ 被改会重读时区 + const tNow = Date.now(); + for (const t of DB.tasks) if (t.on && t.nextAt != null && t.nextAt > tNow) refreshNext(t, tNow); // 已到点的照常跑,跑完自然按新时区排 + }); } const FILE = path.join(CFG.home, "ccapp-sched.json"); diff --git a/gateway/gw/seal.mjs b/gateway/gw/seal.mjs index 12fc07ea..d375ae87 100644 --- a/gateway/gw/seal.mjs +++ b/gateway/gw/seal.mjs @@ -545,19 +545,23 @@ export function sealRecheck(prep) { } /** 清旧东西:一天前的单轮文件(终端起的 claude 没有「结束」可挂)、七天没用过的插件副本 */ -let lastPrune = 0; +let lastPrune = 0, pruning = false; function prune() { const now = Date.now(); - if (now - lastPrune < 3600e3) return; + if (pruning || now - lastPrune < 3600e3) return; lastPrune = now; - let ents = []; try { ents = fs.readdirSync(ROOT()); } catch { return; } - for (const n of ents) { - const p = path.join(ROOT(), n); - let st; try { st = fs.statSync(p); } catch { continue; } - const age = now - st.mtimeMs; - if (/^(?:ctx|mcp)-/.test(n) && age > 864e5) fs.rmSync(p, { force: true }); - else if (/^plug-/.test(n) && age > 7 * 864e5) fs.rmSync(p, { recursive: true, force: true }); - } + pruning = true; + (async () => { + const root = ROOT(); + let ents = []; try { ents = await fs.promises.readdir(root); } catch { return; } + for (const n of ents) { + const p = path.join(root, n); + let st; try { st = await fs.promises.stat(p); } catch { continue; } + const age = now - st.mtimeMs; + if (/^(?:ctx|mcp)-/.test(n) && age > 864e5) await fs.promises.rm(p, { force: true }).catch(() => {}); + else if (/^plug-/.test(n) && age > 7 * 864e5) await fs.promises.rm(p, { recursive: true, force: true }).catch(() => {}); + } + })().catch(() => {}).finally(() => { pruning = false; }); } /** 复用的插件副本:摸一下,别被当成七天没用 */ function touch(dir) { try { const t = new Date(); fs.utimesSync(dir, t, t); } catch {} } diff --git a/gateway/gw/sessions.mjs b/gateway/gw/sessions.mjs index fb1e2f09..609e5ba8 100644 --- a/gateway/gw/sessions.mjs +++ b/gateway/gw/sessions.mjs @@ -61,6 +61,8 @@ export function savePins() { // ── 会话(claude 的 transcript 文件)───────────────────────────────── /** 项目目录名 → 真实 cwd(从 jsonl 里读,目录名本身不可逆) */ export const PEEK_CACHE = new Map(); // 标题/cwd 取自文件开头,写进去就不变了,没必要每次列表都重读 +const REWIND_BUSY = new Set(); // 跨最长 120s 异步 rewind 期间锁住该会话,防止并发 chat/delmsg/trash/rewind 踩踏 +export const isSessionRewinding = (id) => !!(id && REWIND_BUSY.has(id)); // Claude Code 自己的 /resume 只滤 sessionKind=daemon / daemon-worker(后台守护进程开的会话,不是用户 // 开的那条对话);bg 是用户自己甩到后台的会话,在 /resume 里带「bg」标记照常显示,这里不能一起藏掉。 // 同样不按 isSidechain / 标题猜:用户从工具调用里接出来的会话、被复用成任务的会话都不能因此消失。 @@ -612,7 +614,7 @@ export async function routeSessions(req, res, u, p) { if (req.method === "DELETE" && !action) { if (!found) return sendJson(res, 404, { error: "not found" }); - if (!(await idleRetired(id))) return sendJson(res, 409, { error: "busy", message: tz("这个会话正在生成中。") }); + if (isSessionRewinding(id) || !(await idleRetired(id))) return sendJson(res, 409, { error: "busy", message: tz("这个会话正在生成中。") }); // 删除先进回收站(30 天内可恢复),彻底删除走 /api/trash/purge let r; try { r = trashSession(id); } catch (e) { return sendJson(res, 500, { error: e.message }); } @@ -634,41 +636,44 @@ export async function routeSessions(req, res, u, p) { // 回退到某条用户消息之前:文件(claude 检查点)+ 可选连对话一起(截到这条之前另起一个会话,原会话不动) if (req.method === "POST" && action === "rewind") { const b = JSON.parse((await readBody(req)) || "{}"); - if (!(await idleRetired(id))) return sendJson(res, 409, { error: "busy", message: tz("这个会话正在生成中,等它答完再回退。") }); - const loc = locateUserTurn(id, String(b.userText || ""), b.after, String(b.uuid || "").slice(0, 64)); - if (!loc.ok) return sendJson(res, loc.status || 400, { error: "locate", message: loc.message }); - const uuid = loc.users[loc.best].uuid; - // 真回退也先试算一次:要拿到会动哪些文件,回退后逐个核对(见 rewindFixup) - const dry = uuid ? await rewindFiles(id, uuid, true) : { ok: false, error: "no uuid" }; - let files = dry; - if (!b.dryRun && dry.ok && dry.canRewind !== false && (dry.filesChanged || []).length) { - files = await rewindFiles(id, uuid, false); - const fx2 = rewindFixup(loc.found.file, id, uuid, dry.filesChanged); - if (fx2.fixed || fx2.failed) log(`回退补救:补写 ${fx2.fixed} 个,失败 ${fx2.failed} 个`); - if (fx2.failed) files = { ok: false, error: tz("有 {n} 个文件没能还原", { n: fx2.failed }) }; - else files = { ...files, ok: true, canRewind: true, filesChanged: dry.filesChanged, insertions: dry.insertions, deletions: dry.deletions }; - } - // 早于检查点的消息(或这一轮之后根本没改文件)claude 会说不能回退:代码这块就当「没有可撤销的」 - const fx = files.ok && files.canRewind !== false - ? { canRewind: true, files: files.filesChanged || null, insertions: files.insertions || 0, deletions: files.deletions || 0 } - : { canRewind: false, reason: String(files.error || "").slice(0, 300) }; - if (b.dryRun) return sendJson(res, 200, { ok: true, ...fx }); - if (!fx.canRewind && !b.conversation) return sendJson(res, 409, { error: "cannot", message: tz("这条消息之后的文件改动没有留底,没法撤销。") + (fx.reason ? "(" + fx.reason + ")" : "") }); - log(`回退 ${id.slice(0, 8)}:文件${fx.canRewind ? "已撤销" : "未动"}${b.conversation ? ",对话截到这条之前" : ""}`); - let fork = null; - if (b.conversation && loc.best === 0) fork = { ok: true, fresh: true }; // 退到第一条之前 = 空会话,前端直接开新会话 - else if (b.conversation) { - fork = forkSession(id, String(b.userText || ""), b.after, { before: true, uuid: String(b.uuid || "").slice(0, 64) }); - if (!fork.ok) return sendJson(res, fork.status || 400, { error: "fork", message: fork.message, files: fx }); - } - return sendJson(res, 200, { ok: true, files: fx, fork }); + if (REWIND_BUSY.has(id) || !(await idleRetired(id))) return sendJson(res, 409, { error: "busy", message: tz("这个会话正在生成中,等它答完再回退。") }); + REWIND_BUSY.add(id); + try { + const loc = locateUserTurn(id, String(b.userText || ""), b.after, String(b.uuid || "").slice(0, 64)); + if (!loc.ok) return sendJson(res, loc.status || 400, { error: "locate", message: loc.message }); + const uuid = loc.users[loc.best].uuid; + // 真回退也先试算一次:要拿到会动哪些文件,回退后逐个核对(见 rewindFixup) + const dry = uuid ? await rewindFiles(id, uuid, true) : { ok: false, error: "no uuid" }; + let files = dry; + if (!b.dryRun && dry.ok && dry.canRewind !== false && (dry.filesChanged || []).length) { + files = await rewindFiles(id, uuid, false); + const fx2 = rewindFixup(loc.found.file, id, uuid, dry.filesChanged); + if (fx2.fixed || fx2.failed) log(`回退补救:补写 ${fx2.fixed} 个,失败 ${fx2.failed} 个`); + if (fx2.failed) files = { ok: false, error: tz("有 {n} 个文件没能还原", { n: fx2.failed }) }; + else files = { ...files, ok: true, canRewind: true, filesChanged: dry.filesChanged, insertions: dry.insertions, deletions: dry.deletions }; + } + // 早于检查点的消息(或这一轮之后根本没改文件)claude 会说不能回退:代码这块就当「没有可撤销的」 + const fx = files.ok && files.canRewind !== false + ? { canRewind: true, files: files.filesChanged || null, insertions: files.insertions || 0, deletions: files.deletions || 0 } + : { canRewind: false, reason: String(files.error || "").slice(0, 300) }; + if (b.dryRun) return sendJson(res, 200, { ok: true, ...fx }); + if (!fx.canRewind && !b.conversation) return sendJson(res, 409, { error: "cannot", message: tz("这条消息之后的文件改动没有留底,没法撤销。") + (fx.reason ? "(" + fx.reason + ")" : "") }); + log(`回退 ${id.slice(0, 8)}:文件${fx.canRewind ? "已撤销" : "未动"}${b.conversation ? ",对话截到这条之前" : ""}`); + let fork = null; + if (b.conversation && loc.best === 0) fork = { ok: true, fresh: true }; // 退到第一条之前 = 空会话,前端直接开新会话 + else if (b.conversation) { + fork = forkSession(id, String(b.userText || ""), b.after, { before: true, uuid: String(b.uuid || "").slice(0, 64) }); + if (!fork.ok) return sendJson(res, fork.status || 400, { error: "fork", message: fork.message, files: fx }); + } + return sendJson(res, 200, { ok: true, files: fx, fork }); + } finally { REWIND_BUSY.delete(id); } } // 删一条消息(which: user = 这一轮的提问;bot = 这一轮 Claude 的整条回复),可撤销最近一次 if (req.method === "POST" && (action === "delmsg" || action === "undodel")) { const b = JSON.parse((await readBody(req)) || "{}"); // 只剩后台任务的 idle 轮:先结束它(否则永远 409),真正在生成的仍拒绝(195-A.3) - if (action === "delmsg" && !(await idleRetired(id))) return sendJson(res, 409, { ok: false, error: "delmsg", message: tz("这个会话正在生成中,等它答完再删。") }); + if (action === "delmsg" && (isSessionRewinding(id) || !(await idleRetired(id)))) return sendJson(res, 409, { ok: false, error: "delmsg", message: tz("这个会话正在生成中,等它答完再删。") }); let r; try { r = action === "delmsg" ? deleteMessage(id, String(b.userText || ""), Number(b.after) || 0, b.which === "user" ? "user" : "bot", String(b.uuid || "").slice(0, 64), String(b.replyUuid || "").slice(0, 64), Array.isArray(b.offs) ? b.offs.slice(0, 64).map(Number) : []) : undoDelete(id, String(b.undo || "")); } catch (e) { r = { ok: false, status: 500, message: e.message }; } diff --git a/gateway/gw/storage.mjs b/gateway/gw/storage.mjs index 1834c10e..487ad337 100644 --- a/gateway/gw/storage.mjs +++ b/gateway/gw/storage.mjs @@ -58,6 +58,25 @@ export function rmChecked(p, roots) { try { chmodTree(r); fs.rmSync(r, { recursive: true, force: true }); return { ok: true }; } catch { return { ok: false, why: e.code || e.message }; } } } +async function chmodTreeAsync(d) { + let st; try { st = await fs.promises.lstat(d); } catch { return; } + if (!st.isDirectory()) return; + try { await fs.promises.chmod(d, 0o700); } catch {} + let ds; try { ds = await fs.promises.readdir(d); } catch { return; } + for (const n of ds) await chmodTreeAsync(path.join(d, n)); +} +export async function rmCheckedAsync(p, roots) { + const r = realOf(p); + if (!r) return { ok: false, why: "gone" }; + const rs = roots.map(realDir).filter(Boolean); + if (!rs.some((root) => r !== root && under(r, root))) return { ok: false, why: "outside" }; + const nv = NEVER().map((x) => realOf(x) || x); + if (nv.some((x) => under(r, x) || under(x, r)) || NEVER_NAME.test(path.basename(r))) return { ok: false, why: "protected" }; + try { await fs.promises.rm(r, { recursive: true, force: true }); return { ok: true }; } + catch (e) { + try { await chmodTreeAsync(r); await fs.promises.rm(r, { recursive: true, force: true }); return { ok: true }; } catch { return { ok: false, why: e.code || e.message }; } + } +} function chmodTree(d) { let st; try { st = fs.lstatSync(d); } catch { return; } if (!st.isDirectory()) return; @@ -322,17 +341,18 @@ export async function cleanStorage(cats, { picks = null, auto = false, at = Date const now = Date.now(), open = openPaths(), live = await liveSessions(); let freed = 0, n = 0, skipped = 0; const done = {}; - const rm = (p, bytes, roots, cat) => { - const r = rmChecked(p, roots); + const rm = async (p, bytes, roots, cat) => { + const r = await rmCheckedAsync(p, roots); if (r.ok) { freed += bytes; n++; done[cat] = (done[cat] || 0) + bytes; } else if (r.why !== "gone") { skipped++; log(`[存储] 没删 ${tilde(p)}:${r.why}`); } + if (((n + skipped) & 63) === 0) await new Promise((ok) => setImmediate(ok)); }; if (cats.includes("cache")) { const dirs = cacheDirs(); for (const it of await cacheCandidates(open, now)) { const c = dirs.find((x) => x.id === it.id); const roots = c.dir ? [c.dir] : [path.dirname(c.file)]; - for (const f of it.files) { let s = 0; try { s = fs.lstatSync(f).size; } catch {} rm(f, s, roots, "cache"); } + for (const f of it.files) { let s = 0; try { s = (await fs.promises.lstat(f)).size; } catch {} await rm(f, s, roots, "cache"); } } } if (cats.includes("tmp") && TMP()) { @@ -340,10 +360,10 @@ export async function cleanStorage(cats, { picks = null, auto = false, at = Date for (const u of await tmpUnits(open, live, now)) { // 勾的也要过:有进程开着、会话还在跑的照样不删;没数完的不删 const ok = want ? want.has(u.rel) && !u.inUse && !u.active && u.full : u.auto; - if (ok) rm(u.path, u.bytes, [TMP()], "tmp"); + if (ok) await rm(u.path, u.bytes, [TMP()], "tmp"); } } - if (cats.includes("junk")) for (const u of await junkUnits(open, live, now)) if (u.auto) rm(u.path, u.bytes, JUNK_ROOTS(), "junk"); + if (cats.includes("junk")) for (const u of await junkUnits(open, live, now)) if (u.auto) await rm(u.path, u.bytes, JUNK_ROOTS(), "junk"); const rec = { at, auto, freed, n, skipped, cats: done }; st().history.push(rec); st().history = st().history.slice(-30); if (auto) st().lastAuto = at; diff --git a/gateway/gw/usage.mjs b/gateway/gw/usage.mjs index b096aacd..21cf6ea2 100644 --- a/gateway/gw/usage.mjs +++ b/gateway/gw/usage.mjs @@ -1,7 +1,7 @@ import fs from "node:fs"; import net from "node:net"; import path from "node:path"; -import { spawn } from "node:child_process"; +import { execFile, spawn } from "node:child_process"; import { CFG, LIVE, HERE, PATHS, PREFIX, log, tz } from "./config.mjs"; import { claudeEnv, killTree, readLedger } from "./claude.mjs"; import { NEXT, readBody, sendJson } from "./http.mjs"; @@ -134,6 +134,20 @@ export function usageMeter(ctx) { if (seen.size > 5000) seen.delete(seen.keys().next().value); if (d.i || d.o || d.c) add(d, ctx.sid(), p.m || ctx.model()); }; + const SUB_CHUNK = 2 << 20; + function parseSubText(n, from, text) { + const end = text.lastIndexOf("\n"); + if (end < 0) return false; // 半行:等写完 + subPos.set(n, from + Buffer.byteLength(text.slice(0, end + 1))); + for (const line of text.slice(0, end).split("\n")) { + if (!line.includes('"usage"') || !line.includes('"assistant"')) continue; + let e; try { e = JSON.parse(line); } catch { continue; } + // 消息按时间归轮:本轮开始之后写的才算(以前放宽 5 秒,上一轮收尾慢的子代理会被下一轮再算一遍) + if (e.type !== "assistant" || !e.message?.id || !(Date.parse(e.timestamp) >= t0)) continue; + bump(e.message.id, e.message.usage, e.message.model, false); + } + return true; + } function scanSubs() { const dir = ctx.subDir && ctx.subDir(); if (!dir) return; @@ -145,24 +159,67 @@ export function usageMeter(ctx) { if (st.mtimeMs < t0 - 5000) continue; // 以前几轮的子代理 const from = subPos.get(n) || 0; if (st.size <= from) continue; - let text = ""; let fd = null; - try { fd = fs.openSync(file, "r"); const b = Buffer.alloc(st.size - from); fs.readSync(fd, b, 0, b.length, from); text = b.toString("utf8"); } - catch { continue; } - finally { if (fd != null) try { fs.closeSync(fd); } catch {} } // 读一半抛错也要关 fd(200-6-02) - const end = text.lastIndexOf("\n"); - if (end < 0) continue; // 半行:等写完 - subPos.set(n, from + Buffer.byteLength(text.slice(0, end + 1))); - for (const line of text.slice(0, end).split("\n")) { - if (!line.includes('"usage"') || !line.includes('"assistant"')) continue; - let e; try { e = JSON.parse(line); } catch { continue; } - // 消息按时间归轮:本轮开始之后写的才算(以前放宽 5 秒,上一轮收尾慢的子代理会被下一轮再算一遍) - if (e.type !== "assistant" || !e.message?.id || !(Date.parse(e.timestamp) >= t0)) continue; - bump(e.message.id, e.message.usage, e.message.model, false); - } + try { + fd = fs.openSync(file, "r"); + let pos = from; + while (pos < st.size) { + const len = Math.min(SUB_CHUNK, st.size - pos); + const b = Buffer.alloc(len); + const got = fs.readSync(fd, b, 0, len, pos); + if (!got) break; + const text = b.subarray(0, got).toString("utf8"); + if (!parseSubText(n, pos, text)) { + if (len < SUB_CHUNK) break; + // 单行超过 2 MB:跳到下一行起点继续,避免无限卡在半行 + const nl = text.indexOf("\n"); + if (nl < 0) { pos += got; subPos.set(n, pos); continue; } + pos += Buffer.byteLength(text.slice(0, nl + 1)); subPos.set(n, pos); continue; + } + pos = subPos.get(n) || (pos + got); + } + } catch { continue; } + finally { if (fd != null) try { fs.closeSync(fd); } catch {} } } } - const timer = setInterval(scanSubs, 30000); + let subScanning = false; + async function scanSubsAsync() { + if (subScanning) return; + subScanning = true; + try { + const dir = ctx.subDir && ctx.subDir(); + if (!dir) return; + let names = []; + try { names = (await fs.promises.readdir(dir)).filter((n) => n.endsWith(".jsonl")); } catch { return; } + for (const n of names) { + const file = path.join(dir, n); + let st; try { st = await fs.promises.stat(file); } catch { continue; } + if (st.mtimeMs < t0 - 5000) continue; + let pos = subPos.get(n) || 0; + if (st.size <= pos) continue; + let fh = null; + try { + fh = await fs.promises.open(file, "r"); + while (pos < st.size) { + const len = Math.min(SUB_CHUNK, st.size - pos); + const b = Buffer.alloc(len); + const { bytesRead } = await fh.read(b, 0, len, pos); + if (!bytesRead) break; + const text = b.subarray(0, bytesRead).toString("utf8"); + if (!parseSubText(n, pos, text)) { + if (len < SUB_CHUNK) break; + pos += bytesRead; subPos.set(n, pos); + } else { + pos = subPos.get(n) || (pos + bytesRead); + } + await new Promise((ok) => setImmediate(ok)); + } + } catch {} + finally { if (fh) await fh.close().catch(() => {}); } + } + } finally { subScanning = false; } + } + const timer = setInterval(() => { scanSubsAsync().catch(() => {}); }, 30000); timer.unref?.(); return { feed(ev) { diff --git a/gateway/gw/work-island.mjs b/gateway/gw/work-island.mjs index c55c14a9..c4797bc2 100644 --- a/gateway/gw/work-island.mjs +++ b/gateway/gw/work-island.mjs @@ -68,7 +68,7 @@ function amFailed(e, err) { started = false; amQ = []; if (unsub) { try { unsub(); } catch {} unsub = null; } - if (core) { try { core.stop(true, false); } catch {} core = null; } + if (core) { try { core.stop(false, false); } catch {} core = null; } } } function amSendSync(...args) { @@ -152,7 +152,7 @@ export function startWorkIsland() { }); const live = runList().filter((r) => r && !r.ended); if (live.length) core.start(live[0]); // 开设置时已经有轮次在跑 - else core.stop(true, true); // 没有轮次:先发一次 IDLE,收掉上一任网关被 SIGKILL 后留下的胶囊(195-P.1) + else core.stop(false, true); // 没有轮次:先异步发一次 IDLE,收掉上一任网关被 SIGKILL 后留下的胶囊(不阻塞主线程) lastErr = null; log("[work-island] 已订阅网关事件"); }); diff --git a/gateway/tests/race-502-nest.test.mjs b/gateway/tests/race-502-nest.test.mjs new file mode 100644 index 00000000..6d614e62 --- /dev/null +++ b/gateway/tests/race-502-nest.test.mjs @@ -0,0 +1,223 @@ +// 全仓「并发下载 502 / 事件循环阻塞 / 宿主拦截竞态 / 前端轮询致死 + 新工具包下中转桥生命周期」回归测试 +import "../gw/config.mjs"; +import { test } from "node:test"; +import assert from "node:assert/strict"; +import fs from "node:fs"; +import path from "node:path"; +import crypto from "node:crypto"; +import vm from "node:vm"; +import { CFG, PREFIX } from "../gw/config.mjs"; + +const root = process.cwd(); + +test("G-P0-6 usage.mjs: 导入 execFile 不再在 ccMem / 内存查询路径抛出 ReferenceError", async () => { + const src = fs.readFileSync(path.join(root, "gateway", "gw", "usage.mjs"), "utf8"); + assert.match(src, /import\s*\{[^}]*\bexecFile\b[^}]*\}\s*from\s*"node:child_process"/, "usage.mjs 必须导入 execFile"); + const mod = await import("../gw/usage.mjs"); + assert.equal(typeof mod.routeUsage, "function"); +}); + +test("G-P0-1/G-P1-1 components.mjs: recMap 缓存命中与失效、compStart 先占位再删旧暂存", () => { + const src = fs.readFileSync(path.join(root, "gateway", "gw", "components.mjs"), "utf8"); + assert.ok(src.includes("COMP_REC_CACHE"), "compRecordInfo 应按 stat 键缓存大记录解析结果"); + assert.ok(src.includes("const recMap = new Map()"), "compList 应单趟构建 recMap 传给 compUsers 避免 O(K^2) 读盘"); + assert.ok(!/compList\([^)]*\)\s*\{[\s\S]{0,600}compHealSkills\(/.test(src), "热路径 GET compList 不应同步执行 compHealSkills()"); + const m = /async function compStart\([\s\S]{0,4000}/.exec(src); + assert.ok(m, "找到 compStart"); + const idxSet = m[0].indexOf("COMP_JOBS.set("); + const idxRm = m[0].indexOf("rmTreeBatched("); + assert.ok(idxSet > 0 && idxRm > 0 && idxSet < idxRm, "compStart 必须在 await rmTreeBatched 之前先在 COMP_JOBS 占位"); +}); + +test("G-P0-2 modules.mjs: modStart 与 modRemove 通过 modStarting 锁防并发删装踩踏", () => { + const src = fs.readFileSync(path.join(root, "gateway", "gw", "modules.mjs"), "utf8"); + assert.ok(src.includes("modStarting"), "modules.mjs 应使用 modStarting 锁覆盖异步 rmTreeBatched 窗口"); +}); + +test("G-P0-3/G-P1-4 archiver.mjs: extractOne 流背压 + previewEntry single-flight + 异步清理", () => { + const src = fs.readFileSync(path.join(root, "gateway", "gw", "archiver.mjs"), "utf8"); + assert.ok(src.includes("PREV_INFLIGHT"), "previewEntry 应具备 single-flight 去重"); + assert.ok(src.includes('ws.once("drain"') || src.includes("ws.once('drain'"), "extractOne 应处理 ws.write 背压暂停/恢复"); + assert.ok(src.includes("async function sanitizeTree") && src.includes("async function collectSecretExcludes"), "大目录遍历应异步分片让出事件循环"); +}); + +test("G-P0-4 storage.mjs: rmCheckedAsync 异步安全删除目录树且保留同步 rmChecked 导出", async () => { + const mod = await import("../gw/storage.mjs"); + assert.equal(typeof mod.rmChecked, "function"); + assert.equal(typeof mod.rmCheckedAsync, "function"); + const base = path.join(CFG.workspace, "st-async-" + Date.now()); + const sub = path.join(base, "nested"); + fs.mkdirSync(sub, { recursive: true }); + fs.writeFileSync(path.join(sub, "a.txt"), "hello"); + const r = await mod.rmCheckedAsync(base, [CFG.workspace]); + assert.equal(r.ok, true); + assert.equal(fs.existsSync(base), false); +}); + +test("G-P1-5 integrity.mjs: 异步 anchor/seal/check 与同步语义一致", async () => { + const integ = await import("../gw/integrity.mjs"); + const dir = path.join(CFG.workspace, "integ-async-" + Date.now()); + const file = path.join(dir, "s.jsonl"); + fs.mkdirSync(dir, { recursive: true }); + const sid = crypto.randomUUID(); + fs.writeFileSync(file, JSON.stringify({ type: "user", uuid: "u1", sessionId: sid, message: { role: "user", content: "hi" } }) + "\n"); + try { + const syncA = integ.sessionAnchor(file); + const asyncA = await integ.sessionAnchorAsync(file); + assert.deepEqual(asyncA, syncA); + await integ.sealSessionAsync(sid, file); + const chk = await integ.checkSessionAsync(sid, file); + assert.deepEqual(chk, integ.checkSession(sid, file)); + assert.equal(chk, null); + } finally { + fs.rmSync(dir, { recursive: true, force: true }); + } +}); + +test("G-P1-7 sessions.mjs & run.mjs: 导出 isSessionRewinding 且 run.mjs 启动前检查回退锁", async () => { + const sess = await import("../gw/sessions.mjs"); + assert.equal(typeof sess.isSessionRewinding, "function"); + assert.equal(sess.isSessionRewinding("nonexistent-session"), false); + const runSrc = fs.readFileSync(path.join(root, "gateway", "gw", "run.mjs"), "utf8"); + assert.ok(runSrc.includes("isSessionRewinding("), "run.mjs 应阻止对正在回退的会话发起新运行"); +}); + +test("openai-bridge 新工具包生命周期:卸载时入口缺失不误删合法注册;重装后自动清除 component removed 故障锁", async () => { + const mb = await import("../gw/managed-bridge.mjs"); + const srvDir = path.join(CFG.home, ".cccodroid", "services"); + const regFile = path.join(srvDir, "openai-bridge.json"); + const rtDir = path.join(CFG.home, ".local", "share", "ccr-bridge-kit-test-" + Date.now()); + const stateDir = path.join(rtDir, "runtime-home", ".claude-code-router"); + const compDir = path.join(path.dirname(PREFIX), "components"); + const compRec = path.join(compDir, "openai-bridge.json"); + const compEntry = path.join(PREFIX, "lib", "openai-bridge", "component.cjs"); + const prevReg = fs.existsSync(regFile) ? fs.readFileSync(regFile) : null; + const prevRec = fs.existsSync(compRec) ? fs.readFileSync(compRec) : null; + const prevEntry = fs.existsSync(compEntry) ? fs.readFileSync(compEntry) : null; + try { + fs.mkdirSync(srvDir, { recursive: true }); + fs.mkdirSync(stateDir, { recursive: true }); + fs.mkdirSync(compDir, { recursive: true }); + const regObj = { + schema: 1, + id: "openai-bridge", + endpoint: "http://127.0.0.1:34599", + runtimeDir: rtDir, + instanceId: "0123456789abcdef0123456789abcdef", + }; + fs.writeFileSync(regFile, JSON.stringify(regObj)); + // 场景 1:升级新工具包换掉 PREFIX,component.cjs 已不在但 runtimeDir 与合法注册仍在 → retire 保留注册,避免重装后永久 RUNTIME_CONFLICT + fs.rmSync(compEntry, { force: true }); + const retired = await mb.retireManagedBridge("openai-bridge"); + assert.equal(retired, false); + assert.equal(fs.existsSync(regFile), true, "入口因工具包切换缺失时不应误删仍与运行目录配对的合法注册"); + + // 场景 2:重装组件后,清掉 watchdog 写下的 component removed or disabled 故障锁,但不碰其它故障锁 + fs.mkdirSync(path.dirname(compEntry), { recursive: true }); + fs.writeFileSync(compEntry, "module.exports = {};\n"); + fs.writeFileSync(compRec, JSON.stringify({ id: "openai-bridge", state: "ok", files: ["lib/openai-bridge/component.cjs"] })); + const lockFile = path.join(stateDir, "recovery.failed"); + const attFile = path.join(stateDir, "recovery.attempts"); + fs.writeFileSync(lockFile, "recovery limit reached\n"); + assert.equal(mb.clearComponentRemovedRecoveryLock(), false, "真实崩溃故障锁不应被自动清除"); + assert.equal(fs.existsSync(lockFile), true); + + fs.writeFileSync(lockFile, "component removed or disabled\n"); + fs.writeFileSync(attFile, "1\n"); + assert.equal(mb.clearComponentRemovedRecoveryLock(), true, "应清除工具包切换遗留的 component removed or disabled 故障锁"); + assert.equal(fs.existsSync(lockFile), false); + assert.equal(fs.existsSync(attFile), false); + assert.ok(fs.readdirSync(stateDir).some((n) => n.startsWith("recovery.failed.prev-")), "清除时应留 .prev 证据"); + } finally { + fs.rmSync(rtDir, { recursive: true, force: true }); + if (prevReg == null) fs.rmSync(regFile, { force: true }); else fs.writeFileSync(regFile, prevReg); + if (prevRec == null) fs.rmSync(compRec, { force: true }); else fs.writeFileSync(compRec, prevRec); + if (prevEntry == null) fs.rmSync(compEntry, { force: true }); else fs.writeFileSync(compEntry, prevEntry); + } +}); + +test("A-P0-1..5 Android 宿主: ProofFlight 纪元/单飞、fetchStatic 限时限流、PAUSE_LOCK 引用计数与异步停网关", () => { + const envSrc = fs.readFileSync(path.join(root, "android", "java", "cc", "codroid", "Env.java"), "utf8"); + const gwSrc = fs.readFileSync(path.join(root, "android", "java", "cc", "codroid", "GatewayService.java"), "utf8"); + const mainSrc = fs.readFileSync(path.join(root, "android", "java", "cc", "codroid", "MainActivity.java"), "utf8"); + assert.ok(envSrc.includes("class ProofFlight") && envSrc.includes("bootEpoch"), "Env.java 应使用 ProofFlight + bootEpoch 防跨代单飞污染"); + assert.ok(envSrc.includes("setConnectTimeout(1000)") && envSrc.includes("setReadTimeout(5000)"), "fetchStatic 应设短超时避免拖死 WebView 线程"); + assert.ok(gwSrc.includes("PAUSE_LOCK") && gwSrc.includes("pauseCount") && gwSrc.includes("killGatewayAsync"), "GatewayService 应采用 PAUSE_LOCK 引用计数与异步停网关"); + assert.ok(gwSrc.includes("shutdownIfIdle("), "watchFreeze 应快照 startSeq 并调用 shutdownIfIdle"); + assert.ok(mainSrc.includes("DEVKIT_APPLYING") && mainSrc.includes("IK_LOCK"), "MainActivity 应具备 DEVKIT_APPLYING CAS 与 IK_LOCK"); +}); + +test("W-P0-1/W-P0-3/W-P1-1 08-extensions.js: 模块/组件瞬时 502 不清屏且持续重试,loadComponents(true) 遇 502 仍续轮询", async () => { + const src = fs.readFileSync(path.join(root, "gateway", "web", "app", "08-extensions.js"), "utf8"); + const nodes = new Map(), timers = []; + const makeNode = (id) => { + if (!nodes.has(id)) nodes.set(id, { + id, innerHTML: "", textContent: "", dataset: {}, disabled: false, listeners: {}, + classList: { + _s: new Set(), + toggle(k, f) { if (f == null) this._s.has(k) ? this._s.delete(k) : this._s.add(k); else if (f) this._s.add(k); else this._s.delete(k); }, + contains(k) { return this._s.has(k); }, + add(k) { this._s.add(k); }, + remove(k) { this._s.delete(k); }, + }, + querySelector() { return null; }, + querySelectorAll() { return []; }, + addEventListener(type, fn) { (this.listeners[type] ||= []).push(fn); }, + }); + return nodes.get(id); + }; + let modFail = false, compFail = false; + const box = { + window: { I18N: { lang: "zh" } }, I18N: { lang: "zh" }, + pageVisit: 1, pageVisible: () => true, + $: (id) => (["llm-dl", "ext-storage"].includes(id) ? null : makeNode(id)), + t: (s) => s, tk: (s) => s, esc: (s) => String(s ?? ""), isZh: () => true, + document: { querySelectorAll: () => [] }, localStorage: { getItem: () => null }, + pageOn: () => true, setPageSub() {}, webUrl: () => false, fmtSize: (n) => `${n}B`, + extOffNow: async () => ({ comp: [], mod: [] }), + sameGet: (url) => box.api(url), + api: async (url) => { + if (url === "/api/devkit/modules") { + if (modFail) throw new Error("HTTP 502"); + return { + supported: true, modular: true, + items: [{ id: "py", name: { zh: "Python" }, desc: "", state: "downloading", download: 1000, installed: 2000, progress: { phase: "downloading", done: 100, total: 1000 } }], + }; + } + if (url.startsWith("/api/components")) { + if (compFail) throw new Error("HTTP 502"); + return { + supported: true, + items: [{ id: "c1", name: { zh: "C1" }, desc: "", state: "downloading", available: true, verified: true, bytes: 1000, installed: 2000, bin: [], progress: { phase: "downloading", done: 100, total: 1000 } }], + }; + } + return { ok: true }; + }, + setTimeout: (fn, delay) => { timers.push({ fn, delay }); return timers.length; }, + clearTimeout() {}, + }; + vm.runInNewContext(src + "\nglobalThis.__loadModules = loadModules;\nglobalThis.__loadComponents = loadComponents;", box, { filename: "08-extensions.js" }); + + await box.__loadModules(); + const modHtml = makeNode("mod-list").innerHTML; + assert.match(modHtml, /Python/); + timers.length = 0; + modFail = true; + await box.__loadModules(); + assert.equal(makeNode("mod-list").innerHTML, modHtml, "loadModules 瞬时 502 不应清空已渲染模块卡片"); + assert.ok(timers.some((x) => x.delay === 1500), "loadModules 运行中遇瞬时 502 应自动排程 1.5s 重试"); + + await box.__loadComponents(); + timers.length = 0; + compFail = true; + await box.__loadComponents(true); + assert.ok(timers.some((x) => x.delay === 1500), "loadComponents(true) 在下载中遇瞬时 502 不应断掉轮询链"); +}); + +test("W-P0-4/W-P0-5 06-files.js & 18-terminal.js: 压缩任务重试瞬时错误,终端 SSE CLOSED 先探测存活", () => { + const filesSrc = fs.readFileSync(path.join(root, "gateway", "web", "app", "06-files.js"), "utf8"); + const termSrc = fs.readFileSync(path.join(root, "gateway", "web", "app", "18-terminal.js"), "utf8"); + assert.ok(filesSrc.includes("++pollFails > 6"), "arcRunJob 应容忍瞬时网络/502 错并退避重试"); + assert.ok(filesSrc.includes("fsDeleting"), "fsDelete 应防止并发双击删除"); + assert.ok(termSrc.includes("/api/term/list") && termSrc.includes("EventSource.CLOSED"), "termAttach 在 EventSource.CLOSED 时应探测 /api/term/list 确认存活而非立即标死"); +}); diff --git a/gateway/web/app/01-core.js b/gateway/web/app/01-core.js index e7baed2b..5956366e 100644 --- a/gateway/web/app/01-core.js +++ b/gateway/web/app/01-core.js @@ -1081,12 +1081,15 @@ if (/[?&](t|k)=/.test(location.search) || /[#&]k=/.test(location.hash)) history. // 回复 / 查看器里的本机路径:点了直接在应用内打开 async function openPath(p) { + const ok = typeof latest === "function" ? latest("openPath") : () => true; let r; try { r = await api("/api/file/stat?path=" + encodeURIComponent(p)); } catch (e) { + if (!ok()) return; return toast(e.status === 403 ? t("这个位置受保护,不能在界面里打开:{p}", { p }) : e.status === 404 ? t("文件不存在:{p}", { p }) : t("打不开:{msg}", { msg: e.message })); } + if (!ok()) return; if (r.dir) { // 查看器盖着文件页(窄屏两页都铺满、查看器 z 更高):先关查看器,不然文件页开在它底下(0.6.9 审计 195-C.17) const vw = $("viewer"); diff --git a/gateway/web/app/03-perm-status.js b/gateway/web/app/03-perm-status.js index 78deb830..b221925d 100644 --- a/gateway/web/app/03-perm-status.js +++ b/gateway/web/app/03-perm-status.js @@ -202,12 +202,14 @@ async function permAnswer(id, body) { const it = PERMS.get(id); - if (!it || it.done) return; + if (!it || it.done || it.busy) return; + it.busy = true; it.el?.classList.add("busy"); try { await api("/api/perm/answer", { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify({ runId: it.runId, id, ...body }) }); permDone(id, body.behavior, { always: body.always, interrupt: body.interrupt }); } catch (e) { + it.busy = false; it.el?.classList.remove("busy"); if (e.status === 409) permDone(id, "gone"); else toast(e.message, true); diff --git a/gateway/web/app/06-files.js b/gateway/web/app/06-files.js index 535a3ec7..6957782e 100644 --- a/gateway/web/app/06-files.js +++ b/gateway/web/app/06-files.js @@ -364,26 +364,35 @@ } catch (err) { fsErr(err); } } // 删除(永久,不进回收站):先确认,写明几项、文件夹连里面一起删;逐个调接口,删不掉的报出来,删掉的照算 + let fsDeleting = false; async function fsDelete(names) { const here = fsHere, dir = state.fs.path, multi = state.fs.multi; - if (!here() || !names.length || state.fs.arc) return; + if (fsDeleting || !here() || !names.length || state.fs.arc) return; const ents = names.map((name) => ({ name, path: fullPathOf({ name }), dir: state.fs.entries.find(e => e.name === name)?.dir })); const dirs = ents.filter((x) => x.dir).length; const what = names.length === 1 ? `「${names[0]}${dirs ? "/" : ""}」` : t("选中的 {n} 项", { n: names.length }); if (!confirm(t("永久删除{what}?删除后不能恢复。", { what }) + (dirs ? "\n" + t("文件夹会连同里面的内容一起删除。") : ""))) return; - const deleted = new Set(); let fail = null; - for (const { name, path } of ents) { - try { await api(`/api/file/delete?path=${encodeURIComponent(path)}`, { method: "POST" }); deleted.add(name); } - catch (err) { fail = fail || err; } - } - if (here() && deleted.size) { - if (state.fs.multi === multi) for (const name of deleted) multi?.delete(name); - if (deleted.has(state.fs.sel)) state.fs.sel = null; - fsDotsAt = 0; - await fsLoad(dir, { keepSel: true, keepQ: true, keepMulti: true }); + fsDeleting = true; + const delBtn = $("fs-del"); + if (delBtn) delBtn.disabled = true; + try { + const deleted = new Set(); let fail = null; + for (const { name, path } of ents) { + try { await api(`/api/file/delete?path=${encodeURIComponent(path)}`, { method: "POST" }); deleted.add(name); } + catch (err) { fail = fail || err; } + } + if (here() && deleted.size) { + if (state.fs.multi === multi) for (const name of deleted) multi?.delete(name); + if (deleted.has(state.fs.sel)) state.fs.sel = null; + fsDotsAt = 0; + await fsLoad(dir, { keepSel: true, keepQ: true, keepMulti: true }); + } + if (fail) fsErr(fail); + else toast(t("已删除 {n} 项", { n: deleted.size })); + } finally { + fsDeleting = false; + if (delBtn) delBtn.disabled = false; } - if (fail) fsErr(fail); - else toast(t("已删除 {n} 项", { n: deleted.size })); } $("fs-del").addEventListener("click", () => { if (state.fs.multi) fsDelete([...state.fs.multi]); }); $("fs-newfile").addEventListener("click", () => fsCreate(false)); @@ -657,10 +666,17 @@ } line.textContent = `${label} ${j.pct || 0}%`; }; + let pollFails = 0; while (j.state === "running") { paint(); - await new Promise((r) => setTimeout(r, 600)); - try { j = await api("/api/arc/job?id=" + encodeURIComponent(j.id)); } catch { break; } + await new Promise((r) => setTimeout(r, pollFails ? 1200 : 600)); + try { + j = await api("/api/arc/job?id=" + encodeURIComponent(j.id)); + pollFails = 0; + } catch (e) { + if (e && e.status === 404) { j = { ...j, state: "error", error: e.message }; break; } + if (++pollFails > 6) { j = { ...j, state: "error", error: e?.message || "?" }; break; } + } } clear(); if (j.state === "done") { diff --git a/gateway/web/app/07-sessions.js b/gateway/web/app/07-sessions.js index aa8b458c..12087e78 100644 --- a/gateway/web/app/07-sessions.js +++ b/gateway/web/app/07-sessions.js @@ -294,11 +294,13 @@ /** 成功返回 true,失败返回错误(同 loadSessions,「刷新列表」在回收站里刷的是回收站) */ async function loadTrash() { + const ok = latest("trash"); let ret = true; try { const r = await api("/api/trash"); + if (!ok()) return ret; sess.trash = r.items || []; sess.keepDays = r.keepDays || 30; sess.trashErr = ""; - } catch (e) { sess.trashErr = e.message || String(e); ret = e; } + } catch (e) { if (!ok()) return e; sess.trashErr = e.message || String(e); ret = e; } renderSessions(); return ret; } diff --git a/gateway/web/app/08-extensions.js b/gateway/web/app/08-extensions.js index a03769e2..fea71479 100644 --- a/gateway/web/app/08-extensions.js +++ b/gateway/web/app/08-extensions.js @@ -1,5 +1,6 @@ // ── 扩展:插件 / 技能 / MCP ────────────────────────────────────────── const ext = { q: "", offset: 0, busy: false }; + const extLatest = (k) => (typeof latest === "function" ? latest(k) : () => true); // 设计稿的行:左名称 + 一行等宽小字,右边大小 / 状态 / 按钮;说明、依赖这些点一下行才展开(.it-more),进度条一直在 const EI = { lock: '', @@ -37,7 +38,7 @@ ${acts ? `
${acts}
` : ""}`; // ── 工具包模块(0.3.9 起):基础 + 随装随卸的模块;用途、命令、包、大小、依赖、谁在用都摆出来 ── - let modTimer = 0; + let modTimer = 0, modLoad = 0, modHasItems = false, modMoving = false, compMoving = false; // 模块装完 / 卸完后组件卡要跟着刷新:组件装的正是刚补上的模块,不刷新的话安装按钮一直是灰的(0.6.10 审计 195-I.4) let modTouched = false; const MOD_USES = () => ({ @@ -50,14 +51,20 @@ const OFF_TIP = () => t("停用后 Claude 看不到它,命令文件还在,随时可以启用。"); async function loadModules() { clearTimeout(modTimer); - const visit = pageVisit, live = () => pageVisible("ext", visit); + const visit = pageVisit, req = ++modLoad, live = () => pageVisible("ext", visit) && req === modLoad; if (!live()) return; - const [r, xoff] = await Promise.all([sameGet("/api/devkit/modules").catch(() => null), extOffNow()]); + let netErr = null; + const [r, xoff] = await Promise.all([sameGet("/api/devkit/modules").catch((e) => { netErr = e; return null; }), extOffNow()]); if (!live()) return; + if (netErr && modHasItems) { + if (modMoving && pageOn("ext")) modTimer = setTimeout(() => { if (live()) loadModules(); }, 1500); + return; + } const modOff = new Set(xoff.mod || []); const on = !!(r && r.supported && r.modular); $("mod-field").classList.toggle("hidden", !on); - if (!on) return; + if (!on) { if (!netErr) { modHasItems = false; modMoving = false; } return; } + modHasItems = true; const items = r.items || [], byId = Object.fromEntries(items.map((m) => [m.id, m])); // 多个共享运行库(lib-clang / lib-guile / lib-libllvm / lib-openjdk-21)在 modules.json 里默认同名,按 id 后缀区分 const modLabel = (m) => { @@ -122,6 +129,7 @@ return rowItem(esc(modLabel(m) || m.id) + tag, '' + (m.key || []).map(esc).join(" ") + "", '' + size + "" + acts, { more: desc, extra: bar }); }).join(""); + modMoving = moving; if (moving && pageOn("ext")) modTimer = setTimeout(() => { if (live()) loadModules(); }, 1500); // 装 / 卸完成后(列表里不再有进行中的那块)再刷组件卡;模块 POST 一返回任务才刚起,不能当场刷 if (!moving && modTouched && pageOn("ext")) { modTouched = false; loadComponents(); } @@ -147,7 +155,8 @@ const r = await post("/api/devkit/modules/" + c, { id }).catch((e2) => ({ ok: false, message: e2.message })); if (!r.ok) toast(r.message || t("失败"), true); else modTouched = true; // 任务结束后刷组件卡(见 loadModules 末尾) - setTimeout(loadModules, 300); + clearTimeout(modTimer); + modTimer = setTimeout(loadModules, 300); }); function loadExt() { loadModules(); loadComponents(60); loadCustom(); loadExtPlugins(); loadExtCmds(); loadExtSkills(); loadExtMcp(); loadExtMarkets(); loadExtHooks(); } @@ -229,7 +238,7 @@ }); function pauseExtReads() { clearTimeout(compTimer); clearTimeout(modTimer); clearTimeout(ghAuth.timer); - compLoad++; + compLoad++; modLoad++; ghAuth.seq = (ghAuth.seq || 0) + 1; pauseCatalog(); } async function loadComponents(refresh) { @@ -239,9 +248,9 @@ let netErr = null; const raw = await api("/api/components" + (refresh ? "?refresh=" + (refresh === true ? 1 : refresh) : "")).catch((e) => { netErr = e; return null; }); if (request !== compLoad || !pageOn("ext")) return "stale"; - // 并发下载时若瞬时撞上 502 / 抖动,且列表已在屏幕上:保留现有卡片和进度条,1.5s 后自动重试,别清屏并停掉轮询 + // 并发下载时若瞬时撞上 502 / 抖动,且列表已在屏幕上:保留现有卡片和进度条,1.5s 后自动重试(下载中点强刷也要续约下载轮询) if (netErr && compHasItems) { - if (refresh !== true) compTimer = setTimeout(() => { if (request === compLoad && pageOn("ext")) loadComponents(); }, 1500); + if (refresh !== true || compMoving) compTimer = setTimeout(() => { if (request === compLoad && pageOn("ext")) loadComponents(); }, 1500); return { err: netErr.message }; } const r = raw || { supported: true, items: [], indexError: netErr ? netErr.message : "" }; @@ -365,10 +374,11 @@ ext.nComp = (r.items || []).length; extSub(); ext.compBytes = (r.items || []).filter((c) => c.installedVersion || c.state === "ok").reduce((s, c) => s + (c.installed || 0), 0); paintStorage(); renderIdx("comp", [["inst", t("已装")], ["upd", t("要更新")], ...Object.entries(CAT()).map(([k, v]) => ["cat:" + k, v])]); - if ($("gh-auth")) loadGhAuth(refresh); + if ($("gh-auth")) loadGhAuth(refresh === true); syncCatalog(); // 有在跑的就一秒刷一次;抽屉关了 / 换了页签就停 - if ((compRemoving.size || (r.items || []).some((c) => c.progress || ["removing", "configuring", "fetching-models"].includes(c.state))) && pageOn("ext")) + compMoving = !!(compRemoving.size || (r.items || []).some((c) => c.progress || ["removing", "configuring", "fetching-models"].includes(c.state))); + if (compMoving && pageOn("ext")) compTimer = setTimeout(() => { if (request === compLoad && pageOn("ext")) loadComponents(); }, 1000); // 首开撞上瞬时 502 / 网关抖动:1.5 秒后自动拉一次缓存列表,不用干等手动刷新 else if (netErr && pageOn("ext")) @@ -397,11 +407,14 @@ const KIND = () => ({ glibc: t("Linux 程序(glibc)"), bionic: t("安卓原生程序"), static: t("静态程序"), script: t("脚本"), musl: "musl", unsupported: t("跑不了") }); async function loadCustom() { + const ok = extLatest("ext-custom"); // 读失败不能当成「这个版本没有自定义组件」把整节藏掉(195-N.4 / X.2) const r = await api("/api/custom").catch((e) => ({ supported: true, error: e.message, items: [] })); + if (!ok()) return; if (r.ok === false && !r.error) r.error = r.message || "?"; $("custom-field").classList.remove("hidden"); if (r.error) { + if ($("custom-list").querySelector(".item")) return toast(t("自定义组件列表读取失败:{msg}", { msg: r.error }), true); $("custom-count").textContent = "—"; $("custom-list").innerHTML = '
' + esc(t("自定义组件列表读取失败:{msg}", { msg: r.error })) + '
"; $("custom-retry").onclick = () => loadCustom(); @@ -535,8 +548,14 @@ const visit = llmDl.visit, live = () => catalogOpen() && visit === llmDl.visit; return viewRead("llm-catalog", visit, live, async () => { clearTimeout(llmDl.timer); - const r = await api("/api/local/catalog").catch((e) => ({ items: [], err: e.message })); - if (live()) paintCatalog(r, live); + let netErr = null; + const r = await api("/api/local/catalog").catch((e) => { netErr = e; return { items: [], err: e.message }; }); + if (!live()) return; + if (netErr && llmDl.items && llmDl.items.size > 0) { + if (llmDl.wasBusy) llmDl.timer = setTimeout(() => { if (live()) loadLlmDl(); }, 1500); + return; + } + paintCatalog(r, live); }); } function paintCatalog(r, live) { @@ -597,6 +616,7 @@ const inp = $("llm-url"); if (inp) inp.oninput = () => { llmDl.url = inp.value; }; } const busy = (r.items || []).some((m) => m.job && m.job.phase !== "error"); + llmDl.wasBusy = busy; if (busy) llmDl.timer = setTimeout(() => { if (live()) loadLlmDl(); }, 1000); } $("tab-ext").addEventListener("click", async (e) => { @@ -619,7 +639,7 @@ }); // ── gh 登录卡:设备码流程。令牌只在 gh 自己那儿,网关只回账号名与状态 ── - const ghAuth = { html: "", at: 0, timer: 0, polling: false }; + const ghAuth = { html: "", at: 0, timer: 0, polling: false, seq: 0 }; // 没有组件系统的地方(开发端):gh 在 PATH 里就单独给一张 GitHub 卡片,登录卡同一套 async function loadGhField() { const visit = pageVisit; @@ -636,10 +656,17 @@ clearTimeout(ghAuth.timer); // 组件列表下载时一秒刷一次,gh auth status 要联网验令牌,别跟着每秒跑 if (!force && !ghAuth.polling && Date.now() - ghAuth.at < 30000) return; + const my = ++ghAuth.seq; ghAuth.at = Date.now(); - const r = data || await api("/api/gh/auth").catch((e) => ({ installed: true, accounts: [], error: e.message })); - if (!live()) return; - const j = r.job, wasPolling = ghAuth.polling; + let netErr = null; + const r = data || await api("/api/gh/auth").catch((e) => { netErr = e; return { installed: true, accounts: [], error: e.message }; }); + if (!live() || my !== ghAuth.seq) return; + const wasPolling = ghAuth.polling; + if (netErr && (wasPolling || ghAuth.html)) { + if (wasPolling && $("gh-auth")) ghAuth.timer = setTimeout(() => { if (live() && my === ghAuth.seq) loadGhAuth(); }, 2000); + return; + } + const j = r.job; ghAuth.polling = !!j && ["starting", "waiting"].includes(j.state); if (wasPolling && j && j.state === "done") toast(j.git ? t("GitHub 已登录,git 推送已配好") : t("GitHub 已登录,但 git 凭据没配上,可在终端运行 gh auth setup-git"), !j.git); let h = ""; @@ -668,10 +695,12 @@ } async function loadExtPlugins() { + const ok = extLatest("ext-plugins"); const box = $("ext-plugins"); let r; - try { r = await api("/api/ext/plugins"); } catch (e) { box.innerHTML = `
${esc(e.message)}
`; return; } - if (r.ok === false) { box.innerHTML = `
${esc(r.message)}
`; return; } + try { r = await api("/api/ext/plugins"); } catch (e) { if (!ok()) return; if (box.querySelector(".item")) return toast(e.message, true); box.innerHTML = `
${esc(e.message)}
`; return; } + if (!ok()) return; + if (r.ok === false) { if (box.querySelector(".item")) return toast(r.message || "?", true); box.innerHTML = `
${esc(r.message)}
`; return; } $("ext-p-count").textContent = r.installed.length; box.innerHTML = r.installed.length ? r.installed.map((p) => extItem( esc(p.id.split("@")[0]) + (p.enabled ? "" : ` ${t("已停用")}`), @@ -729,10 +758,13 @@ } async function loadExtMarkets() { + const ok = extLatest("ext-markets"); // 读失败要报错,不能画成「只有内置的官方目录」(195-N.4 / X.2) const r = await api("/api/ext/marketplaces").catch((e) => ({ items: [], err: e.message })); + if (!ok()) return; if (r.ok === false) r.err = r.err || r.message || "?"; if (r.err) { + if ($("ext-markets").querySelector(".item")) return toast(t("插件市场读取失败:{msg}", { msg: r.err }), true); $("ext-markets").innerHTML = `
${esc(t("插件市场读取失败:{msg}", { msg: r.err }))}
`; return; } @@ -742,10 +774,13 @@ } async function loadExtSkills() { + const ok = extLatest("ext-skills"); // 读失败不能显示成「还没有技能」、计数 0(审查 F-007) const r = await api("/api/ext/skills").catch((e) => ({ items: [], err: e.message || "?" })); + if (!ok()) return; if (r.ok === false) r.err = r.message || "?"; // 200 + {ok:false}(195-X.2) if (r.err) { + if ($("ext-skills").querySelector(".item")) return toast(t("技能列表读取失败:{msg}", { msg: r.err }), true); $("ext-s-count").textContent = "—"; $("ext-skills").innerHTML = `
${esc(t("技能列表读取失败:{msg}", { msg: r.err }))}
`; $("ext-s-retry").onclick = () => loadExtSkills(); @@ -858,9 +893,11 @@ }; async function loadExtHooks() { + const ok = extLatest("ext-hooks"); let d; - try { d = await api("/api/ext/hooks"); } catch (e) { $("ext-hooks").innerHTML = `
${esc(e.message)}
`; return; } - if (d && d.ok === false) { $("ext-hooks").innerHTML = `
${esc(d.message || "?")}
`; return; } + try { d = await api("/api/ext/hooks"); } catch (e) { if (!ok()) return; if (HK.data) return toast(e.message, true); $("ext-hooks").innerHTML = `
${esc(e.message)}
`; return; } + if (!ok()) return; + if (d && d.ok === false) { if (HK.data) return toast(d.message || "?", true); $("ext-hooks").innerHTML = `
${esc(d.message || "?")}
`; return; } HK.data = d; if (!d.scopes.some((s) => s.scope === HK.scope)) HK.scope = "user"; renderHooks(); @@ -1067,36 +1104,40 @@ if (a === "f-cancel") return hkCloseForm(); if (a === "f-test") { const v = hkFormVal(); return hkRunTest($("hook-form").querySelector(".hk-out"), v.event, v.command, v.matcher, v.timeout); } if (a === "f-save") { + if (HK.saving || b.disabled) return; const v = hkFormVal(); if (!v.command) return toast(t("命令是空的"), true); - // 内置脚本装不上就别保存规则:以前吞掉错误,界面提示“已保存”,实际这条规则永远跑不起来(197-2.9) - if (/\$HOME\/\.claude\/hooks\/cc-/.test(v.command)) { - let inst; - try { inst = await api("/api/ext/hooks/scripts", { method: "POST", body: "{}" }); } - catch (e) { return toast(t("内置脚本没装上:{msg},规则没有保存", { msg: e.message }), true); } - if (inst.ok === false) return toast(t("内置脚本没装上:{msg},规则没有保存", { msg: inst.message || "?" }), true); - } - const h = hkClone(); - const entry = { type: "command", command: v.command }; - if (v.timeout) entry.timeout = v.timeout; - if (HK.edit) { - // 编辑期间列表可能变了(删了前面一条、别处改了文件):按下标找到的得还是原来那条,不是就在同一事件里按内容重新找; - // 都找不到就不存,不能把修改稿写到另一条规则上(#152-1) - const same = (g, x) => g && x && JSON.stringify({ m: g.matcher || "", h: x }) === HK.edit.orig; - let gi = HK.edit.gi, hi = HK.edit.hi; - if (HK.edit.scope !== HK.scope || !same(h[HK.edit.ev]?.[gi], h[HK.edit.ev]?.[gi]?.hooks?.[hi])) { - gi = hi = -1; - (h[HK.edit.ev] || []).some((g, a) => (g.hooks || []).some((x, b) => same(g, x) && ((gi = a), (hi = b), true))); + HK.saving = true; b.disabled = true; + try { + // 内置脚本装不上就别保存规则:以前吞掉错误,界面提示“已保存”,实际这条规则永远跑不起来(197-2.9) + if (/\$HOME\/\.claude\/hooks\/cc-/.test(v.command)) { + let inst; + try { inst = await api("/api/ext/hooks/scripts", { method: "POST", body: "{}" }); } + catch (e) { return toast(t("内置脚本没装上:{msg},规则没有保存", { msg: e.message }), true); } + if (inst.ok === false) return toast(t("内置脚本没装上:{msg},规则没有保存", { msg: inst.message || "?" }), true); } - if (gi < 0 || HK.edit.scope !== HK.scope) { toast(t("这条规则在你编辑期间被改动或删掉了,重新打开它再改"), true); return hkCloseForm(); } - HK.edit.gi = gi; HK.edit.hi = hi; - const old = h[HK.edit.ev][HK.edit.gi]; - const keep = old.hooks[HK.edit.hi]; - // 事件、匹配都没变就原地换;变了就从原组里摘掉,按新的事件 / 匹配放 - if (HK.edit.ev === v.event && (old.matcher || "") === v.matcher) { const nh = { ...keep, ...entry }; if (!v.timeout) delete nh.timeout; old.hooks[HK.edit.hi] = nh; } - else { old.hooks.splice(HK.edit.hi, 1); hkPut(h, v, entry); } - } else hkPut(h, v, entry); - if (await hkSave(h)) hkCloseForm(); + const h = hkClone(); + const entry = { type: "command", command: v.command }; + if (v.timeout) entry.timeout = v.timeout; + if (HK.edit) { + // 编辑期间列表可能变了(删了前面一条、别处改了文件):按下标找到的得还是原来那条,不是就在同一事件里按内容重新找; + // 都找不到就不存,不能把修改稿写到另一条规则上(#152-1) + const same = (g, x) => g && x && JSON.stringify({ m: g.matcher || "", h: x }) === HK.edit.orig; + let gi = HK.edit.gi, hi = HK.edit.hi; + if (HK.edit.scope !== HK.scope || !same(h[HK.edit.ev]?.[gi], h[HK.edit.ev]?.[gi]?.hooks?.[hi])) { + gi = hi = -1; + (h[HK.edit.ev] || []).some((g, a) => (g.hooks || []).some((x, b) => same(g, x) && ((gi = a), (hi = b), true))); + } + if (gi < 0 || HK.edit.scope !== HK.scope) { toast(t("这条规则在你编辑期间被改动或删掉了,重新打开它再改"), true); return hkCloseForm(); } + HK.edit.gi = gi; HK.edit.hi = hi; + const old = h[HK.edit.ev][HK.edit.gi]; + const keep = old.hooks[HK.edit.hi]; + // 事件、匹配都没变就原地换;变了就从原组里摘掉,按新的事件 / 匹配放 + if (HK.edit.ev === v.event && (old.matcher || "") === v.matcher) { const nh = { ...keep, ...entry }; if (!v.timeout) delete nh.timeout; old.hooks[HK.edit.hi] = nh; } + else { old.hooks.splice(HK.edit.hi, 1); hkPut(h, v, entry); } + } else hkPut(h, v, entry); + if (await hkSave(h)) hkCloseForm(); + } finally { HK.saving = false; b.disabled = false; } } }); $("ext-hook-sec").addEventListener("change", async (e) => { @@ -1117,9 +1158,12 @@ } async function loadExtMcp() { + const ok = extLatest("ext-mcp"); const box = $("ext-mcp"); const r = await api("/api/ext/mcp").catch((e) => ({ items: [], err: e.message })); + if (!ok()) return; if (r.ok === false) r.err = r.message || "?"; // 200 + {ok:false} 也是失败,不能画成空列表(195-X.2) + if (r.err && box.querySelector(".item")) return toast(r.err, true); $("ext-m-count").textContent = r.err ? "—" : (r.items || []).length; box.innerHTML = (r.items || []).map((m) => extItem( esc(m.name) + (m.cloud ? ` ${t("账户连接器")}` : ""), @@ -1137,10 +1181,16 @@ // ── 官方技能目录(anthropics/skills):展开时才拉;装好后上面「技能」列表跟着刷新 ── const KB = (n) => (n < 1048576 ? Math.max(1, Math.ceil((n || 0) / 1024)) + " KB" : MB(n)); async function loadSkillCat(force) { + const ok = extLatest("skillcat"); const box = $("ext-s-cat"); if (!box.children.length || force) box.innerHTML = `
${t("正在拉取官方技能目录…")}
`; const r = await api("/api/ext/catalog/skills" + (force ? "?refresh=1" : "")).catch((e) => ({ ok: false, message: e.message })); - if (!r.ok) { box.innerHTML = `
${esc(r.message || "")}
`; return; } + if (!ok()) return; + if (!r.ok) { + if (box.querySelector(".item")) return toast(r.message || "?", true); + box.innerHTML = `
${esc(r.message || "")}
`; + return; + } box.innerHTML = r.items.map((x) => extItem(esc(x.name), `${KB(x.bytes)}${x.installed ? `${t("已安装")}` : ""}`, x.installed ? "" : ``, @@ -1198,7 +1248,7 @@ const b = e.target.closest("button"); if (!b) return; if (b.classList.contains("mcpcat-more")) return searchMcpCat(true); const x = b.dataset.x; - if (x === "skillcat-retry") return loadSkillCat(true); + if (x === "skillcat-retry") return loadSkillCat(false); if (x === "market-retry") return loadExtMarkets(); if (x === "skillcat-install") { b.disabled = true; b.textContent = t("安装中…"); @@ -1255,13 +1305,18 @@ loadExtSkills(); }); $("ext-m-add").addEventListener("click", async () => { + const btn = $("ext-m-add"); + if (btn.disabled) return; const source = $("ext-m-src").value.trim(); if (!source) return; - toast(t("正在添加市场…")); - const r = await post("/api/ext/marketplaces/add", { source }).catch((e) => ({ ok: false, message: e.message })); - toast(r.ok ? t("已添加") : t("添加失败:{msg}", { msg: r.message || "" }), !r.ok); - if (r.ok) $("ext-m-src").value = ""; - loadExtMarkets(); + btn.disabled = true; + try { + toast(t("正在添加市场…")); + const r = await post("/api/ext/marketplaces/add", { source }).catch((e) => ({ ok: false, message: e.message })); + toast(r.ok ? t("已添加") : t("添加失败:{msg}", { msg: r.message || "" }), !r.ok); + if (r.ok) $("ext-m-src").value = ""; + loadExtMarkets(); + } finally { btn.disabled = false; } }); // 选 http / sse 时把输入框提示换成请求头的写法:远程服务器常要 Bearer 令牌, // 写成 KEY=值 会被当成环境变量(远程没有子进程,-e 无处注入),令牌根本没发出去。 @@ -1382,6 +1437,8 @@ if (r.ok) { endMcpEdit(); loadExtMcp(); } }); $("ext-mcp-add").addEventListener("click", async () => { + const btn = $("ext-mcp-add"); + if (btn.disabled) return; const transport = $("ext-mcp-tr").value; const raw = $("ext-mcp-env").value; const extra = (raw.includes("\n") ? raw.split("\n") : raw.split(",")).map((x) => x.trim()).filter(Boolean); @@ -1395,9 +1452,12 @@ env: envLike, headers: hdrLike, }; - const r = await post("/api/ext/mcp/add", body).catch((e) => ({ ok: false, message: e.message })); - toast(r.ok ? t("已添加 {name}", { name: body.name }) : t("添加失败:{msg}", { msg: r.message || "" }), !r.ok); - if (r.ok) { ["ext-mcp-name", "ext-mcp-target", "ext-mcp-env"].forEach((id) => ($(id).value = "")); loadExtMcp(); } + btn.disabled = true; + try { + const r = await post("/api/ext/mcp/add", body).catch((e) => ({ ok: false, message: e.message })); + toast(r.ok ? t("已添加 {name}", { name: body.name }) : t("添加失败:{msg}", { msg: r.message || "" }), !r.ok); + if (r.ok) { ["ext-mcp-name", "ext-mcp-target", "ext-mcp-env"].forEach((id) => ($(id).value = "")); loadExtMcp(); } + } finally { btn.disabled = false; } }); $("tab-ext").addEventListener("click", async (e) => { @@ -1584,12 +1644,18 @@ `).join("") + (j.steps.some((s) => s.state === "handed") ? `
${esc(t("交给应用的那几步在「设置 → 更新」里看进度,做完后再点「核对记录」。"))}
` : ""); box.classList.remove("hidden"); } + let fixFails = 0; async function followFix(visit = setVisit, j) { const live = () => setVisible("trouble", visit); if (!live()) return; clearTimeout(fixTimer); j ||= await sameGet("/api/reconcile/fix").catch(() => null); - if (!live() || !j?.ok) return; + if (!live()) return; + if (!j?.ok) { + if (++fixFails <= 6) fixTimer = setTimeout(() => followFix(visit), 2000); + return; + } + fixFails = 0; paintFix(j); if (j.running) { fixTimer = setTimeout(() => followFix(visit), 1500); return; } const failed = j.steps.filter((s) => s.state === "fail").length; @@ -1623,19 +1689,26 @@ return r; } $("btn-reconcile").addEventListener("click", async () => { + const btn = $("btn-reconcile"); + if (btn.disabled) return; // 按钮是「核对」:已有结果时点它也要重新核,不能第一次只把面板收起来(195-M.6) const visit = setVisit; - toast(t("正在核对…")); - const r = await loadReconcile(true); - if (!setVisible("trouble", visit)) return; - if (!r) toast(t("核对失败"), true); - else if (!r.supported) toast(t("这里没有工具包,不用核对")); + btn.disabled = true; + try { + toast(t("正在核对…")); + const r = await loadReconcile(true); + if (!setVisible("trouble", visit)) return; + if (!r) toast(t("核对失败"), true); + else if (!r.supported) toast(t("这里没有工具包,不用核对")); + } finally { btn.disabled = false; } }); // 本机自检(195-M.1):看上次结果,点「重新自检」不等过期立刻重跑;跑着的时候每 5 秒刷新一次 - let envFactsTimer = 0; + let envFactsTimer = 0, envFactsRunning = false, envFactsFails = 0; function paintEnvFacts(r, visit) { $("envfacts-row").classList.toggle("hidden", !r.supported); const el = $("envfacts-state"), b = $("btn-envfacts"); + envFactsRunning = !!r.running; + envFactsFails = 0; b.disabled = !!r.running; const why = { timeout: t("超时了"), empty: t("没有输出") }; const lines = []; @@ -1652,12 +1725,21 @@ const visit = setVisit; if (!setVisible("trouble", visit)) return; const r = await sameGet("/api/env-facts").catch(() => null); - if (r && setVisible("trouble", visit)) paintEnvFacts(r, visit); + if (!setVisible("trouble", visit)) return; + if (r) return paintEnvFacts(r, visit); + if (envFactsRunning) { + if (++envFactsFails <= 6) envFactsTimer = setTimeout(() => { if (setVisible("trouble", visit)) loadEnvFacts(); }, 5000); + else { envFactsRunning = false; $("btn-envfacts").disabled = false; } + } } $("btn-envfacts").addEventListener("click", async () => { + const btn = $("btn-envfacts"); + if (btn.disabled) return; const visit = setVisit; + btn.disabled = true; const r = await post("/api/env-facts/rerun").catch((e) => (toast(e.message, true), null)); if (r && setVisible("trouble", visit)) paintEnvFacts(r, visit); + else btn.disabled = false; }); const LEDGER_KIND = () => ({ verify: t("校验"), repair: t("修复"), install: t("安装"), uninstall: t("卸载"), recover: t("恢复"), "safe-mode": t("安全模式"), logs: t("日志") }); $("btn-ledger").addEventListener("click", async () => { @@ -1680,7 +1762,17 @@ const UC = { data: null, scope: localStorage.getItem("cc.cmdScope") || "user", edit: null }; const ucScope = () => UC.data && UC.data.scopes.find((s) => s.scope === UC.scope); async function loadExtCmds() { - try { UC.data = await api("/api/commands"); } catch (e) { $("ext-cmds").innerHTML = `
${esc(e.message)}
`; return; } + const ok = extLatest("ext-cmds"); + try { + const d = await api("/api/commands"); + if (!ok()) return; + UC.data = d; + } catch (e) { + if (!ok()) return; + if (UC.data) return toast(e.message, true); + $("ext-cmds").innerHTML = `
${esc(e.message)}
`; + return; + } renderCmds(); } function renderCmds() { @@ -1734,23 +1826,31 @@ if (act === "use" && c) { closePage(); insertAtCursor((UC.data.sealed ? "/user:" : "/") + c.name); inputEl.focus(); return; } if (act === "edit" && c) return ucForm(c); if (act === "del" && c) { + if (b.disabled) return; if (!confirm(t("删除指令 /{name}?", { name: c.name }))) return; - const r = await post("/api/commands/del", { scope: UC.scope, dir: UC.data.workspace, name: c.name }).catch((err) => ({ ok: false, message: err.message })); - if (!r.ok) return toast(r.message, true); - if (MO.on() && it.animate) await it.animate([{ opacity: 1, transform: "none" }, { opacity: 0, transform: `translateX(${MO.rtl() ? 24 : -24}px)` }], { duration: 155, easing: "cubic-bezier(.4,0,1,1)", fill: "forwards" }).finished.catch(() => {}); - await loadExtCmds(); loadCaps(); + b.disabled = true; + try { + const r = await post("/api/commands/del", { scope: UC.scope, dir: UC.data.workspace, name: c.name }).catch((err) => ({ ok: false, message: err.message })); + if (!r.ok) return toast(r.message, true); + if (MO.on() && it.animate) await it.animate([{ opacity: 1, transform: "none" }, { opacity: 0, transform: `translateX(${MO.rtl() ? 24 : -24}px)` }], { duration: 155, easing: "cubic-bezier(.4,0,1,1)", fill: "forwards" }).finished.catch(() => {}); + await loadExtCmds(); loadCaps(); + } finally { b.disabled = false; } return; } if (act === "f-cancel") return ucClose(); if (act === "f-save") { + if (b.disabled) return; const f = $("cmd-form"), q = (k) => f.querySelector(`[data-f="${k}"]`).value; const body = { scope: UC.scope, dir: UC.data.workspace, name: q("name").trim().replace(/^\//, ""), description: q("description"), hint: q("hint"), body: q("body") }; if (UC.edit) { if (UC.edit !== body.name) body.oldName = UC.edit; } else body.fresh = true; - const r = await post("/api/commands/save", body).catch((err) => ({ ok: false, message: err.message })); - if (!r.ok) return toast(t("保存失败:{msg}", { msg: t(r.message || "") }), true); - toast(t("已保存 /{name},输入框里打 / 就能用", { name: r.name })); - ucClose(); await loadExtCmds(); loadCaps(); - const row = [...document.querySelectorAll("#ext-cmds .uc-item .mono")].find((x) => x.textContent === "/" + r.name); - if (row) MO.play(row.closest(".uc-item"), "mo-in-rise", 1400); + b.disabled = true; + try { + const r = await post("/api/commands/save", body).catch((err) => ({ ok: false, message: err.message })); + if (!r.ok) return toast(t("保存失败:{msg}", { msg: t(r.message || "") }), true); + toast(t("已保存 /{name},输入框里打 / 就能用", { name: r.name })); + ucClose(); await loadExtCmds(); loadCaps(); + const row = [...document.querySelectorAll("#ext-cmds .uc-item .mono")].find((x) => x.textContent === "/" + r.name); + if (row) MO.play(row.closest(".uc-item"), "mo-in-rise", 1400); + } finally { b.disabled = false; } } }); diff --git a/gateway/web/app/09-settings.js b/gateway/web/app/09-settings.js index 9d84b135..a10dc9df 100644 --- a/gateway/web/app/09-settings.js +++ b/gateway/web/app/09-settings.js @@ -17,8 +17,10 @@ }); async function loadProviders() { + const ok = latest("providers"); try { const r = await api("/api/providers"); + if (!ok()) return; state.providers = r.providers || []; state.providerActive = r.active; if (!state.provView || (state.provView !== "__new__" && !state.providers.some((p) => p.id === state.provView))) { @@ -42,6 +44,7 @@ $("provider-info").title = cur.baseUrl || ""; if (setVisible("provider")) renderProvCard(); } catch (e) { + if (!ok()) return; $("provider-info").textContent = t("读取接口清单失败:{msg}", { msg: e.message }); } } @@ -323,7 +326,7 @@ `; $("btn-login-term").onclick = async () => { await post("/api/login/cancel").catch(() => {}); - clearInterval(state.loginTimer); + stopLoginWatch(); closeSettings(); // 终端窗格在设置模态下面,不关设置就点不着(审查 P2-6) openLoginTerm(method === "console" ? "console" : "claudeai"); }; @@ -344,11 +347,21 @@ if (live()) paintLoginFlow(r.url || "", method); watchLogin(p, method); } + let loginWatchGen = 0; + function stopLoginWatch() { + loginWatchGen++; + clearTimeout(state.loginTimer); + state.loginTimer = null; + } function watchLogin(p, method) { - clearInterval(state.loginTimer); - state.loginTimer = setInterval(async () => { + stopLoginWatch(); + const gen = loginWatchGen; + const step = async () => { + if (gen !== loginWatchGen || !setOpen || setCatOpen !== "provider") { if (gen === loginWatchGen) stopLoginWatch(); return; } + if (document.hidden) { state.loginTimer = setTimeout(step, 2000); return; } let st; - try { st = await api("/api/login/status"); } catch { return; } + try { st = await api("/api/login/status"); } catch { if (gen === loginWatchGen) state.loginTimer = setTimeout(step, 2000); return; } + if (gen !== loginWatchGen) return; if (st.pending) { // 20 秒后才拿到的授权地址:轮询里补开,只开一次(0.6.9 审计 195-G.4) if (st.url && st.url !== loginUrlOpened) { @@ -357,22 +370,28 @@ if (state.provView === p.id) paintLoginFlow(st.url, method); } if (state.provView === p.id) paintLoginState(st, p); + state.loginTimer = setTimeout(step, 2000); return; } - clearInterval(state.loginTimer); + stopLoginWatch(); if (st.loggedIn) toast((st.email ? t("✓ 已登录:{email}", { email: st.email }) : t("✓ 已登录")) + (p.active ? "" : t(",点「使用这个接口」切过去"))); else if (st.last && !st.last.ok) toast(t("登录没有完成"), true); if (state.provView === p.id) renderProvCard(); refreshStatus(); - }, 2000); + }; + state.loginTimer = setTimeout(step, 2000); } async function logout(p) { + if (logout._busy) return; if (!confirm(t("退出这台设备上的 Claude 账户登录?"))) return; - const r = await post("/api/login/logout").catch((e) => ({ ok: false, output: e.message })); - toast(r.ok ? t("已退出登录") : t("退出失败:{msg}", { msg: r.output || r.message || "" }), !r.ok); - renderProvCard(); - // 退出成功后顶栏 / 用量页的额度要跟着撤掉,不能留着上一个账户的数(195-O.9) - if (r.ok) { refreshStatus(); qbLoad(); loadQuota().catch(() => {}); } + logout._busy = true; + try { + const r = await post("/api/login/logout").catch((e) => ({ ok: false, output: e.message })); + toast(r.ok ? t("已退出登录") : t("退出失败:{msg}", { msg: r.output || r.message || "" }), !r.ok); + renderProvCard(); + // 退出成功后顶栏 / 用量页的额度要跟着撤掉,不能留着上一个账户的数(195-O.9) + if (r.ok) { refreshStatus(); qbLoad(); loadQuota().catch(() => {}); } + } finally { logout._busy = false; } } // ── 密钥卡(Claude API Key 与第三方厂商)── @@ -721,9 +740,16 @@ ${p.hasKey ? `
` : ""}`; if (p.hasKey) loadBill(p); box.onclick = async (e) => { - const act = e.target.dataset && e.target.dataset.act; - if (!act) return; - if (act === "use") return useProvider(p); + const btn = e.target.closest && e.target.closest("button[data-act]"); + const act = btn ? btn.dataset.act : (e.target.dataset && e.target.dataset.act); + if (!act || box._busy || (btn && btn.disabled)) return; + const runLocked = async (fn) => { + box._busy = true; + if (btn) btn.disabled = true; + try { return await fn(); } + finally { box._busy = false; if (btn && btn.isConnected) btn.disabled = false; } + }; + if (act === "use") return runLocked(() => useProvider(p)); // 这张卡的身份与编辑代次:await 回来的旧回执只许动仍在原卡、且输入没被再改过的输入框。 // 以前 A 卡保存还没回来就切到 B:A 的旧闭包按全局 id 找 #pc-key,把 B 刚粘进去的 Key 清掉, // 随后的刷新还会把 B 重画(BUG-UIFS-004)。 @@ -731,34 +757,41 @@ const live = () => state.provView === p.id && box.contains(keyEl) && $("pc-key") === keyEl; if (act === "clear") { if (!confirm(t("清除 {name} 的 Key?", { name: p.label }))) return; - // 没清掉就别说「已清除」(审查 D-04) - try { await post("/api/providers/save", { id: p.id, clearKey: true }); } catch (e2) { return toast(e2.message, true); } - if (!live()) return toast(t("已清除")); - return reloadProv(t("已清除")); + return runLocked(async () => { + // 没清掉就别说「已清除」(审查 D-04) + try { await post("/api/providers/save", { id: p.id, clearKey: true }); } catch (e2) { return toast(e2.message, true); } + if (!live()) return toast(t("已清除")); + return reloadProv(t("已清除")); + }); } const body = { id: p.id, apiKey: keyEl.value.trim() }; if ($("pc-endpoint")) body.endpoint = $("pc-endpoint").value; else if (p.endpointLost) body.endpoint = p.endpoint; // 只剩一条线路时没有下拉框,也得把新线路记下来,提示才会消失(196-凭据.1) // 还没 Key、输入框也空着:点保存不能说「已保存」,其实什么都没配上(审查 P3-3) if (act === "save" && !body.apiKey && !p.hasKey && !(body.endpoint && body.endpoint !== p.endpoint)) return toast(t("先把 API Key 粘进来再保存"), true); - if (act === "save" || body.apiKey || body.endpoint !== p.endpoint) { - let r; - try { r = await post("/api/providers/save", body); } catch (e2) { return toast(e2.message, true); } - // 线路失效后只重选、没填新 Key:网关把旧 Key 清掉了(196-凭据.1) - const msg = r && r.keyCleared ? t("换了线路,旧 Key 已清掉,请重新填") : t("已保存"); - if (!live()) return toast(msg); // 卡已切走:只报结果,不动当前卡 - if (keyEl.value.trim() !== body.apiKey) return toast(msg); // 同卡提交后又敲了新内容:留着 - keyEl.value = ""; - if (r && r.keyCleared) return reloadProv(msg); - if (act === "save") return reloadProv(msg, true); - } - await testAndShow(p.id); + return runLocked(async () => { + if (act === "save" || body.apiKey || body.endpoint !== p.endpoint) { + let r; + try { r = await post("/api/providers/save", body); } catch (e2) { return toast(e2.message, true); } + // 线路失效后只重选、没填新 Key:网关把旧 Key 清掉了(196-凭据.1) + const msg = r && r.keyCleared ? t("换了线路,旧 Key 已清掉,请重新填") : t("已保存"); + if (!live()) return toast(msg); // 卡已切走:只报结果,不动当前卡 + if (keyEl.value.trim() !== body.apiKey) return toast(msg); // 同卡提交后又敲了新内容:留着 + keyEl.value = ""; + if (r && r.keyCleared) return reloadProv(msg); + if (act === "save") return reloadProv(msg, true); + } + await testAndShow(p.id); + }); }; } + let testProvSeq = 0; async function testAndShow(id) { const el = $("pc-result"); if (!el) return; + const my = ++testProvSeq; el.className = "prov-state"; el.textContent = t("测试中…"); const r = await post("/api/providers/test", { id }).catch((e) => ({ ok: false, message: e.message })); + if (my !== testProvSeq || !el.isConnected) return; el.className = "prov-state " + (r.ok ? "ok" : "err"); el.textContent = (r.ok ? "✓ " : "✗ ") + r.message; } diff --git a/gateway/web/app/10-settings-device.js b/gateway/web/app/10-settings-device.js index 8a6d7e02..508230e2 100644 --- a/gateway/web/app/10-settings-device.js +++ b/gateway/web/app/10-settings-device.js @@ -42,15 +42,19 @@ if (act === "ack") { const st = await post("/api/app/freeze_ack").catch(() => null); if (st) renderBg(st.frozen); } }); + let privBusy = false; async function loadPriv() { const visit = setVisit, cat = setCatOpen; if ((cat !== "device" && cat !== "run") || !setVisible(cat, visit)) return; let st; - try { st = await api("/api/priv/status"); } catch { return; } + try { st = await api("/api/priv/status"); } catch { + if (privBusy && cat === "device" && setVisible("device", visit)) privLater(2000, visit); + return; + } if (!setVisible(cat, visit)) return; if (cat === "run") { renderBg(st.frozen); return; } $("priv-field").classList.toggle("hidden", st.state === "unsupported"); - if (st.state === "unsupported") return; // 旧版:没有这项集成 + if (st.state === "unsupported") { privBusy = false; return; } // 旧版:没有这项集成 const el = $("priv-state"); if (st.state === "ok") { el.className = "prov-state ok"; @@ -63,6 +67,7 @@ // 一键安装 / 激活的进度 const su = st.setup || { phase: "idle" }; const busy = SETUP_BUSY.includes(su.phase); + privBusy = busy; const se = $("priv-setup"); const showSetup = su.message && !(st.state === "ok" && su.phase !== "done"); se.classList.toggle("hidden", !showSetup); @@ -246,6 +251,7 @@ $("upd-last").textContent = "✗ " + msg; const rt = $("upd-retry"); if (rt) rt.onclick = () => loadUpd(); // 反复失败也只挂一个监听 } + let updWasMoving = false; async function loadUpd(changed = false) { if (changed) updRev++; const visit = setVisit, rev = updRev; @@ -253,10 +259,20 @@ if (!live()) return; let st; try { st = await readUpdateStatus(); } - catch (e) { if (live()) updFailed(e.message || "?"); return; } + catch (e) { + if (live()) { + updFailed(e.message || "?"); + if (updWasMoving || Date.now() < updFollowUntil) updLater(2000, visit); + } + return; + } if (!live() || !st) return; - if (st?.ok === false && st.message && st.state !== "unsupported") return updFailed(st.message); - if (!st?.ok || !st.items) { $("upd-field").classList.add("hidden"); setDiscovery("update", t("不可用")); return; } + if (st?.ok === false && st.message && st.state !== "unsupported") { + updFailed(st.message); + if (updWasMoving || Date.now() < updFollowUntil) updLater(2000, visit); + return; + } + if (!st?.ok || !st.items) { updWasMoving = false; $("upd-field").classList.add("hidden"); setDiscovery("update", t("不可用")); return; } $("upd-field").classList.remove("hidden"); $("upd-auto").checked = !!st.auto; $("upd-channel").value = st.channel === "pinned" ? "pinned" : st.channel || "stable"; @@ -304,6 +320,7 @@ $("upd-last").textContent = st.checking ? t("检查中…") : st.error ? "✗ " + st.error : st.lastCheck ? t("上次检查:{at}", { at: new Date(st.lastCheck).toLocaleString() }) : t("还没检查过"); clearTimeout(updPoll); + updWasMoving = !!(moving || st.checking); // 点完按钮 / 换完渠道后的一小段时间也接着刷:后台的检查、换版本要过一会儿才开始,只看「正在进行」会漏掉结果 if (moving || st.checking || Date.now() < updFollowUntil) updLater(1500, visit); return st; @@ -370,9 +387,10 @@ }); } $("upd-items").addEventListener("click", async (e) => { - const item = e.target.dataset && e.target.dataset.item; - if (!item) return; - const act = e.target.dataset.act; + const btn = e.target.closest && e.target.closest("button[data-item]"); + const item = btn ? btn.dataset.item : (e.target.dataset && e.target.dataset.item); + if (!item || (btn && btn.disabled)) return; + const act = btn ? btn.dataset.act : e.target.dataset.act; if (act === "pick" || act === "versions") { openClaudeVersions(); return; } // 卸载后重装、平时换版本:都走版本选单 if (act === "uninstall") { const msg = item === "devkit" @@ -389,15 +407,21 @@ } if (act === "verify" || act === "repair") { if (act === "repair" && !confirm(t("修复开发工具包?\n\n会重新下载当前这一版你装着的部分(断点续传)并重装,装的时候暂停服务 1–2 分钟。\n你用 pip / npm -g 装进工具包的东西会被保留。"))) return; - const r = await post(act === "verify" ? "/api/app/upd_verify" : "/api/app/upd_repair", { full: true }).catch((e2) => ({ ok: false, message: e2.message })); - toast(r.message || (r.ok ? t("开始") : t("失败")), !r.ok); - followUpd(); updRev++; updLater(500); + if (btn) btn.disabled = true; + try { + const r = await post(act === "verify" ? "/api/app/upd_verify" : "/api/app/upd_repair", { full: true }).catch((e2) => ({ ok: false, message: e2.message })); + toast(r.message || (r.ok ? t("开始") : t("失败")), !r.ok); + followUpd(); updRev++; updLater(500); + } finally { if (btn && btn.isConnected) btn.disabled = false; } return; } if (item === "devkit" && !confirm(t("更新开发工具包?\n\n要下多少见这一项旁边标的大小(断点续传),装的时候会暂停服务 1–2 分钟。\n你用 pip / npm -g 装进工具包的东西会被保留。"))) return; - const r = await post("/api/app/upd_apply", { item }).catch((e2) => ({ ok: false, message: e2.message })); - toast(r.message || (r.ok ? t("开始") : t("失败")), !r.ok); - followUpd(); updRev++; updLater(500); + if (btn) btn.disabled = true; + try { + const r = await post("/api/app/upd_apply", { item }).catch((e2) => ({ ok: false, message: e2.message })); + toast(r.message || (r.ok ? t("开始") : t("失败")), !r.ok); + followUpd(); updRev++; updLater(500); + } finally { if (btn && btn.isConnected) btn.disabled = false; } }); // ── 通知(只有 cccodroid:GatewayService 订阅事件流发通知)── async function loadNotify() { diff --git a/gateway/web/app/10b-storage.js b/gateway/web/app/10b-storage.js index cb7e8987..289554d9 100644 --- a/gateway/web/app/10b-storage.js +++ b/gateway/web/app/10b-storage.js @@ -1,6 +1,6 @@ // ── 设置 → 存储(D10):网关 gw/storage.mjs 扫、清;这里只画和转发。六类:缓存 / 临时文件 / Claude Code 杂物 能清, // 会话、程序和文件只看大小,已有的清理入口汇总后跳回原处 ── - const ST = { r: null, poll: 0, picks: null, open: false, result: null, cleanSeq: 0 }; + const ST = { r: null, poll: 0, picks: null, open: false, result: null, cleanSeq: 0, scanning: false, fails: 0, cleaning: false }; const CACHE_NAMES = { webview: () => t("内置浏览器"), npm: () => "npm", pip: () => "pip", gh: () => "GitHub CLI", pkg: () => t("pkg 下载的安装包"), apt: () => "apt", lineage: () => t("脉络索引") }; const sz = (b) => (b ? fmtSize(b) : "0 B"); function stPaintResult() { @@ -19,8 +19,22 @@ return viewRead("storage", visit, live, async () => { clearTimeout(ST.poll); let r; - try { r = await api("/api/storage"); } catch (e) { if (live()) stOut("err", "✗ " + e.message); return; } + try { r = await api("/api/storage"); } + catch (e) { + if (!live()) return; + if (ST.scanning && ST.fails < 6) { + ST.fails++; + stLater(2000, visit); + return; + } + ST.scanning = false; + $("st-scan").disabled = false; + stOut("err", "✗ " + e.message); + return; + } if (!live()) return; + ST.fails = 0; + ST.scanning = !!r.scanning; ST.r = r; stPaint(); if (r.scanning) stLater(1500, visit); @@ -31,6 +45,7 @@ const visit = setVisit; if (!setVisible("storage", visit)) return; clearTimeout(ST.poll); + ST.scanning = true; ST.fails = 0; $("st-scan").disabled = true; $("st-when").textContent = t("正在扫描…"); try { await post("/api/storage/scan", {}); } catch (e) { if (setVisible("storage", visit)) stOut("err", "✗ " + e.message); } @@ -104,18 +119,26 @@ return out.join(""); } - async function stClean(cat, picks) { + async function stClean(cat, picks, btn) { + if (ST.cleaning) return; + ST.cleaning = true; + if (btn) btn.disabled = true; const seq = ++ST.cleanSeq; stOut("", t("正在清理…")); - let r; - try { r = await post("/api/storage/clean", picks ? { cat, picks } : { cat }); } - catch (e) { if (seq === ST.cleanSeq) stOut("err", "✗ " + e.message); return; } - if (seq !== ST.cleanSeq) return; - if (!r || !r.ok) return stOut("err", "✗ " + ((r && r.message) || t("失败"))); - // 清理已经执行:离开时只记结果,回来仍能看到;不重启已离开的轮询。 - stOut("ok", t("✓ 删了 {n} 项,腾出 {size}", { n: r.n, size: sz(r.freed) }) + (r.skipped ? ";" + t("{n} 项没删(正在用或不在允许的范围里)", { n: r.skipped }) : "")); - ST.picks = null; - stLater(800, setVisit); + try { + let r; + try { r = await post("/api/storage/clean", picks ? { cat, picks } : { cat }); } + catch (e) { if (seq === ST.cleanSeq) stOut("err", "✗ " + e.message); return; } + if (seq !== ST.cleanSeq) return; + if (!r || !r.ok) return stOut("err", "✗ " + ((r && r.message) || t("失败"))); + // 清理已经执行:离开时只记结果,回来仍能看到;不重启已离开的轮询。 + stOut("ok", t("✓ 删了 {n} 项,腾出 {size}", { n: r.n, size: sz(r.freed) }) + (r.skipped ? ";" + t("{n} 项没删(正在用或不在允许的范围里)", { n: r.skipped }) : "")); + ST.picks = null; + stLater(800, setVisit); + } finally { + ST.cleaning = false; + if (btn && btn.isConnected) btn.disabled = false; + } } $("st-scan").addEventListener("click", stScan); @@ -133,17 +156,17 @@ }); $("st-cards").addEventListener("click", async (e) => { const b = e.target.closest("[data-st]"); - if (!b) return; + if (!b || b.disabled) return; const act = b.dataset.st; - if (act === "clean-cache") return stClean("cache"); - if (act === "clean-junk") return stClean("junk"); - if (act === "clean-tmp") return stClean("tmp"); + if (act === "clean-cache") return stClean("cache", null, b); + if (act === "clean-junk") return stClean("junk", null, b); + if (act === "clean-tmp") return stClean("tmp", null, b); if (act === "tmp-list") { ST.open = !ST.open; return stPaint(); } if (act === "clean-picks") { const picks = [...(ST.picks || [])]; if (!picks.length) return stOut("err", t("没有勾选")); if (!confirm(t("删除勾选的 {n} 项临时文件?删了找不回来。", { n: picks.length }))) return; - return stClean("tmp", picks); + return stClean("tmp", picks, b); } if (act === "open-sess") { closeSettings(); return openSession(b.dataset.id); } if (act === "go-trash") { closeSettings(); openPage("sessions"); sess.mode = "trash"; return loadTrash(); } @@ -151,8 +174,11 @@ if (act === "go-usage") return openSettings("usage"); if (act === "purge-comp") { if (!confirm(t("删掉 {id} 留下的运行数据?以后再装要重新下载。", { id: b.dataset.id }))) return; - const r = await post("/api/components/purge", { id: b.dataset.id }).catch((e2) => ({ ok: false, message: e2.message })); - stOut(r.ok ? "ok" : "err", r.ok ? t("✓ 已删除") : "✗ " + (r.message || t("失败"))); - return stScan(); + b.disabled = true; + try { + const r = await post("/api/components/purge", { id: b.dataset.id }).catch((e2) => ({ ok: false, message: e2.message })); + stOut(r.ok ? "ok" : "err", r.ok ? t("✓ 已删除") : "✗ " + (r.message || t("失败"))); + return stScan(); + } finally { if (b.isConnected) b.disabled = false; } } }); diff --git a/gateway/web/app/11-usage.js b/gateway/web/app/11-usage.js index 217abdd2..22d5dace 100644 --- a/gateway/web/app/11-usage.js +++ b/gateway/web/app/11-usage.js @@ -561,35 +561,45 @@ Context window: 200k (optional; only if the provider doesn't report one)
${t("第三方端口由你自己选择,应用不审核、不背书。对方能看到你的 Key、代码和对话,请只用你信任的服务;不要使用共享或转售的账户。")}
`; box.onclick = async (e) => { - const act = e.target.dataset && e.target.dataset.act; - if (!act) return; - if (act === "use") return useProvider(p); - if (act === "test") return testAndShow(p.id); + const btn = e.target.closest && e.target.closest("button[data-act]"); + const act = btn ? btn.dataset.act : (e.target.dataset && e.target.dataset.act); + if (!act || box._busy || (btn && btn.disabled)) return; + const runLocked = async (fn) => { + box._busy = true; + if (btn) btn.disabled = true; + try { return await fn(); } + finally { box._busy = false; if (btn && btn.isConnected) btn.disabled = false; } + }; + if (act === "use") return runLocked(() => useProvider(p)); + if (act === "test") return runLocked(() => testAndShow(p.id)); // 这张卡属于哪一家、还是不是刚才那一份 DOM:await 回来的旧回执只许动仍在原卡上的视图(BUG-UIFS-004) const cardId = p ? p.id : "__new__"; const keyEl = $("pc-key"), labelEl = $("cc-label"); const live = () => state.provView === cardId && $("cc-label") === labelEl && $("pc-key") === keyEl; if (act === "clear") { if (!confirm(t("清除 {name} 的 Key?", { name: p.label }))) return; - // 留空保存会继续用旧 Key,以前只能把整个接口删掉(195-E.9);后端支持 clearKey - let r; - try { r = await post("/api/providers/save", { id: p.id, clearKey: true }); } catch (e2) { return toast(e2.message, true); } - if (r && r.ok === false) return toast(t("清除失败:{msg}", { msg: r.message || "?" }), true); - if (!live()) return toast(t("已清除")); - return reloadProv(t("已清除")); + return runLocked(async () => { + // 留空保存会继续用旧 Key,以前只能把整个接口删掉(195-E.9);后端支持 clearKey + let r; + try { r = await post("/api/providers/save", { id: p.id, clearKey: true }); } catch (e2) { return toast(e2.message, true); } + if (r && r.ok === false) return toast(t("清除失败:{msg}", { msg: r.message || "?" }), true); + if (!live()) return toast(t("已清除")); + return reloadProv(t("已清除")); + }); } if (act === "del") { if (!confirm(t("删除接口「{name}」?", { name: p.label }))) return; - let r; - try { r = await post("/api/providers/delete", { id: p.id }); } catch (e2) { return toast(e2.message, true); } - if (r && r.ok === false) return toast(t("删除失败:{msg}", { msg: r.message || "?" }), true); - const wasActive = state.providerActive === p.id; - state.provView = wasActive ? null : state.providerActive; - await reloadProv(t("已删除")); - // 删的就是正在用的接口:reloadProv 里 provView 已经清空,型号 / 思考强度下拉会停在已删清单上; - // 这里强制按新接口重拉一次,免得再保存时把旧型号写成新接口的型号(195-E.3) - if (wasActive) await loadModels(true); - return; // 删除动作到此结束:以前缺这一句,会落进下面的公共保存分支,用已删的 id 再把当前卡保存一遍(BUG-UIFS-005) + return runLocked(async () => { + let r; + try { r = await post("/api/providers/delete", { id: p.id }); } catch (e2) { return toast(e2.message, true); } + if (r && r.ok === false) return toast(t("删除失败:{msg}", { msg: r.message || "?" }), true); + const wasActive = state.providerActive === p.id; + state.provView = wasActive ? null : state.providerActive; + await reloadProv(t("已删除")); + // 删的就是正在用的接口:reloadProv 里 provView 已经清空,型号 / 思考强度下拉会停在已删清单上; + // 这里强制按新接口重拉一次,免得再保存时把旧型号写成新接口的型号(195-E.3) + if (wasActive) await loadModels(true); + }); } const body = { id: p ? p.id : "", label: $("cc-label").value.trim(), baseUrl: $("cc-base").value.trim(), @@ -613,17 +623,19 @@ Context window: 200k (optional; only if the provider doesn't report one) if (lm[2] && !(w >= 1024 && w <= 16777216)) return toast(t("上下文窗口填 1024 到 16777216 之间的整数,也可以写 256k、1m"), true); if (!body.extraModels.some((m) => m.id === lm[1])) body.extraModels.push({ id: lm[1], contextWindow: w }); } - let r; - try { r = await post("/api/providers/save", body); } catch (e2) { return toast(e2.message, true); } - // 换了主机又没给新 Key:网关把旧 Key 清掉了,得说清楚、让用户重新填(0.6.9 审计 P1-2) - const done = p ? t("已保存") : t("已添加"); - // 远程明文 http:只警告不拦,保存回执带 warning 就跟在「已保存」后面说(199-9-02) - const msg = r.keyCleared ? t("换了主机,旧 Key 已清掉,请重新填") : r.warning ? done + " · " + r.warning : done; - // 卡已切走:迟到的回执只报保存结果,别把视图切回来重画当前卡(BUG-UIFS-004) - if (!live()) return toast(msg); - if (keyEl.value.trim() !== body.apiKey) return toast(msg); // 同卡提交后又敲了新 Key:留着,别重画掉 - state.provView = r.id; - await reloadProv(msg, true); + return runLocked(async () => { + let r; + try { r = await post("/api/providers/save", body); } catch (e2) { return toast(e2.message, true); } + // 换了主机又没给新 Key:网关把旧 Key 清掉了,得说清楚、让用户重新填(0.6.9 审计 P1-2) + const done = p ? t("已保存") : t("已添加"); + // 远程明文 http:只警告不拦,保存回执带 warning 就跟在「已保存」后面说(199-9-02) + const msg = r.keyCleared ? t("换了主机,旧 Key 已清掉,请重新填") : r.warning ? done + " · " + r.warning : done; + // 卡已切走:迟到的回执只报保存结果,别把视图切回来重画当前卡(BUG-UIFS-004) + if (!live()) return toast(msg); + if (keyEl.value.trim() !== body.apiKey) return toast(msg); // 同卡提交后又敲了新 Key:留着,别重画掉 + state.provView = r.id; + await reloadProv(msg, true); + }); }; } diff --git a/gateway/web/app/12-model-caps.js b/gateway/web/app/12-model-caps.js index 9cd2aa7f..5953bfe5 100644 --- a/gateway/web/app/12-model-caps.js +++ b/gateway/web/app/12-model-caps.js @@ -130,14 +130,18 @@ p.style.maxHeight = Math.min(Math.round(w * 1.618), ar.top - 8 - 16) + "px"; } // browse:模型清单正在看哪家(点上面的接口切换,只是看;点了模型才真换) - let info, browse = curProv(), ML = []; + let info, browse = curProv(), ML = [], loadSeq = 0; const list = m.querySelector(".mp-list"), q = m.querySelector(".mp-q"); async function load() { - const want = browse; + const want = browse, my = ++loadSeq; let r; try { r = await api("/api/models" + sidQ(browse && browse !== curProv() ? "browse=" + encodeURIComponent(browse) : "")); } - catch (e) { list.textContent = t("拉取模型清单失败:{msg}", { msg: e.message }); return false; } - if (!m.isConnected || want !== browse) return false; + catch (e) { + if (!m.isConnected || my !== loadSeq || want !== browse) return false; + list.textContent = t("拉取模型清单失败:{msg}", { msg: e.message }); + return false; + } + if (!m.isConnected || my !== loadSeq || want !== browse) return false; info = r; ML = r.models || []; if (r.providers) state.provList = r.providers; if (!browse) browse = r.provider; @@ -582,11 +586,16 @@ extSync(); document.addEventListener("cc:ui", (e) => { if (e.detail.key === "extImg" || e.detail.key == null) extSync(); }); $("set-extimg").addEventListener("change", (e) => uiSet("extImg", e.target.checked ? null : "auto")); // 工作岛起没起来(195-P.4):检测要几秒(pm 再加 am 探一次),开关 / 重试之后隔几秒再看 + let wiTimers = []; + function clearWiTimers() { + for (const id of wiTimers) clearTimeout(id); + wiTimers = []; + } async function loadWorkIsland() { - const visit = setVisit; + const visit = setVisit, ok = latest("work-island"); if (!setVisible("claude", visit)) return; const r = await api("/api/work-island").catch(() => null), box = $("wi-state"); - if (!setVisible("claude", visit)) return; + if (!ok() || !setVisible("claude", visit)) return; const show = !!(r && r.supported && r.wanted && !r.started && !r.detecting && r.error); box.classList.toggle("hidden", !show); if (!show) return; @@ -595,8 +604,9 @@ : t("没检测到「工作岛」应用:装好后点重试。"); } const wiLater = () => { + clearWiTimers(); const visit = setVisit; - if (setVisible("claude", visit)) for (const ms of [2000, 6000, 10000]) setTimeout(() => { if (setVisible("claude", visit)) loadWorkIsland(); }, ms); + if (setVisible("claude", visit)) for (const ms of [2000, 6000, 10000]) wiTimers.push(setTimeout(() => { if (setVisible("claude", visit)) loadWorkIsland(); }, ms)); }; $("wi-retry").addEventListener("click", async () => { await post("/api/work-island/retry").catch((e) => toast(e.message, true)); @@ -709,10 +719,14 @@ } async function loadCaps() { + const ok = latest("caps"); try { - state.caps = await api("/api/capabilities"); state.capsErr = ""; + const r = await api("/api/capabilities"); + if (!ok()) return; + state.caps = r; state.capsErr = ""; renderCaps(); } catch (e) { + if (!ok()) return; // 一次都没拿到过:说清楚读取失败、给重试,别只剩空标题(审查 F-008) state.capsErr = e.message || "?"; renderCaps(); diff --git a/gateway/web/app/13-nav-menus.js b/gateway/web/app/13-nav-menus.js index 32268fba..ecdb2e30 100644 --- a/gateway/web/app/13-nav-menus.js +++ b/gateway/web/app/13-nav-menus.js @@ -547,8 +547,13 @@ } // 项目颜色要进 style 属性:载入时只认 #rrggbb,其余当没设(审查 10-30 第九份 前端低2) async function loadProjects() { - try { const r = await api("/api/projects"); PJ.list = (r.projects || []).map((p) => (/^#[0-9a-f]{6}$/i.test(p.color || "") ? p : { ...p, color: "" })); PJ.colors = r.colors || []; PJ.ws = r.workspace || ""; PJ.loaded = true; PJ.err = ""; } - catch (e) { PJ.err = e.message || "?"; if (curPage === "projects" && !PJ.cur) renderProjects(); return; } // 有缓存也重画:顶上要标出刷新失败(#49 P2-9) + const ok = latest("projects"); + try { + const r = await api("/api/projects"); + if (!ok()) return; + PJ.list = (r.projects || []).map((p) => (/^#[0-9a-f]{6}$/i.test(p.color || "") ? p : { ...p, color: "" })); PJ.colors = r.colors || []; PJ.ws = r.workspace || ""; PJ.loaded = true; PJ.err = ""; + } + catch (e) { if (!ok()) return; PJ.err = e.message || "?"; if (curPage === "projects" && !PJ.cur) renderProjects(); return; } // 有缓存也重画:顶上要标出刷新失败(#49 P2-9) paintProjChip(); if (curPage === "projects") renderProjects(); if (curPage === "sessions") renderSessions(); diff --git a/gateway/web/app/14-projects-sched.js b/gateway/web/app/14-projects-sched.js index b5c2a2cb..806bea5c 100644 --- a/gateway/web/app/14-projects-sched.js +++ b/gateway/web/app/14-projects-sched.js @@ -160,11 +160,21 @@ } if (a === "instr-undo") { box.querySelector(".pj-instr").value = PJ.detail.instr || ""; box.querySelector(".pj-save").classList.add("hidden"); return; } if (a === "instr-save") { + const btn = e.target.closest("[data-a]"); const ta = box.querySelector(".pj-instr"); - if (!ta || ta.dataset.pid !== p.id || PJ.detail.instrErr) return; // 眼前的编辑框必须是这个项目的 + if (!ta || ta.dataset.pid !== p.id || PJ.detail.instrErr || (btn && btn.disabled)) return; // 眼前的编辑框必须是这个项目的 const text = ta.value; - try { await jsend(`/api/projects/${encodeURIComponent(p.id)}/instr`, { text }, "PUT"); PJ.detail.instr = text; box.querySelector(".pj-save").classList.add("hidden"); toast(t("已保存")); } + if (btn) btn.disabled = true; + try { + await jsend(`/api/projects/${encodeURIComponent(p.id)}/instr`, { text }, "PUT"); + if (PJ.detail?.project?.id === p.id) { + PJ.detail.instr = text; + if (ta.isConnected && ta.value === text) box.querySelector(".pj-save")?.classList.add("hidden"); + } + toast(t("已保存")); + } catch (err) { toast(err.message, true); } + finally { if (btn && btn.isConnected) btn.disabled = false; } } }); // 长按项目卡片(安卓长按 = contextmenu):重命名、换颜色、打开目录、删除,和详情页的 ⋯ 是同一份菜单 @@ -285,13 +295,16 @@ ["keep", t("只删项目,目录和对话都留着"), esc(t("对话回到「不在项目里」,目录还在 {p}", { p: p.path }))], ["dir", t("连目录一起删"), esc(t("对话进回收站(可恢复),目录直接删掉,不可恢复"))], ], "keep"), ``); - o.querySelector("#dp-ok").addEventListener("click", async () => { + o.querySelector("#dp-ok").addEventListener("click", async (e) => { + const b = e.currentTarget; + if (b.disabled) return; const withDir = picked(o, "how") === "dir"; if (withDir && !confirm(t("目录 {p} 会被直接删掉,不能恢复。确定?", { p: p.path }))) return; + b.disabled = true; // 删之前记下:聊天区开着的是不是这个项目的对话 / 新对话是不是挂在这个项目上(删完映射就没了) const mine = curProject()?.id === p.id; try { await api(`/api/projects/${encodeURIComponent(p.id)}${withDir ? "?withDir=1" : ""}`, { method: "DELETE" }); } - catch (err) { return toast(err.message, true); } + catch (err) { b.disabled = false; return toast(err.message, true); } OV.close(o); PJ.cur = null; PJ.detail = null; // 连目录删时对话进了回收站:聊天区别再停在这个已删的对话上,换成新对话(群反馈 11-06);新对话挂着这个项目的也摘掉 if (mine && (withDir || !view.sessionId)) newConversation(); @@ -387,7 +400,10 @@ let data; try { data = await api(url); } catch (e) { - if (live()) { SC.cur = null; toast(t("任务详情读取失败:{msg}", { msg: e.message }), true); renderSched(); } + if (live()) { + toast(t("任务详情读取失败:{msg}", { msg: e.message }), true); + if (box._taskId !== id || e.status === 404) { SC.cur = null; renderSched(); } + } return; } if (live()) { SC.detail = data; renderTask(box); } @@ -455,7 +471,16 @@ return; } const ms = e.target.closest("[data-missed]"); - if (ms) { try { await jsend("/api/sched/missed", { taskId: ms.dataset.id, at: +ms.dataset.at, act: ms.dataset.missed }); toast(ms.dataset.missed === "run" ? t("已开始补跑") : t("这次就算了")); } catch (err) { toast(err.message, true); } return loadSched(true); } + if (ms) { + if (ms.disabled) return; + ms.disabled = true; + try { + await jsend("/api/sched/missed", { taskId: ms.dataset.id, at: +ms.dataset.at, act: ms.dataset.missed }); + toast(ms.dataset.missed === "run" ? t("已开始补跑") : t("这次就算了")); + } catch (err) { toast(err.message, true); } + finally { if (ms.isConnected) ms.disabled = false; } + return loadSched(true); + } const sid = e.target.closest("[data-sid]"); if (sid) return goSession(sid.dataset.sid); // 没存成对话的那几次:结果只在运行记录里,点开看全文(#173-2) const fr = e.target.closest("[data-full]"); diff --git a/gateway/web/app/15-pages.js b/gateway/web/app/15-pages.js index 841b5fdb..7a983e81 100644 --- a/gateway/web/app/15-pages.js +++ b/gateway/web/app/15-pages.js @@ -142,6 +142,8 @@ setVisit++; clearTimeout(ST.poll); clearTimeout(privPoll); clearTimeout(updPoll); clearTimeout(devPoll); clearTimeout(fixTimer); clearTimeout(envFactsTimer); + clearWiTimers(); + if (!setOpen || setCatOpen !== "provider") stopLoginWatch(); } // 设备和更新没有静态设置项。发现前也能进;不支持时显示说明,而不是把正在看的分类拿掉。 const setDiscover = new Set(["device", "update"]); diff --git a/gateway/web/app/16-viewer-git.js b/gateway/web/app/16-viewer-git.js index 890af322..ccc85150 100644 --- a/gateway/web/app/16-viewer-git.js +++ b/gateway/web/app/16-viewer-git.js @@ -186,10 +186,24 @@ } if (op) { GIT.file = s.files[+op.dataset.open].path; GIT.view = { kind: "diff" }; return gitRender(); } if (un != null) { + const btn = e.target.closest && e.target.closest("[data-undo]"); + const dir = GIT.dir; + if (GIT_BUSY.has(dir) || (btn && btn.disabled)) return; const f = s.files[+un]; const q = (f.kind === "new" || f.kind === "added") ? t("{f} 是新文件,撤销就是删掉它。确定?", { f: f.path }) : t("把 {f} 改回上次提交时的样子?这个文件没提交的改动会丢掉。", { f: f.path }); if (!confirm(q)) return; - try { const r = await gpost("discard", { file: f.path }); toast(r.message || t("已撤销")); gitLoad(); } catch (e2) { toast(e2.message, true); } + GIT_BUSY.set(dir, "discard"); gitSyncBar(); + if (btn) btn.disabled = true; + try { + const r = await gpost("discard", { file: f.path }); + toast(r.message || t("已撤销")); + if (GIT.dir === dir) gitLoad(); + } catch (e2) { toast(e2.message, true); } + finally { + GIT_BUSY.delete(dir); + if (GIT.dir === dir) gitSyncBar(); + if (btn && btn.isConnected) btn.disabled = false; + } } }; $("git-do").onclick = () => gitCommit(); @@ -222,32 +236,50 @@
${t("本地分支")}
${[...r.local].sort((x, y) => (y.current ? 1 : 0) - (x.current ? 1 : 0)).map((b) => row(b, false)).join("") || `
${t("还没有提交,所以也还没有分支。")}
`} ${r.remote.length ? `
${t("只在远端的分支")}
${r.remote.map((b) => row(b, true)).join("")}` : ""} ${r.remotes.length ? "" : `
${t("这个仓库还没有设置远端(remote),推送和拉取用不了。")}
`}`; - const sw = async (name, create) => { - try { const x = await gpost("switch", { branch: name, create }); toast(x.message || t("已切换")); } - catch (e) { return toast(e.message, true); } - GIT.known = null; GIT.sel = new Set(); - await gitLoad(); + const sw = async (name, create, btn) => { + const dir = GIT.dir; + if (GIT_BUSY.has(dir) || (btn && btn.disabled)) return; + GIT_BUSY.set(dir, "switch"); gitSyncBar(); + if (btn) btn.disabled = true; + try { + const x = await gpost("switch", { branch: name, create }); + toast(x.message || t("已切换")); + if (GIT.dir !== dir) return; + GIT.known = null; GIT.sel = new Set(); + await gitLoad(); + } + catch (e) { toast(e.message, true); } + finally { + GIT_BUSY.delete(dir); + if (GIT.dir === dir) gitSyncBar(); + if (btn && btn.isConnected) btn.disabled = false; + } }; box.onclick = (e) => { const b = e.target.closest("[data-sw]"); if (!b) return; const rowEl = b.closest(".gbr"); - sw(rowEl.dataset.b, false); + sw(rowEl.dataset.b, false, b); }; - $("git-newbr-ok").onclick = () => { + $("git-newbr-ok").onclick = (e) => { const n = $("git-newbr").value.trim(); if (!n) { toast(t("填一个分支名"), true); return $("git-newbr").focus(); } - sw(n, true); + sw(n, true, e.currentTarget); }; $("git-newbr").onkeydown = (e) => { if (e.key === "Enter") $("git-newbr-ok").click(); }; } async function gitCommit(again) { + const dir = GIT.dir; + if (GIT_BUSY.has(dir)) return; const msg = ($("git-msg")?.value || "").trim(); if (!msg) { toast(t("写一句提交说明"), true); $("git-msg")?.focus(); return; } // 一律按勾选清单传:以前「全选」发 files:null,网关 add -A 把状态快照之后新冒出来的文件、子模块指针也一起提交了 // (0.6.10 审计 195-S.1)。列表截断时也是清单的子集,没显示的本来就不该跟着提交(#106 07-002) // 提交在途时面板可能已换到别的仓库:回执只收拾发起它的那个仓库,别清掉另一个仓库正在写的说明(#154-1) - const dir = GIT.dir; + const doBtn = $("git-do"); + GIT_BUSY.set(dir, "commit"); gitSyncBar(); + if (doBtn) doBtn.disabled = true; + let askId = false; try { const r = await gpost("commit", { message: msg, files: [...GIT.sel] }); toast(r.message || t("已提交")); @@ -260,9 +292,14 @@ } catch (e) { if (GIT.dir !== dir) return toast(e.message, true); // 只有「还没设置署名」才弹身份表单;冲突、合并中不能只提交一部分之类也是 409,要直接说清楚(195-S.2) - if (e.status === 409 && e.body && e.body.error === "no_identity" && !again) return gitAskIdentity(); - toast(e.message, true); + if (e.status === 409 && e.body && e.body.error === "no_identity" && !again) askId = true; + else toast(e.message, true); + } finally { + GIT_BUSY.delete(dir); + if (GIT.dir === dir) gitSyncBar(); + if (doBtn && doBtn.isConnected) doBtn.disabled = !GIT.sel.size; } + if (askId) gitAskIdentity(); } /** 第一次提交:git 要知道署名。填一次,存进全局配置 */ function gitAskIdentity() { @@ -270,9 +307,12 @@ box.innerHTML = `
${t("第一次提交要先告诉 git 你的名字和邮箱(写进提交记录,存在本机)。")}
`; - $("git-id-ok").onclick = async () => { + $("git-id-ok").onclick = async (e) => { + const b = e.currentTarget; + if (b.disabled) return; + b.disabled = true; try { await gpost("identity", { name: $("git-id-name").value, email: $("git-id-mail").value }); } - catch (e) { return toast(e.message, true); } + catch (err) { b.disabled = false; return toast(err.message, true); } box.classList.add("hidden"); gitCommit(true); }; @@ -325,9 +365,23 @@ if (a === "wrap") { GIT.wrap = !GIT.wrap; box.querySelectorAll(".gdiff").forEach((d) => d.classList.toggle("nowrap", !GIT.wrap)); return; } if (a === "hist") { GIT.tab = "history"; GIT.view = null; return gitRender(); } if (a === "undo") { + const btn = e.target.closest && e.target.closest("[data-a]"); + const dir = GIT.dir; + if (GIT_BUSY.has(dir) || (btn && btn.disabled)) return; const f = GIT.status.files.find((x) => x.path === file); if (!confirm(f && (f.kind === "new" || f.kind === "added") ? t("{f} 是新文件,撤销就是删掉它。确定?", { f: file }) : t("把 {f} 改回上次提交时的样子?这个文件没提交的改动会丢掉。", { f: file }))) return; - try { await gpost("discard", { file }); toast(t("已撤销")); GIT.view = null; GIT.file = ""; gitLoad(); } catch (e2) { toast(e2.message, true); } + GIT_BUSY.set(dir, "discard"); gitSyncBar(); + if (btn) btn.disabled = true; + try { + await gpost("discard", { file }); + toast(t("已撤销")); + if (GIT.dir === dir) { GIT.view = null; GIT.file = ""; gitLoad(); } + } catch (e2) { toast(e2.message, true); } + finally { + GIT_BUSY.delete(dir); + if (GIT.dir === dir) gitSyncBar(); + if (btn && btn.isConnected) btn.disabled = false; + } } }; const ok = latest("gitbody"); diff --git a/gateway/web/app/18-terminal.js b/gateway/web/app/18-terminal.js index 3ea62dc6..9a433d6f 100644 --- a/gateway/web/app/18-terminal.js +++ b/gateway/web/app/18-terminal.js @@ -88,10 +88,13 @@ /** 手动登录:开一个新终端,网关替你敲好 claude auth login;授权码贴给 claude 自己的提示 */ async function openLoginTerm(method) { + const gen = ++TERM.gen; MO.cancel(termEl); termEl.classList.remove("hidden"); raisePane("term"); try { await loadXterm(); } catch (e) { toast(t("终端组件加载失败:{msg}", { msg: e.message }), true); return; } - try { const r = await api("/api/term/list"); TERM.list = (r.terms || []).filter((x) => x.alive || TERM.inst.has(x.id)); } catch {} - await newTerm({ login: method === "console" ? "console" : true }); + if (gen !== TERM.gen) return; + try { const r = await api("/api/term/list"); if (gen !== TERM.gen) return; TERM.list = (r.terms || []).filter((x) => x.alive || TERM.inst.has(x.id)); } catch {} + if (gen !== TERM.gen) return; + await newTerm({ gen, login: method === "console" ? "console" : true }); } async function newTerm(opts = {}) { @@ -251,6 +254,7 @@ }); function termDetach(a) { + if (a.reconnTimer) { clearTimeout(a.reconnTimer); a.reconnTimer = 0; } const es = a.es; a.es = null; if (es) try { es.close(); } catch {} @@ -259,6 +263,7 @@ } function termAttach(a) { if (a.es || a.exited) return; + if (a.reconnTimer) { clearTimeout(a.reconnTimer); a.reconnTimer = 0; } const { id, xt } = a; const es = new EventSource(`/api/term/${encodeURIComponent(id)}/stream`); a.es = es; @@ -296,17 +301,41 @@ const x = TERM.list.find((y) => y.id === id); if (x) { x.alive = false; x.code = code; renderTermTabs(); } }); - // 网关重启后这个终端就没了:重连拿到 404,EventSource 自己停下,这时说一声并标成已退出(195-H.4)。 - // 网关整个没了的时候它一直停在「连接中」,以前什么都不显示(复审 中12):第一次断就先提示在重连 + // EventSource 收到 HTTP 502/503 会直接进入 CLOSED:先探 /api/term/list 确认终端真不在才判死,否则退避重连 let lost = false; - es.onopen = () => { lost = false; }; + es.onopen = () => { lost = false; a.closedRetries = 0; }; es.onerror = () => { if (a.es !== es) return; // 已关闭或换过连接,不补提示 if (es.readyState === EventSource.CLOSED) { - a.es = null; es.close(); a.exited = true; - const x = TERM.list.find((y) => y.id === id); - if (x) { x.alive = false; renderTermTabs(); } - termOutput(a, "\r\n\x1b[2m" + t("[与网关的连接已断开]") + "\x1b[0m\r\n"); + a.es = null; es.close(); + if (!lost) { lost = true; termOutput(a, "\r\n\x1b[2m" + t("[与网关的连接断了,正在重连…]") + "\x1b[0m\r\n"); } + const gen = TERM.gen; + const wait = Math.min(5000, 1000 * (++a.closedRetries || (a.closedRetries = 1))); + a.reconnTimer = setTimeout(async () => { + a.reconnTimer = 0; + if (gen !== TERM.gen || a.es || a.exited || !TERM.inst.has(id)) return; + try { + const r = await api("/api/term/list"); + if (gen !== TERM.gen || a.es || a.exited || !TERM.inst.has(id)) return; + const found = (r.terms || []).find((y) => y.id === id); + if (!found || found.alive === false) { + a.exited = true; + const x = TERM.list.find((y) => y.id === id); + if (x) { x.alive = false; renderTermTabs(); } + termOutput(a, "\r\n\x1b[2m" + t("[与网关的连接已断开]") + "\x1b[0m\r\n"); + return; + } + } catch { + // 探活本身撞 502:还没确认死亡,继续下轮退避重连(超过上限放弃) + if (a.closedRetries >= 8) { + const x = TERM.list.find((y) => y.id === id); + if (x) { x.alive = false; renderTermTabs(); } + termOutput(a, "\r\n\x1b[2m" + t("[与网关的连接已断开]") + "\x1b[0m\r\n"); + return; + } + } + if (termCurrent(a) && !a.exited) termAttach(a); + }, wait); return; } if (!lost) { lost = true; termOutput(a, "\r\n\x1b[2m" + t("[与网关的连接断了,正在重连…]") + "\x1b[0m\r\n"); } diff --git a/gateway/web/app/18b-lineage.js b/gateway/web/app/18b-lineage.js index 194d4188..4333d062 100644 --- a/gateway/web/app/18b-lineage.js +++ b/gateway/web/app/18b-lineage.js @@ -68,6 +68,13 @@ try { [g] = await Promise.all([sameGet("/api/lineage"), ensureLinMap()]); } catch (e) { if (!live()) return; + if (LIN.building && (LIN.fails || 0) < 6) { + LIN.fails = (LIN.fails || 0) + 1; + LIN.poll = setTimeout(() => { if (live()) loadLineage(); }, 2000); + return; + } + LIN.building = false; + if (LIN.map) { toast(t("读不到脉络:{e}", { e: e.message }), true); return; } linState(t("读不到脉络:{e}", { e: e.message })); const b = document.createElement("button"); b.type = "button"; b.className = "btn ghost sm"; b.textContent = t("重试"); b.onclick = () => { linState(t("加载中…")); loadLineage(); }; @@ -75,11 +82,14 @@ return; } if (!live()) return; + LIN.fails = 0; if (g.building) { + LIN.building = true; linState(t("正在整理会话记录… {d}/{n}", { d: g.done || 0, n: g.total || "?" })); LIN.poll = setTimeout(() => { if (live()) loadLineage(); }, 800); return; } + LIN.building = false; // 头一回画图才归位到「现在」;后台重取保持用户拖着的位置(195-K.8) const first = !LIN.map; LIN.g = g; LIN.stale = false; @@ -90,14 +100,19 @@ } // ── 补档(gw/backfill.mjs):没题名的旧章,用全局默认模型按压缩摘要补起题名;先报预估,用户点头才跑 ── - const FILL = { st: null, poll: 0, was: false, revision: 0 }; + const FILL = { st: null, poll: 0, was: false, revision: 0, fails: 0 }; function linFill(changed = false) { if (changed) FILL.revision++; const visit = pageVisit, rev = FILL.revision, live = () => pageVisible("lineage", visit) && FILL.revision === rev; return viewRead("lineage-backfill", visit + ":" + rev, live, async () => { clearTimeout(FILL.poll); const r = await api("/api/lineage/backfill").catch(() => null); - if (live() && r?.job && r.estimate) paintFill(r, live); + if (!live()) return; + if (r?.job && r.estimate) { FILL.fails = 0; paintFill(r, live); } + else if (FILL.was && FILL.fails < 6) { + FILL.fails++; + FILL.poll = setTimeout(() => { if (live()) linFill(); }, 2000); + } }); } function paintFill(r, live) { @@ -122,18 +137,26 @@ el.classList.toggle("hidden", !n); } $("lin-fill").addEventListener("click", async () => { - const r = FILL.st; if (!r) return; - if (r.job.running) { await post("/api/lineage/backfill", { action: "stop" }).catch(() => {}); return linFill(true); } + const el = $("lin-fill"), r = FILL.st; + if (!r || el.disabled) return; + if (r.job.running) { + el.disabled = true; + try { await post("/api/lineage/backfill", { action: "stop" }).catch(() => {}); } + finally { el.disabled = false; } + return linFill(true); + } const e = r.estimate, num = (x) => x.toLocaleString(I18N.lang); const msg = t("用全局默认的 {m}({p})给 {s} 个会话的 {c} 章补起题名。", { m: r.modelName || r.model || "?", p: r.provider, s: e.sessions, c: e.chapters }) + "\n\n" + t("素材是每章结束时的压缩摘要,不重读全文。预计 {k} 次调用,输入约 {i} token、输出约 {o} token(按上限估,实际通常更少)。", { k: e.calls, i: num(e.tokensIn), o: num(e.tokensOut) }) + "\n\n" + t("补出来的题名随时能改,之后 AI 建档也会盖过它。开始吗?"); if (!confirm(msg)) return; + el.disabled = true; try { const s = await post("/api/lineage/backfill", { action: "start" }); if (!s.ok && s.message === "nothing") toast(t("没有要补的章了")); else if (!s.ok && s.message === "bridge") toast(t("本地 DNS 桥启动失败,无法连接 API。"), true); } catch (err) { toast(err.message, true); } + finally { el.disabled = false; } linFill(true); }); const mdOf = (ms) => { const d = new Date(ms), p = (n) => String(n).padStart(2, "0"); return p(d.getMonth() + 1) + "-" + p(d.getDate()); }; diff --git a/gateway/web/app/18d-bookmarks.js b/gateway/web/app/18d-bookmarks.js index 91ae8713..8d08e6a8 100644 --- a/gateway/web/app/18d-bookmarks.js +++ b/gateway/web/app/18d-bookmarks.js @@ -64,49 +64,54 @@ // 点了书签键:那颗键弹一下(加上、取消都弹,颜色本身说明是哪个) const bmTick = (msg) => { const b = msg.querySelector(':scope > .msg-acts button[data-a="mark"]'); if (b) MO.play(b, "mo-tick", 900); }; + const bmBusy = new WeakSet(); async function toggleMark(msg) { + if (bmBusy.has(msg)) return; const sid = view.sessionId; if (!sid) return toast(t("这个会话还没存下来,答完一轮再加书签"), true); - const uu = msgUuids(msg), mine = BMK.items.filter((b) => uu.includes(b.uuid)); - if (mine.length) { // 已经有:再点一下取消 - try { await post("/api/bookmarks/del", { ids: mine.map((b) => b.id) }); } catch (e) { return toast(e.message, true); } - BMK.items = BMK.items.filter((b) => !mine.includes(b)); - paintMarks(msg); bmTick(msg); - return toast(t("已取消书签")); - } - const tg = topIn(msg); - if (!tg) return; - const user = isUserMsg(msg), uuid = boxUuid(msg, tg.box); - const src = user ? userTextOf.get(msg) || "" : tg.box._src ? tg.box._src() : ""; - // 没有 uuid 时网关从尾部按开头认领:同样的话后面又出现过几次,就跳过几次,免得认成后一条(审查 #50 S2-02) - const head = src.trim().slice(0, 200); - let nth = 0, unsure = false; - if (!uuid && head) for (const m of chatEl.querySelectorAll(user ? ".msg.user" : ".msg.bot")) { - if (m === msg || !(msg.compareDocumentPosition(m) & Node.DOCUMENT_POSITION_FOLLOWING)) continue; - for (const b of markBoxes(m)) { - const t2 = user ? userTextOf.get(m) || "" : b._src ? b._src() : ""; - if (!t2.trim().startsWith(head)) continue; - // 后面那条同样的话还在跑、或者那一轮失败 / 被停了:说不准它进没进会话记录,数错了就认到别的消息上。 - // 宁可这次不加(审查 #52 S2-02) - if (m.dataset.run && m.dataset.done !== "ok") unsure = true; - nth++; - } - } - if (unsure) return toast(t("后面有一条同样的话还没确认存下,等那一轮答完(或重新打开这个会话)再加书签"), true); + bmBusy.add(msg); try { - const r = await post("/api/bookmarks", { - session: sid, uuid, hint: Number(msg.closest(".page")?.dataset.from) || 0, para: paraIndex(msg, tg.box, tg.para), - role: user ? "user" : "assistant", head, nth, - excerpt: ((tg.el && tg.el.innerText) || src).trim().slice(0, 120), - }); - // 刚答完的回复界面上没有 uuid:网关认领到了就补上,之后按钮状态、再点取消都靠它 - if (!uuid && r.item) (user ? msg : tg.box).dataset.uuid = r.item.uuid; - if (sid === view.sessionId && r.item) { BMK.items.push(r.item); paintMarks(msg); bmTick(msg); } - toast(t("已加书签")); - } catch (e) { - toast(e.status === 409 ? t("这个会话的书签已满 {n} 个,先删掉一些", { n: (e.body && e.body.limit) || 50 }) - : e.status === 404 ? t("没在会话记录里找到这条消息,稍后再试") : e.message, true); - } + const uu = msgUuids(msg), mine = BMK.items.filter((b) => uu.includes(b.uuid)); + if (mine.length) { // 已经有:再点一下取消 + try { await post("/api/bookmarks/del", { ids: mine.map((b) => b.id) }); } catch (e) { return toast(e.message, true); } + BMK.items = BMK.items.filter((b) => !mine.includes(b)); + paintMarks(msg); bmTick(msg); + return toast(t("已取消书签")); + } + const tg = topIn(msg); + if (!tg) return; + const user = isUserMsg(msg), uuid = boxUuid(msg, tg.box); + const src = user ? userTextOf.get(msg) || "" : tg.box._src ? tg.box._src() : ""; + // 没有 uuid 时网关从尾部按开头认领:同样的话后面又出现过几次,就跳过几次,免得认成后一条(审查 #50 S2-02) + const head = src.trim().slice(0, 200); + let nth = 0, unsure = false; + if (!uuid && head) for (const m of chatEl.querySelectorAll(user ? ".msg.user" : ".msg.bot")) { + if (m === msg || !(msg.compareDocumentPosition(m) & Node.DOCUMENT_POSITION_FOLLOWING)) continue; + for (const b of markBoxes(m)) { + const t2 = user ? userTextOf.get(m) || "" : b._src ? b._src() : ""; + if (!t2.trim().startsWith(head)) continue; + // 后面那条同样的话还在跑、或者那一轮失败 / 被停了:说不准它进没进会话记录,数错了就认到别的消息上。 + // 宁可这次不加(审查 #52 S2-02) + if (m.dataset.run && m.dataset.done !== "ok") unsure = true; + nth++; + } + } + if (unsure) return toast(t("后面有一条同样的话还没确认存下,等那一轮答完(或重新打开这个会话)再加书签"), true); + try { + const r = await post("/api/bookmarks", { + session: sid, uuid, hint: Number(msg.closest(".page")?.dataset.from) || 0, para: paraIndex(msg, tg.box, tg.para), + role: user ? "user" : "assistant", head, nth, + excerpt: ((tg.el && tg.el.innerText) || src).trim().slice(0, 120), + }); + // 刚答完的回复界面上没有 uuid:网关认领到了就补上,之后按钮状态、再点取消都靠它 + if (!uuid && r.item) (user ? msg : tg.box).dataset.uuid = r.item.uuid; + if (sid === view.sessionId && r.item) { BMK.items.push(r.item); paintMarks(msg); bmTick(msg); } + toast(t("已加书签")); + } catch (e) { + toast(e.status === 409 ? t("这个会话的书签已满 {n} 个,先删掉一些", { n: (e.body && e.body.limit) || 50 }) + : e.status === 404 ? t("没在会话记录里找到这条消息,稍后再试") : e.message, true); + } + } finally { bmBusy.delete(msg); } } /** 落到书签:把那一段放到视口上三分之一(「上次读到」放在顶上、不闪) */ @@ -149,12 +154,19 @@ // ── 侧栏「书签」页 ── const BM_DEL = ''; async function loadBookmarks() { - const box = $("tab-bookmarks"); + const box = $("tab-bookmarks"), ok = latest("bookmarks"); let r; - try { r = await api("/api/bookmarks"); } catch (e) { box.innerHTML = `
${emptyRow(e.message)}
`; return; } + try { r = await api("/api/bookmarks"); } + catch (e) { + if (!ok()) return; + if (box._items) toast(e.message, true); + else box.innerHTML = `
${emptyRow(e.message)}
`; + return; + } + if (!ok()) return; const items = (r.items || []).sort((a, b) => b.at - a.at); setPageSub("bookmarks", t("{n} 个", { n: items.length })); - if (!items.length) { box.innerHTML = `
${emptyRow(t("还没有书签。在提问或回复底下点书签键,就在那一处留了个记号。"))}
`; return; } + if (!items.length) { box.innerHTML = `
${emptyRow(t("还没有书签。在提问或回复底下点书签键,就在那一处留了个记号。"))}
`; box._items = []; return; } // 按会话分组,组的先后看组里最新的那个 const groups = new Map(); for (const b of items) { if (!groups.has(b.sid)) groups.set(b.sid, []); groups.get(b.sid).push(b); } @@ -183,7 +195,9 @@ const box = $("tab-bookmarks"), items = box._items || []; const d = e.target.closest("[data-del]"); if (d) { - try { await post("/api/bookmarks/del", { id: d.dataset.del }); } catch (err) { return toast(err.message, true); } + if (d.disabled) return; + d.disabled = true; + try { await post("/api/bookmarks/del", { id: d.dataset.del }); } catch (err) { d.disabled = false; return toast(err.message, true); } BMK.items = BMK.items.filter((b) => b.id !== d.dataset.del); paintMarks(); return bmDropRow(d.closest("[data-bm]")); } diff --git a/gateway/web/app/18e-lineage-merge.js b/gateway/web/app/18e-lineage-merge.js index 490c5c5a..6a483051 100644 --- a/gateway/web/app/18e-lineage-merge.js +++ b/gateway/web/app/18e-lineage-merge.js @@ -36,13 +36,16 @@ } $("lin-pick-x").addEventListener("click", linPickEnd); $("lin-pick-ok").addEventListener("click", async () => { - const P = MG.pick; if (!P || !P.ids.length) return; + const ok = $("lin-pick-ok"), P = MG.pick; + if (!P || !P.ids.length || ok.disabled) return; if (P.mode === "merge") return mergeWizard(P.ids.slice()); + ok.disabled = true; try { const r = await post("/api/lineage/extra", { child: P.child, add: P.ids }); toast(t("已补记 {n} 个来源", { n: r.n || P.ids.length })); linPickEnd(); lineageDirty(); } catch (e) { toast(e.message === "too_many" ? t("这个会话补记的来源已经满了(最多 {n} 个)", { n: 32 }) : e.message, true); } + finally { if (MG.pick) ok.disabled = !MG.pick.ids.length; } }); // 卡片「更多…」:从这里分叉、补记来源、撤掉补错的来源 @@ -65,11 +68,14 @@ return items; } async function linFork(id) { + if (linFork._busy) return; + linFork._busy = true; try { const r = await post("/api/session/" + encodeURIComponent(id) + "/fork", { latest: true }); toast(t("已分叉:保留了前 {n} 轮,接着聊就行", { n: r.kept })); loadSessions(); openSession(r.id); } catch (e) { toast(e.message, true); } + finally { linFork._busy = false; } } // ── 向导 ──