npm - cicy-desktop - Versions diffs - 2.1.140 → 2.1.142 - Mend

cicy-desktop 2.1.140 → 2.1.142

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/package.json +1 -1
package/src/backends/homepage-preload.js +1 -0
package/src/backends/homepage-react/assets/index-DVdvubOy.js +377 -0
package/src/backends/homepage-react/index.html +1 -1
package/src/backends/sidecar-ipc.js +10 -0
package/src/sidecar/wsl-docker.js +57 -43
package/workers/render/src/App.jsx +28 -6
package/src/backends/homepage-react/assets/index-TR02tbIs.js +0 -377

package/src/backends/homepage-react/index.html CHANGED Viewed

@@ -6,7 +6,7 @@
   <link rel="icon" type="image/svg+xml" href="./favicon.svg" />
   <link rel="icon" type="image/png" sizes="256x256" href="./favicon-256.png" />
   <title>CiCy Desktop</title>
-  <script type="module" crossorigin src="./assets/index-TR02tbIs.js"></script>
+  <script type="module" crossorigin src="./assets/index-DVdvubOy.js"></script>
   <link rel="stylesheet" crossorigin href="./assets/index-CKhSx1lp.css">
 </head>
 <body>

package/src/backends/sidecar-ipc.js CHANGED Viewed

@@ -224,6 +224,16 @@ function register({ sidecarLogPath } = {}) {
     return { installed: false, dockerRunning: false, running: false, unknown: true, port: APP_PORT, platform: process.platform };
   });
+  // 「重试检测」: FORCE a fresh probe right now (appStatus only reads the cache, so
+  // clicking it changed nothing — the "点了没反应" bug). Returns the freshly-probed
+  // status and kicks the auto-start reconcile in the background. If WSL is wedged
+  // this resolves to unknown after the probe timeout, which the UI then surfaces.
+  ipcMain.handle("docker:app-redetect", async () => {
+    const s = await refreshDockerStatus();
+    reconcileDocker().catch(() => {});
+    return s;
+  });
   // Common run options for the :8009 instance: its own container/volume + the
   // LLM gateway env keyed by the 8008 team's token. (WSL: whole-home mount via
   // -v <volume>:/home/cicy inside wsl-docker.)

package/src/sidecar/wsl-docker.js CHANGED Viewed

@@ -190,8 +190,10 @@ async function installDistro({ emit } = {}) {
   emit && emit({ phase: "container", status: "running", message: "重置运行环境(冷启动)…" });
   try { await wslTerminate(); } catch {}
-  // 4) Free the ~444MB package now that the distro has everything.
-  try { fs.unlinkSync(dest); } catch {}
+  // 4) KEEP the rootfs (deletion removed per 主人). Deleting it forced a fresh
+  //    447MB re-download on every reinstall / new user / clean retry — the main
+  //    「怎么这么慢」 pain. We keep it so reinstall reuses it (curlDownload skips a
+  //    complete file). Users who want the disk back can delete the tarball manually.
 }
 // docker CLI present inside the distro?
@@ -230,51 +232,63 @@ async function dockerEngineUp() {
 //   • iptables must use the LEGACY backend (Ubuntu defaults to nft, which
 //     dockerd can't drive in WSL2 → daemon fails to set up networking).
 //   • run dockerd detached and wait for /var/run/docker.sock.
+// Launch dockerd FULLY DETACHED. This is the core fix for the all-day「WSL 卡死 /
+// app 未响应」: the old launch `(nohup dockerd >log 2>&1 &)` left dockerd in the wsl
+// session with stdin still on the wsl pipe, so `wsl.exe` would NOT exit — the
+// launching call hung (up to its 150s timeout), and a hung wsl session wedges the
+// whole WSL subsystem so every later `wsl` call blocks and the app freezes.
+//   setsid → new session (detached from the wsl console)
+//   </dev/null + >log 2>&1 → no shared stdio with the wsl pipe
+// ⇒ the launch returns INSTANTLY and dockerd is fully orphaned. Short timeout: if
+// THIS times out, WSL itself is already wedged (not dockerd's fault).
+// The boot/autostart script the rootfs ships (run by wsl.conf [boot] + our logon
+// task) used a NON-detached `nohup dockerd &`, which hangs the logon wsl.exe and
+// wedges WSL on every reboot. Rewrite it to launch detached too. base64 so the
+// multi-line script survives `bash -lc "…"` without any quote escaping.
+const BOOT_SCRIPT_B64 = Buffer.from(
+  "#!/bin/sh\n" +
+  "update-alternatives --set iptables /usr/sbin/iptables-legacy 2>/dev/null || true\n" +
+  "update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy 2>/dev/null || true\n" +
+  "pgrep dockerd >/dev/null 2>&1 || setsid sh -c 'exec dockerd >/var/log/dockerd.log 2>&1 </dev/null' &\n"
+).toString("base64");
+async function launchDockerd() {
+  await wslRun(
+    `echo ${BOOT_SCRIPT_B64} | base64 -d > /usr/local/sbin/start-dockerd.sh 2>/dev/null; chmod +x /usr/local/sbin/start-dockerd.sh 2>/dev/null; ` +
+    "update-alternatives --set iptables /usr/sbin/iptables-legacy >/dev/null 2>&1; " +
+    "update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy >/dev/null 2>&1; " +
+    // Stale /var/run/docker.{pid,sock} from the pre-baked rootfs make a fresh dockerd
+    // refuse to start; clear them when dockerd isn't already running.
+    "if ! pgrep dockerd >/dev/null 2>&1; then rm -f /var/run/docker.pid /run/docker.pid /var/run/docker.sock /run/docker.sock; fi; " +
+    "pgrep dockerd >/dev/null 2>&1 || setsid bash -c 'exec dockerd >/var/log/cicy-dockerd.log 2>&1 </dev/null' & " +
+    "true",
+    { timeout: 20000 });
+}
 async function startEngine() {
-  // Up to 3 clean attempts: on a cold first boot dockerd can die mid-init (e.g.
-  // networking not ready yet) and only succeed on a fresh relaunch — that race
-  // was the main "一次装不上、要点几次重试" culprit. Each attempt clears stale
-  // runtime files, (re)launches dockerd, and waits for the socket; between
-  // attempts we hard-kill any half-dead daemon so the next launch is clean.
+  // Up to 3 attempts. Each: launch dockerd (detached, returns instantly) then POLL
+  // the socket in SHORT, SEPARATE wsl calls — never hold the distro in one 120s call
+  // (that both masked wedges and blocked everything else). Cold first boot of a
+  // freshly-imported distro can take well over 40s, so poll up to 90s.
   for (let attempt = 1; attempt <= 3; attempt++) {
     const at0 = Date.now();
-    let launchErr = null;
-    log.info(`[startEngine] attempt ${attempt}/3 — (re)launch dockerd + wait for socket`);
-    try {
-      await wslRun(
-        "update-alternatives --set iptables /usr/sbin/iptables-legacy >/dev/null 2>&1; " +
-        "update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy >/dev/null 2>&1; " +
-        // A pre-baked rootfs (docker export after an inner dind dockerd) can ship a
-        // STALE /var/run/docker.{pid,sock}: a fresh dockerd then refuses to start
-        // ("pid file found, ensure docker is not running"). Clear them when dockerd
-        // is NOT already running — that was the 烤制包「引擎没起来」failure.
-        "if ! pgrep dockerd >/dev/null 2>&1; then rm -f /var/run/docker.pid /run/docker.pid /var/run/docker.sock /run/docker.sock; fi; " +
-        "pgrep dockerd >/dev/null 2>&1 || (nohup dockerd >/var/log/cicy-dockerd.log 2>&1 &); " +
-        // First boot of a freshly-imported distro: cold WSL2 VM + large pre-baked
-        // /var/lib/docker (restoring containers + overlay) can take well over 40s.
-        // Wait up to 120s — the 40s window was too short on cold boot, which made
-        // the next attempt pkill the STILL-INITIALIZING daemon and relaunch it
-        // cold again (a restart loop → 「引擎没起来」even though dockerd was fine).
-        "for i in $(seq 1 120); do [ -S /var/run/docker.sock ] && docker version >/dev/null 2>&1 && break; sleep 1; done",
-        { timeout: 150000 });
-    } catch (e) { launchErr = e; log.warn(`[startEngine] attempt ${attempt} launch/wait errored: ${e.message}`); }
-    if (await dockerEngineUp()) { log.info(`[startEngine] ✓ dockerd up on attempt ${attempt} (${((Date.now() - at0) / 1000).toFixed(1)}s)`); return true; }
-    log.warn(`[startEngine] attempt ${attempt} dockerd still not up after ${((Date.now() - at0) / 1000).toFixed(1)}s`);
-    // Reset between attempts. If the launch itself ERRORED (timeout = WSL wedged /
-    // unresponsive — the post-import failure where the command can't even get into
-    // the distro), `wsl --terminate` so the next attempt cold-boots a CLEAN distro;
-    // clearing pid files inside a wedged WSL does nothing. Otherwise dockerd just
-    // died/is slow — clear stale runtime files only when it's actually gone.
-    if (launchErr) {
-      log.info(`[startEngine] launch errored → wsl --terminate for a clean cold boot`);
-      try { await wslTerminate(); } catch {}
-    } else {
-      try {
-        await wslRun(
-          "if ! pgrep dockerd >/dev/null 2>&1; then rm -f /var/run/docker.pid /run/docker.pid /var/run/docker.sock /run/docker.sock; fi; sleep 1",
-          { timeout: 15000 });
-      } catch {}
+    let stuck = false;
+    log.info(`[startEngine] attempt ${attempt}/3 — launch dockerd (detached) + poll socket`);
+    try { await launchDockerd(); }
+    catch (e) { stuck = true; log.warn(`[startEngine] attempt ${attempt} launch errored — WSL stuck? ${e.message}`); }
+    if (!stuck) {
+      const deadline = Date.now() + 90000;
+      while (Date.now() < deadline) {
+        if (await dockerEngineUp()) { log.info(`[startEngine] ✓ dockerd up on attempt ${attempt} (${((Date.now() - at0) / 1000).toFixed(1)}s)`); return true; }
+        await new Promise((r) => setTimeout(r, 2000));
+      }
     }
+    log.warn(`[startEngine] attempt ${attempt} dockerd not up after ${((Date.now() - at0) / 1000).toFixed(1)}s`);
+    // Recover. A stuck launch = WSL wedged → `wsl --shutdown` (full VM reset — the
+    // ONLY thing that clears a real wedge; --terminate isn't enough). Otherwise
+    // dockerd just died/is slow → clear stale runtime files for a clean relaunch.
+    if (stuck) { log.info(`[startEngine] WSL stuck → wsl --shutdown`); try { await wslShutdown(); } catch {} }
+    else { try { await wslRun("if ! pgrep dockerd >/dev/null 2>&1; then rm -f /var/run/docker.pid /run/docker.pid /var/run/docker.sock /run/docker.sock; fi", { timeout: 15000 }); } catch {} }
   }
   log.error("[startEngine] ✗ dockerd NOT up after 3 attempts");
   return false;

package/workers/render/src/App.jsx CHANGED Viewed

@@ -1708,7 +1708,8 @@ function DockerInstallDrawerHost() {
 // Desktop and runs it (主人指令), streaming progress through the drawer above.
 function DockerCard({ dockerTeam, cloudTitle, onOpen, onRename, onRefresh }) {
   const [status, setStatus] = useState(null);
-  const [busy, setBusy] = useState("");   // "" | bootstrap | restart | stop | upgrade
+  const [busy, setBusy] = useState("");   // "" | bootstrap | restart | stop | upgrade | probe
+  const [probeNote, setProbeNote] = useState(""); // 「重试检测」后给用户的明确反馈(WSL 仍卡 → 提示重启)
   const [menuOpen, setMenuOpen] = useState(false);
   const [confirmRecreate, setConfirmRecreate] = useState(false); // 重建容器 in-app 确认弹窗(不用 native confirm)
   // Inline rename (mirrors LocalTeamCard): double-click the title to edit.
@@ -1731,8 +1732,11 @@ function DockerCard({ dockerTeam, cloudTitle, onOpen, onRename, onRefresh }) {
   const DOCKER_BLUE = "#2496ed";
   const checkStatus = useCallback(async () => {
-    try { setStatus(await window.cicy?.docker?.appStatus?.()); }
-    catch (e) { console.warn("[DockerCard]", e); }
+    try {
+      const s = await window.cicy?.docker?.appStatus?.();
+      setStatus(s);
+      if (s && !s.unknown) setProbeNote(""); // WSL came back → clear the stuck note
+    } catch (e) { console.warn("[DockerCard]", e); }
   }, []);
   // Poll so the card reflects reality even when Docker changes outside the app
@@ -1874,6 +1878,8 @@ function DockerCard({ dockerTeam, cloudTitle, onOpen, onRename, onRefresh }) {
   const ctaLabel = busy === "open"
     ? tr("docker.opening", "打开中…")
+    : busy === "probe"
+    ? tr("docker.probing", "检测中…")
     : isBusy
     ? tr("docker.working", "处理中…")
     : running
@@ -1900,9 +1906,20 @@ function DockerCard({ dockerTeam, cloudTitle, onOpen, onRename, onRefresh }) {
       try { await onOpen?.(dockerTeam?.id); } finally { setBusy(""); }
       return;
     }
-    // WSL didn't answer the probe → re-check instead of (re)installing. If WSL
-    // has since come up (e.g. autostart finished), this flips the card to 打开/启动.
-    if (unknown) { await checkStatus(); return; }
+    // 「重试检测」: FORCE a fresh WSL probe (checkStatus only re-read the cache, so
+    // clicking did nothing — the「点了没反应」bug). Show a spinner so the click always
+    // gives feedback; if WSL is STILL stuck after a real probe, say so clearly.
+    if (unknown) {
+      setBusy("probe");
+      try {
+        const s = await (window.cicy?.docker?.appRedetect?.() ?? window.cicy?.docker?.appStatus?.());
+        if (s) setStatus(s);
+        if (s?.unknown) setProbeNote(tr("docker.wslStillStuck", "WSL 仍无响应 —— 多半要重启 Windows 后再试"));
+        else setProbeNote("");
+      } catch (e) { setProbeNote(tr("docker.probeFailed", "检测失败,请重试")); }
+      finally { setBusy(""); }
+      return;
+    }
     runBootstrap();
   };
@@ -2002,6 +2019,11 @@ function DockerCard({ dockerTeam, cloudTitle, onOpen, onRename, onRefresh }) {
           )}
         </div>
         <div className="bcard__meta"><span className="bcard__chip">Docker</span></div>
+        {(probeNote || (!running && stateText)) && (
+          <div data-id="DockerCard-statusline" style={{ marginTop: 4, fontSize: 11, lineHeight: 1.4, color: probeNote ? "#f0a020" : "rgba(255,255,255,0.55)" }}>
+            {probeNote || stateText}
+          </div>
+        )}
       </div>
       <button
         type="button"