@wendongfly/zihi 1.1.12 → 1.1.14

package/bin/daemon.js

@@ -1,23 +1,7 @@
 #!/usr/bin/env node
 /**
- * zihi 守护进程：写入 PID 并启动 server
+ * zihi 守护进程：标记为后台模式并启动 server。
+ * PID 文件的写入/清理由 server 自己负责（写的是完整 JSON 元信息）。
  */
-import { writeFileSync, unlinkSync } from 'fs';
-import { join, dirname } from 'path';
-import { fileURLToPath } from 'url';
-import { homedir } from 'os';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const pidFile = join(homedir(), '.zihi', 'daemon.pid');
-
-// 写入自身 PID
-writeFileSync(pidFile, String(process.pid));
-
-// 退出时清理 PID 文件
-function cleanup() { try { unlinkSync(pidFile); } catch {} }
-process.on('exit', cleanup);
-process.on('SIGTERM', () => process.exit(0));
-process.on('SIGINT', () => process.exit(0));
-
-// 启动 server
+process.env.ZIHI_DAEMON = '1';
 await import('../dist/index.js');

package/bin/zihi.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { spawn } from 'child_process';
+import { spawn, execSync } from 'child_process';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { mkdirSync, openSync, readFileSync, writeFileSync, unlinkSync } from 'fs';
@@ -30,31 +30,142 @@ const logFile = join(configDir, 'daemon.log');
 
 // ── 工具函数 ──────────────────────────────────────────────
 
-function readPid() {
-  try { return parseInt(readFileSync(pidFile, 'utf8').trim(), 10); }
-  catch { return null; }
+/** 读取 pidfile，兼容 JSON（新格式）和纯 PID 数字（旧格式）。 */
+function readPidInfo() {
+  try {
+    const raw = readFileSync(pidFile, 'utf8').trim();
+    if (!raw) return null;
+    if (raw.startsWith('{')) return JSON.parse(raw);
+    const pid = parseInt(raw, 10);
+    return pid ? { pid } : null;
+  } catch { return null; }
 }
 
-function isRunning(pid) {
+function isPidAlive(pid) {
   try { process.kill(pid, 0); return true; }
   catch { return false; }
 }
 
-function stopDaemon() {
-  const pid = readPid();
-  if (!pid) { console.log('[zihi] 没有正在运行的后台进程'); return false; }
-  if (!isRunning(pid)) {
+/** 查进程命令行是否含 zihi 标识，防 PID 复用导致误判成别的 node 进程。 */
+function pidCmdlineLooksLikeZihi(pid) {
+  try {
+    if (process.platform === 'win32') {
+      const out = execSync(
+        `wmic process where "ProcessId=${pid}" get CommandLine /format:list`,
+        { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 3000 }
+      );
+      return /zihi/i.test(out) && /(daemon\.js|dist[\\/]index\.js)/i.test(out);
+    } else {
+      const out = readFileSync(`/proc/${pid}/cmdline`, 'utf8');
+      return /zihi/i.test(out) && /(daemon\.js|dist\/index\.js)/i.test(out);
+    }
+  } catch { return false; }
+}
+
+/** 向运行中的实例发健康探针：确认签名为 zihi 且 pid 匹配。 */
+async function probeZihiPing(port, timeoutMs = 1500) {
+  if (!port) return null;
+  try {
+    const ctrl = new AbortController();
+    const t = setTimeout(() => ctrl.abort(), timeoutMs);
+    const resp = await fetch(`http://127.0.0.1:${port}/api/zihi-ping`, { signal: ctrl.signal });
+    clearTimeout(t);
+    if (!resp.ok) return null;
+    const data = await resp.json();
+    return data && data.zihi === true ? data : null;
+  } catch { return null; }
+}
+
+/**
+ * 校验当前 pidfile 指向的是否确实是一个活着的 zihi 实例。
+ * 两层校验：HTTP 探针 为主，cmdline 检查 为辅。
+ */
+async function verifyRunning() {
+  const info = readPidInfo();
+  if (!info || !info.pid) return null;
+  if (!isPidAlive(info.pid)) return null;
+
+  // 主校验：健康探针
+  const ping = await probeZihiPing(info.port);
+  if (ping && ping.pid === info.pid) {
+    return { ...info, ...ping, verifiedBy: 'http' };
+  }
+
+  // 辅校验：命令行关键字
+  if (pidCmdlineLooksLikeZihi(info.pid)) {
+    return { ...info, verifiedBy: 'cmdline' };
+  }
+
+  return null;
+}
+
+function formatUptime(startedAt) {
+  if (!startedAt) return '未知';
+  const ms = Date.now() - startedAt;
+  const s = Math.floor(ms / 1000);
+  if (s < 60) return `${s}s`;
+  const m = Math.floor(s / 60);
+  if (m < 60) return `${m}m${s % 60}s`;
+  const h = Math.floor(m / 60);
+  return `${h}h${m % 60}m`;
+}
+
+function printRunningInfo(info, opts = {}) {
+  const started = info.startedAt ? new Date(info.startedAt).toLocaleString() : '未知';
+  console.log(`[zihi] 服务已在运行，跳过启动`);
+  console.log(`  PID:       ${info.pid}`);
+  if (info.port)      console.log(`  端口:      ${info.port}`);
+  if (info.version)   console.log(`  版本:      v${info.version}`);
+  if (info.cwd)       console.log(`  工作目录:  ${info.cwd}`);
+  if (info.execPath)  console.log(`  Node:      ${info.execPath}`);
+  console.log(`  启动时间:  ${started}  (运行 ${formatUptime(info.startedAt)})`);
+  console.log(`  校验方式:  ${info.verifiedBy === 'http' ? 'HTTP 探针' : '命令行匹配'}`);
+  if (info.port) console.log(`  管理界面:  http://localhost:${info.port}/admin`);
+
+  const n = opts.logLines ?? 20;
+  if (n > 0) {
+    try {
+      const content = readFileSync(logFile, 'utf8');
+      const lines = content.split('\n');
+      console.log(`\n  ── 最近 ${n} 行日志 ──`);
+      console.log(lines.slice(-n).join('\n'));
+    } catch {}
+  }
+}
+
+async function stopDaemon() {
+  const info = readPidInfo();
+  if (!info || !info.pid) { console.log('[zihi] 没有正在运行的后台进程'); return false; }
+  if (!isPidAlive(info.pid)) {
     try { unlinkSync(pidFile); } catch {}
     console.log('[zihi] 进程已不存在，已清理 PID 文件');
     return false;
   }
-  process.kill(pid, 'SIGTERM');
+  // 额外校验：确认 PID 确实是 zihi，避免 PID 复用后误杀别人
+  const verified = await verifyRunning();
+  if (!verified) {
+    try { unlinkSync(pidFile); } catch {}
+    console.log(`[zihi] PID ${info.pid} 存在但不是 zihi 进程，已清理陈旧 PID 文件`);
+    return false;
+  }
+  process.kill(info.pid, 'SIGTERM');
   try { unlinkSync(pidFile); } catch {}
-  console.log(`[zihi] 已停止后台进程 (PID ${pid})`);
+  console.log(`[zihi] 已停止后台进程 (PID ${info.pid})`);
   return true;
 }
 
-function startDaemon() {
+async function startDaemon() {
+  // 启动前唯一性校验
+  const running = await verifyRunning();
+  if (running) {
+    printRunningInfo(running);
+    process.exit(0);
+  }
+  // pidfile 存在但校验失败 → 清理陈旧文件
+  if (readPidInfo()) {
+    try { unlinkSync(pidFile); } catch {}
+  }
+
   mkdirSync(configDir, { recursive: true });
   const out = openSync(logFile, 'a');
   // 启动守护进程（daemon.js），由它管理 server 子进程
@@ -103,21 +214,28 @@ if (cmd === 'attach') {
   await import('../dist/attach.js');
 
 } else if (cmd === 'stop') {
-  stopDaemon();
+  await stopDaemon();
 
 } else if (cmd === 'restart') {
-  stopDaemon();
+  await stopDaemon();
   await new Promise(r => setTimeout(r, 500));
-  startDaemon();
+  await startDaemon();
   process.exit(0);
 
 } else if (cmd === 'status') {
   const pkgVersion = JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), '../package.json'), 'utf8')).version;
-  const pid = readPid();
-  if (pid && isRunning(pid)) {
-    console.log(`[zihi] v${pkgVersion} 运行中 (PID ${pid})`);
+  const running = await verifyRunning();
+  if (running) {
+    console.log(`[zihi] v${pkgVersion} 运行中`);
+    printRunningInfo(running, { logLines: 0 });
   } else {
-    console.log(`[zihi] v${pkgVersion} 未运行`);
+    const stale = readPidInfo();
+    if (stale) {
+      try { unlinkSync(pidFile); } catch {}
+      console.log(`[zihi] v${pkgVersion} 未运行（已清理陈旧 PID 文件）`);
+    } else {
+      console.log(`[zihi] v${pkgVersion} 未运行`);
+    }
   }
 
 } else if (cmd === 'log' || cmd === 'logs') {
@@ -594,10 +712,17 @@ SSH 开发：
 `);
 
 } else if (cmd === '-d' || cmd === '--daemon' || cmd === 'daemon') {
-  startDaemon();
-  process.exit(0);
+  await startDaemon();
+  // startDaemon 内部会在检测到已运行时 exit(0)；
+  // 正常启动路径由 poll 定时器结束进程。
 
 } else {
-  // 默认 / 'start'：前台运行
+  // 默认 / 'start'：前台运行前也要做唯一性校验
+  const running = await verifyRunning();
+  if (running) {
+    printRunningInfo(running);
+    process.exit(0);
+  }
+  if (readPidInfo()) { try { unlinkSync(pidFile); } catch {} }
   await import('../dist/index.js');
 }