@lancewu602/mihomo-dash 0.6.1 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancewu602/mihomo-dash",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "mihomo 管理工具：CLI + 守护进程 + Web 面板",
   "type": "module",
   "license": "MIT",

package/server/CHANGELOG.md

@@ -5,6 +5,13 @@
 
 ## [Unreleased]
 
+## [0.6.2] - 2026-10-31
+
+### 修复
+
+- `service uninstall` / `service start` 回显的动作命令按作用域生成：system 作用域下不再印
+  `systemctl --user …`（真实执行的 argv 本来就不带 `--user`，只有文案错）
+
 ## [0.6.1] - 2026-10-31
 
 ### 修复

package/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mihomo-dash-server",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "private": true,
   "type": "module",
   "description": "mihomo-dash 后端源码（作为 mihomo-dash 的一部分发布，不单独发包）",

package/server/src/shared/service.js

@@ -227,6 +227,8 @@ export function createServiceManager(options = {}) {
   const scope = platform === 'linux' ? (options.scope ?? (isRoot ? 'system' : 'user')) : 'user';
   /** systemd 的公共参数：system 作用域不带 `--user` */
   const systemdArgs = scope === 'system' ? [] : ['--user'];
+  /** 回显给人看的 systemctl 前缀，必须与 systemdArgs 一致 */
+  const systemctlCmd = ['systemctl', ...systemdArgs].join(' ');
   /** launchd 的域：GUI 会话固定在 gui/<uid>，只有 SSH 时会话里退到 user/<uid> */
   const domains = [`gui/${uid}`, `user/${uid}`];
   const dir = serviceDir({ platform, home, scope, systemDir: options.systemDir });
@@ -433,7 +435,7 @@ export function createServiceManager(options = {}) {
       const stillLoaded = platform === 'darwin' && !!(await loadedDomain(job));
       if (platform === 'linux') {
         const r = await run('systemctl', [...systemdArgs, 'disable', jobOf(job).unit]);
-        if (r.ok) actions.push(`systemctl --user disable ${jobOf(job).unit}`);
+        if (r.ok) actions.push(`${systemctlCmd} disable ${jobOf(job).unit}`);
         else if (r.stderr && !/not loaded|does not exist|No such file/i.test(r.stderr)) {
           errors.push(`${job}: ${r.stderr.trim()}`);
         }
@@ -541,7 +543,7 @@ export function createServiceManager(options = {}) {
         else errors.push(`${j}: ${r.stderr.trim() || 'launchctl kickstart 失败'}`);
       } else {
         const r = await run('systemctl', [...systemdArgs, 'start', jobOf(j).unit]);
-        if (r.ok) started.push(`systemctl --user start ${jobOf(j).unit}`);
+        if (r.ok) started.push(`${systemctlCmd} start ${jobOf(j).unit}`);
         else errors.push(`${j}: ${r.stderr.trim() || 'systemctl start 失败'}`);
       }
     }

package/server/tests/service.test.js

@@ -252,6 +252,36 @@ test('Linux 安装/卸载：daemon-reload + enable --now / disable（不 --now
   assert.ok(!calls.some((c) => c.includes('--now') && c.includes('disable')));
 });
 
+test('Linux system 作用域：回显的动作命令不带 --user', async () => {
+  const { run, calls } = stubRun();
+  // system 作用域默认写 /etc（测试里换成临时目录，别碰本机）
+  const systemDir = path.join(tmpDir, 'etc-systemd');
+  const svc = createServiceManager({
+    run,
+    platform: 'linux',
+    scope: 'system',
+    systemDir,
+    home,
+    cliDir,
+  });
+  await svc.install({ port: 8982, host: '0.0.0.0' });
+  // 真正执行的命令本来就不带 --user；回显文案以前写死了 --user，照着抄会失败
+  assert.ok(calls.some((c) => c.join(' ') === 'systemctl enable --now mihomo-dash-panel.service'));
+
+  const started = await svc.start();
+  assert.deepEqual(started.started, [
+    'systemctl start mihomo-dash-panel.service',
+    'systemctl start mihomo-dash-kernel.service',
+  ]);
+
+  const res = await svc.uninstall();
+  assert.deepEqual(res.actions, [
+    'systemctl disable mihomo-dash-panel.service',
+    'systemctl disable mihomo-dash-kernel.service',
+  ]);
+  assert.deepEqual(res.errors, []);
+});
+
 test('Linux 安装：manualRunning 的 job 只 enable（不 --now），不拉第二个实例', async () => {
   const { run, calls } = stubRun();
   const svc = createServiceManager({ run, platform: 'linux', home, cliDir });