mihomo-cli 2.5.0 → 2.6.1

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [2.6.1] - 2026-05-03
+
+### 修复
+
+- **启动前配置校验** - 自动检测并修复 proxy-group 中引用不存在的节点/分组，避免内核启动失败
+- 写入配置后使用 `mihomo -t` 做内核级校验，提前发现配置错误
+
+### 改进
+
+- 移除已废弃的 `global-client-fingerprint` 配置项，消除内核启动时的 warning
+
+---
+
+## [2.6.0] - 2026-05-03
+
+### 改进
+
+- **统一使用 mixed-port**：用 `mixed-port: 7890` 替代原来的 `port: 7890` + `socks-port: 7891`，单端口同时支持 HTTP 和 SOCKS5
+- **BASE_CONFIG 优化**：新增 `unified-delay`、`tcp-concurrent`、`geo-auto-update`、`profile.store-selected`，不再依赖订阅自带这些配置
+- **自动启用 sniffer**：检测到 `fake-ip` 模式时自动注入 sniffer 配置（嗅探 HTTP/TLS/QUIC），确保域名规则正常工作；订阅自带 sniffer 时不覆盖
+
+---
+
 ## [2.5.0] - 2026-05-03
 
 ### 新功能

package/README.md

@@ -301,8 +301,7 @@ sudo pkill -9 mihomo
 
 默认端口（系统强制，不受订阅配置影响）：
 
-- HTTP 端口: `7890`
-- SOCKS5 端口: `7891`
+- 混合端口 (HTTP + SOCKS5): `7890`
 - 外部控制器: `127.0.0.1:9090`
 
 ## 安全特性

package/dist/index.js

@@ -2688,29 +2688,32 @@ function getFreeSubscriptionSources() {
   ];
 }
 var BENCH_CONFIG = {
+  "mixed-port": 17890,
   "allow-lan": false,
   "external-controller": "127.0.0.1:19090",
-  port: 17890,
-  "socks-port": 17891,
   "log-level": "error",
   "geodata-mode": true
 };
 var TEST_CONFIG = {
+  "mixed-port": 27890,
   "allow-lan": false,
   "external-controller": "127.0.0.1:29090",
-  port: 27890,
-  "socks-port": 27891,
   "log-level": "error",
   "geodata-mode": true
 };
 var BASE_CONFIG = {
+  "mixed-port": 7890,
   "allow-lan": false,
   "external-controller": "127.0.0.1:9090",
-  port: 7890,
-  "socks-port": 7891,
-  "log-level": "warning",
-  "geodata-mode": true,
+  "unified-delay": true,
+  "tcp-concurrent": true,
+  "geo-auto-update": true,
   "geo-update-interval": 24,
+  "geodata-mode": true,
+  "log-level": "warning",
+  profile: {
+    "store-selected": true
+  },
   "geox-url": {
     geoip: "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip-lite.dat",
     geosite: "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite-lite.dat",
@@ -3109,6 +3112,40 @@ function excludeOverwriteProxiesFromIncludeAll(config, overwriteFiles) {
     }
   }
 }
+var BUILTIN_PROXY_NAMES = /* @__PURE__ */ new Set(["DIRECT", "REJECT", "REJECT-DROP", "PASS", "COMPATIBLE"]);
+function validateProxyGroupDependencies(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 removedGroups = /* @__PURE__ */ new Set();
+  let changed = true;
+  while (changed) {
+    changed = false;
+    for (const group of groups) {
+      if (removedGroups.has(group.name)) continue;
+      if (!Array.isArray(group.proxies)) continue;
+      const invalid = group.proxies.filter((name) => !validNames.has(name));
+      if (invalid.length === 0) continue;
+      group.proxies = group.proxies.filter((name) => validNames.has(name));
+      warnings.push(`proxy-group "${group.name}": \u79FB\u9664\u4E86\u4E0D\u5B58\u5728\u7684\u5F15\u7528 ${invalid.map((n) => `"${n}"`).join(", ")}`);
+      const hasOtherSource = group.use || group["include-all"] || group["include-all-proxies"];
+      if (group.proxies.length === 0 && !hasOtherSource) {
+        removedGroups.add(group.name);
+        validNames.delete(group.name);
+        warnings.push(`proxy-group "${group.name}": \u5DF2\u79FB\u9664\uFF08\u65E0\u53EF\u7528\u8282\u70B9\uFF09`);
+        changed = true;
+      }
+    }
+  }
+  if (removedGroups.size > 0) {
+    config["proxy-groups"] = groups.filter((g) => !removedGroups.has(g.name));
+  }
+  return warnings;
+}
 function buildConfig(subRawContent, mode) {
   const subscriptionConfig = parseYamlOrJson(subRawContent, "\u8BA2\u9605\u5185\u5BB9");
   if (!subscriptionConfig) {
@@ -3128,9 +3165,10 @@ function buildConfig(subRawContent, mode) {
   }
   systemConfig["allow-lan"] = false;
   systemConfig["external-controller"] = BASE_CONFIG["external-controller"];
-  systemConfig.port = BASE_CONFIG.port;
-  systemConfig["socks-port"] = BASE_CONFIG["socks-port"];
+  systemConfig["mixed-port"] = BASE_CONFIG["mixed-port"];
   delete withOverwrites["mixed-port"];
+  delete withOverwrites.port;
+  delete withOverwrites["socks-port"];
   delete withOverwrites["external-ui"];
   delete withOverwrites["external-ui-name"];
   delete withOverwrites["external-ui-url"];
@@ -3149,7 +3187,34 @@ function buildConfig(subRawContent, mode) {
   if (systemConfig.dns) {
     merged.dns = { ...withOverwrites.dns || {}, ...systemConfig.dns };
   }
-  return { config: merged, subscriptionConfig, overwriteFiles, systemConfig };
+  const mergedDns = merged.dns || {};
+  if (mergedDns["enhanced-mode"] === "fake-ip" && !("sniffer" in withOverwrites)) {
+    merged.sniffer = {
+      enable: true,
+      sniff: {
+        HTTP: { ports: [80, "8080-8880"], "override-destination": true },
+        TLS: { ports: [443, 8443] },
+        QUIC: { ports: [443, 8443] }
+      },
+      "skip-domain": ["+.push.apple.com"]
+    };
+  }
+  const warnings = validateProxyGroupDependencies(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();
@@ -4427,8 +4492,20 @@ function prepareConfigForStart(mode, subName = "default") {
     throw new Error(`\u672A\u627E\u5230\u8BA2\u9605\u914D\u7F6E "${subName}"\uFF0C\u8BF7\u5148\u6DFB\u52A0\u8BA2\u9605`);
   }
   const buildResult = buildConfig(rawContent, mode);
+  if (buildResult.warnings.length > 0) {
+    for (const warning of buildResult.warnings) {
+      console.log(`${colors.yellow("\u81EA\u52A8\u4FEE\u590D:")} ${warning}`);
+    }
+    console.log("");
+  }
   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 {
@@ -5379,7 +5456,7 @@ async function cmdBench(args) {
     for (const d of downloaded) {
       d.proxies = d.proxies.filter((p) => survivingSet.has(p));
     }
-    const benchPort = BENCH_CONFIG.port;
+    const benchPort = BENCH_CONFIG["mixed-port"];
     const benchApi = BENCH_CONFIG["external-controller"];
     console.log(colors.cyan("\u542F\u52A8\u6D4B\u8BD5\u5B9E\u4F8B..."));
     await startBenchInstance();

package/package.json

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