dsh-oc-desktop 0.3.12 → 0.3.14

package/bin/dsh-desktop.cjs

@@ -60,32 +60,41 @@ function main() {
 // re-downloaded. Probe ProductName first (fast); inject when it is not 'DSH Desktop'.
 const injectScript = path.join(__dirname, '..', 'scripts', 'set-exe-icon.ps1');
 
+// Ordered candidate mirrors; npmmirror can lag a new electron release and 404, so
+// fall back to the official GitHub source. A user-set ELECTRON_MIRROR is tried first.
+function electronMirrors(env) {
+  const out = [];
+  const push = (m) => { if (m && out.indexOf(m) < 0) out.push(m); };
+  push(env && env.ELECTRON_MIRROR);
+  push('https://npmmirror.com/mirrors/electron/');
+  push('https://github.com/electron/electron/releases/download/');
+  return out;
+}
+
 // 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);
+  const mirrors = electronMirrors(process.env);
+  let lastErr = null;
+  for (const mirror of mirrors) {
+    console.log(`dsh-oc-desktop: electron binary missing, trying mirror ${mirror}`);
+    const env = Object.assign({}, process.env, { ELECTRON_MIRROR: mirror });
+    try {
+      execFileSync(process.execPath, [installJs], { stdio: 'inherit', windowsHide: true, env });
+      if (fs.existsSync(electron)) return;
+    } catch (e) { lastErr = e; }
   }
+  console.error(`dsh-oc-desktop: failed to fetch electron binary: ${(lastErr && lastErr.message) ? lastErr.message : 'unknown'}`);
+  console.error('Check network / ELECTRON_MIRROR, then retry.');
+  process.exit(1);
 }
 
 function ensureInjected(electron) {

package/launcher/main.js

@@ -862,7 +862,16 @@ ipcMain.on('set-window-bg', (_e, color) => {
 // 无单独更新:引擎有新版时兼容插件随引擎一起更新,不兼容插件保留;更新前备份旧引擎,可回滚。
 function runCommand(cmd, args) {
   return new Promise((resolve, reject) => {
-    const p = spawn(cmd, args, { windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] });
+    // npx / npm 等是 .cmd shim,Node 的 spawn 在 Windows 无法直接执行(报 ENOENT),
+    // 须经 cmd /c 运行(与 spawnEngine / autoBootstrapSource 同款:仅含空白参数加引号)。
+    let command = cmd;
+    let spawnArgs = args;
+    if (process.platform === 'win32') {
+      const line = [cmd, ...args].map((a) => (/\s/.test(String(a)) ? `"${String(a).replace(/"/g, '""')}"` : String(a))).join(' ');
+      command = process.env.ComSpec || 'cmd.exe';
+      spawnArgs = ['/d', '/s', '/c', line];
+    }
+    const p = spawn(command, spawnArgs, { windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] });
     let out = '';
     p.stdout.on('data', (d) => { out += d; });
     p.stderr.on('data', (d) => { out += d; });

package/package.json

@@ -1,12 +1,20 @@
 {
   "name": "dsh-oc-desktop",
   "productName": "DeepSeek Harness Desktop",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "description": "DeepSeek Harness 桌面端插件(Electron 启动器):自绘标题栏/托盘/通知/快捷键/崩溃自愈",
   "main": "launcher/main.js",
   "bin": {
     "dsh-desktop": "bin/dsh-desktop.cjs"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/FeiJi-9527/dsh.git"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "author": "feiji9527",
   "scripts": {
     "start": "electron .",
     "postinstall": "node scripts/postinstall.js",
@@ -15,6 +23,11 @@
   "dependencies": {
     "electron": "^43.4.0"
   },
-  "files": ["launcher", "bin", "assets", "scripts"],
+  "files": [
+    "launcher",
+    "bin",
+    "assets",
+    "scripts"
+  ],
   "license": "MIT"
 }

package/scripts/postinstall.js

@@ -9,18 +9,30 @@ 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 ELECTRON_MIRRORS = [
+  'https://npmmirror.com/mirrors/electron/',
+  'https://github.com/electron/electron/releases/download/',
+];
 
 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.log('dsh-oc-desktop: electron binary missing, downloading ...');
+// Try a user-set ELECTRON_MIRROR first, then npmmirror, then the official GitHub source
+// (npmmirror can lag a new electron release and 404). Never fail the install.
+const mirrors = [];
+const push = (m) => { if (m && mirrors.indexOf(m) < 0) mirrors.push(m); };
+push(process.env.ELECTRON_MIRROR);
+for (const m of ELECTRON_MIRRORS) push(m);
+for (const mirror of mirrors) {
+  if (fs.existsSync(exe)) break;
+  const env = Object.assign({}, process.env, { ELECTRON_MIRROR: mirror });
+  const r = spawnSync(process.execPath, [path.join(electronDir, 'install.js')], { stdio: 'inherit', env, windowsHide: true });
+  if (r.status === 0 && fs.existsSync(exe)) break;
+}
+if (!fs.existsSync(exe)) {
   console.warn('dsh-oc-desktop: electron binary fetch failed; it will self-heal on first launch.');
 }
 process.exit(0);