mihomo-cli 2.6.1 → 2.6.2

package/CHANGELOG.md

@@ -1,11 +1,19 @@
 # Changelog
 
+## [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 {

package/package.json

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