mihomo-cli 2.6.1 → 2.6.3

package/CHANGELOG.md

@@ -1,11 +1,31 @@
 # Changelog
 
+## [2.6.3] - 2026-05-03
+
+### 改进
+
+- **自动清理三轮重试** - 节点测试失败后自动重试两轮，三轮都失败才删除，减少网络抖动导致的误删
+- **实时进度条** - 测试/清理过程中显示单行刷新进度条，测完输出按名称排序的最终结果
+- **并发模型优化** - 节点测试从分批等待改为 worker pool，逐个完成即时反馈
+- 重试通过的节点标注轮次（第N轮通过）
+- start/test/clean 命令统一使用进度条
+
+---
+
+## [2.6.2] - 2026-05-03
+
+### 改进
+
+- **配置校验增强** - 新增重名节点/分组去重、无效规则清理，覆盖更多启动失败场景
+- 移除多余的 `mihomo -t` 预校验（启动本身即校验）
+
+---
+
 ## [2.6.1] - 2026-05-03
 
 ### 修复
 
 - **启动前配置校验** - 自动检测并修复 proxy-group 中引用不存在的节点/分组，避免内核启动失败
-- 写入配置后使用 `mihomo -t` 做内核级校验，提前发现配置错误
 
 ### 改进
 

package/dist/index.js

@@ -3113,19 +3113,42 @@ function excludeOverwriteProxiesFromIncludeAll(config, overwriteFiles) {
   }
 }
 var BUILTIN_PROXY_NAMES = /* @__PURE__ */ new Set(["DIRECT", "REJECT", "REJECT-DROP", "PASS", "COMPATIBLE"]);
-function validateProxyGroupDependencies(config) {
+function deduplicateByName(items) {
+  const names = /* @__PURE__ */ new Set();
+  const duplicates = [];
+  const result = items.filter((item) => {
+    if (names.has(item.name)) {
+      duplicates.push(item.name);
+      return false;
+    }
+    names.add(item.name);
+    return true;
+  });
+  return { result, names, duplicates };
+}
+function validateConfig(config) {
   const warnings = [];
   const proxies = config.proxies || [];
   const groups = config["proxy-groups"] || [];
-  if (groups.length === 0) return warnings;
-  const validNames = new Set(BUILTIN_PROXY_NAMES);
-  for (const p of proxies) validNames.add(p.name);
-  for (const g of groups) validNames.add(g.name);
+  const rules = config.rules || [];
+  const proxyDedup = deduplicateByName(proxies);
+  config.proxies = proxyDedup.result;
+  if (proxyDedup.duplicates.length > 0) {
+    const preview = proxyDedup.duplicates.slice(0, 3).map((n) => `"${n}"`).join(", ");
+    warnings.push(`\u79FB\u9664\u4E86 ${proxyDedup.duplicates.length} \u4E2A\u91CD\u540D\u8282\u70B9: ${preview}${proxyDedup.duplicates.length > 3 ? " ..." : ""}`);
+  }
+  const groupDedup = deduplicateByName(groups);
+  config["proxy-groups"] = groupDedup.result;
+  if (groupDedup.duplicates.length > 0) {
+    warnings.push(`\u79FB\u9664\u4E86 ${groupDedup.duplicates.length} \u4E2A\u91CD\u540D\u5206\u7EC4: ${groupDedup.duplicates.map((n) => `"${n}"`).join(", ")}`);
+  }
+  const validNames = /* @__PURE__ */ new Set([...BUILTIN_PROXY_NAMES, ...proxyDedup.names, ...groupDedup.names]);
+  const activeGroups = groupDedup.result;
   const removedGroups = /* @__PURE__ */ new Set();
   let changed = true;
   while (changed) {
     changed = false;
-    for (const group of groups) {
+    for (const group of activeGroups) {
       if (removedGroups.has(group.name)) continue;
       if (!Array.isArray(group.proxies)) continue;
       const invalid = group.proxies.filter((name) => !validNames.has(name));
@@ -3142,7 +3165,21 @@ function validateProxyGroupDependencies(config) {
     }
   }
   if (removedGroups.size > 0) {
-    config["proxy-groups"] = groups.filter((g) => !removedGroups.has(g.name));
+    config["proxy-groups"] = activeGroups.filter((g) => !removedGroups.has(g.name));
+  }
+  if (rules.length > 0) {
+    const removedRules = [];
+    config.rules = rules.filter((rule) => {
+      const parts = rule.split(",");
+      if (parts.length < 2) return true;
+      const target = parts[parts.length - 1].trim();
+      if (!target || validNames.has(target)) return true;
+      removedRules.push(rule);
+      return false;
+    });
+    if (removedRules.length > 0) {
+      warnings.push(`\u79FB\u9664\u4E86 ${removedRules.length} \u6761\u5F15\u7528\u4E0D\u5B58\u5728\u76EE\u6807\u7684\u89C4\u5219`);
+    }
   }
   return warnings;
 }
@@ -3199,23 +3236,9 @@ function buildConfig(subRawContent, mode) {
       "skip-domain": ["+.push.apple.com"]
     };
   }
-  const warnings = validateProxyGroupDependencies(merged);
+  const warnings = validateConfig(merged);
   return { config: merged, subscriptionConfig, overwriteFiles, systemConfig, warnings };
 }
-function checkConfig() {
-  if (!hasKernel() || !hasConfig()) return { ok: true, errors: [] };
-  try {
-    execSync(`"${PATHS.mihomoBinary}" -t -f "${PATHS.configFile}" 2>&1`, { encoding: "utf8" });
-    return { ok: true, errors: [] };
-  } catch (e) {
-    const output = e.stdout || e.message || "";
-    const errors = output.split("\n").filter((line) => line.includes("level=error") || line.includes("level=fatal")).map((line) => {
-      const match = line.match(/msg="(.+)"/);
-      return match ? match[1] : line;
-    });
-    return { ok: false, errors };
-  }
-}
 function writeMihomoConfig(configObj) {
   ensureDirs();
   const content = jsYaml.dump(configObj, { indent: 2, lineWidth: -1, noCompatMode: true });
@@ -4500,12 +4523,6 @@ function prepareConfigForStart(mode, subName = "default") {
   }
   writeMihomoConfig(buildResult.config);
   writeDebugConfig(buildResult);
-  const configCheck = checkConfig();
-  if (!configCheck.ok) {
-    const errorDetail = configCheck.errors.length > 0 ? configCheck.errors.join("\n  ") : "\u672A\u77E5\u9519\u8BEF";
-    throw new Error(`\u914D\u7F6E\u6821\u9A8C\u5931\u8D25:
-  ${errorDetail}`);
-  }
   const proxies = buildResult.config.proxies;
   const proxyGroups = buildResult.config["proxy-groups"];
   return {
@@ -4589,17 +4606,20 @@ async function testSubscriptionProxies(subName, options = {}) {
     return { total: 0, alive: 0, dead: 0, results: [] };
   }
   const client = createHttpClient({ timeout: timeout + 3e3 });
-  const results = [];
+  const results = new Array(proxies.length);
   let completedCount = 0;
-  for (let i = 0; i < proxies.length; i += concurrency) {
-    const batch = proxies.slice(i, i + concurrency);
-    const batchResults = await Promise.all(batch.map((proxy) => testProxyDelay(proxy.name, timeout, testUrl, client, apiBase)));
-    for (const result of batchResults) {
-      results.push(result);
+  let nextIndex = 0;
+  async function runNext() {
+    while (nextIndex < proxies.length) {
+      const idx = nextIndex++;
+      const result = await testProxyDelay(proxies[idx].name, timeout, testUrl, client, apiBase);
+      results[idx] = result;
       onResult?.(result, completedCount, proxies.length);
       completedCount++;
     }
   }
+  const workers = Array.from({ length: Math.min(concurrency, proxies.length) }, () => runNext());
+  await Promise.all(workers);
   const alive = results.filter((r) => r.delay !== null).length;
   return { total: results.length, alive, dead: results.length - alive, results };
 }
@@ -4659,7 +4679,13 @@ function cleanDeadProxies(parsed, deadNames) {
 }
 async function autoCleanSubscription(subName, options = {}) {
   const parsed = loadSubscriptionConfig(subName);
-  const summary = await testSubscriptionProxies(subName, { ...options, parsed });
+  const { onResult, onRetryRound, ...testOptions } = options;
+  const wrapOnResult = (round) => onResult ? (r, i, t) => onResult(r, i, t, round) : void 0;
+  const summary = await testSubscriptionProxies(subName, {
+    ...testOptions,
+    parsed,
+    onResult: wrapOnResult(1)
+  });
   let removedProxies = 0;
   let updatedGroups = 0;
   let removedGroups = 0;
@@ -4669,10 +4695,32 @@ async function autoCleanSubscription(subName, options = {}) {
       skipped = true;
     } else {
       const deadNames = new Set(summary.results.filter((r) => r.delay === null).map((r) => r.name));
-      const cleanResult = cleanDeadProxies(parsed, deadNames);
-      removedProxies = cleanResult.removedProxies;
-      updatedGroups = cleanResult.updatedGroups;
-      removedGroups = cleanResult.removedGroups;
+      const deadProxies = parsed.proxies.filter((p) => deadNames.has(p.name));
+      for (let retry = 0; retry < 2; retry++) {
+        const round = retry + 2;
+        const retryTargets = deadProxies.filter((p) => deadNames.has(p.name));
+        if (retryTargets.length === 0) break;
+        onRetryRound?.(round, retryTargets.length);
+        const retryParsed = { raw: {}, proxies: retryTargets, proxyGroups: [] };
+        const retrySummary = await testSubscriptionProxies(subName, {
+          ...testOptions,
+          parsed: retryParsed,
+          onResult: wrapOnResult(round)
+        });
+        for (const r of retrySummary.results) {
+          if (r.delay !== null) {
+            deadNames.delete(r.name);
+          }
+        }
+      }
+      summary.dead = deadNames.size;
+      summary.alive = summary.total - summary.dead;
+      if (deadNames.size > 0) {
+        const cleanResult = cleanDeadProxies(parsed, deadNames);
+        removedProxies = cleanResult.removedProxies;
+        updatedGroups = cleanResult.updatedGroups;
+        removedGroups = cleanResult.removedGroups;
+      }
     }
   }
   if (!skipped && removedProxies > 0) {
@@ -4916,8 +4964,12 @@ async function cmdStart(args) {
     console.log(`\u8282\u70B9\u6570 ${configInfo.proxies} \u8D85\u8FC7 ${AUTO_CLEAN_THRESHOLD}\uFF0C\u81EA\u52A8\u6E05\u7406...`);
     console.log("");
     await sleep(1e3);
-    const cleanResult = await autoCleanSubscription(sub.name, { onResult: printTestResult });
-    console.log("");
+    const progress = createProgressPrinter();
+    const cleanResult = await autoCleanSubscription(sub.name, {
+      onResult: progress.onResult,
+      onRetryRound: progress.onRetryRound
+    });
+    progress.finish();
     console.log(formatTestSummary(cleanResult.summary));
     if (cleanResult.skipped) {
       console.log(colors.yellow("\u5B58\u6D3B\u8282\u70B9\u4E0D\u8DB3 1%\uFF0C\u8DF3\u8FC7\u6E05\u7406\u3002\u8BF7\u68C0\u67E5\u539F\u59CB\u8BA2\u9605\u662F\u5426\u6709\u6548"));
@@ -4940,14 +4992,71 @@ async function cmdStart(args) {
 }
 
 // src/commands/subscription.ts
-function printTestResult(result, index, total) {
-  const prefix = `[${index + 1}/${total}]`;
-  if (result.delay !== null) {
-    const delayColor = result.delay < 300 ? colors.green : result.delay < 800 ? colors.yellow : colors.red;
-    console.log(`${prefix} ${colors.green("\u2713")} ${result.name} ${delayColor(`${result.delay}ms`)}`);
-  } else {
-    console.log(`${prefix} ${colors.red("\u2717")} ${result.name} ${colors.gray(result.error || "timeout")}`);
+var IS_TTY = process.stdout.isTTY === true;
+var BAR_WIDTH = 20;
+function createProgressPrinter() {
+  let alive = 0;
+  let dead = 0;
+  let hasRetry = false;
+  const resultMap = /* @__PURE__ */ new Map();
+  function render(done, total) {
+    if (!IS_TTY) return;
+    const pct = Math.round(done / total * 100);
+    const filled = Math.round(done / total * BAR_WIDTH);
+    const bar = "\u2588".repeat(filled) + "\u2591".repeat(BAR_WIDTH - filled);
+    process.stdout.write(`\r${bar} ${done}/${total} (${pct}%) | ${colors.green(`\u2713${alive}`)} ${colors.red(`\u2717${dead}`)}`);
   }
+  return {
+    onResult(result, index, total, round = 1) {
+      const prev = resultMap.get(result.name);
+      if (prev) {
+        if (prev.result.delay === null && result.delay !== null) {
+          alive++;
+          dead--;
+        }
+      } else {
+        if (result.delay !== null) alive++;
+        else dead++;
+      }
+      resultMap.set(result.name, { result, round });
+      render(index + 1, total);
+    },
+    onRetryRound(round, count) {
+      if (!hasRetry) {
+        hasRetry = true;
+        if (IS_TTY) {
+          process.stdout.write("\n");
+        }
+        console.log(`--- \u7B2C 1 \u8F6E\u6D4B\u8BD5 (${resultMap.size} \u4E2A\u8282\u70B9) ---`);
+      }
+      if (IS_TTY) {
+        process.stdout.write("\n");
+      }
+      console.log(`--- \u7B2C ${round} \u8F6E\u91CD\u8BD5 (${count} \u4E2A\u8282\u70B9) ---`);
+    },
+    finish() {
+      if (IS_TTY) {
+        process.stdout.write("\n");
+      }
+      console.log("");
+      const entries = [...resultMap.values()];
+      entries.sort((a, b) => a.result.name.localeCompare(b.result.name));
+      const total = entries.length;
+      console.log("\u8282\u70B9\u6700\u7EC8\u72B6\u6001:");
+      for (let i = 0; i < entries.length; i++) {
+        const { result, round } = entries[i];
+        const prefix = `[${i + 1}/${total}]`;
+        if (result.delay !== null) {
+          const delayColor = result.delay < 300 ? colors.green : result.delay < 800 ? colors.yellow : colors.red;
+          const retryNote = round > 1 ? colors.gray(` (\u7B2C${round}\u8F6E\u901A\u8FC7)`) : "";
+          console.log(`${prefix} ${colors.green("\u2713")} ${result.name} ${delayColor(`${result.delay}ms`)}${retryNote}`);
+        } else {
+          console.log(`${prefix} ${colors.red("\u2717")} ${result.name} ${colors.gray(result.error || "timeout")}`);
+        }
+      }
+      console.log("");
+    }
+  };
 }
 function formatCleanSummary(result) {
   const parts = [`\u79FB\u9664 ${result.removedProxies} \u4E2A\u8282\u70B9`];
@@ -5311,15 +5420,17 @@ async function cmdSubscription(args) {
     console.log(`\u6E05\u7406\u8BA2\u9605 "${target.name}"...`);
     console.log(`\u8D85\u65F6: ${timeout}ms  \u5E76\u53D1: ${concurrency}`);
     console.log("");
+    const progress = createProgressPrinter();
     const result = await withTestInstance(target.name, async (apiBase) => {
       return autoCleanSubscription(target.name, {
         timeout,
         concurrency,
         apiBase,
-        onResult: printTestResult
+        onResult: progress.onResult,
+        onRetryRound: progress.onRetryRound
       });
     });
-    console.log("");
+    progress.finish();
     console.log(formatTestSummary(result.summary));
     if (result.skipped) {
       console.log("");
@@ -5339,15 +5450,16 @@ async function cmdSubscription(args) {
     console.log(`\u6D4B\u8BD5\u8BA2\u9605 "${target.name}" \u7684\u8282\u70B9\u8FDE\u901A\u6027...`);
     console.log(`\u8D85\u65F6: ${timeout}ms  \u5E76\u53D1: ${concurrency}`);
     console.log("");
+    const progress = createProgressPrinter();
     const summary = await withTestInstance(target.name, async (apiBase) => {
       return testSubscriptionProxies(target.name, {
         timeout,
         concurrency,
         apiBase,
-        onResult: printTestResult
+        onResult: progress.onResult
       });
     });
-    console.log("");
+    progress.finish();
     console.log(formatTestSummary(summary));
     return;
   }
@@ -6264,12 +6376,13 @@ async function cmdTest(args) {
   console.log(`\u6D4B\u8BD5 "${activeSub.name}" \u8282\u70B9\u8FDE\u901A\u6027...`);
   console.log(`\u8D85\u65F6: ${timeout}ms  \u5E76\u53D1: ${concurrency}`);
   console.log("");
+  const progress = createProgressPrinter();
   const summary = await testSubscriptionProxies(activeSub.name, {
     timeout,
     concurrency,
-    onResult: printTestResult
+    onResult: progress.onResult
   });
-  console.log("");
+  progress.finish();
   console.log(formatTestSummary(summary));
 }
 async function cmdClean(args) {
@@ -6280,12 +6393,14 @@ async function cmdClean(args) {
   console.log(`\u6E05\u7406 "${activeSub.name}" \u5931\u8D25\u8282\u70B9...`);
   console.log(`\u8D85\u65F6: ${timeout}ms  \u5E76\u53D1: ${concurrency}`);
   console.log("");
+  const progress = createProgressPrinter();
   const result = await autoCleanSubscription(activeSub.name, {
     timeout,
     concurrency,
-    onResult: printTestResult
+    onResult: progress.onResult,
+    onRetryRound: progress.onRetryRound
   });
-  console.log("");
+  progress.finish();
   console.log(formatTestSummary(result.summary));
   if (result.skipped) {
     console.log("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mihomo-cli",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "type": "module",
   "description": "A terminal-based mihomo (Clash.Meta) client for macOS",
   "bin": {