cicy-desktop 2.1.92 → 2.1.94

package/bin/cicy-desktop

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const { spawn, execSync } = require("child_process");
+const { spawn, execSync, execFileSync } = require("child_process");
 const path = require("path");
 const fs = require("fs");
 const os = require("os");
@@ -76,13 +76,50 @@ function globalElectronDir() {
   } catch { return null; }
 }
 
+// The per-platform Electron artifact (mirror zip name + the in-dist executable
+// that path.txt must point at).
+function electronArtifact() {
+  const plat = process.platform === "win32" ? "win32" : process.platform === "darwin" ? "darwin" : "linux";
+  const arch = process.arch === "arm64" ? "arm64" : "x64";
+  return {
+    zip: `electron-v${ELECTRON_VERSION}-${plat}-${arch}.zip`,
+    exe: process.platform === "win32" ? "electron.exe"
+       : process.platform === "darwin" ? "Electron.app/Contents/MacOS/Electron"
+       : "electron",
+  };
+}
+
+// Provision the Electron binary INTO the bundled npx copy ourselves: download the
+// platform zip from the mirror (R2) with curl, extract with the OS's own unzip,
+// then write path.txt. We deliberately do NOT use electron's install.js /
+// @electron/get: on Windows its bundled extract-zip only PARTIALLY unpacks
+// electron 41 (leaves no path.txt → "Electron failed to install correctly") even
+// though the downloaded zip is valid. curl + Expand-Archive/unzip is reliable,
+// mirror-only (no GitHub), and writes a complete dist/.
+function provisionElectronFromMirror(bundledDir) {
+  const { zip, exe } = electronArtifact();
+  const url = `${ELECTRON_MIRROR}v${ELECTRON_VERSION}/${zip}`;
+  const tmpZip = path.join(os.tmpdir(), `cicy-${zip}`);
+  const curl = isWindows ? "curl.exe" : "curl";
+  execFileSync(curl, ["-fL", "--retry", "5", "--retry-delay", "2", "--connect-timeout", "20", "-o", tmpZip, url], { stdio: "inherit" });
+  const distDir = path.join(bundledDir, "dist");
+  fs.rmSync(distDir, { recursive: true, force: true });
+  fs.mkdirSync(distDir, { recursive: true });
+  if (isWindows) {
+    execFileSync("powershell", ["-NoProfile", "-Command", `Expand-Archive -LiteralPath "${tmpZip}" -DestinationPath "${distDir}" -Force`], { stdio: "inherit" });
+  } else {
+    execFileSync("unzip", ["-o", "-q", tmpZip, "-d", distDir], { stdio: "inherit" });
+    try { fs.chmodSync(path.join(distDir, exe), 0o755); } catch {}
+  }
+  fs.writeFileSync(path.join(bundledDir, "path.txt"), exe);
+  try { fs.rmSync(tmpZip, { force: true }); } catch {}
+}
+
 // Make sure a USABLE electron exists before spawning the worker. A pre-existing
-// GLOBAL electron is reused if present (downloaded once, shared). Otherwise we
-// provision the electron binary LOCALLY into the bundled npx copy by re-running
-// electron's own install.js against our R2 mirror — NO `npm i -g`, NO GitHub.
-// This is what lets a single `npx cicy-desktop` self-provision electron and
-// start first-try even when the install-time postinstall couldn't fetch the
-// binary (GitHub blocked/slow). Runs once per process.
+// GLOBAL electron is reused if present. Otherwise we provision the binary LOCALLY
+// into the bundled npx copy straight from the R2 mirror — NO `npm i -g`, NO
+// GitHub, NO @electron/get. This is what lets a single `npx cicy-desktop`
+// self-provision electron and start first-try. Runs once per process.
 let _electronEnsured = false;
 function ensureElectron() {
   if (_electronEnsured) return;
@@ -96,20 +133,13 @@ function ensureElectron() {
     console.warn(`⚠️  electron package not resolvable under ${PACKAGE_ROOT}; cannot self-provision.`);
     return;
   }
-  // The electron package is installed but its binary wasn't downloaded. Fetch it
-  // INTO node_modules/electron from the mirror (R2) by invoking electron's own
-  // installer — @electron/get reads ELECTRON_MIRROR and pulls
-  // <mirror>v<version>/electron-v<version>-<platform>.zip. Local, no global.
   console.log(`⚙️  Fetching Electron ${ELECTRON_VERSION} from mirror (one-time)…`);
   try {
-    execSync(`node "${path.join(bundledDir, "install.js")}"`, {
-      stdio: "inherit",
-      cwd: bundledDir,
-      env: { ...process.env, ELECTRON_MIRROR, npm_config_registry: NPM_REGISTRY },
-    });
+    provisionElectronFromMirror(bundledDir);
+    if (electronBinaryHealthy(bundledDir)) return;
+    console.warn(`⚠️  Electron provisioned but health check still failing.`);
   } catch (e) {
-    console.warn(`⚠️  Electron download from mirror failed: ${e.message}`);
-    console.warn(`   Retry: ELECTRON_MIRROR=${ELECTRON_MIRROR} node "${path.join(bundledDir, "install.js")}"`);
+    console.warn(`⚠️  Electron provision from mirror failed: ${e.message}`);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.92",
+  "version": "2.1.94",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -133,11 +133,11 @@
   "//optionalDependencies": "Runtime Bundle v1 (主人指令): platform binaries delivered by `npm i -g cicy-desktop` itself — npm installs only the current-platform subpackage (os/cpu pinned in each), so first start seeds the runtime store with ZERO network, ZERO npx. Windows packages are named *-windows-* (npm spam filter 403s new names containing win32). cicy-msys2 added once published.",
   "optionalDependencies": {
     "electron": "41.0.3",
-    "cicy-code-darwin-x64": "2.3.12",
-    "cicy-code-darwin-arm64": "2.3.12",
-    "cicy-code-linux-x64": "2.3.12",
-    "cicy-code-linux-arm64": "2.3.12",
-    "cicy-code-windows-x64": "2.3.12",
+    "cicy-code-darwin-x64": "2.3.13",
+    "cicy-code-darwin-arm64": "2.3.13",
+    "cicy-code-linux-x64": "2.3.13",
+    "cicy-code-linux-arm64": "2.3.13",
+    "cicy-code-windows-x64": "2.3.13",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",
     "cicy-mihomo-linux-x64": "1.10.4",

package/src/main.js

@@ -20,7 +20,25 @@ const appUpdater = require("./app-updater");
 // and guests fell back to the OS-native menu; this unifies them and adds 重新加载
 // + 切换开发者工具 + 检查元素 everywhere (see utils/context-menu-options.js).
 const { attachContextMenu } = require("./utils/context-menu-options");
-electronApp.on("web-contents-created", (_e, wc) => attachContextMenu(wc));
+electronApp.on("web-contents-created", (_e, wc) => {
+  attachContextMenu(wc);
+  // Ctrl/Cmd+C inside a <webview> guest: on Windows the application menu's
+  // role:"copy" accelerator doesn't reach the focused guest, so a selection
+  // couldn't be copied with the keyboard (right-click 复制 is fixed separately via
+  // attachContextMenu). Wire copy directly on the guest. COPY-ONLY and WITHOUT
+  // preventDefault, so the gotty terminal's Ctrl+C=SIGINT and any web app's own
+  // copy handler still fire; wc.copy() is a no-op when there's no selection.
+  try {
+    if (wc.getType && wc.getType() === "webview") {
+      wc.on("before-input-event", (_ev, input) => {
+        if (input.type === "keyDown" && (input.control || input.meta) &&
+            !input.alt && !input.shift && (input.key === "c" || input.key === "C")) {
+          try { wc.copy(); } catch (_) {}
+        }
+      });
+    }
+  } catch (_) {}
+});
 
 // Setup Electron flags IMMEDIATELY after require
 electronApp.commandLine.appendSwitch("ignore-certificate-errors");

package/src/utils/context-menu-options.js

@@ -58,17 +58,19 @@ const OPTIONS = {
   },
 };
 
-// Attach the menu to the host window + BrowserView tabs only. <webview> guests
-// are EXCLUDED on purpose: they carry their OWN custom context menu (e.g.
-// cicy-code's WebFrame / the gotty terminal), and an ecm native menu would cover
-// it. Idempotent via __cicyCtxMenu so the web-contents-created hook + the
-// tab-browser's per-tab call never double-pop.
+// Attach the menu to the host window, BrowserView tabs AND <webview> guests, so
+// right-click → 复制/粘贴 works on EVERY surface. Webviews used to be excluded on
+// the assumption they carry their own copy menu, but on Windows that left
+// selections uncopyable: the app menu's Ctrl+C / role:"copy" doesn't reach the
+// focused <webview> guest, and no own-menu filled the gap. Giving guests the ecm
+// 复制/粘贴 menu fixes copy cross-platform. Idempotent via __cicyCtxMenu so the
+// web-contents-created hook + the tab-browser's per-tab call never double-pop.
 function attachContextMenu(wc) {
   try {
     if (!wc || (wc.isDestroyed && wc.isDestroyed())) return;
     if (wc.__cicyCtxMenu) return;
     const t = wc.getType && wc.getType();
-    if (t !== "window" && t !== "browserView") return; // skip <webview> + others
+    if (t !== "window" && t !== "browserView" && t !== "webview") return; // host + tabs + <webview>
     wc.__cicyCtxMenu = true;
     contextMenu({ ...OPTIONS, window: wc });
   } catch (e) {}