@wendongfly/myhi 1.0.92 → 1.0.93

package/bin/daemon.js

@@ -0,0 +1,132 @@
+#!/usr/bin/env node
+/**
+ * myhi 守护进程
+ * 负责 fork/管理 server 子进程，处理升级和重启
+ * daemon 本身不会被升级影响，保证服务连续性
+ */
+import { fork, execSync } 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 });
+writeFileSync(pidFile, String(process.pid));
+
+let child = null;
+let restarting = 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' },
+  });
+
+  child.on('message', (msg) => {
+    if (msg?.type === 'upgrade') doUpgrade();
+    else if (msg?.type === 'restart') doRestart();
+  });
+
+  child.on('exit', (code, signal) => {
+    child = null;
+    if (restarting) 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) {
+    child.kill('SIGTERM');
+    // 等子进程退出后重启
+    child.on('exit', () => {
+      restarting = false;
+      setTimeout(startServer, 500);
+    });
+    // 5秒后强制杀
+    setTimeout(() => {
+      if (child) { try { child.kill('SIGKILL'); } catch {} }
+    }, 5000);
+  } else {
+    restarting = false;
+    startServer();
+  }
+}
+
+async function doUpgrade() {
+  log('收到升级请求，执行 npm install...');
+  try {
+    const cmd = process.platform === 'win32'
+      ? 'npm install -g @wendongfly/myhi@latest'
+      : 'sudo npm install -g @wendongfly/myhi@latest 2>&1 || 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，停止...');
+  if (child) child.kill('SIGTERM');
+  cleanup();
+  setTimeout(() => process.exit(0), 1000);
+});
+
+process.on('SIGINT', () => {
+  log('收到 SIGINT，停止...');
+  if (child) child.kill('SIGTERM');
+  cleanup();
+  setTimeout(() => process.exit(0), 1000);
+});
+
+// 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();

package/bin/myhi.js

@@ -57,17 +57,18 @@ function stopDaemon() {
 function startDaemon() {
   mkdirSync(configDir, { recursive: true });
   const out = openSync(logFile, 'a');
-  const child = spawn(process.execPath, [join(__dirname, '..', 'dist', 'index.js')], {
+  // 启动守护进程（daemon.js），由它管理 server 子进程
+  const child = spawn(process.execPath, [join(__dirname, 'daemon.js')], {
     detached: true,
     stdio: ['ignore', out, out],
     cwd: process.cwd(),
     env: { ...process.env },
   });
-  writeFileSync(pidFile, String(child.pid));
   child.unref();
   console.log(`[myhi] 已在后台启动 (PID ${child.pid})`);
   console.log(`[myhi] 日志: ${logFile}`);
   console.log(`[myhi] 停止: myhi stop`);
+  console.log(`[myhi] 管理: http://localhost:${process.env.PORT || 12300}/admin`);
 }
 
 // ── 命令分发 ──────────────────────────────────────────────

package/dist/index.html

@@ -429,10 +429,7 @@
     </div>
   </div>
 
-  <div id="update-banner">
-    <span class="update-text">新版本 <span class="update-ver" id="update-ver"></span> 可用</span>
-    <button id="update-btn" onclick="doUpdate()">更新</button>
-  </div>
+  <!-- 升级管理已移至 /admin -->
 
   <div id="list">
     <div class="empty-state">
@@ -974,39 +971,10 @@
       const resp = await fetch('/api/version');
       if (!resp.ok) return;
       const data = await resp.json();
-      // 显示当前版本
       const verEl = document.getElementById('current-version');
       if (verEl) verEl.textContent = 'v' + data.current;
-      if (data.updateAvailable) {
-        document.getElementById('update-ver').textContent = 'v' + data.latest;
-        document.getElementById('update-banner').classList.add('show');
-      }
     } catch {}
   }
-  window.doUpdate = async function() {
-    const btn = document.getElementById('update-btn');
-    btn.disabled = true;
-    btn.textContent = '更新中...';
-    try {
-      const resp = await fetch('/api/update', { method: 'POST' });
-      const data = await resp.json();
-      if (data.ok) {
-        btn.textContent = '重启中...';
-        // 等待服务器重启后自动刷新
-        setTimeout(() => waitAndReload(), 3000);
-      } else {
-        btn.textContent = '失败';
-        setTimeout(() => { btn.textContent = '更新'; btn.disabled = false; }, 3000);
-      }
-    } catch {
-      btn.textContent = '重启中...';
-      setTimeout(() => waitAndReload(), 3000);
-    }
-  };
-  function waitAndReload() {
-    const check = () => fetch('/api/version').then(r => { if (r.ok) location.reload(); else throw 0; }).catch(() => setTimeout(check, 2000));
-    check();
-  }
   checkUpdate();
   setInterval(checkUpdate, 10 * 60 * 1000);
 </script>