@wendongfly/myhi 1.3.188 → 1.3.190

package/bin/daemon.js

@@ -1,170 +1,196 @@
-#!/usr/bin/env node
-/**
- * myhi 守护进程
- * 负责 fork/管理 server 子进程，处理升级和重启
- * daemon 本身不会被升级影响，保证服务连续性
- */
-import { fork, execSync, spawn } from 'child_process';
-import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
-import { writeFileSync, readFileSync, mkdirSync, unlinkSync } from 'fs';
-import { homedir } from 'os';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname  = dirname(__filename);
-const configDir  = join(homedir(), '.myhi');
-const pidFile    = join(configDir, 'daemon.pid');
-const serverEntry = join(__dirname, '../dist/index.js');
-
-mkdirSync(configDir, { recursive: true });
-
-// 单例守卫：如果已有活 daemon，先 SIGTERM 它再启动。否则双 daemon 会让各自的
-// server child 因互读 server.pid 而互杀，触发"连续崩溃 5 次"熔断（pc41 1.3.51 升级踩到）
-(function killOldDaemon() {
-  let oldPid;
-  try { oldPid = parseInt(readFileSync(pidFile, 'utf8').trim(), 10); } catch { return; }
-  if (!oldPid || oldPid === process.pid) return;
-  let alive = false;
-  try { process.kill(oldPid, 0); alive = true; } catch {}
-  if (!alive) return;
-  process.stderr.write(`[daemon] 检测到已运行的 daemon (PID ${oldPid})，先停止...\n`);
-  try {
-    if (process.platform === 'win32') execSync(`taskkill /PID ${oldPid} /F /T`, { stdio: 'pipe', timeout: 5000 });
-    else process.kill(oldPid, 'SIGTERM');
-  } catch {}
-  // 等最多 5 秒
-  const deadline = Date.now() + 5000;
-  while (Date.now() < deadline) {
-    try { process.kill(oldPid, 0); } catch { return; }
-    const end = Date.now() + 200;
-    while (Date.now() < end) {} // busy-wait, 此处无事件循环可用
-  }
-  let stillAlive = false;
-  try { process.kill(oldPid, 0); stillAlive = true; } catch {}
-  if (stillAlive) {
-    process.stderr.write(`[daemon] 无法停止旧 daemon (PID ${oldPid})，本进程退出避免冲突\n`);
-    process.exit(1);
-  }
-})();
-
-writeFileSync(pidFile, String(process.pid));
-
-let child = null;
-let restarting = false;
-let stopping = false;
-let crashCount = 0;
-let lastCrash = 0;
-const startTime = Date.now();
-
-function log(msg) {
-  const ts = new Date().toISOString().slice(11, 19);
-  process.stderr.write(`[daemon ${ts}] ${msg}\n`);
-}
-
-function startServer() {
-  log('启动 server 子进程...');
-  child = fork(serverEntry, process.argv.slice(2), {
-    stdio: ['ignore', 'inherit', 'inherit', 'ipc'],
-    env: { ...process.env, MYHI_DAEMON: '1', MYHI_DAEMON_PID: String(process.pid) },
-    windowsHide: true,
-  });
-
-  child.on('message', (msg) => {
-    if (msg?.type === 'upgrade') doUpgrade();
-    else if (msg?.type === 'restart') doRestart();
-  });
-
-  const thisChild = child;
-  child.on('exit', (code, signal) => {
-    if (child === thisChild) child = null; // 只清自己的引用
-    if (restarting || stopping) return; // 主动重启或正在停止，不自动恢复
-
-    // 防止崩溃循环：10秒内连续崩溃超过5次则退出
-    const now = Date.now();
-    if (now - lastCrash < 10000) crashCount++;
-    else crashCount = 1;
-    lastCrash = now;
-
-    if (crashCount >= 5) {
-      log(`server 连续崩溃 ${crashCount} 次，daemon 退出`);
-      cleanup();
-      process.exit(1);
-    }
-
-    log(`server 退出 (code=${code}, signal=${signal})，${1}秒后重启...`);
-    setTimeout(startServer, 1000);
-  });
-}
-
-function doRestart() {
-  log('收到重启请求');
-  restarting = true;
-  if (child) {
-    const oldChild = child;
-    child = null; // 清引用，防止 startServer 里的 exit handler 再次触发
-    // 等旧进程退出后启动新的
-    const onExit = () => {
-      restarting = false;
-      setTimeout(startServer, 500);
-    };
-    oldChild.once('exit', onExit);
-    oldChild.kill('SIGTERM');
-    // 5秒后强制杀
-    setTimeout(() => {
-      try { oldChild.kill('SIGKILL'); } catch {}
-    }, 5000);
-  } else {
-    restarting = false;
-    startServer();
-  }
-}
-
-async function doUpgrade() {
-  log('收到升级请求，执行 npm install...');
-  try {
-    const cmd = process.platform === 'win32'
-      ? 'npm.cmd install -g @wendongfly/myhi@latest'
-      : 'npm install -g @wendongfly/myhi@latest 2>&1 || sudo npm install -g @wendongfly/myhi@latest 2>&1';
-    const output = execSync(cmd, { timeout: 120000, encoding: 'utf8' });
-    log('升级完成: ' + output.trim().split('\n').pop());
-  } catch (e) {
-    log('升级失败: ' + e.message);
-    // 即使升级失败也重启，用现有代码继续运行
-  }
-  doRestart();
-}
-
-function cleanup() {
-  try {
-    const savedPid = parseInt(readFileSync(pidFile, 'utf8').trim(), 10);
-    if (savedPid === process.pid) unlinkSync(pidFile);
-  } catch {}
-}
-
-// 信号处理
-process.on('SIGTERM', () => {
-  log('收到 SIGTERM，停止...');
-  stopping = true;
-  if (child) child.kill('SIGTERM');
-  cleanup();
-  setTimeout(() => process.exit(0), 2000);
-});
-
-process.on('SIGINT', () => {
-  log('收到 SIGINT，停止...');
-  stopping = true;
-  if (child) child.kill('SIGTERM');
-  cleanup();
-  setTimeout(() => process.exit(0), 2000);
-});
-
-// Windows: 通过 stdin 消息（无 SIGUSR2 支持）
-if (process.platform === 'win32') {
-  process.on('message', (msg) => {
-    if (msg === 'upgrade') doUpgrade();
-    else if (msg === 'restart') doRestart();
-  });
-}
-
-log(`daemon 启动 (PID ${process.pid})`);
-startServer();
+#!/usr/bin/env node
+/**
+ * myhi 守护进程
+ * 负责 fork/管理 server 子进程，处理升级和重启
+ * daemon 本身不会被升级影响，保证服务连续性
+ */
+import { fork, execSync, exec } from 'child_process';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+import { writeFileSync, readFileSync, mkdirSync, unlinkSync } from 'fs';
+import { homedir } from 'os';
+import { checkInstall, upgradeStatusFile } from './install-check.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname  = dirname(__filename);
+const configDir  = join(homedir(), '.myhi');
+const pidFile    = join(configDir, 'daemon.pid');
+const serverEntry = join(__dirname, '../dist/index.js');
+const pkgRoot    = join(__dirname, '..');
+// 告诉 server 本 daemon 支持哪些能力（server 按它选升级方式；老 daemon 没这个变量 → server 走旧路）
+const DAEMON_CAPS = 'graceful,upgrade-v2';
+
+mkdirSync(configDir, { recursive: true });
+
+// 单例守卫：如果已有活 daemon，先 SIGTERM 它再启动。否则双 daemon 会让各自的
+// server child 因互读 server.pid 而互杀，触发"连续崩溃 5 次"熔断（pc41 1.3.51 升级踩到）
+(function killOldDaemon() {
+  let oldPid;
+  try { oldPid = parseInt(readFileSync(pidFile, 'utf8').trim(), 10); } catch { return; }
+  if (!oldPid || oldPid === process.pid) return;
+  let alive = false;
+  try { process.kill(oldPid, 0); alive = true; } catch {}
+  if (!alive) return;
+  process.stderr.write(`[daemon] 检测到已运行的 daemon (PID ${oldPid})，先停止...\n`);
+  try {
+    if (process.platform === 'win32') execSync(`taskkill /PID ${oldPid} /F /T`, { stdio: 'pipe', timeout: 5000 });
+    else process.kill(oldPid, 'SIGTERM');
+  } catch {}
+  // 等最多 5 秒
+  const deadline = Date.now() + 5000;
+  while (Date.now() < deadline) {
+    try { process.kill(oldPid, 0); } catch { return; }
+    const end = Date.now() + 200;
+    while (Date.now() < end) {} // busy-wait, 此处无事件循环可用
+  }
+  let stillAlive = false;
+  try { process.kill(oldPid, 0); stillAlive = true; } catch {}
+  if (stillAlive) {
+    process.stderr.write(`[daemon] 无法停止旧 daemon (PID ${oldPid})，本进程退出避免冲突\n`);
+    process.exit(1);
+  }
+})();
+
+writeFileSync(pidFile, String(process.pid));
+
+let child = null;
+let restarting = false;
+let stopping = false;
+let crashCount = 0;
+let childStartedAt = 0;
+let upgrading = false;
+
+function log(msg) {
+  const ts = new Date().toISOString().slice(11, 19);
+  process.stderr.write(`[daemon ${ts}] ${msg}\n`);
+}
+
+function startServer() {
+  log('启动 server 子进程...');
+  childStartedAt = Date.now();
+  child = fork(serverEntry, process.argv.slice(2), {
+    stdio: ['ignore', 'inherit', 'inherit', 'ipc'],
+    env: { ...process.env, MYHI_DAEMON: '1', MYHI_DAEMON_PID: String(process.pid), MYHI_DAEMON_CAPS: DAEMON_CAPS },
+    windowsHide: true,
+  });
+
+  child.on('message', (msg) => {
+    if (msg?.type === 'upgrade') doUpgrade(msg.target);
+    else if (msg?.type === 'restart') doRestart();
+  });
+
+  const thisChild = child;
+  child.on('exit', (code, signal) => {
+    if (child === thisChild) child = null; // 只清自己的引用
+    if (restarting || stopping || upgrading) return; // 主动重启/停止/升级中，不自动恢复
+
+    // 崩溃退避：起来跑满 60 秒算稳定，计数清零；否则 1s→2s→4s…封顶 60s 一直重试。
+    // 以前是「10 秒内崩 5 次 daemon 就退出」——升级装出半成品时整个服务彻底停掉，只能上机器手动救；
+    // 现在 daemon 永不放弃，修好文件（重装）后自己就能起来。
+    if (Date.now() - childStartedAt > 60000) crashCount = 0;
+    crashCount++;
+    const delay = Math.min(60000, 1000 * 2 ** (crashCount - 1));
+    log(`server 退出 (code=${code}, signal=${signal})，第 ${crashCount} 次，${Math.round(delay / 1000)} 秒后重启...`);
+    if (crashCount >= 3) {
+      const chk = checkInstall(pkgRoot);
+      if (!chk.ok) log(`⚠ ${chk.error}——请重新安装：npm i -g @wendongfly/myhi@latest（Windows 先把 myhi 目录加入杀毒软件信任区）`);
+    }
+    setTimeout(startServer, delay);
+  });
+}
+
+// 让 server 自己收尾后退出（保存会话、停掉 claude 子进程）。Windows 上 kill('SIGTERM') 等于直接结束进程，
+// server 的 SIGTERM 处理根本不执行 → 改走 IPC 让它自己退；4 秒没退再 SIGTERM，8 秒强杀。
+function stopChild(cb) {
+  const c = child;
+  child = null; // 清引用，防止 exit handler 当成崩溃再拉起
+  if (!c) { cb?.(); return; }
+  let done = false;
+  c.once('exit', () => { if (!done) { done = true; cb?.(); } });
+  try { if (c.connected) c.send({ type: 'shutdown' }); else c.kill('SIGTERM'); } catch { try { c.kill('SIGTERM'); } catch {} }
+  setTimeout(() => { if (!done) { try { c.kill('SIGTERM'); } catch {} } }, 4000);
+  setTimeout(() => { if (!done) { try { c.kill('SIGKILL'); } catch {} } }, 8000);
+}
+
+function doRestart() {
+  if (upgrading) { log('升级进行中，忽略重启请求'); return; }
+  log('收到重启请求');
+  restarting = true;
+  crashCount = 0;
+  stopChild(() => { restarting = false; setTimeout(startServer, 500); });
+}
+
+// 停服升级：先让 server 退出（释放 node-pty 的 pty.node，Windows 上它被占用时 npm 覆盖会 EBUSY、
+// 装出半成品），再 npm install，装完校验文件齐全 + 版本对，最后拉起 server。
+// 不论成败都拉起 server（失败时 npm 一般已回滚，旧版照常跑）；结果写 upgrade-status.json 给网页看。
+function doUpgrade(target) {
+  if (upgrading) { log('升级已在进行中，忽略'); return; }
+  upgrading = true;
+  const from = (() => { try { return JSON.parse(readFileSync(join(pkgRoot, 'package.json'), 'utf8')).version; } catch { return null; } })();
+  log(`收到升级请求（${from} → ${target || 'latest'}），先停 server 释放文件占用...`);
+  stopChild(() => {
+    const cmd = (process.platform === 'win32' ? 'npm.cmd' : 'npm') +
+      ' install -g @wendongfly/myhi@latest --registry https://registry.npmjs.org';
+    log('执行: ' + cmd);
+    exec(cmd, { timeout: 600000, encoding: 'utf8', windowsHide: true }, (err, stdout, stderr) => {
+      let result;
+      if (err) {
+        const tail = String(stderr || stdout || err.message).split('\n').filter((l) => l.trim()).slice(-5).join('\n');
+        result = { ok: false, from, to: target || null, error: 'npm install 失败：\n' + tail };
+      } else {
+        const chk = checkInstall(pkgRoot, target);
+        result = chk.ok ? { ok: true, from, to: chk.version } : { ok: false, from, to: target || null, error: chk.error };
+      }
+      result.at = Date.now();
+      log(result.ok ? `升级成功：${from} → ${result.to}` : `升级失败：${result.error}`);
+      try { writeFileSync(upgradeStatusFile(configDir), JSON.stringify(result, null, 2)); } catch {}
+      upgrading = false;
+      crashCount = 0;
+      startServer();
+    });
+  });
+}
+
+function cleanup() {
+  try {
+    const savedPid = parseInt(readFileSync(pidFile, 'utf8').trim(), 10);
+    if (savedPid === process.pid) unlinkSync(pidFile);
+  } catch {}
+}
+
+// 信号处理
+function shutdown(sig) {
+  log(`收到 ${sig}，停止...`);
+  stopping = true;
+  cleanup();
+  stopChild(() => process.exit(0));
+  setTimeout(() => process.exit(0), 9000);
+}
+process.on('SIGTERM', () => shutdown('SIGTERM'));
+process.on('SIGINT', () => shutdown('SIGINT'));
+
+// Windows: 通过 stdin 消息（无 SIGUSR2 支持）
+if (process.platform === 'win32') {
+  process.on('message', (msg) => {
+    if (msg === 'upgrade') doUpgrade();
+    else if (msg === 'restart') doRestart();
+  });
+}
+
+log(`daemon 启动 (PID ${process.pid})`);
+// 前台运行的 myhi 网页升级/重启时会拉起本 daemon 接班（MYHI_WAIT_PID=旧进程）：
+// 等旧进程退出、端口释放后再起 server，否则新 server 撞端口会改用下一个端口
+const waitPid = parseInt(process.env.MYHI_WAIT_PID || '0', 10);
+if (waitPid) {
+  delete process.env.MYHI_WAIT_PID;
+  const t0 = Date.now();
+  const tick = () => {
+    let alive = false;
+    try { process.kill(waitPid, 0); alive = true; } catch {}
+    if (alive && Date.now() - t0 < 20000) return setTimeout(tick, 300);
+    startServer();
+  };
+  tick();
+} else {
+  startServer();
+}

package/bin/install-check.js

@@ -0,0 +1,25 @@
+// 升级后校验安装是否完整。npm 被中断、Windows 上文件被锁（EBUSY）、杀毒软件（360 等）拦截，
+// 都会留下缺文件的半成品——带着它重启，新进程起不来，服务就挂了（测试机缺 dist/login.html 即此类）。
+// server（网页升级）和 daemon（Windows 停服升级）共用。
+import { existsSync, readFileSync } from 'fs';
+import { join } from 'path';
+
+export const REQUIRED_FILES = [
+  'package.json', 'bin/myhi.js', 'bin/daemon.js',
+  'dist/index.js', 'dist/lib',
+  'dist/login.html', 'dist/index.html', 'dist/chat.html', 'dist/admin.html', 'dist/grid.html', 'dist/terminal.html',
+];
+
+// pkgRoot：@wendongfly/myhi 安装目录；expectVersion：期望装上的版本（不知道就不比）
+export function checkInstall(pkgRoot, expectVersion) {
+  const missing = REQUIRED_FILES.filter((f) => !existsSync(join(pkgRoot, f)));
+  let version = null;
+  try { version = JSON.parse(readFileSync(join(pkgRoot, 'package.json'), 'utf8')).version; } catch {}
+  let error = null;
+  if (missing.length) error = `安装不完整，缺少 ${missing.join('、')}（可能被杀毒软件拦截或安装被中断）`;
+  else if (expectVersion && version !== expectVersion) error = `安装后版本是 ${version || '未知'}，不是期望的 ${expectVersion}（npm 可能装到了别的目录或镜像未同步）`;
+  return { ok: !error, version, missing, error };
+}
+
+// 上次升级结果，落 ~/.myhi/upgrade-status.json：重启后的新进程（或 daemon 停服升级时）靠它把成败告诉网页
+export function upgradeStatusFile(configDir) { return join(configDir, 'upgrade-status.json'); }

package/dist/admin.html

@@ -442,15 +442,38 @@ async function changePwd() {
   } catch { msg.className = 'msg msg-err'; msg.textContent = '连接失败'; }
 }
 
-async function doUpgrade() {
+// 等升级落地：轮询 /api/version（重启/停服期间连不上是正常的）。
+// 成功 = 版本变了（且等于目标）；失败 = 服务端报了本次升级的失败原因；10 分钟兜底超时。
+async function waitUpgrade(from, target, onTick) {
+  const t0 = Date.now();
+  while (Date.now() - t0 < 10 * 60 * 1000) {
+    await new Promise(r => setTimeout(r, 3000));
+    let v = null;
+    try { const r = await fetch('/api/version', { cache: 'no-store' }); if (r.ok) v = await r.json(); } catch {}
+    onTick?.(!!v, Math.round((Date.now() - t0) / 1000));
+    if (!v) continue;
+    if (v.current !== from && (!target || v.current === target)) return { ok: true, version: v.current };
+    const last = v.upgrade?.last;
+    if (!v.upgrade?.running && last && !last.ok && last.at >= t0 - 5000) return { ok: false, error: last.error };
+  }
+  return { ok: false, error: '等了 10 分钟仍未完成，请稍后刷新页面查看版本，或到服务器上查看 myhi log' };
+}
+async function doUpgrade(force) {
   const btn = document.getElementById('btn-up'), msg = document.getElementById('op-msg');
-  btn.disabled = true; btn.textContent = '升级中...'; msg.textContent = '正在下载安装...'; msg.style.display = '';
+  const fail = (t) => { msg.textContent = '失败: ' + t; btn.disabled = false; btn.textContent = '重试'; };
+  btn.disabled = true; btn.textContent = '升级中...'; msg.textContent = '正在提交升级...'; msg.style.display = '';
   try {
-    const r = await fetch('/api/admin/upgrade', { method: 'POST', headers: H() });
-    const d = await r.json();
-    if (d.ok) { msg.textContent = '升级完成，重启中...'; waitReload(); }
-    else { msg.textContent = '失败: ' + (d.error||''); btn.disabled = false; btn.textContent = '重试'; }
-  } catch { msg.textContent = '连接失败'; btn.disabled = false; btn.textContent = '重试'; }
+    const r = await fetch('/api/admin/upgrade', { method: 'POST', headers: { ...H(), 'Content-Type': 'application/json' }, body: JSON.stringify({ force: !!force }) });
+    const d = await r.json().catch(() => ({}));
+    if (!d.ok) {
+      if (d.busy?.length && confirm(d.error + '\n\n仍然现在升级吗？')) return doUpgrade(true);
+      return fail(d.error || ('HTTP ' + r.status));
+    }
+    msg.textContent = d.message || '升级中...';
+    const res = await waitUpgrade(d.from, d.target, (up, sec) => { msg.textContent = (up ? '正在安装新版本… ' : '服务重启中… ') + sec + 's'; });
+    if (res.ok) { msg.textContent = '已升级到 v' + res.version + '，即将刷新'; setTimeout(() => location.reload(), 800); }
+    else fail(res.error);
+  } catch { fail('连接失败'); }
 }
 
 async function doClaudeUpgrade() {