mihomo-cli 1.2.2 → 1.2.3

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [1.2.3] - 2026-04-07
+
+### 优化
+
+- **简短帮助**：大幅精简，只列出最常用命令，增加 `mihomo help` 提示
+- **性能**：
+  - settings 读取增加内存缓存，减少重复 JSON 解析
+  - 内核版本增加缓存，避免重复执行 `mihomo -v`
+  - `sleepSync()` 改用 `Atomics.wait` 而非 `execSync('sleep')`，减少子进程开销
+
+### 重构
+
+- 精简模块导出接口，移除不必要的内部函数导出
+- 新增 `formatProxySummary()` 复用函数（消除 3 处重复代码）
+- `pickSingleSubscription()` 移除多余参数
+- 统一代码风格：数组/条件表达式换行风格、`cmdUi` → `cmdUI` 命名一致性
+
+### 文档
+
+- README 修复：GitHub 链接、重复段落、`profile-update-interval` 格式
+
+---
+
 ## [1.2.2] - 2026-04-05
 
 ### 优化

package/README.md

@@ -28,7 +28,7 @@ npm install -g mihomo-cli
 ### 方式二：源码安装
 
 ```bash
-git clone https://github.com/yourname/mihomo-cli.git
+git clone https://github.com/adaex/mihomo-cli.git
 cd mihomo-cli
 npm install
 npm link
@@ -79,49 +79,50 @@ mihomo ui yacd     # YACD
 
 ### 核心命令
 
-| 命令 | 说明 |
-|------|------|
-| `mihomo start [tun\|mixed]` | 启动/重启/切换代理模式 |
-| `mihomo stop` | 停止代理 |
-| `mihomo status` | 查看运行状态 |
-| `mihomo log` | 实时查看日志 (`-o` 用系统编辑器打开) |
-| `mihomo logs` | 列出所有日志（当前 + 历史归档） |
-| `mihomo logs <编号>` | 查看指定日志（`0`=当前日志，`1+`=归档日志，支持 `-n N` 指定行数、`-o` 打开） |
+| 命令                        | 说明                                                                         |
+| --------------------------- | ---------------------------------------------------------------------------- |
+| `mihomo start [tun\|mixed]` | 启动/重启/切换代理模式                                                       |
+| `mihomo stop`               | 停止代理                                                                     |
+| `mihomo status`             | 查看运行状态                                                                 |
+| `mihomo log`                | 实时查看日志 (`-o` 用系统编辑器打开)                                         |
+| `mihomo logs`               | 列出所有日志（当前 + 历史归档）                                              |
+| `mihomo logs <编号>`        | 查看指定日志（`0`=当前日志，`1+`=归档日志，支持 `-n N` 指定行数、`-o` 打开） |
 
 ### 订阅管理
 
-| 命令 | 说明 |
-|------|------|
-| `mihomo sub list` | 列出所有订阅（含流量、到期时间） |
-| `mihomo sub add <url> [name]` | 添加订阅 |
-| `mihomo sub update` | 更新所有订阅 |
-| `mihomo sub update <name>` | 更新指定订阅（支持模糊匹配） |
-| `mihomo sub use <name>` | 设置默认订阅（支持模糊匹配，自动重启） |
-| `mihomo sub web [name]` | 打开订阅页面（无参打开默认） |
+| 命令                          | 说明                                   |
+| ----------------------------- | -------------------------------------- |
+| `mihomo sub`                  | 列出所有订阅（含流量、到期时间）       |
+| `mihomo sub add <url> [name]` | 添加订阅                               |
+| `mihomo sub update`           | 更新所有订阅                           |
+| `mihomo sub update <name>`    | 更新指定订阅（支持模糊匹配）           |
+| `mihomo sub use <name>`       | 设置默认订阅（支持模糊匹配，自动重启） |
+| `mihomo sub web [name]`       | 打开订阅页面（无参打开默认）           |
 
 ### 覆写配置
 
-| 命令 | 说明 |
-|------|------|
+| 命令                           | 说明                       |
+| ------------------------------ | -------------------------- |
 | `mihomo ow` / `mihomo ow list` | 查看覆写配置状态和文件列表 |
-| `mihomo ow on` | 启用覆写配置（自动重启） |
-| `mihomo ow off` | 禁用覆写配置（自动重启） |
+| `mihomo ow on`                 | 启用覆写配置（自动重启）   |
+| `mihomo ow off`                | 禁用覆写配置（自动重启）   |
 
 ### 其他命令
 
-| 命令 | 说明 |
-|------|------|
-| `mihomo kernel [镜像\|--no-mirror]` | 更新内核 |
-| `mihomo ui [zash\|dash\|yacd]` | 打开 Web UI |
-| `mihomo dir` | 显示数据目录位置 |
-| `mihomo dir open [target]` | 打开指定目录（`root`, `subs`, `logs`, `overwrites` 等） |
-| `mihomo reset [--full]` | 重置用户数据 (--full 同时删除内核) |
-| `mihomo version` | 显示版本信息 |
-| `mihomo help` | 显示帮助信息 |
+| 命令                                | 说明                                                    |
+| ----------------------------------- | ------------------------------------------------------- |
+| `mihomo kernel [镜像\|--no-mirror]` | 更新内核                                                |
+| `mihomo ui [zash\|dash\|yacd]`      | 打开 Web UI                                             |
+| `mihomo dir`                        | 显示数据目录位置                                        |
+| `mihomo dir open [target]`          | 打开指定目录（`root`, `subs`, `logs`, `overwrites` 等） |
+| `mihomo reset [--full]`             | 重置用户数据 (--full 同时删除内核)                      |
+| `mihomo version`                    | 显示版本信息                                            |
+| `mihomo help`                       | 显示帮助信息                                            |
 
 ### 命令别名
 
 以下任意命令等效：
+
 - `mihomo-cli` (原名)
 - `mihomo`
 - `mmc`
@@ -204,12 +205,12 @@ mihomo kernel --no-mirror
 
 覆写配置支持以下特殊操作符：
 
-| 语法 | 作用 | 示例 |
-|------|------|------|
-| `key!` | 强制覆盖整个对象（不深度合并） | `dns!`: { ... } |
-| `+key` | 数组前置插入 | `+proxies`: [...] |
-| `key+` | 数组追加 | `rules+`: [...] |
-| `<+key>` | 键名以 `+` 开头时转义 | `<+.google.cn>`: ... |
+| 语法     | 作用                           | 示例                 |
+| -------- | ------------------------------ | -------------------- |
+| `key!`   | 强制覆盖整个对象（不深度合并） | `dns!`: { ... }      |
+| `+key`   | 数组前置插入                   | `+proxies`: [...]    |
+| `key+`   | 数组追加                       | `rules+`: [...]      |
+| `<+key>` | 键名以 `+` 开头时转义          | `<+.google.cn>`: ... |
 
 ### 示例
 
@@ -225,18 +226,18 @@ dns!:
 
 # 追加规则
 rules+:
-  - "DOMAIN-SUFFIX,example.com,DIRECT"
+  - 'DOMAIN-SUFFIX,example.com,DIRECT'
 ```
 
 ## Web UI
 
 内置三个常用 Web UI：
 
-| 名称 | 地址 | 说明 |
-|------|------|------|
-| zash | https://board.zash.run.place | 现代简洁界面（默认） |
-| dash | https://metacubex.github.io/metacubexd | MetaCubeX 官方 UI |
-| yacd | https://yacd.metacubex.one | 经典 YACD 界面 |
+| 名称 | 地址                                     | 说明                 |
+| ---- | ---------------------------------------- | -------------------- |
+| zash | <https://board.zash.run.place>           | 现代简洁界面（默认） |
+| dash | <https://metacubex.github.io/metacubexd> | MetaCubeX 官方 UI    |
+| yacd | <https://yacd.metacubex.one>             | 经典 YACD 界面       |
 
 ## 故障排除
 
@@ -261,6 +262,7 @@ sudo pkill -9 mihomo
 ### 端口被占用
 
 默认端口（取决于订阅配置）：
+
 - Mixed 端口: `7890`
 - 外部控制器: `127.0.0.1:9090`
 

package/index.js

@@ -33,7 +33,7 @@ process.on('SIGTERM', () => {
   process.exit(0);
 });
 
-process.on('uncaughtException', (e) => {
+process.on('uncaughtException', e => {
   console.error('\n未捕获的异常: ' + e.message);
   if (e.stack) {
     console.error(e.stack.split('\n').slice(1).join('\n'));
@@ -41,80 +41,79 @@ process.on('uncaughtException', (e) => {
   process.exit(1);
 });
 
-process.on('unhandledRejection', (reason) => {
+process.on('unhandledRejection', reason => {
   const msg = reason instanceof Error ? reason.message : String(reason);
   console.error('\n未处理的 Promise 拒绝: ' + msg);
   process.exit(1);
 });
 
 function printShortHelp() {
-  console.log('\nmihomo-cli v' + VERSION);
-  console.log('别名: mihomo, mmc, mh\n');
-  console.log('命令:\n' +
-    '  start [tun|mixed]        启动/切换代理\n' +
-    '  stop                     停止代理\n' +
-    '  status                   查看状态\n' +
-    '  ui [zash|dash|yacd]      Web 界面\n' +
-    '  log                      实时日志\n' +
-    '  logs                     日志列表\n' +
-    '  subscription             订阅管理（别名 sub）\n' +
-    '  overwrite [on|off]       覆写配置（别名 ow）\n' +
-    '  directory                数据目录（别名 dir）\n' +
-    '  kernel                   更新内核\n' +
-    '  reset                    重置配置\n' +
-    '  version                  版本信息\n');
+  console.log('\nmihomo-cli v' + VERSION + '  (mihomo help 查看完整帮助)\n');
+  console.log(
+    '常用命令:\n' +
+      '  start [tun|mixed]    启动/切换代理\n' +
+      '  ui [zash|dash|yacd]  打开 Web UI\n' +
+      '  ow [on|off]          覆写配置\n' +
+      '  sub [use|update]     订阅管理\n',
+  );
 }
 
 function printHelp() {
-  console.log('\nmihomo-cli v' + VERSION + '\n' +
-    '\n' +
-    '命令别名: mihomo, mmc, mh\n' +
-    '\n' +
-    '用法:\n' +
-    '  mihomo <命令> [选项]\n' +
-    '\n' +
-    '控制:\n' +
-    '  start [tun|mixed]            启动/切换代理 (默认 mixed)\n' +
-    '  stop                         停止代理\n' +
-    '  status                       查看状态\n' +
-    '\n' +
-    '界面:\n' +
-    '  ui [zash|dash|yacd]          打开 Web UI (默认 zash)\n' +
-    '  log [-o]                     实时日志（-o 打开文件）\n' +
-    '  logs [编号] [-n N] [-o]      日志列表（0=当前，1+=归档）\n' +
-    '\n' +
-    '订阅:\n' +
-    '  subscription                列出所有订阅（别名 sub）\n' +
-    '  subscription add <url> [name]  添加订阅\n' +
-    '  subscription update [name]     更新订阅（无参更新所有）\n' +
-    '  subscription use <name>        切换默认订阅\n' +
-    '  subscription web [name]        打开订阅页面\n' +
-    '\n' +
-    '配置:\n' +
-    '  overwrite                   查看覆写状态（别名 ow）\n' +
-    '  overwrite on|off            启用/禁用覆写配置\n' +
-    '  directory                   显示数据目录位置（别名 dir）\n' +
-    '  directory open [target]     打开目录: root|subs|logs|overwrites|...\n' +
-    '\n' +
-    '系统:\n' +
-    '  kernel [镜像|--no-mirror]    更新内核\n' +
-    '  reset [--full]               重置用户数据 (--full 同时删除内核)\n' +
-    '  help, -h                     显示帮助\n' +
-    '  version, -v                  显示版本\n' +
-    '\n' +
-    '示例:\n' +
-    '  mihomo start              # 启动/重启 Mixed 模式\n' +
-    '  mihomo start tun          # 切换到 TUN 透明代理模式\n' +
-    '  mihomo sub add <url>      # 添加订阅 (sub 是 subscription 别名)\n' +
-    '  mihomo ui                 # 打开 Web UI\n' +
-    '\n' +
-    '模式说明:\n' +
-    '  mixed  HTTP + SOCKS5 混合端口 (默认)\n' +
-    '  tun    透明代理，全局自动路由，需要 sudo\n' +
-    '\n' +
-    '数据目录:\n' +
-    '  环境变量 MIHOMO_CLI_DIR 可自定义位置\n' +
-    '  默认: ' + config.USER_DATA_DIR + '\n');
+  console.log(
+    '\nmihomo-cli v' +
+      VERSION +
+      '\n' +
+      '\n' +
+      '命令别名: mihomo, mmc, mh\n' +
+      '\n' +
+      '用法:\n' +
+      '  mihomo <命令> [选项]\n' +
+      '\n' +
+      '控制:\n' +
+      '  start [tun|mixed]            启动/切换代理 (默认 mixed)\n' +
+      '  stop                         停止代理\n' +
+      '  status                       查看状态\n' +
+      '\n' +
+      '界面:\n' +
+      '  ui [zash|dash|yacd]          打开 Web UI (默认 zash)\n' +
+      '  log [-o]                     实时日志（-o 打开文件）\n' +
+      '  logs [编号] [-n N] [-o]      日志列表（0=当前，1+=归档）\n' +
+      '\n' +
+      '订阅:\n' +
+      '  subscription                 列出所有订阅（别名 sub）\n' +
+      '  subscription add <url> [name]  添加订阅\n' +
+      '  subscription update [name]   更新订阅（无参更新所有）\n' +
+      '  subscription use <name>      切换默认订阅\n' +
+      '  subscription web [name]      打开订阅页面\n' +
+      '\n' +
+      '配置:\n' +
+      '  overwrite                   查看覆写状态（别名 ow）\n' +
+      '  overwrite on|off            启用/禁用覆写配置\n' +
+      '  directory                   显示数据目录位置（别名 dir）\n' +
+      '  directory open [target]     打开目录: root|subs|logs|overwrites|...\n' +
+      '\n' +
+      '系统:\n' +
+      '  kernel [镜像|--no-mirror]    更新内核\n' +
+      '  reset [--full]               重置用户数据 (--full 同时删除内核)\n' +
+      '  help, -h                     显示帮助\n' +
+      '  version, -v                  显示版本\n' +
+      '\n' +
+      '示例:\n' +
+      '  mihomo start              # 启动/重启 Mixed 模式\n' +
+      '  mihomo start tun          # 切换到 TUN 透明代理模式\n' +
+      '  mihomo sub add <url>      # 添加订阅 (sub 是 subscription 别名)\n' +
+      '  mihomo ui                 # 打开 Web UI\n' +
+      '\n' +
+      '模式说明:\n' +
+      '  mixed  HTTP + SOCKS5 混合端口 (默认)\n' +
+      '  tun    透明代理，全局自动路由，需要 sudo\n' +
+      '\n' +
+      '数据目录:\n' +
+      '  环境变量 MIHOMO_CLI_DIR 可自定义位置\n' +
+      '  默认: ' +
+      config.USER_DATA_DIR +
+      '\n',
+  );
 }
 
 function printVersion() {
@@ -126,7 +125,7 @@ function printVersion() {
 
 function printStatus() {
   const status = processMgr.getStatus();
-  const info = subscription.getConfigInfo();
+  const info = config.getConfigInfo();
   const owEnabled = overwrite.isOverwriteEnabled();
   const owFiles = overwrite.listOverwriteFiles().files;
   const activeSub = getActiveSubscription();
@@ -160,12 +159,7 @@ function printStatus() {
   if (activeSub) {
     let subLine = '订阅: ' + activeSub.name;
     if (info) {
-      let parts = [];
-      if (info.proxyGroups && info.proxyGroups > 0) {
-        parts.push(info.proxyGroups + ' 组');
-      }
-      parts.push(info.proxies + ' 节点');
-      subLine += ' (' + parts.join(', ') + ')';
+      subLine += ' (' + subscription.formatProxySummary(info) + ')';
     }
     console.log(subLine);
   } else {
@@ -213,7 +207,7 @@ function findSubscriptionFuzzy(subs, pattern) {
   return includes;
 }
 
-function pickSingleSubscription(subs, pattern, actionName) {
+function pickSingleSubscription(subs, pattern) {
   if (subs.length === 0) {
     console.error('错误: 未找到匹配 "' + pattern + '" 的订阅');
     process.exit(1);
@@ -291,7 +285,7 @@ function viewLogWithTail(logPath, options) {
   const tail = spawn('tail', tailArgs, { stdio: 'inherit' });
 
   tail.on('close', () => process.exit(0));
-  tail.on('error', (e) => {
+  tail.on('error', e => {
     console.error('无法读取日志: ' + e.message);
     process.exit(1);
   });
@@ -344,10 +338,7 @@ async function cmdStart(args) {
   }
 
   const modeLabel = targetMode === 'tun' ? 'TUN' : 'Mixed';
-  const parts = [];
-  if (cfgInfo.proxyGroups && cfgInfo.proxyGroups > 0) parts.push(cfgInfo.proxyGroups + ' 组');
-  parts.push(cfgInfo.proxies + ' 节点');
-  console.log([modeLabel, sub.name, parts.join(', ')].join(' · '));
+  console.log([modeLabel, sub.name, subscription.formatProxySummary(cfgInfo)].join(' · '));
 
   try {
     const result = await processMgr.start(targetMode);
@@ -377,7 +368,7 @@ async function cmdStop() {
   console.log('已停止');
 }
 
-function cmdUi(args) {
+function cmdUI(args) {
   const uiName = args[1] || 'zash';
   const url = UI_URLS[uiName];
 
@@ -396,7 +387,6 @@ function cmdUi(args) {
   }
 }
 
-
 function cmdLog(args) {
   const logPath = processMgr.getLogPath();
 
@@ -419,7 +409,20 @@ function cmdLogs(args) {
     if (targetName === 'current' || targetName === '0') {
       logPath = processMgr.getLogPath();
     } else {
-      logPath = processMgr.getLogPathByName(targetName);
+      // 纯数字 1+ 表示归档日志的位置（最新=1）
+      const parsedIdx = parseInt(targetName);
+      if (!isNaN(parsedIdx) && parsedIdx > 0 && String(parsedIdx) === targetName) {
+        const archiveLogs = processMgr.listLogs();
+        const archive = archiveLogs.archives[parsedIdx - 1];
+        if (!archive) {
+          console.error('错误: 未找到日志 "' + targetName + '"');
+          console.log('使用 "mihomo logs" 查看可用日志列表');
+          process.exit(1);
+        }
+        logPath = archive.path;
+      } else {
+        logPath = processMgr.getLogPathByName(targetName);
+      }
     }
 
     if (!logPath) {
@@ -454,8 +457,15 @@ function cmdLogs(args) {
   console.log('日志列表:');
   console.log('');
 
-  all.forEach((log, idx) => {
-    const num = log.isCurrent ? ' 0' : (idx < 10 ? ' ' + idx : '' + idx);
+  let archiveCounter = 0;
+  all.forEach(log => {
+    let num;
+    if (log.isCurrent) {
+      num = ' 0';
+    } else {
+      archiveCounter++;
+      num = archiveCounter < 10 ? ' ' + archiveCounter : '' + archiveCounter;
+    }
     const time = subscription.formatDate(log.mtime);
     const size = subscription.formatBytes(log.size);
     const name = log.isCurrent ? 'mihomo.log (当前运行中)' : log.name;
@@ -463,16 +473,16 @@ function cmdLogs(args) {
     console.log(' ' + num + '. ' + name);
     console.log('    时间: ' + time + '  大小: ' + size);
     if (!log.isCurrent) {
-      console.log('    查看: mihomo logs ' + idx + '  或  mihomo logs -o ' + idx);
+      console.log('    查看: mihomo logs ' + archiveCounter + '  或  mihomo logs ' + archiveCounter + ' -o');
     }
     console.log('');
   });
 
   console.log('用法:');
   console.log('  mihomo logs 0          # 查看当前日志 (最后 100 行)');
-  console.log('  mihomo logs 1          # 查看第 1 个归档日志');
+  console.log('  mihomo logs 1          # 查看第 1 个归档日志（最新）');
   console.log('  mihomo logs 1 -n 200   # 查看 200 行');
-  console.log('  mihomo logs 1 -o        # 用系统默认程序打开');
+  console.log('  mihomo logs 1 -o       # 用系统默认程序打开');
   console.log('');
 }
 
@@ -542,11 +552,8 @@ async function cmdKernel(args) {
 
   console.log('\n可用镜像:');
   config.AVAILABLE_MIRRORS.forEach(m => {
-    const isCurrent = effectiveMirror && (
-      effectiveMirror.includes('//' + m + '/') ||
-      effectiveMirror.includes('//' + m + ':') ||
-      effectiveMirror.endsWith('//' + m)
-    );
+    const isCurrent =
+      effectiveMirror && (effectiveMirror.includes('//' + m + '/') || effectiveMirror.includes('//' + m + ':') || effectiveMirror.endsWith('//' + m));
     console.log('  ' + m + (isCurrent ? ' (当前)' : ''));
   });
 
@@ -568,9 +575,9 @@ async function cmdKernel(args) {
     }
 
     console.log('\n正在下载...');
-    const result = await kernel.downloadKernel((msg) => {
+    const result = await kernel.downloadKernel(msg => {
       console.log(msg);
-    }, mirrorInfo.mirror);  // 传递镜像参数（undefined = 用配置，null = 禁用）
+    }, mirrorInfo.mirror); // 传递镜像参数（undefined = 用配置，null = 禁用）
     console.log('已更新到 ' + result.version);
   } catch (e) {
     console.error('更新失败: ' + e.message);
@@ -625,6 +632,7 @@ async function printSubscriptionList() {
   console.log('切换默认: mihomo sub use <name>');
   console.log('更新订阅: mihomo sub update [name]');
   console.log('打开页面: mihomo sub web [name]');
+  console.log('新增订阅: mihomo sub add <url> [name]');
   console.log('');
 }
 
@@ -649,10 +657,7 @@ async function cmdSubscription(args) {
     try {
       config.addSubscription(url, name);
       const info = await subscription.downloadSubscription(url, name);
-      const parts = [];
-      if (info.proxyGroups && info.proxyGroups > 0) parts.push(info.proxyGroups + ' 组');
-      parts.push(info.proxies + ' 节点');
-      console.log('已添加 (' + parts.join(', ') + ')');
+      console.log('已添加 (' + subscription.formatProxySummary(info) + ')');
     } catch (e) {
       console.error('添加失败: ' + e.message);
       process.exit(1);
@@ -678,10 +683,7 @@ async function cmdSubscription(args) {
       results.forEach(r => {
         if (r.success) {
           ok++;
-          const parts = [];
-          if (r.proxyGroups && r.proxyGroups > 0) parts.push(r.proxyGroups + ' 组');
-          parts.push(r.proxies + ' 节点');
-          console.log('✓ ' + r.name + ': 已更新 (' + parts.join(', ') + ')');
+          console.log('✓ ' + r.name + ': 已更新 (' + subscription.formatProxySummary(r) + ')');
         } else {
           console.log('✗ ' + r.name + ': 失败 (' + r.error.split('\n')[0] + ')');
         }
@@ -693,15 +695,12 @@ async function cmdSubscription(args) {
     }
 
     const matches = findSubscriptionFuzzy(subs, name);
-    const target = pickSingleSubscription(matches, name, '更新');
+    const target = pickSingleSubscription(matches, name);
 
     console.log('更新订阅: ' + target.name);
     try {
       const info = await subscription.downloadSubscription(target.url, target.name);
-      const parts = [];
-      if (info.proxyGroups && info.proxyGroups > 0) parts.push(info.proxyGroups + ' 组');
-      parts.push(info.proxies + ' 节点');
-      console.log('已更新 (' + parts.join(', ') + ')');
+      console.log('已更新 (' + subscription.formatProxySummary(info) + ')');
     } catch (e) {
       console.error('更新失败: ' + e.message);
       process.exit(1);
@@ -725,7 +724,7 @@ async function cmdSubscription(args) {
     }
 
     const matches = findSubscriptionFuzzy(subs, name);
-    const target = pickSingleSubscription(matches, name, '切换');
+    const target = pickSingleSubscription(matches, name);
 
     // 检查是否已是当前默认订阅
     const currentDefault = getActiveSubscription();
@@ -775,7 +774,7 @@ async function cmdSubscription(args) {
     let target;
     if (name) {
       const matches = findSubscriptionFuzzy(subs, name);
-      target = pickSingleSubscription(matches, name, '打开');
+      target = pickSingleSubscription(matches, name);
     } else {
       target = subs[0];
     }
@@ -833,11 +832,11 @@ async function cmdReset(args) {
     const readline = require('readline');
     const rl = readline.createInterface({
       input: process.stdin,
-      output: process.stdout
+      output: process.stdout,
     });
 
     const answer = await new Promise(resolve => {
-      rl.question('确认? (y/N) ', (a) => {
+      rl.question('确认? (y/N) ', a => {
         rl.close();
         resolve(a);
       });
@@ -943,14 +942,14 @@ async function cmdOverwrite(args) {
 
 // 目录目标映射（精确匹配）
 const DIRECTORY_TARGETS = {
-  'root': { path: null, label: '根目录' },
-  'subs': { path: config.DIRS.subscriptions, label: '订阅目录' },
-  'logs': { path: config.DIRS.logs, label: '日志目录' },
-  'data': { path: config.DIRS.data, label: 'mihomo 数据目录' },
-  'runtime': { path: config.DIRS.runtime, label: '运行时目录' },
-  'overwrites': { path: config.DIRS.overwrites, label: '覆写目录' },
-  'settings': { path: config.PATHS.settingsFile, label: '设置文件' },
-  'kernel': { path: config.DIRS.core, label: '内核目录' },
+  root: { path: null, label: '根目录' },
+  subs: { path: config.DIRS.subscriptions, label: '订阅目录' },
+  logs: { path: config.DIRS.logs, label: '日志目录' },
+  data: { path: config.DIRS.data, label: 'mihomo 数据目录' },
+  runtime: { path: config.DIRS.runtime, label: '运行时目录' },
+  overwrites: { path: config.DIRS.overwrites, label: '覆写目录' },
+  settings: { path: config.PATHS.settingsFile, label: '设置文件' },
+  kernel: { path: config.DIRS.core, label: '内核目录' },
 };
 
 function cmdDirectory(args) {
@@ -1055,7 +1054,7 @@ async function main() {
       cmdLogs(args);
       break;
     case 'ui':
-      cmdUi(args);
+      cmdUI(args);
       break;
     case 'kernel':
       await cmdKernel(args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mihomo-cli",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "A terminal-based mihomo (Clash.Meta) client for macOS",
   "main": "index.js",
   "bin": {

package/src/config.js

@@ -34,8 +34,6 @@ const DIRS = {
 
 const PATHS = {
   root: DIRS.root,
-  data: DIRS.data,
-  userDataDir: USER_DATA_DIR,
   mihomoBinary: path.join(DIRS.core, 'mihomo'),
   settingsFile: path.join(USER_DATA_DIR, 'settings.json'),
   subscriptionsCacheFile: path.join(DIRS.subscriptions, 'cache.json'),
@@ -77,36 +75,41 @@ function maskUrl(url) {
   }
 }
 
+let _settingsCache = null;
+
 function readSettings() {
+  if (_settingsCache !== null) return _settingsCache;
   ensureDirs();
   if (fs.existsSync(PATHS.settingsFile)) {
     try {
       const content = fs.readFileSync(PATHS.settingsFile, 'utf8');
-      return JSON.parse(content);
+      _settingsCache = JSON.parse(content);
+      return _settingsCache;
     } catch (e) {
-      return {};
+      _settingsCache = {};
+      return _settingsCache;
     }
   }
-  return {};
+  _settingsCache = {};
+  return _settingsCache;
 }
 
 function writeSettings(settings) {
   ensureDirs();
   const existing = readSettings();
   const merged = { ...existing, ...settings };
+  // undefined 值表示删除该键
+  for (const key of Object.keys(settings)) {
+    if (settings[key] === undefined) delete merged[key];
+  }
   fs.writeFileSync(PATHS.settingsFile, JSON.stringify(merged, null, 2), { mode: 0o600 });
+  _settingsCache = merged;
   return merged;
 }
 
 // GitHub 镜像配置
 const DEFAULT_GITHUB_MIRROR = 'https://v6.gh-proxy.org/';
-const AVAILABLE_MIRRORS = [
-  'v6.gh-proxy.org',
-  'gh-proxy.org',
-  'hk.gh-proxy.org',
-  'cdn.gh-proxy.org',
-  'edgeone.gh-proxy.org',
-];
+const AVAILABLE_MIRRORS = ['v6.gh-proxy.org', 'gh-proxy.org', 'hk.gh-proxy.org', 'cdn.gh-proxy.org', 'edgeone.gh-proxy.org'];
 
 function getGitHubMirror() {
   const settings = readSettings();
@@ -125,9 +128,7 @@ function setGitHubMirror(mirror) {
   // - null 或 undefined: 恢复默认
 
   if (mirror === null || mirror === undefined) {
-    const settings = readSettings();
-    delete settings.github_mirror;
-    writeSettings(settings);
+    writeSettings({ github_mirror: undefined });
     return DEFAULT_GITHUB_MIRROR;
   }
 
@@ -239,24 +240,28 @@ function hasKernel() {
   return fs.existsSync(PATHS.mihomoBinary);
 }
 
+let _kernelVersionCache = undefined;
+
 function getKernelVersion() {
   if (!hasKernel()) {
+    _kernelVersionCache = undefined;
     return null;
   }
+  if (_kernelVersionCache !== undefined) return _kernelVersionCache;
   try {
     const output = execSync('"' + PATHS.mihomoBinary + '" -v 2>&1 || true', {
       encoding: 'utf8',
     }).trim();
     if (output) {
       const match = output.match(/v?[\d]+\.[\d]+\.[\d]+/);
-      if (match) {
-        return match[0];
-      }
-      return output;
+      _kernelVersionCache = match ? match[0] : output;
+      return _kernelVersionCache;
     }
-    return 'unknown';
+    _kernelVersionCache = 'unknown';
+    return _kernelVersionCache;
   } catch (e) {
-    return 'unknown';
+    _kernelVersionCache = 'unknown';
+    return _kernelVersionCache;
   }
 }
 
@@ -377,13 +382,7 @@ function resetUserData(options) {
   if (options === undefined) options = {};
   const keepKernel = options.keepKernel !== false;
 
-  const itemsToRemove = [
-    PATHS.settingsFile,
-    DIRS.subscriptions,
-    DIRS.logs,
-    DIRS.data,
-    DIRS.runtime,
-  ];
+  const itemsToRemove = [PATHS.settingsFile, DIRS.subscriptions, DIRS.logs, DIRS.data, DIRS.runtime];
 
   if (!keepKernel) {
     itemsToRemove.push(DIRS.core);
@@ -402,37 +401,35 @@ function resetUserData(options) {
   }
 
   ensureDirs();
+  _settingsCache = null;
   return removedCount;
 }
 
 module.exports = {
   PATHS,
   DIRS,
-  PROJECT_ROOT,
   USER_DATA_DIR,
-  IS_PKG,
   ensureDirs,
   readSettings,
   writeSettings,
   readSubscriptionsCache,
-  writeSubscriptionsCache,
   saveSubscriptionCache,
   maskUrl,
   getSubscriptions,
   getSubscriptionsWithCache,
   addSubscription,
   setDefaultSubscription,
-  getSubRawConfigPath,
   saveSubRawConfig,
   readSubRawConfig,
   hasKernel,
   getKernelVersion,
+  clearKernelVersionCache: () => {
+    _kernelVersionCache = undefined;
+  },
   getGitHubMirror,
   setGitHubMirror,
   DEFAULT_GITHUB_MIRROR,
   AVAILABLE_MIRRORS,
-  TUN_CONFIG,
-  BASE_CONFIG,
   parseYamlOrJson,
   buildConfig,
   writeMihomoConfig,

package/src/kernel.js

@@ -31,8 +31,7 @@ function getArch() {
 function findMatchingAsset(assets, platform, arch) {
   const prefix = 'mihomo-' + platform + '-' + arch;
   const matchingAssets = assets.filter(a => {
-    return (a.name.startsWith(prefix) && a.name.endsWith('.gz')) ||
-           (a.name.startsWith(prefix + '-') && a.name.endsWith('.gz'));
+    return (a.name.startsWith(prefix) && a.name.endsWith('.gz')) || (a.name.startsWith(prefix + '-') && a.name.endsWith('.gz'));
   });
 
   if (matchingAssets.length === 0) {
@@ -67,11 +66,12 @@ async function getLatestRelease(repo) {
     throw new Error('无法获取版本信息');
   }
 
-  const stableReleases = releases.filter(r =>
-    !r.prerelease &&
-    !r.tag_name.toLowerCase().includes('alpha') &&
-    !r.tag_name.toLowerCase().includes('beta') &&
-    !r.tag_name.toLowerCase().includes('prerelease')
+  const stableReleases = releases.filter(
+    r =>
+      !r.prerelease &&
+      !r.tag_name.toLowerCase().includes('alpha') &&
+      !r.tag_name.toLowerCase().includes('beta') &&
+      !r.tag_name.toLowerCase().includes('prerelease'),
   );
 
   if (stableReleases.length > 0) {
@@ -194,14 +194,18 @@ async function downloadKernel(progressCallback, mirror) {
       extractedBinary = outputPath;
     }
   } catch (e) {
-    try { fs.unlinkSync(tempPath); } catch {}
+    try {
+      fs.unlinkSync(tempPath);
+    } catch {}
     throw new Error('解压失败: ' + e.message);
   }
 
   const foundBinary = extractedBinary || findBinaryInDir(extractPath);
 
   if (!foundBinary) {
-    try { fs.unlinkSync(tempPath); } catch {}
+    try {
+      fs.unlinkSync(tempPath);
+    } catch {}
     throw new Error('解压后未找到可执行文件');
   }
 
@@ -223,6 +227,9 @@ async function downloadKernel(progressCallback, mirror) {
     fs.unlinkSync(tempPath);
   } catch (e) {}
 
+  // 内核已更新，清除版本缓存
+  config.clearKernelVersionCache();
+
   return {
     version: latest.tag_name,
     path: targetPath,
@@ -230,9 +237,6 @@ async function downloadKernel(progressCallback, mirror) {
 }
 
 module.exports = {
-  getArch,
-  getLatestRelease,
-  findMatchingAsset,
   checkUpdate,
   downloadKernel,
 };

package/src/process.js

@@ -3,6 +3,11 @@ const path = require('path');
 const { spawn, execSync } = require('child_process');
 const config = require('./config');
 
+const _sharedBuf = new Int32Array(new SharedArrayBuffer(4));
+function sleepSync(ms) {
+  Atomics.wait(_sharedBuf, 0, 0, ms);
+}
+
 function clearRuntime() {
   if (fs.existsSync(config.DIRS.runtime)) {
     config.rmrf(config.DIRS.runtime);
@@ -47,7 +52,10 @@ function getAllMihomoPids() {
       encoding: 'utf8',
     }).trim();
     if (!output) return [];
-    return output.split('\n').filter(Boolean).map(p => parseInt(p));
+    return output
+      .split('\n')
+      .filter(Boolean)
+      .map(p => parseInt(p));
   } catch {
     return [];
   }
@@ -208,9 +216,7 @@ function cleanupAll(forceSudo) {
 
   for (let i = 0; i < 50; i++) {
     if (getAllMihomoPids().length === 0) break;
-    try {
-      execSync('sleep 0.1', { stdio: 'ignore' });
-    } catch (e) {}
+    sleepSync(100);
   }
 
   clearPid();
@@ -227,14 +233,25 @@ function createTunLaunchScript() {
   const configFile = config.PATHS.configFile;
   const logFile = config.PATHS.logFile;
   const pidFile = config.PATHS.pidFile;
-  const dataDir = config.PATHS.data;
-
-  const scriptContent = '#!/bin/bash\n' +
-    'BINARY="' + binary + '"\n' +
-    'CONFIG_FILE="' + configFile + '"\n' +
-    'LOG_FILE="' + logFile + '"\n' +
-    'PID_FILE="' + pidFile + '"\n' +
-    'DATA_DIR="' + dataDir + '"\n' +
+  const dataDir = config.DIRS.data;
+
+  const scriptContent =
+    '#!/bin/bash\n' +
+    'BINARY="' +
+    binary +
+    '"\n' +
+    'CONFIG_FILE="' +
+    configFile +
+    '"\n' +
+    'LOG_FILE="' +
+    logFile +
+    '"\n' +
+    'PID_FILE="' +
+    pidFile +
+    '"\n' +
+    'DATA_DIR="' +
+    dataDir +
+    '"\n' +
     '\n' +
     '# 终止旧进程\n' +
     'pkill -9 -f "${BINARY}" 2>/dev/null || true\n' +
@@ -361,10 +378,7 @@ async function startMixedMode(staleState) {
     throw new Error('未找到配置文件，请先添加订阅并启动');
   }
 
-  const args = [
-    '-d', config.PATHS.data,
-    '-f', configFile,
-  ];
+  const args = ['-d', config.DIRS.data, '-f', configFile];
 
   const out = fs.openSync(logFile, 'a');
   const err = fs.openSync(logFile, 'a');
@@ -389,7 +403,12 @@ async function startMixedMode(staleState) {
       try {
         const logs = fs.readFileSync(logFile, 'utf8').slice(-3000);
         if (logs.trim()) {
-          errorMsg += '\n最近的日志:\n' + logs.split('\n').map(l => '  ' + l).join('\n');
+          errorMsg +=
+            '\n最近的日志:\n' +
+            logs
+              .split('\n')
+              .map(l => '  ' + l)
+              .join('\n');
         }
       } catch {}
     }
@@ -427,14 +446,18 @@ async function startTunMode(staleState) {
       timeout: 60000,
     });
   } catch (e) {
-    try { fs.unlinkSync(launchScript); } catch (e2) {}
+    try {
+      fs.unlinkSync(launchScript);
+    } catch (e2) {}
     if (e.status === 1) {
       throw new Error('密码错误或取消');
     }
     throw new Error(e.message);
   }
 
-  try { fs.unlinkSync(launchScript); } catch (e) {}
+  try {
+    fs.unlinkSync(launchScript);
+  } catch (e) {}
 
   await new Promise(resolve => setTimeout(resolve, 500));
 
@@ -446,7 +469,7 @@ async function startTunMode(staleState) {
   return { success: true, pid: finalPid, mode: 'tun' };
 }
 
-function stop(wasTunMode) {
+function stop(forceSudo) {
   const allPids = getAllMihomoPids();
   if (allPids.length === 0) {
     clearPid();
@@ -454,7 +477,7 @@ function stop(wasTunMode) {
     return { success: true, notRunning: true };
   }
 
-  const result = cleanupAll(wasTunMode);
+  const result = cleanupAll(forceSudo);
 
   const remaining = getAllMihomoPids();
   if (remaining.length > 0) {
@@ -490,10 +513,7 @@ function rotateLog() {
     return null;
   }
 
-  const timestamp = new Date().toISOString()
-    .replace(/T/, '_')
-    .replace(/:/g, '-')
-    .replace(/\..+/, '');
+  const timestamp = new Date().toISOString().replace(/T/, '_').replace(/:/g, '-').replace(/\..+/, '');
 
   const rotatedName = `mihomo.${timestamp}.log`;
   const rotatedPath = path.join(config.DIRS.logs, rotatedName);
@@ -616,33 +636,6 @@ function getLogPathByName(name) {
   return null;
 }
 
-function readLog(lines) {
-  if (lines === undefined) lines = 100;
-  if (!fs.existsSync(config.PATHS.logFile)) {
-    return '(暂无日志)';
-  }
-
-  try {
-    const content = fs.readFileSync(config.PATHS.logFile, 'utf8');
-    const allLines = content.split('\n');
-    return allLines.slice(-lines).join('\n');
-  } catch (e) {
-    return '(读取日志失败: ' + e.message + ')';
-  }
-}
-
-function clearLog() {
-  if (fs.existsSync(config.PATHS.logFile)) {
-    try {
-      fs.writeFileSync(config.PATHS.logFile, '');
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-  return true;
-}
-
 function openUrl(url) {
   try {
     spawn('open', [url], { stdio: 'ignore', detached: true });
@@ -653,21 +646,12 @@ function openUrl(url) {
 }
 
 module.exports = {
-  getPid,
-  isRunning,
-  isProcessRunning,
   getAllMihomoPids,
-  isProcessRoot,
-  checkStaleState,
   cleanupAll,
   getStatus,
   start,
   stop,
   getLogPath,
-  readLog,
-  clearLog,
-  rotateLog,
-  cleanupOldLogs,
   listLogs,
   getLogPathByName,
   openUrl,

package/src/subscription.js

@@ -67,6 +67,13 @@ function formatDate(dateOrIso) {
   }
 }
 
+function formatProxySummary(info) {
+  const parts = [];
+  if (info && info.proxyGroups > 0) parts.push(info.proxyGroups + ' 组');
+  parts.push(((info && info.proxies) || 0) + ' 节点');
+  return parts.join(', ');
+}
+
 async function downloadSubscription(url, subName) {
   if (subName === undefined) subName = 'default';
 
@@ -159,7 +166,7 @@ function needsAutoUpdate(sub) {
   if (isNaN(lastUpdate)) return true;
   const intervalHours = sub.update_interval || DEFAULT_UPDATE_INTERVAL_HOURS;
   const intervalMs = intervalHours * 60 * 60 * 1000;
-  return (Date.now() - lastUpdate) > intervalMs;
+  return Date.now() - lastUpdate > intervalMs;
 }
 
 async function tryUpdateOne(sub) {
@@ -193,10 +200,7 @@ async function autoUpdateStaleSubscriptions() {
   results.forEach(r => {
     if (r.success) {
       updatedCount++;
-      const parts = [];
-      if (r.proxyGroups && r.proxyGroups > 0) parts.push(r.proxyGroups + ' 组');
-      parts.push(r.proxies + ' 节点');
-      console.log('✓ ' + r.name + ': 已更新 (' + parts.join(', ') + ')');
+      console.log('✓ ' + r.name + ': 已更新 (' + formatProxySummary(r) + ')');
     } else {
       console.log('✗ ' + r.name + ': 失败 (' + r.error.split('\n')[0] + ')');
     }
@@ -213,11 +217,10 @@ module.exports = {
   DEFAULT_UPDATE_INTERVAL_HOURS,
   downloadSubscription,
   prepareConfigForStart,
-  hasConfig: config.hasConfig,
-  getConfigInfo: config.getConfigInfo,
   formatBytes,
   formatTimestamp,
   formatDate,
+  formatProxySummary,
   tryUpdateOne,
   autoUpdateStaleSubscriptions,
 };