dsh-oc-desktop 0.3.10 → 0.3.12

package/bin/dsh-desktop.cjs

@@ -73,7 +73,10 @@ function ensureElectron(electron) {
     process.exit(1);
   }
   try {
-    execFileSync(process.execPath, [installJs], { stdio: 'inherit', windowsHide: true });
+    // 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.');

package/launcher/main.js

@@ -409,8 +409,16 @@ function createMainWindow(url) {
   win.on('resize', saveStateDebounced);
   win.on('move', saveStateDebounced);
   attachShellGuards(win);
-  win.webContents.on('did-fail-load', (e, code, desc) => {
-    if (code !== -3) showError(`页面加载失败 (${code} ${desc})`);
+  win.webContents.on('did-fail-load', (e, code, desc, url, isMainFrame) => {
+    // -3 (ERR_ABORTED) 是正常的中止(导航被替换/用户取消),不算失败
+    if (code === -3) return;
+    // 子框架(iframe)加载失败(如某个预览面板尝试连本地 5173)不应整页报错,
+    // 否则会把已正常加载的 harness 页面覆盖成错误页。仅记日志。
+    if (!isMainFrame) {
+      log('warn', `subframe load failed (${code} ${desc}) url=${url}`);
+      return;
+    }
+    showError(`页面加载失败 (${code} ${desc})`);
   });
   return win;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-oc-desktop",
   "productName": "DeepSeek Harness Desktop",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "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);