mihomo-cli 1.2.4 → 1.3.0

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "mihomo-cli",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "description": "A terminal-based mihomo (Clash.Meta) client for macOS",
-  "main": "index.js",
   "bin": {
     "mihomo-cli": "index.js",
     "mihomo": "index.js",
@@ -15,7 +14,10 @@
     "CHANGELOG.md"
   ],
   "scripts": {
-    "start": "node index.js"
+    "format": "prettier --write \"**/*.{js,json,md}\"",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "prepare": "husky"
   },
   "keywords": [
     "mihomo",
@@ -26,21 +28,26 @@
     "cli",
     "macos"
   ],
-  "author": "",
+  "author": "Aex",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/adaex/mihomo-cli.git"
+  },
   "engines": {
     "node": ">=18.0.0"
   },
-  "os": [
-    "darwin"
-  ],
-  "cpu": [
-    "x64",
-    "arm64"
-  ],
   "dependencies": {
     "axios": "^1.6.0",
     "compare-versions": "^6.1.0",
     "js-yaml": "^4.1.0"
+  },
+  "devDependencies": {
+    "@eslint/js": "^10.0.1",
+    "eslint": "^10.2.0",
+    "globals": "^17.4.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^16.4.0",
+    "prettier": "^3.0.0"
   }
 }

package/src/config.js

@@ -1,9 +1,15 @@
+// 内置模块
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
-const yaml = require('js-yaml');
 const { execSync } = require('child_process');
 
+// 第三方模块
+const yaml = require('js-yaml');
+
+// 本地模块
+// （无额外本地模块，overwrite.js 在 buildConfig 中延迟加载以避免循环依赖）
+
 const IS_PKG = typeof process.pkg !== 'undefined';
 
 let PROJECT_ROOT;
@@ -75,23 +81,23 @@ function maskUrl(url) {
   }
 }
 
-let _settingsCache = null;
+let settingsCache = null;
 
 function readSettings() {
-  if (_settingsCache !== null) return _settingsCache;
+  if (settingsCache !== null) return settingsCache;
   ensureDirs();
   if (fs.existsSync(PATHS.settingsFile)) {
     try {
       const content = fs.readFileSync(PATHS.settingsFile, 'utf8');
-      _settingsCache = JSON.parse(content);
-      return _settingsCache;
-    } catch (e) {
-      _settingsCache = {};
-      return _settingsCache;
+      settingsCache = JSON.parse(content);
+      return settingsCache;
+    } catch (_e) {
+      settingsCache = {};
+      return settingsCache;
     }
   }
-  _settingsCache = {};
-  return _settingsCache;
+  settingsCache = {};
+  return settingsCache;
 }
 
 function writeSettings(settings) {
@@ -103,7 +109,7 @@ function writeSettings(settings) {
     if (settings[key] === undefined) delete merged[key];
   }
   fs.writeFileSync(PATHS.settingsFile, JSON.stringify(merged, null, 2), { mode: 0o600 });
-  _settingsCache = merged;
+  settingsCache = merged;
   return merged;
 }
 
@@ -150,28 +156,28 @@ function setGitHubMirror(mirror) {
 }
 
 // 订阅缓存读写（动态数据：流量、用户名、更新时间等）
-function readSubscriptionsCache() {
+function readSubscriptionCache() {
   ensureDirs();
   if (fs.existsSync(PATHS.subscriptionsCacheFile)) {
     try {
       const content = fs.readFileSync(PATHS.subscriptionsCacheFile, 'utf8');
       return JSON.parse(content);
-    } catch (e) {
+    } catch (_e) {
       return {};
     }
   }
   return {};
 }
 
-function writeSubscriptionsCache(cache) {
+function writeSubscriptionCache(cache) {
   ensureDirs();
   fs.writeFileSync(PATHS.subscriptionsCacheFile, JSON.stringify(cache, null, 2), { mode: 0o600 });
 }
 
 function saveSubscriptionCache(subName, data) {
-  const cache = readSubscriptionsCache();
+  const cache = readSubscriptionCache();
   cache[subName] = { ...cache[subName], ...data };
-  writeSubscriptionsCache(cache);
+  writeSubscriptionCache(cache);
 }
 
 function getSubscriptions() {
@@ -182,7 +188,7 @@ function getSubscriptions() {
 // 获取合并了缓存数据的订阅列表
 function getSubscriptionsWithCache() {
   const subs = getSubscriptions();
-  const cache = readSubscriptionsCache();
+  const cache = readSubscriptionCache();
   return subs.map(s => ({
     ...s,
     ...(cache[s.name] || {}),
@@ -218,18 +224,18 @@ function setDefaultSubscription(name) {
   return true;
 }
 
-function getSubRawConfigPath(subName) {
+function getSubscriptionRawConfigPath(subName) {
   return path.join(DIRS.subscriptions, subName + '.yaml');
 }
 
-function saveSubRawConfig(subName, content) {
+function saveSubscriptionRawConfig(subName, content) {
   ensureDirs();
-  const filePath = getSubRawConfigPath(subName);
+  const filePath = getSubscriptionRawConfigPath(subName);
   fs.writeFileSync(filePath, content, { mode: 0o600 });
 }
 
-function readSubRawConfig(subName) {
-  const filePath = getSubRawConfigPath(subName);
+function readSubscriptionRawConfig(subName) {
+  const filePath = getSubscriptionRawConfigPath(subName);
   if (!fs.existsSync(filePath)) {
     return null;
   }
@@ -240,28 +246,28 @@ function hasKernel() {
   return fs.existsSync(PATHS.mihomoBinary);
 }
 
-let _kernelVersionCache = undefined;
+let kernelVersionCache = undefined;
 
 function getKernelVersion() {
   if (!hasKernel()) {
-    _kernelVersionCache = undefined;
+    kernelVersionCache = undefined;
     return null;
   }
-  if (_kernelVersionCache !== undefined) return _kernelVersionCache;
+  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]+/);
-      _kernelVersionCache = match ? match[0] : output;
-      return _kernelVersionCache;
+      kernelVersionCache = match ? match[0] : output;
+      return kernelVersionCache;
     }
-    _kernelVersionCache = 'unknown';
-    return _kernelVersionCache;
-  } catch (e) {
-    _kernelVersionCache = 'unknown';
-    return _kernelVersionCache;
+    kernelVersionCache = 'unknown';
+    return kernelVersionCache;
+  } catch (_e) {
+    kernelVersionCache = 'unknown';
+    return kernelVersionCache;
   }
 }
 
@@ -296,10 +302,10 @@ function parseYamlOrJson(content, errorMsg) {
   try {
     const result = yaml.load(content);
     if (result !== undefined) return result;
-  } catch (e) {}
+  } catch (_e) {}
   try {
     return JSON.parse(content);
-  } catch (e2) {
+  } catch (_e2) {
     throw new Error((errorMsg || '内容') + '格式错误，无法解析为 YAML 或 JSON');
   }
 }
@@ -369,7 +375,7 @@ function getConfigInfo() {
       socksPort: cfg['socks-port'] || null,
       tun: cfg.tun ? cfg.tun.enable : false,
     };
-  } catch (e) {
+  } catch (_e) {
     return null;
   }
 }
@@ -401,30 +407,43 @@ function resetUserData(options) {
   }
 
   ensureDirs();
-  _settingsCache = null;
+  settingsCache = null;
   return removedCount;
 }
 
+// 目录目标映射（从 index.js 移入，精确匹配）
+const DIRECTORY_TARGETS = {
+  root: { path: null, label: '根目录' },
+  subs: { path: DIRS.subscriptions, label: '订阅目录' },
+  logs: { path: DIRS.logs, label: '日志目录' },
+  data: { path: DIRS.data, label: 'mihomo 数据目录' },
+  runtime: { path: DIRS.runtime, label: '运行时目录' },
+  overwrites: { path: DIRS.overwrites, label: '覆写目录' },
+  settings: { path: PATHS.settingsFile, label: '设置文件' },
+  kernel: { path: DIRS.core, label: '内核目录' },
+};
+
 module.exports = {
   PATHS,
   DIRS,
   USER_DATA_DIR,
+  DIRECTORY_TARGETS,
   ensureDirs,
   readSettings,
   writeSettings,
-  readSubscriptionsCache,
+  readSubscriptionCache,
   saveSubscriptionCache,
   maskUrl,
   getSubscriptions,
   getSubscriptionsWithCache,
   addSubscription,
   setDefaultSubscription,
-  saveSubRawConfig,
-  readSubRawConfig,
+  saveSubscriptionRawConfig,
+  readSubscriptionRawConfig,
   hasKernel,
   getKernelVersion,
   clearKernelVersionCache: () => {
-    _kernelVersionCache = undefined;
+    kernelVersionCache = undefined;
   },
   getGitHubMirror,
   setGitHubMirror,

package/src/kernel.js

@@ -1,11 +1,26 @@
-const axios = require('axios');
+// 内置模块
 const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
+
+// 第三方模块
 const { compareVersions } = require('compare-versions');
+
+// 本地模块
 const config = require('./config');
+const utils = require('./utils');
 
+// 常量定义
 const GITHUB_REPO = 'MetaCubeX/mihomo';
+const KERNEL_HTTP_TIMEOUT = 120000;
+const KERNEL_MAX_CONTENT_LENGTH = 200 * 1024 * 1024;
+const KERNEL_DOWNLOAD_TIMEOUT = 180000;
+
+// 内核专用 HTTP 客户端（超时和容量较大，适合下载大文件）
+const HTTP_CLIENT = utils.createHttpClient({
+  timeout: KERNEL_HTTP_TIMEOUT,
+  maxContentLength: KERNEL_MAX_CONTENT_LENGTH,
+});
 
 function withMirror(url, overrideMirror) {
   const mirror = overrideMirror !== undefined ? overrideMirror : config.getGitHubMirror();
@@ -15,12 +30,6 @@ function withMirror(url, overrideMirror) {
   return url;
 }
 
-const HTTP_CLIENT = axios.create({
-  timeout: 120000,
-  headers: { 'User-Agent': 'mihomo-cli' },
-  maxContentLength: 200 * 1024 * 1024,
-});
-
 function getArch() {
   const arch = process.arch;
   if (arch === 'arm64') return 'arm64';
@@ -94,7 +103,7 @@ async function checkUpdate() {
   } else {
     try {
       needsUpdate = compareVersions(latestVersion.replace(/^v/, ''), currentVersion.replace(/^v/, '')) > 0;
-    } catch (e) {
+    } catch (_e) {
       needsUpdate = latestVersion !== currentVersion;
     }
   }
@@ -162,7 +171,7 @@ async function downloadKernel(progressCallback, mirror) {
     method: 'get',
     url: downloadUrl,
     responseType: 'stream',
-    timeout: 180000,
+    timeout: KERNEL_DOWNLOAD_TIMEOUT,
   });
 
   const writer = fs.createWriteStream(tempPath);
@@ -225,9 +234,8 @@ async function downloadKernel(progressCallback, mirror) {
 
   try {
     fs.unlinkSync(tempPath);
-  } catch (e) {}
+  } catch (_e) {}
 
-  // 内核已更新，清除版本缓存
   config.clearKernelVersionCache();
 
   return {
@@ -237,6 +245,10 @@ async function downloadKernel(progressCallback, mirror) {
 }
 
 module.exports = {
+  GITHUB_REPO,
+  KERNEL_HTTP_TIMEOUT,
+  KERNEL_MAX_CONTENT_LENGTH,
+  KERNEL_DOWNLOAD_TIMEOUT,
   checkUpdate,
   downloadKernel,
 };

package/src/overwrite.js

@@ -1,6 +1,11 @@
+// 内置模块
 const fs = require('fs');
 const path = require('path');
+
+// 第三方模块
 const yaml = require('js-yaml');
+
+// 本地模块
 const config = require('./config');
 
 /**
@@ -178,7 +183,8 @@ function loadOverwriteFile() {
     return [];
   }
 
-  const files = fs.readdirSync(dir)
+  const files = fs
+    .readdirSync(dir)
     .filter(f => f.endsWith('.yaml') || f.endsWith('.yml'))
     .sort();
 

package/src/process.js

@@ -1,9 +1,25 @@
+// 内置模块
 const fs = require('fs');
 const path = require('path');
 const { spawn, execSync } = require('child_process');
+
+// 第三方模块
+// （无第三方模块依赖）
+
+// 本地模块
 const config = require('./config');
 const utils = require('./utils');
 
+// 进程等待常量
+const PROCESS_WAIT_ATTEMPTS = 50;
+const PROCESS_WAIT_INTERVAL = 100; // ms
+const STARTUP_WAIT_MS = 800; // ms
+const SUDO_TIMEOUT_MS = 60000; // ms
+const TUN_MODE_POST_WAIT_MS = 500; // ms
+
+// 日志清理常量
+const DEFAULT_LOG_RETENTION_DAYS = 7;
+
 function clearRuntime() {
   if (fs.existsSync(config.DIRS.runtime)) {
     config.rmrf(config.DIRS.runtime);
@@ -18,7 +34,7 @@ function getPid() {
   try {
     const pid = parseInt(fs.readFileSync(config.PATHS.pidFile, 'utf8').trim());
     return pid > 0 ? pid : null;
-  } catch (e) {
+  } catch (_e) {
     return null;
   }
 }
@@ -52,7 +68,7 @@ function isPidFileOwnedByRoot() {
   try {
     const stat = fs.statSync(config.PATHS.pidFile);
     return stat.uid === 0;
-  } catch (e) {
+  } catch (_e) {
     return false;
   }
 }
@@ -86,13 +102,13 @@ function clearPid() {
         stdio: 'inherit',
         timeout: 10000,
       });
-    } catch (e) {
+    } catch (_e) {
       // 忽略失败，后续操作可能会检测到问题
     }
   } else {
     try {
       fs.unlinkSync(config.PATHS.pidFile);
-    } catch (e) {
+    } catch (_e) {
       // ignore
     }
   }
@@ -108,11 +124,11 @@ function killProcess(pid, needsSudo) {
           timeout: 10000,
         });
         return true;
-      } catch (e) {
+      } catch (_e) {
         try {
           process.kill(pid, 'SIGKILL');
           return true;
-        } catch (e2) {
+        } catch (_e2) {
           return false;
         }
       }
@@ -120,7 +136,7 @@ function killProcess(pid, needsSudo) {
       process.kill(pid, 'SIGKILL');
       return true;
     }
-  } catch (e) {
+  } catch (_e) {
     return false;
   }
 }
@@ -158,9 +174,7 @@ function cleanupAll(forceSudo) {
   }
 
   const hasRootProcess = pids.some(p => utils.isProcessRoot(p));
-  const hasRootPidFile = isPidFileOwnedByRoot();
   const needsSudo = hasRootProcess;
-  const allowSudo = forceSudo || hasRootProcess || hasRootPidFile;
 
   let killedCount = 0;
   let failedPids = [];
@@ -187,9 +201,10 @@ function cleanupAll(forceSudo) {
     }
   }
 
-  for (let i = 0; i < 50; i++) {
+  // 等待进程终止
+  for (let i = 0; i < PROCESS_WAIT_ATTEMPTS; i++) {
     if (getAllMihomoPids().length === 0) break;
-    utils.sleepSync(100);
+    utils.sleepSync(PROCESS_WAIT_INTERVAL);
   }
 
   clearPid();
@@ -281,7 +296,7 @@ function getProcessInfo(pid) {
       cpu: pcpu ? pcpu.toFixed(1) + '%' : '未知',
       isRoot: utils.isProcessRoot(pid),
     };
-  } catch (e) {
+  } catch (_e) {
     return { pid, memory: '未知', cpu: '未知', isRoot: false };
   }
 }
@@ -367,7 +382,7 @@ async function startMixedMode(staleState) {
   const pid = child.pid;
   savePid(pid);
 
-  await new Promise(resolve => setTimeout(resolve, 800));
+  await new Promise(resolve => setTimeout(resolve, STARTUP_WAIT_MS));
 
   if (!isRunning()) {
     clearPid();
@@ -416,12 +431,12 @@ async function startTunMode(staleState) {
   try {
     execSync('sudo "' + launchScript + '"', {
       stdio: 'inherit',
-      timeout: 60000,
+      timeout: SUDO_TIMEOUT_MS,
     });
   } catch (e) {
     try {
       fs.unlinkSync(launchScript);
-    } catch (e2) {}
+    } catch {}
     if (e.status === 1) {
       throw new Error('密码错误或取消');
     }
@@ -430,9 +445,9 @@ async function startTunMode(staleState) {
 
   try {
     fs.unlinkSync(launchScript);
-  } catch (e) {}
+  } catch (_e) {}
 
-  await new Promise(resolve => setTimeout(resolve, 500));
+  await new Promise(resolve => setTimeout(resolve, TUN_MODE_POST_WAIT_MS));
 
   const finalPid = getPid();
   if (!finalPid) {
@@ -468,7 +483,7 @@ function stop(forceSudo) {
 
 function rotateAndCleanupLogs() {
   rotateLog();
-  cleanupOldLogs(7);
+  cleanupOldLogs(DEFAULT_LOG_RETENTION_DAYS);
 }
 
 function getLogPath() {
@@ -496,7 +511,7 @@ function rotateLog() {
 }
 
 function cleanupOldLogs(maxAgeDays) {
-  if (maxAgeDays === undefined) maxAgeDays = 7;
+  if (maxAgeDays === undefined) maxAgeDays = DEFAULT_LOG_RETENTION_DAYS;
   const logsDir = config.DIRS.logs;
 
   if (!fs.existsSync(logsDir)) {
@@ -524,7 +539,7 @@ function cleanupOldLogs(maxAgeDays) {
         fs.unlinkSync(filePath);
         deleted++;
       }
-    } catch (e) {
+    } catch (_e) {
       errors++;
     }
   }
@@ -570,7 +585,7 @@ function listLogs() {
         mtime: stat.mtime,
         isCurrent: false,
       });
-    } catch (e) {
+    } catch (_e) {
       // ignore
     }
   }
@@ -588,7 +603,6 @@ function isPathUnderDir(filePath, baseDir) {
 function getLogPathByName(name) {
   const logsDir = config.DIRS.logs;
 
-  // 处理部分匹配（用户只输入时间戳部分）
   let targetName = name;
   if (!name.endsWith('.log')) {
     targetName = 'mihomo.' + name + '.log';
@@ -602,7 +616,6 @@ function getLogPathByName(name) {
     return filePath;
   }
 
-  // 尝试模糊匹配（readdirSync 返回的文件名已是安全的，但为了一致性仍校验）
   if (fs.existsSync(logsDir)) {
     const files = fs.readdirSync(logsDir);
     for (const file of files) {
@@ -622,12 +635,60 @@ function openUrl(url) {
   try {
     spawn('open', [url], { stdio: 'ignore', detached: true });
     return true;
-  } catch (e) {
+  } catch (_e) {
     return false;
   }
 }
 
+/**
+ * 打开日志文件（从 index.js 移入）
+ */
+function openLogFile(logPath, label) {
+  const displayLabel = label || logPath;
+  console.log('用系统默认程序打开: ' + displayLabel);
+  const success = openUrl(logPath);
+  if (!success) {
+    console.log('请手动打开: ' + logPath);
+  }
+}
+
+/**
+ * 用 tail 查看日志（从 index.js 移入）
+ */
+function viewLogWithTail(logPath, options) {
+  const follow = options && options.follow;
+  const lines = (options && options.lines) || 100;
+
+  console.log('日志: ' + logPath);
+  if (follow) {
+    console.log('按 Ctrl+C 退出\n');
+  } else {
+    console.log('显示最后 ' + lines + ' 行\n');
+  }
+
+  const tailArgs = [];
+  if (follow) tailArgs.push('-f');
+  tailArgs.push('-n', lines.toString());
+  tailArgs.push(logPath);
+
+  const tail = spawn('tail', tailArgs, { stdio: 'inherit' });
+
+  tail.on('close', () => process.exit(0));
+  tail.on('error', e => {
+    console.error('无法读取日志: ' + e.message);
+    process.exit(1);
+  });
+}
+
 module.exports = {
+  // 常量
+  PROCESS_WAIT_ATTEMPTS,
+  PROCESS_WAIT_INTERVAL,
+  STARTUP_WAIT_MS,
+  SUDO_TIMEOUT_MS,
+  TUN_MODE_POST_WAIT_MS,
+  DEFAULT_LOG_RETENTION_DAYS,
+  // 函数
   getAllMihomoPids,
   cleanupAll,
   getStatus,
@@ -637,4 +698,6 @@ module.exports = {
   listLogs,
   getLogPathByName,
   openUrl,
+  openLogFile,
+  viewLogWithTail,
 };