mihomo-cli 1.0.2 → 1.1.0

package/package.json

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

package/src/config.js

@@ -25,10 +25,11 @@ const USER_DATA_DIR = getUserDataDir();
 const DIRS = {
   root: PROJECT_ROOT,
   core: path.join(USER_DATA_DIR, 'core'),
-  subs: path.join(USER_DATA_DIR, 'subs'),
+  subscriptions: path.join(USER_DATA_DIR, 'subscriptions'),
   logs: path.join(USER_DATA_DIR, 'logs'),
   data: path.join(USER_DATA_DIR, 'data'),
   runtime: path.join(USER_DATA_DIR, '.runtime'),
+  overwrites: path.join(USER_DATA_DIR, 'overwrites'),
 };
 
 const PATHS = {
@@ -37,7 +38,7 @@ const PATHS = {
   userDataDir: USER_DATA_DIR,
   mihomoBinary: path.join(DIRS.core, 'mihomo'),
   settingsFile: path.join(USER_DATA_DIR, 'settings.json'),
-  subsCacheFile: path.join(USER_DATA_DIR, 'subs-cache.json'),
+  subscriptionsCacheFile: path.join(DIRS.subscriptions, 'cache.json'),
   configFile: path.join(DIRS.runtime, 'config.yaml'),
   logFile: path.join(DIRS.logs, 'mihomo.log'),
   pidFile: path.join(DIRS.runtime, 'pid'),
@@ -110,10 +111,10 @@ const AVAILABLE_MIRRORS = [
 function getGitHubMirror() {
   const settings = readSettings();
   // 空字符串或 false 表示禁用镜像
-  if (settings.githubMirror === '' || settings.githubMirror === false) {
+  if (settings.github_mirror === '' || settings.github_mirror === false) {
     return null;
   }
-  return settings.githubMirror || DEFAULT_GITHUB_MIRROR;
+  return settings.github_mirror || DEFAULT_GITHUB_MIRROR;
 }
 
 function setGitHubMirror(mirror) {
@@ -125,13 +126,13 @@ function setGitHubMirror(mirror) {
 
   if (mirror === null || mirror === undefined) {
     const settings = readSettings();
-    delete settings.githubMirror;
+    delete settings.github_mirror;
     writeSettings(settings);
     return DEFAULT_GITHUB_MIRROR;
   }
 
   if (mirror === '' || mirror === false) {
-    writeSettings({ githubMirror: '' });
+    writeSettings({ github_mirror: '' });
     return null;
   }
 
@@ -143,16 +144,16 @@ function setGitHubMirror(mirror) {
     mirrorUrl += '/';
   }
 
-  writeSettings({ githubMirror: mirrorUrl });
+  writeSettings({ github_mirror: mirrorUrl });
   return mirrorUrl;
 }
 
-// 订阅缓存读写（动态数据：流量、用户名等）
-function readSubsCache() {
+// 订阅缓存读写（动态数据：流量、用户名、更新时间等）
+function readSubscriptionsCache() {
   ensureDirs();
-  if (fs.existsSync(PATHS.subsCacheFile)) {
+  if (fs.existsSync(PATHS.subscriptionsCacheFile)) {
     try {
-      const content = fs.readFileSync(PATHS.subsCacheFile, 'utf8');
+      const content = fs.readFileSync(PATHS.subscriptionsCacheFile, 'utf8');
       return JSON.parse(content);
     } catch (e) {
       return {};
@@ -161,15 +162,15 @@ function readSubsCache() {
   return {};
 }
 
-function writeSubsCache(cache) {
+function writeSubscriptionsCache(cache) {
   ensureDirs();
-  fs.writeFileSync(PATHS.subsCacheFile, JSON.stringify(cache, null, 2), { mode: 0o600 });
+  fs.writeFileSync(PATHS.subscriptionsCacheFile, JSON.stringify(cache, null, 2), { mode: 0o600 });
 }
 
-function saveSubCache(subName, data) {
-  const cache = readSubsCache();
+function saveSubscriptionCache(subName, data) {
+  const cache = readSubscriptionsCache();
   cache[subName] = { ...cache[subName], ...data };
-  writeSubsCache(cache);
+  writeSubscriptionsCache(cache);
 }
 
 function getSubscriptions() {
@@ -180,7 +181,7 @@ function getSubscriptions() {
 // 获取合并了缓存数据的订阅列表
 function getSubscriptionsWithCache() {
   const subs = getSubscriptions();
-  const cache = readSubsCache();
+  const cache = readSubscriptionsCache();
   return subs.map(s => ({
     ...s,
     ...(cache[s.name] || {}),
@@ -193,9 +194,9 @@ function addSubscription(url, name) {
   const subs = settings.subscriptions || [];
   const existingIndex = subs.findIndex(s => s.name === name);
   if (existingIndex >= 0) {
-    subs[existingIndex] = { name, url, updatedAt: new Date().toISOString() };
+    subs[existingIndex] = { name, url };
   } else {
-    subs.push({ name, url, updatedAt: null });
+    subs.push({ name, url });
   }
   writeSettings({ subscriptions: subs });
 }
@@ -217,7 +218,7 @@ function setDefaultSubscription(name) {
 }
 
 function getSubRawConfigPath(subName) {
-  return path.join(DIRS.subs, subName + '.yaml');
+  return path.join(DIRS.subscriptions, subName + '.yaml');
 }
 
 function saveSubRawConfig(subName, content) {
@@ -305,7 +306,14 @@ function buildConfig(subRawContent, mode) {
     throw new Error('订阅内容为空');
   }
 
-  const merged = { ...baseConfig, ...BASE_CONFIG };
+  // 延迟加载以避免循环依赖
+  const overwrite = require('./overwrite');
+
+  // 应用覆写配置
+  const withOverwrites = overwrite.applyOverwrites(baseConfig);
+
+  // 合并 BASE_CONFIG（优先级高于覆写）
+  const merged = { ...withOverwrites, ...BASE_CONFIG };
 
   if (mode === 'tun') {
     // 合并 TUN 配置
@@ -351,7 +359,9 @@ function getConfigInfo() {
       proxies: cfg.proxies ? cfg.proxies.length : 0,
       proxyGroups: cfg['proxy-groups'] ? cfg['proxy-groups'].length : 0,
       mode: cfg.mode || 'rule',
-      port: cfg.port || cfg['mixed-port'] || '未知',
+      mixedPort: cfg['mixed-port'] || null,
+      httpPort: cfg.port || null,
+      socksPort: cfg['socks-port'] || null,
       tun: cfg.tun ? cfg.tun.enable : false,
     };
   } catch (e) {
@@ -369,7 +379,7 @@ function resetUserData(options) {
 
   const itemsToRemove = [
     PATHS.settingsFile,
-    DIRS.subs,
+    DIRS.subscriptions,
     DIRS.logs,
     DIRS.data,
     DIRS.runtime,
@@ -404,9 +414,9 @@ module.exports = {
   ensureDirs,
   readSettings,
   writeSettings,
-  readSubsCache,
-  writeSubsCache,
-  saveSubCache,
+  readSubscriptionsCache,
+  writeSubscriptionsCache,
+  saveSubscriptionCache,
   maskUrl,
   getSubscriptions,
   getSubscriptionsWithCache,

package/src/overwrite.js

@@ -0,0 +1,258 @@
+const fs = require('fs');
+const path = require('path');
+const yaml = require('js-yaml');
+const config = require('./config');
+
+/**
+ * 解析覆写键名
+ * 支持的格式：
+ * - key!           → 强制覆盖整个对象
+ * - +key           → 数组前置插入
+ * - key+           → 数组追加
+ * - <+key>         → 实际键名是 +key（当键名以 + 开头/结尾时）
+ * - +<+key>        → 为键名 +key 执行前置插入
+ * - <+key>+        → 为键名 +key 执行追加
+ *
+ * 返回: { key: string, forceOverwrite: boolean, arrayPrepend: boolean, arrayAppend: boolean }
+ */
+function parseOverrideKey(key) {
+  let actualKey = key;
+  let forceOverwrite = false;
+  let arrayPrepend = false;
+  let arrayAppend = false;
+
+  // 1. 检查强制覆盖标记 (! 后缀，不在 <> 内时)
+  // 只有当 ! 是最后一个字符，且前面没有未闭合的 < 时才是标记
+  const lastChar = key[key.length - 1];
+  const openAngleCount = (key.match(/</g) || []).length;
+  const closeAngleCount = (key.match(/>/g) || []).length;
+
+  if (lastChar === '!' && openAngleCount === closeAngleCount) {
+    forceOverwrite = true;
+    actualKey = key.slice(0, -1);
+  }
+
+  // 2. 解析 <> 包裹的键名和 + 操作符
+  // 支持的模式：
+  // +<key>   → prepend, key
+  // <key>+   → append, key
+  // <+key>   → 无操作, 实际键名是 +key
+  // +<+key>  → prepend, 实际键名是 +key
+  // <+key>+  → append, 实际键名是 +key
+
+  const wrappedMatch = actualKey.match(/^(\+)?(<[^>]+>)(\+)?$/);
+  if (wrappedMatch) {
+    const prefixPlus = wrappedMatch[1] === '+';
+    const wrappedPart = wrappedMatch[2];
+    const suffixPlus = wrappedMatch[3] === '+';
+
+    // 提取 <> 内的内容作为实际键名
+    const unwrapped = wrappedPart.slice(1, -1);
+
+    if (prefixPlus || suffixPlus) {
+      // 有 + 操作符，<> 内是实际键名
+      actualKey = unwrapped;
+      if (prefixPlus) arrayPrepend = true;
+      if (suffixPlus) arrayAppend = true;
+    } else {
+      // 没有 + 操作符，<key> 形式本身就是为了表示键名含特殊字符
+      // 这种情况下不需要额外处理，actualKey 已经是 wrappedPart，但我们需要 unwrap
+      // 例如：<+.google.cn> 的实际键名就是 +.google.cn
+      actualKey = unwrapped;
+    }
+  } else {
+    // 没有被 <> 完整包裹，检查开头和结尾的 +
+    if (actualKey.startsWith('+')) {
+      arrayPrepend = true;
+      actualKey = actualKey.slice(1);
+    }
+    if (actualKey.endsWith('+')) {
+      arrayAppend = true;
+      actualKey = actualKey.slice(0, -1);
+    }
+  }
+
+  return { key: actualKey, forceOverwrite, arrayPrepend, arrayAppend };
+}
+
+/**
+ * 深度合并带覆写规则
+ */
+function deepMergeWithOverrides(target, override) {
+  if (target === null || target === undefined) {
+    target = Array.isArray(override) ? [] : {};
+  }
+
+  if (override === null || override === undefined) {
+    return target;
+  }
+
+  // 如果 override 不是对象，直接返回 override（覆盖）
+  if (typeof override !== 'object') {
+    return override;
+  }
+
+  // 如果 override 是数组，target 也必须是数组
+  if (Array.isArray(override)) {
+    return override;
+  }
+
+  // 此时 override 是普通对象
+
+  const result = { ...target };
+
+  for (const [rawKey, value] of Object.entries(override)) {
+    const { key, forceOverwrite, arrayPrepend, arrayAppend } = parseOverrideKey(rawKey);
+
+    const existingValue = result[key];
+
+    // 处理数组操作
+    if (arrayPrepend || arrayAppend) {
+      const existingArr = Array.isArray(existingValue) ? existingValue : [];
+      const overrideArr = Array.isArray(value) ? value : [value];
+
+      if (arrayPrepend) {
+        result[key] = [...overrideArr, ...existingArr];
+      } else {
+        result[key] = [...existingArr, ...overrideArr];
+      }
+      continue;
+    }
+
+    // 处理强制覆盖
+    if (forceOverwrite) {
+      result[key] = value;
+      continue;
+    }
+
+    // 递归合并对象
+    if (
+      value !== null &&
+      typeof value === 'object' &&
+      !Array.isArray(value) &&
+      existingValue !== null &&
+      typeof existingValue === 'object' &&
+      !Array.isArray(existingValue)
+    ) {
+      result[key] = deepMergeWithOverrides(existingValue, value);
+      continue;
+    }
+
+    // 其他情况直接覆盖
+    result[key] = value;
+  }
+
+  return result;
+}
+
+/**
+ * 获取覆写目录路径
+ */
+function getOverwritesDir() {
+  return config.DIRS.overwrites;
+}
+
+/**
+ * 检查覆写功能是否启用
+ */
+function isOverwriteEnabled() {
+  const settings = config.readSettings();
+  return settings.overwrite_enabled !== false; // 默认启用
+}
+
+/**
+ * 启用/禁用覆写功能
+ */
+function setOverwriteEnabled(enabled) {
+  config.writeSettings({ overwrite_enabled: enabled });
+}
+
+/**
+ * 读取 overwrites 目录下的所有 yaml 文件
+ * 按文件名排序返回
+ */
+function loadOverwriteFiles() {
+  const dir = getOverwritesDir();
+
+  if (!fs.existsSync(dir)) {
+    return [];
+  }
+
+  const files = fs.readdirSync(dir)
+    .filter(f => f.endsWith('.yaml') || f.endsWith('.yml'))
+    .sort();
+
+  const results = [];
+
+  for (const file of files) {
+    const filePath = path.join(dir, file);
+    try {
+      const content = fs.readFileSync(filePath, 'utf8');
+      const parsed = yaml.load(content);
+      if (parsed && typeof parsed === 'object') {
+        results.push({
+          name: file,
+          path: filePath,
+          config: parsed,
+        });
+      }
+    } catch (e) {
+      // 忽略解析错误的文件
+    }
+  }
+
+  return results;
+}
+
+/**
+ * 应用所有覆写配置到基础配置
+ */
+function applyOverwrites(baseConfig) {
+  if (!isOverwriteEnabled()) {
+    return baseConfig;
+  }
+
+  const overwriteFiles = loadOverwriteFiles();
+
+  if (overwriteFiles.length === 0) {
+    return baseConfig;
+  }
+
+  let result = { ...baseConfig };
+
+  for (const file of overwriteFiles) {
+    result = deepMergeWithOverrides(result, file.config);
+  }
+
+  return result;
+}
+
+/**
+ * 列出覆写文件信息
+ */
+function listOverwriteFiles() {
+  const files = loadOverwriteFiles();
+  const enabled = isOverwriteEnabled();
+  const dir = getOverwritesDir();
+
+  return {
+    enabled,
+    dir,
+    files: files.map(f => ({
+      name: f.name,
+      path: f.path,
+      keys: Object.keys(f.config || {}),
+    })),
+  };
+}
+
+module.exports = {
+  parseOverrideKey,
+  deepMergeWithOverrides,
+  getOverwritesDir,
+  isOverwriteEnabled,
+  setOverwriteEnabled,
+  loadOverwriteFiles,
+  applyOverwrites,
+  listOverwriteFiles,
+};

package/src/process.js

@@ -329,15 +329,15 @@ async function start(mode) {
 async function startMixedMode(staleState) {
   if (staleState.needsCleanup) {
     if (staleState.needsSudo) {
-      console.log('\n  发现需要 root 权限清理的残留进程/文件');
-      console.log('  请先手动清理: sudo pkill -9 mihomo');
-      console.log('  或者切换到 TUN 模式，启动时会自动清理');
+      console.log('\n发现需要 root 权限清理的残留进程/文件');
+      console.log('请先手动清理: sudo pkill -9 mihomo');
+      console.log('或者切换到 TUN 模式，启动时会自动清理');
       throw new Error('存在需要 root 权限清理的残留');
     }
 
     const cleanupResult = cleanupAll();
     if (cleanupResult.killed > 0) {
-      console.log('  清理了 ' + cleanupResult.killed + ' 个残留进程');
+      console.log('清理了 ' + cleanupResult.killed + ' 个残留进程');
     }
   }
 
@@ -389,7 +389,7 @@ 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 {}
     }
@@ -417,9 +417,9 @@ async function startTunMode(staleState) {
   const launchScript = createTunLaunchScript();
 
   if (staleState.needsCleanup) {
-    console.log('  清理 ' + staleState.allPids.length + ' 个残留进程...');
+    console.log('清理 ' + staleState.allPids.length + ' 个残留进程...');
   }
-  console.log('  TUN 模式需要 sudo 权限...');
+  console.log('TUN 模式需要 sudo 权限...');
 
   try {
     execSync('sudo "' + launchScript + '"', {
@@ -459,9 +459,9 @@ function stop(wasTunMode) {
   const remaining = getAllMihomoPids();
   if (remaining.length > 0) {
     console.log('');
-    console.log('  仍有进程残留，需要手动清理:');
-    console.log('  进程 PID: ' + remaining.join(', '));
-    console.log('  手动命令: sudo pkill -9 mihomo');
+    console.log('仍有进程残留，需要手动清理:');
+    console.log('进程 PID: ' + remaining.join(', '));
+    console.log('手动命令: sudo pkill -9 mihomo');
     console.log('');
     return { success: true, warning: '部分进程未终止', remaining };
   }

package/src/subscription.js

@@ -104,23 +104,11 @@ async function downloadSubscription(url, subName) {
   const webPageUrl = headers['profile-web-page-url'] || null;
   const username = parseUsernameFromContentDisposition(headers['content-disposition']);
 
-  // 1. updatedAt 保存到 settings.json（元数据，用于判断更新间隔）
-  // 同时清理旧的动态字段（迁移到缓存文件）
-  const subs = config.getSubscriptions();
-  const subIndex = subs.findIndex(s => s.name === subName);
-  if (subIndex >= 0) {
-    // 只保留核心配置字段，动态字段已迁移到缓存
-    const cleanedSub = {
-      name: subs[subIndex].name,
-      url: subs[subIndex].url,
-      updatedAt: new Date().toISOString(),
-    };
-    subs[subIndex] = cleanedSub;
-    config.writeSettings({ subscriptions: subs });
-  }
+  // 2. 动态数据 + updated_at 保存到缓存文件（settings 只存 name/url）
 
-  // 2. 动态数据保存到缓存文件
-  const cacheData = {};
+  const cacheData = {
+    updated_at: new Date().toISOString(),
+  };
   if (userInfo) {
     cacheData.upload = userInfo.upload;
     cacheData.download = userInfo.download;
@@ -128,15 +116,15 @@ async function downloadSubscription(url, subName) {
     cacheData.expire = userInfo.expire;
   }
   if (updateInterval) {
-    cacheData.updateInterval = updateInterval;
+    cacheData.update_interval = updateInterval;
   }
   if (webPageUrl) {
-    cacheData.webPageUrl = webPageUrl;
+    cacheData.web_page_url = webPageUrl;
   }
   if (username) {
     cacheData.username = username;
   }
-  config.saveSubCache(subName, cacheData);
+  config.saveSubscriptionCache(subName, cacheData);
 
   return {
     proxies: parsed.proxies ? parsed.proxies.length : 0,
@@ -166,10 +154,10 @@ function prepareConfigForStart(mode, subName) {
 }
 
 function needsAutoUpdate(sub) {
-  if (!sub.updatedAt) return true;
-  const lastUpdate = new Date(sub.updatedAt).getTime();
+  if (!sub.updated_at) return true;
+  const lastUpdate = new Date(sub.updated_at).getTime();
   if (isNaN(lastUpdate)) return true;
-  const intervalHours = sub.updateInterval || DEFAULT_UPDATE_INTERVAL_HOURS;
+  const intervalHours = sub.update_interval || DEFAULT_UPDATE_INTERVAL_HOURS;
   const intervalMs = intervalHours * 60 * 60 * 1000;
   return (Date.now() - lastUpdate) > intervalMs;
 }
@@ -177,7 +165,7 @@ function needsAutoUpdate(sub) {
 async function tryUpdateOne(sub) {
   try {
     const info = await downloadSubscription(sub.url, sub.name);
-    return { name: sub.name, success: true, proxies: info.proxies };
+    return { name: sub.name, success: true, proxies: info.proxies, proxyGroups: info.proxyGroups };
   } catch (e) {
     return { name: sub.name, success: false, error: e.message };
   }
@@ -193,10 +181,10 @@ async function autoUpdateStaleSubscriptions() {
 
   if (staleSubs.length === 1) {
     const sub = staleSubs[0];
-    const interval = sub.updateInterval || DEFAULT_UPDATE_INTERVAL_HOURS;
-    console.log('  订阅 "' + sub.name + '" 超过 ' + interval + ' 小时未更新，正在更新...');
+    const interval = sub.update_interval || DEFAULT_UPDATE_INTERVAL_HOURS;
+    console.log('订阅 "' + sub.name + '" 超过 ' + interval + ' 小时未更新，正在更新...');
   } else {
-    console.log('  检查到 ' + staleSubs.length + ' 个订阅需要更新，正在并行更新...');
+    console.log('检查到 ' + staleSubs.length + ' 个订阅需要更新，正在并行更新...');
   }
 
   const results = await Promise.all(staleSubs.map(tryUpdateOne));
@@ -205,10 +193,12 @@ async function autoUpdateStaleSubscriptions() {
   results.forEach(r => {
     if (r.success) {
       updatedCount++;
-      console.log('  ✓ ' + r.name + ': 已更新 (' + r.proxies + ' 节点)');
+      const parts = [];
+      if (r.proxyGroups && r.proxyGroups > 0) parts.push(r.proxyGroups + ' 组');
+      parts.push(r.proxies + ' 节点');
+      console.log('✓ ' + r.name + ': 已更新 (' + parts.join(', ') + ')');
     } else {
-      console.log('  ✗ ' + r.name + ': 更新失败，使用本地缓存');
-      console.log('    原因: ' + r.error.split('\n')[0]);
+      console.log('✗ ' + r.name + ': 失败 (' + r.error.split('\n')[0] + ')');
     }
   });