dsh-oc-desktop 0.3.9 → 0.3.11

package/bin/dsh-desktop.cjs

@@ -37,6 +37,10 @@ function main() {
     console.error('dsh-oc-desktop: launcher/main.js missing, reinstall the package.');
     process.exit(1);
   }
+  // electron.exe binary may be missing when npm global install hit its package cache
+  // and skipped electron's postinstall (no dist/). Re-run install.js before booting —
+  // it pulls from the local electron cache or the network.
+  ensureElectron(electron);
   // electron.exe brand icon may be lost after `npm install` (electron re-downloads its
   // exe). Re-inject before the shell starts — electron is not running yet, so the exe
   // is writable. Taskbar/TaskManager icons come from the exe, so this keeps them right.
@@ -55,6 +59,35 @@ function main() {
 // Re-inject the brand icon (and DSH Desktop version info) into electron.exe if it was
 // re-downloaded. Probe ProductName first (fast); inject when it is not 'DSH Desktop'.
 const injectScript = path.join(__dirname, '..', 'scripts', 'set-exe-icon.ps1');
+
+// Ensure the electron binary exists before booting. `npm install -g` can skip
+// electron's postinstall when the npm package cache is warm, leaving dist/ empty;
+// re-running install.js fetches the binary from the local electron cache or network.
+function ensureElectron(electron) {
+  if (fs.existsSync(electron)) return; // binary already present
+  console.log('dsh-oc-desktop: electron binary missing, running electron/install.js ...');
+  const pkgDir = path.resolve(path.dirname(electron), '..');
+  const installJs = path.join(pkgDir, 'install.js');
+  if (!fs.existsSync(installJs)) {
+    console.error(`dsh-oc-desktop: ${installJs} missing, reinstall the package.`);
+    process.exit(1);
+  }
+  try {
+    // Default to the npmmirror mirror unless the user set ELECTRON_MIRROR already.
+    const env = Object.assign({}, process.env);
+    if (!env.ELECTRON_MIRROR) env.ELECTRON_MIRROR = 'https://npmmirror.com/mirrors/electron/';
+    execFileSync(process.execPath, [installJs], { stdio: 'inherit', windowsHide: true, env });
+  } catch (e) {
+    console.error(`dsh-oc-desktop: failed to fetch electron binary: ${e && e.message ? e.message : e}`);
+    console.error('If this is a network issue, set ELECTRON_MIRROR to a mirror and retry.');
+    process.exit(1);
+  }
+  if (!fs.existsSync(electron)) {
+    console.error('dsh-oc-desktop: electron binary still missing after install.js; reinstall the package.');
+    process.exit(1);
+  }
+}
+
 function ensureInjected(electron) {
   if (!fs.existsSync(injectScript)) return; // package missing the script — skip silently
   try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-oc-desktop",
   "productName": "DeepSeek Harness Desktop",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "description": "DeepSeek Harness 桌面端插件(Electron 启动器):自绘标题栏/托盘/通知/快捷键/崩溃自愈",
   "main": "launcher/main.js",
   "bin": {
@@ -9,7 +9,8 @@
   },
   "scripts": {
     "start": "electron .",
-    "test": "node --check launcher/main.js && node --check launcher/preload.js && node --check launcher/dialog-preload.js && node --check launcher/events.js && node --check launcher/session-window.js && node --check launcher/updater.js && node --check launcher/apply-update.js && node --check bin/dsh-desktop.cjs && node scripts/test.mjs && node scripts/test-updater.mjs"
+    "postinstall": "node scripts/postinstall.js",
+    "test": "node --check launcher/main.js && node --check launcher/preload.js && node --check launcher/dialog-preload.js && node --check launcher/events.js && node --check launcher/session-window.js && node --check launcher/updater.js && node --check launcher/apply-update.js && node --check bin/dsh-desktop.cjs && node --check scripts/postinstall.js && node scripts/test.mjs && node scripts/test-updater.mjs"
   },
   "dependencies": {
     "electron": "^43.4.0"

package/scripts/postinstall.js

@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+'use strict';
+// dsh-oc-desktop postinstall: make sure the electron binary exists after install.
+// npm package-cache hits can skip electron's postinstall (dist/ left empty), which
+// makes the desktop shell unbootable. Download it now via the npmmirror mirror so
+// the install is complete; never fail the install — the bin self-heals on first
+// launch as a last resort.
+const fs = require('node:fs');
+const path = require('node:path');
+const { spawnSync } = require('node:child_process');
+
+const ELECTRON_MIRROR_DEFAULT = 'https://npmmirror.com/mirrors/electron/';
+
+const electronDir = path.join(__dirname, '..', 'node_modules', 'electron');
+if (!fs.existsSync(path.join(electronDir, 'install.js'))) process.exit(0);
+const exe = path.join(electronDir, 'dist', process.platform === 'win32' ? 'electron.exe' : 'electron');
+if (fs.existsSync(exe)) process.exit(0);
+
+console.log('dsh-oc-desktop: electron binary missing, downloading (mirror) ...');
+const env = Object.assign({}, process.env);
+if (!env.ELECTRON_MIRROR) env.ELECTRON_MIRROR = ELECTRON_MIRROR_DEFAULT;
+const r = spawnSync(process.execPath, [path.join(electronDir, 'install.js')], { stdio: 'inherit', env, windowsHide: true });
+if (r.status !== 0 || !fs.existsSync(exe)) {
+  console.warn('dsh-oc-desktop: electron binary fetch failed; it will self-heal on first launch.');
+}
+process.exit(0);