cicy-desktop 2.1.369 → 2.1.370

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.369",
+  "version": "2.1.370",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {

package/src/sidecar/docker.js

@@ -380,7 +380,9 @@ function curlDownload(url, dest, { emit, phase = "image", label = "下载镜像"
     // --retry-connrefused (curl 7.52+) covers a not-yet-ready net. On curl 7.71+
     // also add --retry-all-errors so a transient DNS blip (exit 6, common right
     // after app start) retries on the fast curl path instead of the slow node one.
-    const args = ["-sL", "-A", DL_UA, "-C", "-", "--retry", "8", "--retry-delay", "3", "--retry-connrefused"];
+    // --connect-timeout + --speed-limit/--speed-time:被墙的源几秒就放弃,传着传着卡死(<10KB/s 持续 2 分钟)
+    // 也会退出 —— 否则 curl 永远挂着,bootstrap 和守护循环一起卡住(国内链路上真会发生)。
+    const args = ["-sL", "-A", DL_UA, "-C", "-", "--connect-timeout", "20", "--speed-limit", "10240", "--speed-time", "120", "--retry", "8", "--retry-delay", "3", "--retry-connrefused"];
     if (curlSupportsRetryAllErrors(bin)) args.push("--retry-all-errors");
     args.push("-o", dest, url);
     let child;

package/src/sidecar/qemu-docker.js

@@ -88,13 +88,25 @@ function sshConnect() {
 }
 // 等价于 wslRun:成功 resolve {stdout, stderr};非零退出 reject(err.stdout/err.stderr/err.code)。
 // opts.stdin:可读流,灌进命令的 stdin(docker load 用)。opts.onLine:逐行回调(流式进度)。
+// ⚠️ 超时必须从调用开始就算(含建连、开通道):虚拟机慢启动时 sshd 可能接了 TCP 却迟迟不开 exec 通道,
+// 以前计时器只在 exec 回调里才挂上 → 回调永不来 → 这个 promise 永不结束 → status()/守护循环整条卡死
+// (xs-2002 2026-10-22 起卡了一夜,docker-status 一直停在旧时间)。
 async function vmRun(cmd, { timeout = 60000, stdin, onLine } = {}) {
-  const c = await sshConnect();
+  const t0 = Date.now();
+  const c = await Promise.race([sshConnect(), new Promise((_, rej) => setTimeout(() => rej(new Error("ssh connect timeout")), Math.min(timeout, 30000)))]);
   return new Promise((resolve, reject) => {
-    c.exec(`sudo -n sh -c ${shQuote(cmd)}`, (err, stream) => {
-      if (err) { _conn = null; try { c.end(); } catch {} return reject(err); }
-      let out = "", errOut = "", buf = "";
-      const timer = setTimeout(() => { try { stream.close(); } catch {} reject(Object.assign(new Error(`vmRun timeout after ${timeout}ms: ${cmd.slice(0, 120)}`), { stdout: out, stderr: errOut })); }, timeout);
+    let stream = null, done = false;
+    let out = "", errOut = "", buf = "";
+    const timer = setTimeout(() => {
+      if (done) return; done = true;
+      try { stream && stream.close(); } catch {}
+      if (!stream) { _conn = null; try { c.end(); } catch {} }   // 通道都没开出来:这条连接已不可信,丢掉重连
+      reject(Object.assign(new Error(`vmRun timeout after ${timeout}ms: ${cmd.slice(0, 120)}`), { stdout: out, stderr: errOut }));
+    }, Math.max(1000, timeout - (Date.now() - t0)));
+    c.exec(`sudo -n sh -c ${shQuote(cmd)}`, (err, st) => {
+      if (done) { try { st && st.close(); } catch {} return; }
+      if (err) { done = true; clearTimeout(timer); _conn = null; try { c.end(); } catch {} return reject(err); }
+      stream = st;
       const line = (chunk) => {
         if (!onLine) return;
         buf += chunk;
@@ -104,6 +116,7 @@ async function vmRun(cmd, { timeout = 60000, stdin, onLine } = {}) {
       stream.stderr.on("data", (d) => { const s = d.toString("utf8"); errOut += s; line(s); });
       stream.on("close", (code) => {
         clearTimeout(timer);
+        if (done) return; done = true;
         if (code === 0) resolve({ stdout: out, stderr: errOut });
         else reject(Object.assign(new Error(`exit ${code}: ${(errOut || out).trim().slice(-300)}`), { code, stdout: out, stderr: errOut }));
       });

package/src/sidecar/qemu-vm.cjs

@@ -307,8 +307,10 @@ function httpOk(port, p) {
 function accelOf() {
   const t = tailOf(F.qemuLog, 32 * 1024);
   if (!t && !pidAlive(readPid(F.qemuPid))) return "";
-  // qemu 依次试 -accel:whpx 起不来会打一行 WHPX 报错再退到 tcg
-  return /whpx/i.test(t) && /(fail|error|no accelerator|not supported|unavailable)/i.test(t) ? "tcg" : "whpx";
+  // qemu 依次试 -accel:whpx 起不来会打「failed to initialize whpx: …」再「falling back to tcg」。
+  // 只认这两句 —— WHPX 正常时也会打无害的 warning(如「WHPX: Failed to get performance monitoring
+  // features」),以前按「whpx + fail」判,把 9 台跑在 WHPX 上的机器误报成软件模拟(2026-10-23)。
+  return /falling back to tcg|failed to initialize whpx/i.test(t) ? "tcg" : "whpx";
 }
 function whpxFeature() { return WIN && fs.existsSync(path.join(process.env.SystemRoot || "C:\\Windows", "System32", "WinHvPlatform.dll")); }
 // 串口日志最后一行可读的话 = 开机进度(给卡片「启动中」下面那一行小字)