@wendongfly/myhi 1.3.27 → 1.3.29

package/bin/daemon.js

@@ -21,6 +21,7 @@ writeFileSync(pidFile, String(process.pid));
 
 let child = null;
 let restarting = false;
+let stopping = false;
 let crashCount = 0;
 let lastCrash = 0;
 const startTime = Date.now();
@@ -46,7 +47,7 @@ function startServer() {
   const thisChild = child;
   child.on('exit', (code, signal) => {
     if (child === thisChild) child = null; // 只清自己的引用
-    if (restarting) return; // 主动重启，不自动恢复
+    if (restarting || stopping) return; // 主动重启或正在停止，不自动恢复
 
     // 防止崩溃循环：10秒内连续崩溃超过5次则退出
     const now = Date.now();
@@ -113,16 +114,18 @@ function cleanup() {
 // 信号处理
 process.on('SIGTERM', () => {
   log('收到 SIGTERM，停止...');
+  stopping = true;
   if (child) child.kill('SIGTERM');
   cleanup();
-  setTimeout(() => process.exit(0), 1000);
+  setTimeout(() => process.exit(0), 2000);
 });
 
 process.on('SIGINT', () => {
   log('收到 SIGINT，停止...');
+  stopping = true;
   if (child) child.kill('SIGTERM');
   cleanup();
-  setTimeout(() => process.exit(0), 1000);
+  setTimeout(() => process.exit(0), 2000);
 });
 
 // Windows: 通过 stdin 消息（无 SIGUSR2 支持）

package/bin/myhi.js

@@ -696,14 +696,21 @@ SSH 开发：
   const port = process.env.PORT || '12300';
   const serviceFile = '/etc/systemd/system/myhi.service';
 
+  // 找到 node 和 daemon.js 的路径，用 Type=simple 直接前台运行 daemon
+  let nodeBin;
+  try { nodeBin = ex('which node', { encoding: 'utf8' }).trim(); } catch { nodeBin = '/usr/bin/node'; }
+  // myhi bin 可能是 symlink，解析真实路径后找到同目录的 daemon.js
+  let realMyhiBin;
+  try { realMyhiBin = ex(`readlink -f ${myhiBin}`, { encoding: 'utf8' }).trim(); } catch { realMyhiBin = myhiBin; }
+  const daemonScript = join(dirname(realMyhiBin), 'daemon.js');
+
   const unitContent = `[Unit]
 Description=myhi - Web Terminal Sharing
 After=network.target
 
 [Service]
-Type=forking
-PIDFile=${home}/.myhi/daemon.pid
-ExecStart=${myhiBin} -d
+Type=simple
+ExecStart=${nodeBin} ${daemonScript}
 ExecStop=${myhiBin} stop
 WorkingDirectory=${cwd}
 Restart=on-failure