@lancewu602/mihomo-dash 0.6.1 → 0.6.3

package/package.json

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

package/server/CHANGELOG.md

@@ -5,6 +5,21 @@
 
 ## [Unreleased]
 
+## [0.6.3] - 2026-10-31
+
+### 工程
+
+- 服务定义带版本与文档地址：`Description` 里写 `mihomo-dash <版本>`，
+  并加 `Documentation=https://github.com/lancewu602/mihomo-dash`——
+  `systemctl status` 的标题行与 `Docs:` 行直接显示；面板启动日志与内核日志也带上版本号
+
+## [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.3",
   "private": true,
   "type": "module",
   "description": "mihomo-dash 后端源码（作为 mihomo-dash 的一部分发布，不单独发包）",

package/server/src/http/index.js

@@ -255,6 +255,6 @@ export async function startServer(opts) {
     server.on('error', reject);
   });
 
-  console.log(`mihomo-dash 面板已启动: http://${opts.host}:${opts.port}`);
+  console.log(`mihomo-dash ${PKG_VERSION} 面板已启动: http://${opts.host}:${opts.port}`);
   console.log(`内核接口: ${getController().url}  配置目录: ${detectMihomoDir()}`);
 }

package/server/src/kernel/lifecycle.js

@@ -19,8 +19,12 @@ import {
   detectMihomoDir,
   ensureCliDir,
 } from '../shared/paths.js';
+import { createRequire } from 'node:module';
 import { readTailLines, rotateLogFile } from '../shared/log-file.js';
 
+const require = createRequire(import.meta.url);
+const { version: PKG_VERSION } = require('../../../package.json');
+
 /** pid 活着没（不发信号判断，避免误杀） */
 export function isAlive(pid) {
   const n = Number(pid);
@@ -223,7 +227,14 @@ export async function kernelStart(opts = {}) {
     if (!isAlive(child.pid)) break;
     const ready = await probeKernel(600);
     if (ready) {
-      if (opts.foreground) return waitChildExit(child);
+      // 前台 = 系统服务管理器拉起的路径，输出进 kernel.log：面板的「内核日志」与
+      // `systemctl status` 的日志尾都能看到「面板版本 + 内核版本」
+      if (opts.foreground) {
+        console.log(
+          `mihomo-dash ${PKG_VERSION} 内核已启动: ${ready.url}（pid ${child.pid}，v${ready.version}）`,
+        );
+        return waitChildExit(child);
+      }
       console.log(`内核已启动: ${ready.url}（pid ${child.pid}，v${ready.version}）`);
       return { ok: true, pid: child.pid };
     }

package/server/src/shared/service.js

@@ -28,6 +28,7 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
 import { defaultRun } from './exec.js';
 import { CLI_DIR, DEFAULT_HOST, DEFAULT_PORT } from './paths.js';
@@ -41,19 +42,27 @@ export const SERVICE_ENTRIES = {
 /** 面板 / 内核两个 agent 共用的 bundle 标识：只是给「登录项」UI 认领用的，不是真的 app bundle */
 export const BUNDLE_ID = 'com.mihomo-dash';
 
+/** 单元 / plist 里指回仓库的地址：`systemctl status` 的 `Docs:` 行就是它 */
+export const DOCS_URL = 'https://github.com/lancewu602/mihomo-dash';
+
+const require = createRequire(import.meta.url);
+const { version: PKG_VERSION } = require('../../../package.json');
+
 /** 两个受监管的 job：面板与面板自有内核 */
 const JOBS = {
   panel: {
     label: 'com.mihomo-dash.panel',
     unit: 'mihomo-dash-panel.service',
-    description: 'mihomo-dash 面板（Web UI + REST 转发）',
+    // 版本进 Description：`systemctl status` / `launchctl print` 的第一行就是它，
+    // 升级后跑一次 `service install` 即可刷新（定义本来就随安装重写）
+    description: `mihomo-dash ${PKG_VERSION} 面板（Web UI + REST 转发）`,
     args: (opts) => ['--port', String(opts.port), '--host', opts.host],
     log: (cliDir) => path.join(cliDir, 'daemon.log'),
   },
   kernel: {
     label: 'com.mihomo-dash.kernel',
     unit: 'mihomo-dash-kernel.service',
-    description: 'mihomo-dash 自有内核（用配置目录里的 config.yaml）',
+    description: `mihomo-dash ${PKG_VERSION} 自有内核（用配置目录里的 config.yaml）`,
     args: () => [],
     log: (cliDir) => path.join(cliDir, 'kernel.log'),
   },
@@ -147,6 +156,8 @@ export function renderUnit(job, opts) {
 # 作用域：${scope === 'system' ? 'system（/etc/systemd/system，以 root 运行，开机即起）' : 'user（~/.config/systemd/user，登录后启动 or linger）'}
 [Unit]
 Description=${def.description}
+# systemctl status 的 Docs: 行就是它；没有这条时那行是空的
+Documentation=${DOCS_URL}
 After=network-online.target
 
 [Service]
@@ -227,6 +238,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 +446,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 +554,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

@@ -107,7 +107,10 @@ test('plist：路径里的 XML 特殊字符会被转义', () => {
 test('systemd 单元：ExecStart 固定 argv、Restart=no、日志 append', () => {
   const unit = renderUnit('panel', OPTS());
   assert.match(unit, /^# 由 `mihomo-dash service install` 生成/m);
-  assert.match(unit, /Description=mihomo-dash 面板/);
+  // 版本进 Description：`systemctl status` 第一行就能看到装的是哪一版
+  assert.match(unit, /Description=mihomo-dash \d+\.\d+\.\d+ 面板/);
+  // `systemctl status` 的 `Docs:` 行来自 Documentation=
+  assert.match(unit, /^Documentation=https:\/\/github\.com\/lancewu602\/mihomo-dash$/m);
   assert.match(
     unit,
     /ExecStart=\/usr\/local\/bin\/node \/opt\/mihomo-dash\/server\/src\/index\.js --port 8981 --host 127\.0\.0\.1/,
@@ -252,6 +255,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 });