cicy-desktop 2.1.86 → 2.1.88

package/bin/cicy-desktop

@@ -40,41 +40,65 @@ function globalElectronBin() {
   return _globalElectronBin;
 }
 
-// Self-heal electron's downloaded binary so a FRESH `npx cicy-desktop` starts
-// first-try. cicy-desktop pins electron 41.0.3 as a dependency; its postinstall
-// downloads the platform binary. If that never ran (--ignore-scripts), failed
-// (GitHub blocked in CN with no mirror) or got wiped (AV touched node_modules),
-// `npx electron` throws "Electron failed to install correctly" and the worker
-// crash-loops. Detect a missing binary and re-run electron's OWN install.js with
-// the npmmirror ELECTRON_MIRROR. Uses the pinned 41.0.3 already on disk — never
-// pulls latest (latest's native extract-zip is unpublished for win32-x64 →
-// "Cannot find native binding"). Runs once per process.
+// Pinned electron version = the one cicy-desktop is built against (package.json
+// dependency). NEVER install "latest": its native extract-zip prebuild is
+// unpublished for win32-x64 → `npm i -g electron` dies with "Cannot find native
+// binding". 41.x downloads fine.
+const ELECTRON_VERSION = (() => {
+  try {
+    const pj = require("../package.json");
+    const v = (pj.dependencies && pj.dependencies.electron) ||
+              (pj.devDependencies && pj.devDependencies.electron) || "";
+    return String(v).replace(/^[\^~>=\s]*/, "").trim() || "41.0.3";
+  } catch { return "41.0.3"; }
+})();
+
+// True iff <electronDir> has a downloaded, runnable binary (path.txt → dist/exe).
+function electronBinaryHealthy(electronDir) {
+  if (!electronDir) return false;
+  try {
+    const exe = fs.readFileSync(path.join(electronDir, "path.txt"), "utf8").trim();
+    return !!exe && fs.existsSync(path.join(electronDir, "dist", exe));
+  } catch { return false; }
+}
+
+// The GLOBAL electron's package dir for the current npm prefix (null if none).
+function globalElectronDir() {
+  try {
+    const prefix = execSync("npm prefix -g", { stdio: ["ignore", "pipe", "ignore"] }).toString().trim();
+    if (!prefix) return null;
+    return isWindows
+      ? path.join(prefix, "node_modules", "electron")          // win: <prefix>\node_modules\electron
+      : path.join(prefix, "lib", "node_modules", "electron");  // unix: <prefix>/lib/node_modules/electron
+  } catch { return null; }
+}
+
+// Make sure a USABLE electron exists before spawning the worker. Prefer a shared
+// GLOBAL electron (downloaded once, survives npx-cache eviction, and
+// resolveElectronSpawn() picks it first). If nothing healthy is found anywhere,
+// auto-install the PINNED version GLOBALLY with the npmmirror mirror — i.e. do the
+// `npm i -g electron@<pin>` step for the user, so a fresh `npx cicy-desktop`
+// self-provisions electron and starts first-try. Runs once per process.
 let _electronEnsured = false;
 function ensureElectron() {
   if (_electronEnsured) return;
   _electronEnsured = true;
-  let electronDir;
-  try { electronDir = path.dirname(require.resolve("electron/package.json", { paths: [PACKAGE_ROOT] })); }
-  catch { return; } // not resolvable from here → leave it to npx
-  try {
-    const pathTxt = path.join(electronDir, "path.txt");
-    if (fs.existsSync(pathTxt)) {
-      const exe = fs.readFileSync(pathTxt, "utf8").trim();
-      if (exe && fs.existsSync(path.join(electronDir, "dist", exe))) return; // healthy
-    }
-  } catch {}
-  const installJs = path.join(electronDir, "install.js");
-  if (!fs.existsSync(installJs)) return;
-  console.log("⚙️  Electron binary missing — repairing via electron/install.js (mirror)…");
+  // Already usable (global, or the resolvable bundled/npx copy)? nothing to do.
+  if (electronBinaryHealthy(globalElectronDir())) return;
+  let bundledDir = null;
+  try { bundledDir = path.dirname(require.resolve("electron/package.json", { paths: [PACKAGE_ROOT] })); } catch {}
+  if (electronBinaryHealthy(bundledDir)) return;
+  // None usable → install the pinned electron globally (with the mirror).
+  console.log(`⚙️  No usable Electron — installing electron@${ELECTRON_VERSION} -g (mirror), one-time…`);
   try {
-    execSync(`"${process.execPath}" "${installJs}"`, {
-      cwd: electronDir,
+    execSync(`npm i -g electron@${ELECTRON_VERSION} --registry=${NPM_REGISTRY}`, {
       stdio: "inherit",
       env: { ...process.env, ELECTRON_MIRROR, npm_config_registry: NPM_REGISTRY },
     });
+    _globalElectronBin = undefined; // bust the memo so resolveElectronSpawn re-finds the new global bin
   } catch (e) {
-    console.warn(`⚠️  Electron repair failed: ${e.message}`);
-    console.warn(`   Fix manually: set ELECTRON_MIRROR=${ELECTRON_MIRROR} && npm i -g electron@41.0.3`);
+    console.warn(`⚠️  Global electron install failed: ${e.message}`);
+    console.warn(`   Fix manually: set ELECTRON_MIRROR=${ELECTRON_MIRROR} && npm i -g electron@${ELECTRON_VERSION}`);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.86",
+  "version": "2.1.88",
   "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": {
-    "cicy-code-darwin-x64": "2.3.7",
-    "cicy-code-darwin-arm64": "2.3.7",
-    "cicy-code-linux-x64": "2.3.7",
-    "cicy-code-linux-arm64": "2.3.7",
-    "cicy-code-windows-x64": "2.3.7",
+    "cicy-code-darwin-x64": "2.3.9",
+    "cicy-code-darwin-arm64": "2.3.9",
+    "cicy-code-linux-x64": "2.3.9",
+    "cicy-code-linux-arm64": "2.3.9",
+    "cicy-code-windows-x64": "2.3.9",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",
     "cicy-mihomo-linux-x64": "1.10.4",