mihomo-cli 1.2.2 → 1.2.4

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;
   }
 }
 
@@ -310,7 +315,7 @@ function buildConfig(subRawContent, mode) {
   const overwrite = require('./overwrite');
 
   // 应用覆写配置
-  const withOverwrites = overwrite.applyOverwrites(baseConfig);
+  const withOverwrites = overwrite.applyOverwrite(baseConfig);
 
   // 合并 BASE_CONFIG（优先级高于覆写）
   const merged = { ...withOverwrites, ...BASE_CONFIG };
@@ -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/overwrite.js

@@ -171,7 +171,7 @@ function setOverwriteEnabled(enabled) {
  * 读取 overwrites 目录下的所有 yaml 文件
  * 按文件名排序返回
  */
-function loadOverwriteFiles() {
+function loadOverwriteFile() {
   const dir = getOverwritesDir();
 
   if (!fs.existsSync(dir)) {
@@ -197,7 +197,7 @@ function loadOverwriteFiles() {
         });
       }
     } catch (e) {
-      // 忽略解析错误的文件
+      console.warn('警告: 覆写文件 "' + file + '" 解析失败: ' + e.message);
     }
   }
 
@@ -207,12 +207,12 @@ function loadOverwriteFiles() {
 /**
  * 应用所有覆写配置到基础配置
  */
-function applyOverwrites(baseConfig) {
+function applyOverwrite(baseConfig) {
   if (!isOverwriteEnabled()) {
     return baseConfig;
   }
 
-  const overwriteFiles = loadOverwriteFiles();
+  const overwriteFiles = loadOverwriteFile();
 
   if (overwriteFiles.length === 0) {
     return baseConfig;
@@ -230,8 +230,8 @@ function applyOverwrites(baseConfig) {
 /**
  * 列出覆写文件信息
  */
-function listOverwriteFiles() {
-  const files = loadOverwriteFiles();
+function listOverwriteFile() {
+  const files = loadOverwriteFile();
   const enabled = isOverwriteEnabled();
   const dir = getOverwritesDir();
 
@@ -249,6 +249,6 @@ function listOverwriteFiles() {
 module.exports = {
   isOverwriteEnabled,
   setOverwriteEnabled,
-  applyOverwrites,
-  listOverwriteFiles,
+  applyOverwrite,
+  listOverwriteFile,
 };

package/src/process.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const { spawn, execSync } = require('child_process');
 const config = require('./config');
+const utils = require('./utils');
 
 function clearRuntime() {
   if (fs.existsSync(config.DIRS.runtime)) {
@@ -22,21 +23,9 @@ function getPid() {
   }
 }
 
-function isProcessRunning(pid) {
-  if (!pid) return false;
-  try {
-    const output = execSync('ps -p ' + pid + ' -o pid= 2>/dev/null || true', {
-      encoding: 'utf8',
-    }).trim();
-    return output.length > 0;
-  } catch (e) {
-    return false;
-  }
-}
-
 function isRunning() {
   const pid = getPid();
-  return pid ? isProcessRunning(pid) : false;
+  return pid ? utils.isProcessRunning(pid) : false;
 }
 
 function getAllMihomoPids() {
@@ -47,23 +36,15 @@ 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 [];
   }
 }
 
-function isProcessRoot(pid) {
-  try {
-    const uidOutput = execSync('ps -p ' + pid + ' -o uid= 2>/dev/null || true', {
-      encoding: 'utf8',
-    }).trim();
-    return uidOutput === '0';
-  } catch (e) {
-    return false;
-  }
-}
-
 function isPidFileOwnedByRoot() {
   if (!fs.existsSync(config.PATHS.pidFile)) {
     return false;
@@ -78,7 +59,7 @@ function isPidFileOwnedByRoot() {
 
 function checkStaleState() {
   const allPids = getAllMihomoPids();
-  const hasRootProcess = allPids.some(p => isProcessRoot(p));
+  const hasRootProcess = allPids.some(p => utils.isProcessRoot(p));
   const hasRootPidFile = isPidFileOwnedByRoot();
 
   return {
@@ -176,7 +157,7 @@ function cleanupAll(forceSudo) {
     return { killed: 0, failed: 0, remaining: [] };
   }
 
-  const hasRootProcess = pids.some(p => isProcessRoot(p));
+  const hasRootProcess = pids.some(p => utils.isProcessRoot(p));
   const hasRootPidFile = isPidFileOwnedByRoot();
   const needsSudo = hasRootProcess;
   const allowSudo = forceSudo || hasRootProcess || hasRootPidFile;
@@ -208,9 +189,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) {}
+    utils.sleepSync(100);
   }
 
   clearPid();
@@ -227,14 +206,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' +
@@ -289,7 +279,7 @@ function getProcessInfo(pid) {
       pid,
       memory: rss ? (rss / 1024).toFixed(1) + ' MB' : '未知',
       cpu: pcpu ? pcpu.toFixed(1) + '%' : '未知',
-      isRoot: isProcessRoot(pid),
+      isRoot: utils.isProcessRoot(pid),
     };
   } catch (e) {
     return { pid, memory: '未知', cpu: '未知', isRoot: false };
@@ -361,10 +351,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 +376,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 +419,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 +442,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 +450,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 +486,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);
@@ -586,6 +579,12 @@ function listLogs() {
   return result;
 }
 
+function isPathUnderDir(filePath, baseDir) {
+  const resolvedPath = path.resolve(filePath);
+  const resolvedBase = path.resolve(baseDir);
+  return resolvedPath === resolvedBase || resolvedPath.startsWith(resolvedBase + path.sep);
+}
+
 function getLogPathByName(name) {
   const logsDir = config.DIRS.logs;
 
@@ -599,16 +598,19 @@ function getLogPathByName(name) {
   }
 
   const filePath = path.join(logsDir, targetName);
-  if (fs.existsSync(filePath)) {
+  if (fs.existsSync(filePath) && isPathUnderDir(filePath, logsDir)) {
     return filePath;
   }
 
-  // 尝试模糊匹配
+  // 尝试模糊匹配（readdirSync 返回的文件名已是安全的，但为了一致性仍校验）
   if (fs.existsSync(logsDir)) {
     const files = fs.readdirSync(logsDir);
     for (const file of files) {
       if (file.includes(name)) {
-        return path.join(logsDir, file);
+        const candidatePath = path.join(logsDir, file);
+        if (isPathUnderDir(candidatePath, logsDir)) {
+          return candidatePath;
+        }
       }
     }
   }
@@ -616,33 +618,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 +628,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

@@ -1,5 +1,4 @@
 const axios = require('axios');
-const yaml = require('js-yaml');
 const config = require('./config');
 
 const DEFAULT_UPDATE_INTERVAL_HOURS = 12;
@@ -38,33 +37,11 @@ function parseUsernameFromContentDisposition(header) {
   return parts[parts.length - 1] || null;
 }
 
-function formatBytes(bytes) {
-  if (bytes === undefined || bytes === null) return '未知';
-  if (bytes === 0) return '0 B';
-  const k = 1024;
-  const sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
-  const i = Math.floor(Math.log(bytes) / Math.log(k));
-  return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
-}
-
-function formatTimestamp(ts) {
-  if (!ts) return '未知';
-  try {
-    return new Date(ts * 1000).toLocaleString('zh-CN');
-  } catch {
-    return '未知';
-  }
-}
-
-function formatDate(dateOrIso) {
-  if (!dateOrIso) return '未知';
-  try {
-    const d = dateOrIso instanceof Date ? dateOrIso : new Date(dateOrIso);
-    if (isNaN(d.getTime())) return '未知';
-    return d.toLocaleString('zh-CN');
-  } catch {
-    return '未知';
-  }
+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) {
@@ -159,7 +136,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) {
@@ -171,7 +148,7 @@ async function tryUpdateOne(sub) {
   }
 }
 
-async function autoUpdateStaleSubscriptions() {
+async function autoUpdateStaleSubscription() {
   const allSubs = config.getSubscriptionsWithCache();
   const staleSubs = allSubs.filter(needsAutoUpdate);
 
@@ -193,10 +170,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 +187,7 @@ module.exports = {
   DEFAULT_UPDATE_INTERVAL_HOURS,
   downloadSubscription,
   prepareConfigForStart,
-  hasConfig: config.hasConfig,
-  getConfigInfo: config.getConfigInfo,
-  formatBytes,
-  formatTimestamp,
-  formatDate,
+  formatProxySummary,
   tryUpdateOne,
-  autoUpdateStaleSubscriptions,
+  autoUpdateStaleSubscription,
 };