mihomo-cli 2.3.1 → 2.4.1

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [2.4.1] - 2026-05-02
+
+### 修复
+
+- 启动时清除代理环境变量（`http_proxy` / `https_proxy` / `all_proxy`），避免系统已有代理导致请求异常
+
+---
+
+## [2.4.0] - 2026-05-02
+
+### 新功能
+
+- **sub best** - `sub best <id>` 一键添加聚合订阅（每小时自动更新、去重、测活）
+  - `best 1` 精选 29 组（仅测速源：FreeSubsCheck, shaoyouvip, dalazhi, getnode）
+  - `best 2` ACL4SSR 29 组（全部 7 个源）
+  - `best 3` freeSub 24 组
+- **新增免费源** - yahr601, Auto-Sync, ssrsub, dalazhi, getnode
+
+### 修复
+
+- `setDefaultSubscription` 移到下载成功后再设置，避免下载失败留下无效默认订阅
+
+---
+
 ## [2.3.1] - 2026-05-02
 
 ### 新功能

package/README.md

@@ -10,6 +10,7 @@
 - 🧹 **节点测速清理** - `sub test` 测试连通性，`sub clean` 自动清理失败节点，启动时自动清理
 - 📊 **免费订阅基准测试** - `bench` 命令一键测试 20 个内置免费订阅源质量排名
 - 🆓 **快速添加免费订阅** - `sub free <id>` 一键添加内置免费订阅源
+- 🏆 **聚合订阅** - `sub best <id>` 一键添加自动更新的聚合订阅（每小时更新、去重、测活）
 - 📝 **覆写配置** - 在订阅基础上进行自定义覆写，支持强制覆盖、数组合并
 - 🔄 **智能重启** - `sub use` 切换订阅、`ow on/off` 切换覆写后自动重启
 - 🚀 **进程管理** - 启动/停止/切换模式，自动清理残留进程
@@ -100,6 +101,7 @@ mihomo ui yacd     # YACD
 | `mihomo sub use <name>`       | 切换当前订阅（支持模糊匹配，自动重启） |
 | `mihomo sub add <url> [name]` | 添加订阅并自动切换（支持逗号分隔多 URL 合并） |
 | `mihomo sub free <id>`        | 添加内置免费订阅（`0`=合并 #1+#2，`sub free` 列出可用源）|
+| `mihomo sub best <id>`        | 添加聚合订阅（`sub best` 列出可用源）|
 | `mihomo sub update`           | 更新所有订阅                           |
 | `mihomo sub update <name>`    | 更新指定订阅（支持模糊匹配）           |
 | `mihomo sub remove <name>`    | 删除订阅（支持模糊匹配）               |

package/dist/index.js

@@ -2652,9 +2652,16 @@ var TUN_CONFIG = {
 };
 function getFreeSubscriptionSources() {
   return [
-    // 完整配置（DNS + 分组 + rule-provider, 29 组）
+    // 完整配置（ACL4SSR 29 组）
     { name: "FreeSubsCheck", url: "https://gh-proxy.org/raw.githubusercontent.com/kooker/FreeSubsCheck/main/mihomo.yaml" },
+    { name: "yahr601", url: "https://gh-proxy.org/raw.githubusercontent.com/yahr601-prog/1/main/clash.yaml" },
+    { name: "Auto-Sync", url: "https://gh-proxy.org/raw.githubusercontent.com/walke2019/Auto-Sync/main/clash/GG/clash.yaml" },
+    { name: "ssrsub", url: "https://gh-proxy.org/raw.githubusercontent.com/ssrsub/ssr/master/clash.yaml" },
+    // OpenAi → Ai平台
     { name: "shaoyouvip", url: "https://gh-proxy.org/raw.githubusercontent.com/shaoyouvip/free/main/mihomo.yaml" },
+    { name: "dalazhi", url: "https://gh-proxy.org/raw.githubusercontent.com/dalazhi/v2ray/main/data/mihomo.yaml" },
+    { name: "getnode", url: "https://gh-proxy.org/raw.githubusercontent.com/limitless-d/getnode/main/clash.yaml" },
+    // 完整配置（24 组）
     { name: "freeSub", url: "https://gh-proxy.org/raw.githubusercontent.com/Ruk1ng001/freeSub/main/clash.yaml" },
     // 完整配置（13 组）
     { name: "PuddinCat", url: "https://gh-proxy.org/raw.githubusercontent.com/PuddinCat/BestClash/refs/heads/main/proxies.yaml" },
@@ -2680,6 +2687,14 @@ function getFreeSubscriptionSources() {
     { name: "NoMoreWalls", url: "https://gh-proxy.org/raw.githubusercontent.com/peasoft/NoMoreWalls/master/list.meta.yml" }
   ];
 }
+var GH_SUB = "https://gh-proxy.org/raw.githubusercontent.com/imaex/mihomo-free-sub/sub";
+function getBestSubscriptionSources() {
+  return [
+    { name: "curated", url: `${GH_SUB}/curated.yaml`, description: "\u7CBE\u9009 29 \u7EC4\uFF08\u4EC5\u6D4B\u901F\u6E90\uFF09" },
+    { name: "acl4ssr", url: `${GH_SUB}/acl4ssr.yaml`, description: "ACL4SSR 29 \u7EC4\uFF08\u5168\u90E8\u6E90\uFF09" },
+    { name: "freesub", url: `${GH_SUB}/freesub.yaml`, description: "freeSub 24 \u7EC4" }
+  ];
+}
 var BENCH_CONFIG = {
   "allow-lan": false,
   "external-controller": "127.0.0.1:19090",
@@ -3494,48 +3509,37 @@ function parseProxyUris(content) {
   return proxies;
 }
 async function downloadAllSources(sources, onProgress) {
-  const savedProxy = { http: process.env.http_proxy, https: process.env.https_proxy, HTTP: process.env.HTTP_PROXY, HTTPS: process.env.HTTPS_PROXY };
-  delete process.env.http_proxy;
-  delete process.env.https_proxy;
-  delete process.env.HTTP_PROXY;
-  delete process.env.HTTPS_PROXY;
-  try {
-    const client = createHttpClient({ timeout: 3e4 });
-    const tasks = sources.map(async (source) => {
-      const entry = { name: source.name, url: source.url, proxies: [], proxyGroups: 0 };
+  const client = createHttpClient({ timeout: 3e4 });
+  const tasks = sources.map(async (source) => {
+    const entry = { name: source.name, url: source.url, proxies: [], proxyGroups: 0 };
+    try {
+      const response = await client.get(source.url, { responseType: "text" });
+      const content = response.data;
+      if (!content?.trim()) throw new Error("\u5185\u5BB9\u4E3A\u7A7A");
+      let proxies;
       try {
-        const response = await client.get(source.url, { responseType: "text" });
-        const content = response.data;
-        if (!content?.trim()) throw new Error("\u5185\u5BB9\u4E3A\u7A7A");
-        let proxies;
-        try {
-          const parsed = parseYamlOrJson(content, "\u8BA2\u9605\u5185\u5BB9");
-          proxies = parsed.proxies || [];
-          const groups = parsed["proxy-groups"];
-          if (groups) entry.proxyGroups = groups.length;
-        } catch {
-          const decoded = tryDecodeBase64Content(content);
-          if (decoded) {
-            proxies = parseProxyUris(decoded);
-          } else {
-            proxies = parseProxyUris(content);
-          }
-          if (proxies.length === 0) throw new Error("\u65E0\u6CD5\u89E3\u6790\u8BA2\u9605\u5185\u5BB9\uFF08\u975E YAML/JSON/Base64\uFF09");
+        const parsed = parseYamlOrJson(content, "\u8BA2\u9605\u5185\u5BB9");
+        proxies = parsed.proxies || [];
+        const groups = parsed["proxy-groups"];
+        if (groups) entry.proxyGroups = groups.length;
+      } catch {
+        const decoded = tryDecodeBase64Content(content);
+        if (decoded) {
+          proxies = parseProxyUris(decoded);
+        } else {
+          proxies = parseProxyUris(content);
         }
-        entry.proxies = proxies.map((p) => ({ ...p, name: `[${source.name}] ${p.name}` }));
-        onProgress?.(source.name, true, proxies.length, entry.proxyGroups);
-      } catch (e) {
-        entry.error = e.message;
-        onProgress?.(source.name, false, 0, 0, entry.error);
+        if (proxies.length === 0) throw new Error("\u65E0\u6CD5\u89E3\u6790\u8BA2\u9605\u5185\u5BB9\uFF08\u975E YAML/JSON/Base64\uFF09");
       }
-      return entry;
-    });
-    return await Promise.all(tasks);
-  } finally {
-    for (const [key, val] of Object.entries(savedProxy)) {
-      if (val !== void 0) process.env[key] = val;
+      entry.proxies = proxies.map((p) => ({ ...p, name: `[${source.name}] ${p.name}` }));
+      onProgress?.(source.name, true, proxies.length, entry.proxyGroups);
+    } catch (e) {
+      entry.error = e.message;
+      onProgress?.(source.name, false, 0, 0, entry.error);
     }
-  }
+    return entry;
+  });
+  return await Promise.all(tasks);
 }
 function isProxyValid(proxy) {
   if (!proxy.name || !proxy.server || !proxy.port) return false;
@@ -4861,8 +4865,8 @@ async function addFreeSubscription(freeId) {
     console.log(`\u6DFB\u52A0\u5408\u5E76\u514D\u8D39\u8BA2\u9605: ${name2} (${sources.map((s) => s.name).join(" + ")})`);
     try {
       addSubscription(mergedUrl, name2);
-      setDefaultSubscription(name2);
       const info = await downloadMergedSubscription(urls, name2);
+      setDefaultSubscription(name2);
       const repoUrls = sources.map((s) => githubRepoUrl(s.url)).filter(Boolean);
       if (repoUrls.length > 0) saveSubscriptionCache(name2, { web_page_url: repoUrls.join(", ") });
       console.log(`\u5DF2\u6DFB\u52A0\u5E76\u5207\u6362\u5230 "${name2}" (${formatProxySummary(info)}, \u5408\u5E76 ${sources.length} \u6E90)`);
@@ -4885,8 +4889,8 @@ async function addFreeSubscription(freeId) {
   console.log(`\u6DFB\u52A0\u514D\u8D39\u8BA2\u9605: ${name}`);
   try {
     addSubscription(source.url, name);
-    setDefaultSubscription(name);
     const info = await downloadSubscription(source.url, name);
+    setDefaultSubscription(name);
     const repoUrl = githubRepoUrl(source.url);
     if (repoUrl) saveSubscriptionCache(name, { web_page_url: repoUrl });
     console.log(`\u5DF2\u6DFB\u52A0\u5E76\u5207\u6362\u5230 "${name}" (${formatProxySummary(info)})`);
@@ -4897,6 +4901,36 @@ async function addFreeSubscription(freeId) {
   console.log("");
   await printSubscriptionList();
 }
+function printBestSourceList() {
+  const bestSources = getBestSubscriptionSources();
+  for (let i = 0; i < bestSources.length; i++) {
+    console.log(`  ${i + 1}  ${bestSources[i].name} \u2014 ${bestSources[i].description}`);
+  }
+}
+async function addBestSubscription(bestId) {
+  const bestSources = getBestSubscriptionSources();
+  if (bestId < 1 || bestId > bestSources.length) {
+    console.error(`\u9519\u8BEF: best \u8BA2\u9605 ID \u8303\u56F4 1-${bestSources.length}`);
+    console.log("\n\u53EF\u7528\u6E90:");
+    printBestSourceList();
+    process.exit(1);
+  }
+  const source = bestSources[bestId - 1];
+  const name = `best${bestId}`;
+  console.log(`\u6DFB\u52A0 best \u8BA2\u9605: ${name} (${source.description})`);
+  try {
+    addSubscription(source.url, name);
+    const info = await downloadSubscription(source.url, name);
+    setDefaultSubscription(name);
+    saveSubscriptionCache(name, { web_page_url: "https://github.com/imaex/mihomo-free-sub" });
+    console.log(`\u5DF2\u6DFB\u52A0\u5E76\u5207\u6362\u5230 "${name}" (${formatProxySummary(info)})`);
+  } catch (e) {
+    console.error(`\u6DFB\u52A0\u5931\u8D25: ${e.message}`);
+    process.exit(1);
+  }
+  console.log("");
+  await printSubscriptionList();
+}
 async function cmdSubscription(args) {
   const action = args[1];
   if (!action || action === "list") {
@@ -4914,6 +4948,17 @@ async function cmdSubscription(args) {
     await addFreeSubscription(id);
     return;
   }
+  if (action === "best") {
+    const id = parseInt(args[2], 10);
+    if (Number.isNaN(id)) {
+      console.log("\u7528\u6CD5: mihomo sub best <id>\n");
+      console.log("\u53EF\u7528\u6E90:");
+      printBestSourceList();
+      process.exit(1);
+    }
+    await addBestSubscription(id);
+    return;
+  }
   if (action === "add") {
     const freeId = parseIntArg(args, "--free", "--free", -1);
     if (freeId > 0) {
@@ -6118,7 +6163,16 @@ process.on("unhandledRejection", (reason) => {
 \u672A\u5904\u7406\u7684 Promise \u62D2\u7EDD: ${msg}`);
   process.exit(1);
 });
+function clearProxyEnv() {
+  delete process.env.http_proxy;
+  delete process.env.https_proxy;
+  delete process.env.HTTP_PROXY;
+  delete process.env.HTTPS_PROXY;
+  delete process.env.all_proxy;
+  delete process.env.ALL_PROXY;
+}
 async function main() {
+  clearProxyEnv();
   ensureDirs();
   const args = process.argv.slice(2);
   if (args.length === 0) {

package/package.json

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