mihomo-cli 2.3.0 → 2.3.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.3.1] - 2026-05-02
+
+### 新功能
+
+- **合并订阅** - `sub add url1,url2 name` 支持逗号分隔多 URL，合并节点（按名去重），分组/规则取第一个源
+- **sub free 0** - 特殊 ID `0` 自动合并免费源 #1 + #2（节点更多，配置相同）
+
+### 改进
+
+- 合并订阅在列表中显示 `[合并 N 源]` 标记
+- `sub update` 自动识别合并订阅并重新下载合并
+- URL 脱敏支持逗号分隔多 URL
+
+---
+
 ## [2.3.0] - 2026-05-02
 
 ### 新功能

package/README.md

@@ -98,8 +98,8 @@ mihomo ui yacd     # YACD
 | ----------------------------- | -------------------------------------- |
 | `mihomo sub`                  | 列出所有订阅（含流量、到期时间）       |
 | `mihomo sub use <name>`       | 切换当前订阅（支持模糊匹配，自动重启） |
-| `mihomo sub add <url> [name]` | 添加订阅并自动切换                     |
-| `mihomo sub free <id>`        | 添加内置免费订阅（`sub free` 列出可用源）|
+| `mihomo sub add <url> [name]` | 添加订阅并自动切换（支持逗号分隔多 URL 合并） |
+| `mihomo sub free <id>`        | 添加内置免费订阅（`0`=合并 #1+#2，`sub free` 列出可用源）|
 | `mihomo sub update`           | 更新所有订阅                           |
 | `mihomo sub update <name>`    | 更新指定订阅（支持模糊匹配）           |
 | `mihomo sub remove <name>`    | 删除订阅（支持模糊匹配）               |

package/dist/index.js

@@ -2795,6 +2795,9 @@ function invalidateSettingsCache() {
 }
 function maskUrl(url) {
   if (!url) return url;
+  if (url.includes(",")) {
+    return url.split(",").map((u) => maskUrl(u.trim())).join(", ");
+  }
   try {
     const parsed = new URL(url);
     const tokenKeys = ["token", "key", "secret", "pass", "password", "auth", "access_token", "api_key"];
@@ -4207,6 +4210,12 @@ function viewLogWithTail(logPath, options) {
 var DEFAULT_UPDATE_INTERVAL_HOURS = 12;
 var YAML_DUMP_OPTS = { indent: 2, lineWidth: -1, noCompatMode: true };
 var HTTP_CLIENT = createHttpClient({ timeout: 6e4 });
+function isMultiUrl(url) {
+  return url.includes(",");
+}
+function splitUrls(url) {
+  return url.split(",").map((u) => u.trim()).filter(Boolean);
+}
 function loadSubscriptionConfig(subName) {
   const rawContent = readSubscriptionRawConfig(subName);
   if (!rawContent) {
@@ -4343,6 +4352,71 @@ async function downloadSubscription(url, subName = "default") {
     username
   };
 }
+async function downloadMergedSubscription(urls, subName) {
+  const responses = await Promise.all(
+    urls.map(async (url, index) => {
+      try {
+        const response = await HTTP_CLIENT.get(url, { responseType: "text" });
+        return { url, index, response, error: null };
+      } catch (e) {
+        return { url, index, response: null, error: e };
+      }
+    })
+  );
+  for (const r of responses) {
+    if (r.error) {
+      const maskedUrl = maskUrl(r.url);
+      throw new Error(`\u5408\u5E76\u8BA2\u9605\u7B2C ${r.index + 1} \u4E2A URL \u83B7\u53D6\u5931\u8D25: ${r.error.message}
+  URL: ${maskedUrl}`);
+    }
+  }
+  const parsed = responses.map((r, i) => {
+    const content = r.response?.data;
+    if (!content?.trim()) throw new Error(`\u5408\u5E76\u8BA2\u9605\u7B2C ${i + 1} \u4E2A URL \u5185\u5BB9\u4E3A\u7A7A`);
+    return parseYamlOrJson(content, `\u5408\u5E76\u8BA2\u9605\u7B2C ${i + 1} \u4E2A`);
+  });
+  const base = parsed[0];
+  const baseProxies = base.proxies || [];
+  const seenNames = new Set(baseProxies.map((p) => p.name));
+  for (let i = 1; i < parsed.length; i++) {
+    const extraProxies = parsed[i].proxies || [];
+    for (const proxy of extraProxies) {
+      if (!seenNames.has(proxy.name)) {
+        baseProxies.push(proxy);
+        seenNames.add(proxy.name);
+      }
+    }
+  }
+  base.proxies = baseProxies;
+  const mergedContent = jsYaml.dump(base, YAML_DUMP_OPTS);
+  saveSubscriptionRawConfig(subName, mergedContent);
+  const firstHeaders = responses[0].response?.headers;
+  const userInfo = parseUserInfo(firstHeaders?.get("subscription-userinfo") ?? null);
+  const updateIntervalHeader = firstHeaders?.get("profile-update-interval");
+  const updateInterval = updateIntervalHeader ? parseInt(updateIntervalHeader, 10) : null;
+  const webPageUrl = firstHeaders?.get("profile-web-page-url") || null;
+  const username = parseUsernameFromContentDisposition(firstHeaders?.get("content-disposition") ?? null);
+  const cacheData = { updated_at: (/* @__PURE__ */ new Date()).toISOString() };
+  if (userInfo) {
+    cacheData.upload = userInfo.upload;
+    cacheData.download = userInfo.download;
+    cacheData.total = userInfo.total;
+    cacheData.expire = userInfo.expire;
+  }
+  if (updateInterval) cacheData.update_interval = updateInterval;
+  if (webPageUrl) cacheData.web_page_url = webPageUrl;
+  if (username) cacheData.username = username;
+  saveSubscriptionCache(subName, cacheData);
+  const proxyGroups = base["proxy-groups"];
+  return {
+    proxies: baseProxies.length,
+    proxyGroups: proxyGroups ? proxyGroups.length : 0,
+    userInfo,
+    updateInterval,
+    webPageUrl,
+    username
+  };
+}
 function prepareConfigForStart(mode, subName = "default") {
   const rawContent = readSubscriptionRawConfig(subName);
   if (!rawContent) {
@@ -4368,7 +4442,12 @@ function needsAutoUpdate(sub) {
 }
 async function tryUpdateOne(sub) {
   try {
-    const info = await downloadSubscription(sub.url, sub.name);
+    let info;
+    if (isMultiUrl(sub.url)) {
+      info = await downloadMergedSubscription(splitUrls(sub.url), sub.name);
+    } else {
+      info = await downloadSubscription(sub.url, sub.name);
+    }
     return { name: sub.name, success: true, proxies: info.proxies, proxyGroups: info.proxyGroups };
   } catch (e) {
     return { name: sub.name, success: false, error: e.message };
@@ -4730,8 +4809,9 @@ async function printSubscriptionList(options) {
   subs.forEach((s, i) => {
     const time = formatDate(s.updated_at);
     const defaultMark = activeSub && s.name === activeSub.name ? colors.green(" [\u4F7F\u7528\u4E2D]") : "";
+    const mergeBadge = isMultiUrl(s.url) ? colors.cyan(` [\u5408\u5E76 ${splitUrls(s.url).length} \u6E90]`) : "";
     const interval = s.update_interval || DEFAULT_UPDATE_INTERVAL_HOURS;
-    console.log(`  ${i + 1}. ${s.name}${defaultMark}`);
+    console.log(`  ${i + 1}. ${s.name}${defaultMark}${mergeBadge}`);
     console.log(`    ${colors.gray("\u66F4\u65B0: ")}${time} (\u95F4\u9694: ${interval}h)`);
     if (s.username) {
       console.log(`    ${colors.gray("\u7528\u6237: ")}${s.username}`);
@@ -4764,14 +4844,40 @@ async function printSubscriptionList(options) {
   console.log("\u6253\u5F00\u9875\u9762: mihomo sub web [name]");
   console.log("");
 }
+function printFreeSourceList() {
+  const freeSources = getFreeSubscriptionSources();
+  console.log(`  00  \u5408\u5E76 #1 + #2 (\u8282\u70B9\u66F4\u591A)`);
+  for (let i = 0; i < freeSources.length; i++) {
+    console.log(`  ${String(i + 1).padStart(2, "0")}  ${freeSources[i].name}`);
+  }
+}
 async function addFreeSubscription(freeId) {
   const freeSources = getFreeSubscriptionSources();
+  if (freeId === 0) {
+    const sources = [freeSources[0], freeSources[1]];
+    const urls = sources.map((s) => s.url);
+    const mergedUrl = urls.join(",");
+    const name2 = "free0";
+    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);
+      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)`);
+    } catch (e) {
+      console.error(`\u6DFB\u52A0\u5931\u8D25: ${e.message}`);
+      process.exit(1);
+    }
+    console.log("");
+    await printSubscriptionList();
+    return;
+  }
   if (freeId < 1 || freeId > freeSources.length) {
-    console.error(`\u9519\u8BEF: \u514D\u8D39\u8BA2\u9605 ID \u8303\u56F4 1-${freeSources.length}`);
+    console.error(`\u9519\u8BEF: \u514D\u8D39\u8BA2\u9605 ID \u8303\u56F4 0-${freeSources.length}`);
     console.log("\n\u53EF\u7528\u6E90:");
-    for (let i = 0; i < freeSources.length; i++) {
-      console.log(`  ${String(i + 1).padStart(2, "0")}  ${freeSources[i].name}`);
-    }
+    printFreeSourceList();
     process.exit(1);
   }
   const source = freeSources[freeId - 1];
@@ -4799,13 +4905,10 @@ async function cmdSubscription(args) {
   }
   if (action === "free") {
     const id = parseInt(args[2], 10);
-    if (!id || Number.isNaN(id)) {
-      const freeSources = getFreeSubscriptionSources();
+    if (Number.isNaN(id)) {
       console.log("\u7528\u6CD5: mihomo sub free <id>\n");
       console.log("\u53EF\u7528\u6E90:");
-      for (let i = 0; i < freeSources.length; i++) {
-        console.log(`  ${String(i + 1).padStart(2, "0")}  ${freeSources[i].name}`);
-      }
+      printFreeSourceList();
       process.exit(1);
     }
     await addFreeSubscription(id);
@@ -4819,21 +4922,45 @@ async function cmdSubscription(args) {
     }
     const url = args[2];
     const name = args[3] || "default";
-    if (!url?.startsWith("http")) {
+    if (!url) {
       console.error("\u9519\u8BEF: \u8BF7\u63D0\u4F9B\u6709\u6548\u7684\u8BA2\u9605 URL");
       process.exit(1);
     }
-    console.log(`\u6DFB\u52A0\u8BA2\u9605: ${name}`);
-    try {
-      addSubscription(url, name);
-      setDefaultSubscription(name);
-      const info = await downloadSubscription(url, name);
-      const repoUrl = githubRepoUrl(url);
-      if (repoUrl) saveSubscriptionCache(name, { web_page_url: repoUrl });
-      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);
+    if (isMultiUrl(url)) {
+      const urls = splitUrls(url);
+      for (const u of urls) {
+        if (!u.startsWith("http")) {
+          console.error(`\u9519\u8BEF: \u65E0\u6548\u7684 URL: ${u}`);
+          process.exit(1);
+        }
+      }
+      console.log(`\u6DFB\u52A0\u5408\u5E76\u8BA2\u9605: ${name} (${urls.length} \u4E2A\u6E90)`);
+      try {
+        addSubscription(url, name);
+        setDefaultSubscription(name);
+        const info = await downloadMergedSubscription(urls, name);
+        console.log(`\u5DF2\u6DFB\u52A0\u5E76\u5207\u6362\u5230 "${name}" (${formatProxySummary(info)}, \u5408\u5E76 ${urls.length} \u6E90)`);
+      } catch (e) {
+        console.error(`\u6DFB\u52A0\u5931\u8D25: ${e.message}`);
+        process.exit(1);
+      }
+    } else {
+      if (!url.startsWith("http")) {
+        console.error("\u9519\u8BEF: \u8BF7\u63D0\u4F9B\u6709\u6548\u7684\u8BA2\u9605 URL");
+        process.exit(1);
+      }
+      console.log(`\u6DFB\u52A0\u8BA2\u9605: ${name}`);
+      try {
+        addSubscription(url, name);
+        setDefaultSubscription(name);
+        const info = await downloadSubscription(url, name);
+        const repoUrl = githubRepoUrl(url);
+        if (repoUrl) saveSubscriptionCache(name, { web_page_url: repoUrl });
+        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();
@@ -4867,7 +4994,13 @@ async function cmdSubscription(args) {
     const target = pickSingleSubscription(matches, name);
     console.log(`\u66F4\u65B0\u8BA2\u9605: ${target.name}`);
     try {
-      const info = await downloadSubscription(target.url, target.name);
+      let info;
+      if (isMultiUrl(target.url)) {
+        const urls = splitUrls(target.url);
+        info = await downloadMergedSubscription(urls, target.name);
+      } else {
+        info = await downloadSubscription(target.url, target.name);
+      }
       console.log(`\u5DF2\u66F4\u65B0 (${formatProxySummary(info)})`);
     } catch (e) {
       console.error(`\u66F4\u65B0\u5931\u8D25: ${e.message}`);

package/package.json

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