dsh-oc-desktop 0.3.13 → 0.3.15

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

@@ -601,20 +601,25 @@ const OC_DISPLAY = {
 };
 function updateHtml(title, rows, footer) {
   const esc = escapeHtml;
-  const showAll = rows.some((r) => r.hasUpdate);
+  // 一键更新按钮只看 oc 插件;引擎行有新版仅作"提示",不进入可一键更新(升引擎会清空撤回补丁)
+  const showAll = rows.some((r) => r.hasUpdate && !r.isEngine);
   const cards = rows.map((r) => {
-    const st = r.error ? '检查失败' : r.hasUpdate ? '可更新' : '已最新';
-    const stCls = r.error ? 'err' : r.hasUpdate ? 'upd' : 'ok';
+    const engUpd = r.isEngine && r.hasUpdate && !r.error; // 引擎有新版:仅提示
+    const st = r.error ? '检查失败' : engUpd ? '引擎·提示' : r.hasUpdate ? '可更新' : '已最新';
+    const stCls = r.error ? 'err' : engUpd ? 'warn' : r.hasUpdate ? 'upd' : 'ok';
     const compat = r.compatible == null ? '' : r.compatible
       ? `<span class="compat ok" title="该插件声明的依赖范围兼容最新引擎">兼容新引擎</span>`
       : `<span class="compat err" title="该插件声明的依赖范围不满足最新引擎,将保留当前版本">不兼容·保留</span>`;
     const desc = r.description ? `<div class="desc" title="${esc(r.description)}">${esc(r.description)}</div>` : '';
     const ver = r.error
       ? ''
-      : `<div class="ver"><span class="lbl">当前</span> <b>${esc(r.current)}</b> <span class="arrow ${r.hasUpdate ? 'upd' : ''}">→</span> <span class="lbl">最新</span> <b>${esc(r.latest)}</b></div>`;
+      : `<div class="ver"><span class="lbl">当前</span> <b>${esc(r.current)}</b> <span class="arrow ${(r.hasUpdate && !engUpd) ? 'upd' : ''}">→</span> <span class="lbl">最新</span> <b>${esc(r.latest)}</b></div>`;
+    const engNote = engUpd
+      ? `<div class="eng-note">⚠️ 需作者发布适配补丁后才可升级;当前不可自动升级(升级会清空撤回补丁,撤回功能将失效)。</div>`
+      : '';
     return `<div class="card">
       <div class="top"><span class="pkg">${esc(r.display || r.name)}</span><span class="nm">${esc(r.name)}</span>${compat}<span class="st ${stCls}">${st}</span></div>
-      ${desc}${ver}
+      ${desc}${ver}${engNote}
     </div>`;
   }).join('');
   const foot = footer ? `<div class="footnote">${esc(footer)}</div>` : '';
@@ -635,7 +640,9 @@ function updateHtml(title, rows, footer) {
     .st{margin-left:auto;flex-shrink:0;font-size:11px;padding:2px 10px;border-radius:10px}
     .ok{color:#34d399;background:#12251d}
     .upd{color:#fbbf24;background:#2a2013}
+    .warn{color:#fbbf24;background:#2a2013}
     .err{color:#f87171;background:#2a1414}
+    .eng-note{color:#fbbf24;font-size:11px;margin-top:4px;line-height:1.5}
     .compat{flex-shrink:0;font-size:11px;padding:2px 8px;border-radius:10px}
     .compat.ok{color:#34d399;border:1px solid #1d3a2e}
     .compat.err{color:#f87171;border:1px solid #3a2020}
@@ -898,50 +905,19 @@ async function executeUpdate(action) {
   log('info', `update action: ${JSON.stringify(action)}`);
   if (!action || action.kind !== 'all') return { ok: false, message: '已取消单独更新,仅支持一键更新' };
   const registry = (settings.updateRegistry || 'https://registry.npmjs.org').replace(/\/+$/, '');
-  const engineBin = path.join(dataHome, 'profiles', 'node_modules', '@deepseek-ai', 'dsh', 'lib', 'bin.js');
   try {
+    // 一键更新永远 = npx dsh-oc install:升级全部 oc 插件 + 把引擎钉回补丁兼容版(0.1.1-rc.2)。
+    // 引擎本身不随一键自动升最新(升引擎会清空撤回补丁),只能由作者发布新 dsh-oc
+    // (改 REQUIRED_ENGINE + 重做撤回补丁)后,用户再跑 dsh-oc install 才能更新引擎。
     const results = await checkNpmUpdates(collectInstalled(), registry);
-    const updates = results.filter((r) => r.hasUpdate);
-    if (updates.length === 0) return { ok: true, message: '所有组件已是最新,无需更新' };
+    const ocUpd = results.some((r) => r.name !== '@deepseek-ai/dsh' && r.hasUpdate);
+    if (!ocUpd) return { ok: true, message: '所有 oc 组件已是最新,无需更新' };
+    await runCommand('npx', ['--yes', 'dsh-oc', 'install']);
     const engineUpd = results.find((r) => r.name === '@deepseek-ai/dsh' && r.hasUpdate);
-    if (!engineUpd) {
-      // 引擎无更新:聚合器一键更新全部 oc 组件
-      await runCommand('npx', ['--yes', 'dsh-oc', 'install']);
-      return { ok: true, message: '全部 oc 组件已更新到最新。重启应用后生效。' };
-    }
-    // 引擎有新版:检测各插件兼容性,兼容且有更新的随引擎一起更新,不兼容保留
-    const engineInfo = await npmPackageInfo('@deepseek-ai/dsh', registry);
-    const compatToUpdate = [];
-    const kept = [];
-    for (const r of results) {
-      if (r.name === '@deepseek-ai/dsh' || r.error) continue;
-      const ok = await checkEngineCompat(r.peerDependencies, engineInfo.dependencies, async (pkg) => npmPackageVersions(pkg, registry));
-      if (ok) { if (r.hasUpdate) compatToUpdate.push(r.name); }
-      else kept.push(r.name);
-    }
-    // 备份旧引擎
-    const dshDir = path.join(dataHome, 'profiles', 'node_modules', '@deepseek-ai', 'dsh');
-    if (!fs.existsSync(dshDir)) return { ok: false, message: '共享数据根内未找到 dsh 引擎' };
-    const backup = path.join(dataHome, 'profiles', 'node_modules', '@deepseek-ai', `.dsh-backup-${Date.now()}`);
-    fs.cpSync(dshDir, backup, { recursive: true });
-    log('info', `engine update: backup to ${backup}`);
-    // 更新兼容插件(引擎删除前,用当前引擎 CLI)
-    for (const name of compatToUpdate) {
-      try { await runCommand(process.execPath, [engineBin, 'plugin', '--profile', 'web', 'add', name]); log('info', `plugin updated: ${name}`); }
-      catch (e) { log('warn', `plugin ${name} update skipped: ${e.message}`); }
-    }
-    // 停引擎 + 删 dsh + 重启壳(autoBootstrap 重装最新引擎)
-    killHarness();
-    killWebEngine();
-    fs.rmSync(dshDir, { recursive: true, force: true });
-    app.relaunch();
-    app.exit(0);
     return {
       ok: true,
-      message: '引擎已重置,应用重启后将自动重装最新版。'
-        + (compatToUpdate.length ? `\n随引擎更新的插件:${compatToUpdate.join('、')}。` : '')
-        + (kept.length ? `\n因不兼容保留当前版本:${kept.join('、')}。` : '')
-        + '\n如更新后异常,可在托盘「回滚引擎更新」恢复。',
+      message: '全部 oc 组件已更新到最新,重启应用后生效。'
+        + (engineUpd ? '\n注:引擎有新版(需作者发布适配补丁后才可升级);当前保持补丁兼容版,未自动升级。' : ''),
     };
   } catch (e) {
     const msg = e && e.message ? e.message : String(e);
@@ -994,7 +970,8 @@ async function runCheckUpdates() {
         compatible = await checkEngineCompat(r.peerDependencies, engineDeps, async (pkg) => npmPackageVersions(pkg, registry));
       }
       rows.push({ name: r.name, display: OC_DISPLAY[r.name] || r.name, current: r.current,
-        latest: r.latest, hasUpdate: r.hasUpdate, error: r.error, description: r.description, compatible });
+        latest: r.latest, hasUpdate: r.hasUpdate, error: r.error, description: r.description, compatible,
+        isEngine: r.name === '@deepseek-ai/dsh' });
     }
     let footer = '';
     if (updates.length === 0) {
@@ -1005,10 +982,8 @@ async function runCheckUpdates() {
       const engineUpd = updates.some((u) => u.name === '@deepseek-ai/dsh');
       if (ocUpd) footer += '一键更新将升级全部 oc 组件';
       if (engineUpd) {
-        const kept = rows.filter((r) => r.compatible === false);
-        footer += (footer ? '\n' : '') + '引擎有新版:兼容插件随引擎一起更新'
-          + (kept.length ? `;不兼容插件保留(${kept.map((k) => k.display).join('、')})` : '');
-        footer += '\n引擎更新后若异常,可在托盘「回滚引擎更新」恢复';
+        footer += (footer ? '\n' : '') + '⚠️ 引擎有新版(' + (engineResult ? `${engineResult.current} → ${engineResult.latest}` : '') + '):需等作者发布适配补丁后才可升级;'
+          + '一键更新不会自动升级引擎(升级会清空撤回补丁,撤回功能将失效)。';
       }
       log('info', 'check update: ' + updates.map((u) => `${u.name} ${u.current}→${u.latest}`).join(', '));
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-oc-desktop",
   "productName": "DeepSeek Harness Desktop",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "description": "DeepSeek Harness 桌面端插件(Electron 启动器):自绘标题栏/托盘/通知/快捷键/崩溃自愈",
   "main": "launcher/main.js",
   "bin": {
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/FeiJi-9527/dsh"
+    "url": "git+https://github.com/FeiJi-9527/dsh.git"
   },
   "publishConfig": {
     "access": "public"
@@ -23,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);