mihomo-cli 1.2.2 → 1.2.4

package/index.js

@@ -8,6 +8,7 @@ const kernel = require('./src/kernel');
 const subscription = require('./src/subscription');
 const processMgr = require('./src/process');
 const overwrite = require('./src/overwrite');
+const utils = require('./src/utils');
 
 const VERSION = require('./package.json').version;
 
@@ -33,7 +34,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 +42,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,9 +126,9 @@ 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 owFiles = overwrite.listOverwriteFile().files;
   const activeSub = getActiveSubscription();
 
   console.log('');
@@ -160,12 +160,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 +208,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);
@@ -227,32 +222,6 @@ function pickSingleSubscription(subs, pattern, actionName) {
   process.exit(1);
 }
 
-function hasFlag(args, short, long) {
-  return args && (args.includes(short) || args.includes(long));
-}
-
-function parseIntArg(args, short, long, defaultValue) {
-  if (!args) return defaultValue;
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === short || args[i] === long) {
-      if (i + 1 < args.length) {
-        const val = parseInt(args[i + 1]);
-        return isNaN(val) ? defaultValue : val;
-      }
-    }
-  }
-  return defaultValue;
-}
-
-function getNonFlagArg(args, startIdx) {
-  if (!args) return null;
-  for (let i = startIdx; i < args.length; i++) {
-    if (!args[i].startsWith('-')) {
-      return args[i];
-    }
-  }
-  return null;
-}
 
 function openLogFile(logPath, label) {
   const displayLabel = label || logPath;
@@ -291,7 +260,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);
   });
@@ -311,7 +280,7 @@ async function cmdStart(args) {
     process.exit(1);
   }
 
-  await subscription.autoUpdateStaleSubscriptions();
+  await subscription.autoUpdateStaleSubscription();
 
   // 每次 start 都先确保完全干净的状态（停止进程 + 清理运行时文件）
   const status = processMgr.getStatus();
@@ -344,10 +313,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 +343,7 @@ async function cmdStop() {
   console.log('已停止');
 }
 
-function cmdUi(args) {
+function cmdUI(args) {
   const uiName = args[1] || 'zash';
   const url = UI_URLS[uiName];
 
@@ -396,11 +362,10 @@ function cmdUi(args) {
   }
 }
 
-
 function cmdLog(args) {
   const logPath = processMgr.getLogPath();
 
-  if (hasFlag(args, '-o', '--open')) {
+  if (utils.hasFlag(args, '-o', '--open')) {
     openLogFile(logPath);
     return;
   }
@@ -409,9 +374,9 @@ function cmdLog(args) {
 }
 
 function cmdLogs(args) {
-  const targetName = getNonFlagArg(args, 1);
-  const lines = parseIntArg(args, '-n', '--lines', 100);
-  const openInViewer = hasFlag(args, '-o', '--open');
+  const targetName = utils.getNonFlagArg(args, 1);
+  const lines = utils.parseIntArg(args, '-n', '--lines', 100);
+  const openInViewer = utils.hasFlag(args, '-o', '--open');
 
   if (targetName) {
     let logPath;
@@ -419,7 +384,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,25 +432,32 @@ function cmdLogs(args) {
   console.log('日志列表:');
   console.log('');
 
-  all.forEach((log, idx) => {
-    const num = log.isCurrent ? ' 0' : (idx < 10 ? ' ' + idx : '' + idx);
-    const time = subscription.formatDate(log.mtime);
-    const size = subscription.formatBytes(log.size);
+  let archiveCounter = 0;
+  all.forEach(log => {
+    let num;
+    if (log.isCurrent) {
+      num = ' 0';
+    } else {
+      archiveCounter++;
+      num = archiveCounter < 10 ? ' ' + archiveCounter : '' + archiveCounter;
+    }
+    const time = utils.formatDate(log.mtime);
+    const size = utils.formatBytes(log.size);
     const name = log.isCurrent ? 'mihomo.log (当前运行中)' : log.name;
 
     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 +527,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 +550,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);
@@ -579,7 +561,7 @@ async function cmdKernel(args) {
 }
 
 async function printSubscriptionList() {
-  const updateResult = await subscription.autoUpdateStaleSubscriptions();
+  const updateResult = await subscription.autoUpdateStaleSubscription();
   if (updateResult.total > 0) {
     console.log('');
   }
@@ -594,7 +576,7 @@ async function printSubscriptionList() {
   }
   console.log('订阅列表:');
   subs.forEach((s, i) => {
-    const time = subscription.formatDate(s.updated_at);
+    const time = utils.formatDate(s.updated_at);
     const defaultMark = i === 0 ? ' [默认]' : '';
     const interval = s.update_interval || subscription.DEFAULT_UPDATE_INTERVAL_HOURS;
     console.log('  ' + (i + 1) + '. ' + s.name + defaultMark);
@@ -605,8 +587,8 @@ async function printSubscriptionList() {
     }
     if (s.download !== undefined || s.total !== undefined) {
       const used = (s.upload || 0) + (s.download || 0);
-      const usedStr = subscription.formatBytes(used);
-      const totalStr = subscription.formatBytes(s.total);
+      const usedStr = utils.formatBytes(used);
+      const totalStr = utils.formatBytes(s.total);
       let percentStr = '';
       if (s.total && s.total > 0) {
         const percent = Math.min((used / s.total) * 100, 100);
@@ -615,7 +597,7 @@ async function printSubscriptionList() {
       console.log('    流量: ' + usedStr + ' / ' + totalStr + percentStr);
     }
     if (s.expire !== undefined) {
-      console.log('    到期: ' + subscription.formatTimestamp(s.expire));
+      console.log('    到期: ' + utils.formatTimestamp(s.expire));
     }
     if (s.web_page_url) {
       console.log('    页面: ' + s.web_page_url);
@@ -625,6 +607,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 +632,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 +658,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 +670,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 +699,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 +749,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 +807,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);
       });
@@ -854,7 +828,7 @@ async function cmdReset(args) {
 }
 
 function printOverwriteList() {
-  const info = overwrite.listOverwriteFiles();
+  const info = overwrite.listOverwriteFile();
   console.log('状态: ' + (info.enabled ? '已启用' : '已禁用'));
   console.log('目录: ' + info.dir);
   console.log('');
@@ -943,14 +917,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 +1029,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.4",
   "description": "A terminal-based mihomo (Clash.Meta) client for macOS",
   "main": "index.js",
   "bin": {