@wendongfly/myhi 1.3.51 → 1.3.53

package/bin/daemon.js

@@ -17,6 +17,36 @@ 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;
@@ -35,7 +65,7 @@ function startServer() {
   log('启动 server 子进程...');
   child = fork(serverEntry, process.argv.slice(2), {
     stdio: ['ignore', 'inherit', 'inherit', 'ipc'],
-    env: { ...process.env, MYHI_DAEMON: '1' },
+    env: { ...process.env, MYHI_DAEMON: '1', MYHI_DAEMON_PID: String(process.pid) },
     windowsHide: true,
   });
 

package/dist/chat.html

@@ -3007,6 +3007,12 @@
       try {
         const resp = await fetch('/api/update', { method: 'POST' });
         const data = await resp.json();
+        if (!data.ok) {
+          addStatusMessage('更新失败：' + (data.error || '未知错误'));
+          badge.textContent = '⬆ 更新失败';
+          badge.style.color = '#f85149';
+          return;
+        }
         addStatusMessage(data.message || '升级中...');
         badge.textContent = '⬆ 重启中...';
         // 等待服务重启后自动刷新