@wendongfly/myhi 1.3.11 → 1.3.13

package/bin/myhi.js

@@ -41,17 +41,39 @@ function isRunning(pid) {
 }
 
 function stopDaemon() {
-  const pid = readPid();
-  if (!pid) { console.log('[myhi] 没有正在运行的后台进程'); return false; }
-  if (!isRunning(pid)) {
+  const serverPidFile = join(configDir, 'server.pid');
+  let stopped = false;
+
+  // 停止 daemon 进程
+  const daemonPid = readPid();
+  if (daemonPid && isRunning(daemonPid)) {
+    process.kill(daemonPid, 'SIGTERM');
+    try { unlinkSync(pidFile); } catch {}
+    console.log(`[myhi] 已停止 daemon (PID ${daemonPid})`);
+    stopped = true;
+  } else if (daemonPid) {
     try { unlinkSync(pidFile); } catch {}
-    console.log('[myhi] 进程已不存在，已清理 PID 文件');
-    return false;
   }
-  process.kill(pid, 'SIGTERM');
-  try { unlinkSync(pidFile); } catch {}
-  console.log(`[myhi] 已停止后台进程 (PID ${pid})`);
-  return true;
+
+  // 停止 server 进程（普通模式或残留进程）
+  try {
+    const serverPid = parseInt(readFileSync(serverPidFile, 'utf8').trim(), 10);
+    if (serverPid && isRunning(serverPid)) {
+      if (process.platform === 'win32') {
+        try { require('child_process').execSync(`taskkill /PID ${serverPid} /F /T`, { stdio: 'pipe', timeout: 5000 }); } catch {}
+      } else {
+        process.kill(serverPid, 'SIGTERM');
+      }
+      try { unlinkSync(serverPidFile); } catch {}
+      console.log(`[myhi] 已停止 server (PID ${serverPid})`);
+      stopped = true;
+    } else if (serverPid) {
+      try { unlinkSync(serverPidFile); } catch {}
+    }
+  } catch {}
+
+  if (!stopped) console.log('[myhi] 没有正在运行的 myhi 进程');
+  return stopped;
 }
 
 function startDaemon() {
@@ -113,9 +135,15 @@ if (cmd === 'attach') {
 
 } 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(`[myhi] v${pkgVersion} 运行中 (PID ${pid})`);
+  const daemonPid = readPid();
+  let serverPid = null;
+  try { serverPid = parseInt(readFileSync(join(configDir, 'server.pid'), 'utf8').trim(), 10); } catch {}
+  const daemonAlive = daemonPid && isRunning(daemonPid);
+  const serverAlive = serverPid && isRunning(serverPid);
+  if (daemonAlive || serverAlive) {
+    const mode = daemonAlive ? 'daemon' : '前台';
+    const pid = daemonAlive ? daemonPid : serverPid;
+    console.log(`[myhi] v${pkgVersion} 运行中 (${mode}, PID ${pid})`);
   } else {
     console.log(`[myhi] v${pkgVersion} 未运行`);
   }