@wendongfly/myhi 1.3.24 → 1.3.26

package/bin/daemon.js

@@ -93,7 +93,7 @@ async function doUpgrade() {
   try {
     const cmd = process.platform === 'win32'
       ? 'npm.cmd install -g @wendongfly/myhi@latest'
-      : 'sudo npm install -g @wendongfly/myhi@latest 2>&1 || npm install -g @wendongfly/myhi@latest 2>&1';
+      : 'npm install -g @wendongfly/myhi@latest 2>&1 || sudo npm install -g @wendongfly/myhi@latest 2>&1';
     const output = execSync(cmd, { timeout: 120000, encoding: 'utf8' });
     log('升级完成: ' + output.trim().split('\n').pop());
   } catch (e) {

package/bin/myhi.js

@@ -683,9 +683,16 @@ SSH 开发：
   let myhiBin;
   try { myhiBin = ex('which myhi', { encoding: 'utf8' }).trim(); } catch { myhiBin = '/usr/local/bin/myhi'; }
 
-  const user = process.env.USER || 'root';
-  const home = homedir();
-  const cwd = process.env.MYHI_CWD || process.cwd();
+  // sudo 运行时用 SUDO_USER 获取真实用户
+  const user = process.env.SUDO_USER || process.env.USER || 'root';
+  let home;
+  if (process.env.SUDO_USER) {
+    // sudo 时 homedir() 返回 root 的 home，需要查真实用户的 home
+    try { home = ex(`getent passwd ${process.env.SUDO_USER}`, { encoding: 'utf8' }).trim().split(':')[5]; } catch { home = `/home/${process.env.SUDO_USER}`; }
+  } else {
+    home = homedir();
+  }
+  const cwd = process.env.MYHI_CWD || (process.env.SUDO_USER ? home : process.cwd());
   const port = process.env.PORT || '12300';
   const serviceFile = '/etc/systemd/system/myhi.service';
 
@@ -724,6 +731,21 @@ WantedBy=multi-user.target
     console.log(`  Port: ${port}`);
     console.log(`  WorkingDirectory: ${cwd}`);
     console.log(`  ExecStart: ${myhiBin} -d`);
+
+    // 配置 sudoers 让服务用户可以自升级和重启
+    if (user !== 'root') {
+      const sudoersFile = `/etc/sudoers.d/myhi-${user}`;
+      const npmBin = (() => { try { return ex('which npm', { encoding: 'utf8' }).trim(); } catch { return '/usr/bin/npm'; } })();
+      const sudoersContent = `# myhi: allow ${user} to upgrade and restart service\n${user} ALL=(ALL) NOPASSWD: ${npmBin} install -g @wendongfly/myhi*\n${user} ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart myhi.service\n${user} ALL=(ALL) NOPASSWD: /usr/bin/systemctl stop myhi.service\n`;
+      try {
+        writeFileSync(sudoersFile, sudoersContent, { mode: 0o440 });
+        console.log(`[myhi] 已配置 sudoers: ${sudoersFile}`);
+      } catch {
+        console.log(`[myhi] 提示: 如需 Web 端升级功能，请手动配置 sudoers:`);
+        console.log(`  echo '${user} ALL=(ALL) NOPASSWD: ${npmBin} install -g @wendongfly/myhi*' | sudo tee ${sudoersFile}`);
+      }
+    }
+
     console.log('');
     try {
       ex('systemctl daemon-reload', { stdio: 'inherit' });
@@ -734,6 +756,7 @@ WantedBy=multi-user.target
       console.log('  查看状态: systemctl status myhi.service');
       console.log('  查看日志: journalctl -u myhi -f');
       console.log('  停止服务: sudo systemctl stop myhi.service');
+      console.log('  Web 端升级: 会话页 ⬆ 按钮一键升级');
     } catch (e) {
       console.log('[myhi] systemctl 执行失败，请手动运行:');
       console.log('  sudo systemctl daemon-reload');
@@ -748,6 +771,8 @@ WantedBy=multi-user.target
     } catch {}
     try {
       unlinkSync(serviceFile);
+      // 清理 sudoers
+      try { unlinkSync(`/etc/sudoers.d/myhi-${user}`); } catch {}
       ex('systemctl daemon-reload', { stdio: 'pipe' });
       console.log('[myhi] 已卸载 systemd 服务');
     } catch (e) {