mihomo-cli 2.0.0 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## [2.1.0] - 2026-05-01
+
+### 新增
+
+- **删除订阅**：`sub remove <name>` 删除订阅（别名 `rm`/`delete`），同时清理缓存和配置文件
+  - 删除当前使用中的订阅时自动切换到第一个剩余订阅
+- **添加即切换**：`sub add` 添加订阅后自动切换为当前使用的订阅
+
+### 安全
+
+- **强制 `allow-lan: false`**：无论订阅配置如何，始终禁止局域网访问
+- **强制 `external-controller: 127.0.0.1:9090`**：控制面板仅监听本地，防止不可信订阅暴露控制接口
+- **剥离 `external-ui` 相关字段**：构建配置时强制删除 `external-ui`/`external-ui-name`/`external-ui-url`，防止订阅触发额外下载
+
+### 优化
+
+- **TUN DNS 劫持**：`dns-hijack` 从 `['0.0.0.0:53']` 改为 `['any:53', 'tcp://any:53']`，同时劫持 UDP 和 TCP DNS，覆盖 IPv4/IPv6
+- **帮助顺序统一**：订阅子命令统一为 use → add → update → remove → web 顺序
+- **`removeSubscription` 返回切换信息**：返回自动切换到的订阅名，避免调用方重复读取状态
+- **`setDefaultSubscription` 跳过冗余写入**：已是同值时直接返回
+- **删除后跳过自动更新**：`sub remove` 后列出订阅时不触发网络更新
+
+---
+
+## [2.0.1] - 2026-04-22
+
+### 修复
+
+- **TUN DNS 默认值**：使用属性存在性检查替代 falsy 检查，避免订阅中 `dns.enable: false` 等值被覆盖
+- **覆写文件名显示**：`overwrite.yaml` 不再显示为 "yaml"，改为 "主文件"
+
+### 优化
+
+- **消除重复文件扫描**：覆写文件加载从每次构建 2 次减少为 1 次
+- **清理死代码**：移除 `resetUserData`、`getGitHubMirror`、`setGitHubMirror`、未使用的类型字段
+
+---
+
 ## [2.0.0] - 2026-04-11
 
 ### 架构重写

package/README.md

@@ -94,10 +94,11 @@ mihomo ui yacd     # YACD
 | 命令                          | 说明                                   |
 | ----------------------------- | -------------------------------------- |
 | `mihomo sub`                  | 列出所有订阅（含流量、到期时间）       |
-| `mihomo sub add <url> [name]` | 添加订阅                               |
+| `mihomo sub use <name>`       | 切换当前订阅（支持模糊匹配，自动重启） |
+| `mihomo sub add <url> [name]` | 添加订阅并自动切换                     |
 | `mihomo sub update`           | 更新所有订阅                           |
 | `mihomo sub update <name>`    | 更新指定订阅（支持模糊匹配）           |
-| `mihomo sub use <name>`       | 切换当前订阅（支持模糊匹配，自动重启） |
+| `mihomo sub remove <name>`    | 删除订阅（支持模糊匹配）               |
 | `mihomo sub web [name]`       | 打开订阅页面（无参打开默认）           |
 
 ### 覆写配置

package/dist/index.js

@@ -2695,13 +2695,15 @@ var TUN_CONFIG = {
   tun: {
     enable: true,
     stack: "mixed",
-    "dns-hijack": ["0.0.0.0:53"],
+    "dns-hijack": ["any:53", "tcp://any:53"],
     "auto-route": true,
     "auto-detect-interface": true,
     "strict-route": true
   }
 };
 var BASE_CONFIG = {
+  "allow-lan": false,
+  "external-controller": "127.0.0.1:9090",
   "log-level": "warning",
   "geodata-mode": true,
   "geo-update-interval": 24,
@@ -2819,11 +2821,33 @@ function addSubscription(url, name = "default") {
   }
   writeSettings(updates);
 }
+function removeSubscription(name) {
+  const settings = readSettings();
+  const subs = settings.subscriptions || [];
+  const idx = subs.findIndex((s) => s.name === name);
+  if (idx < 0) return null;
+  subs.splice(idx, 1);
+  const updates = { subscriptions: subs };
+  let switchedTo = null;
+  if (settings.active_subscription === name) {
+    switchedTo = subs.length > 0 ? subs[0].name : null;
+    updates.active_subscription = switchedTo ?? void 0;
+  }
+  writeSettings(updates);
+  const cache = readSubscriptionCache();
+  if (cache[name]) {
+    delete cache[name];
+    writeSubscriptionCache(cache);
+  }
+  fs2.rmSync(getSubscriptionRawConfigPath(name), { force: true });
+  return switchedTo;
+}
 function setDefaultSubscription(name) {
   const settings = readSettings();
   const subs = settings.subscriptions || [];
   const idx = subs.findIndex((s) => s.name === name);
   if (idx < 0) return false;
+  if (settings.active_subscription === name) return true;
   writeSettings({ active_subscription: name });
   return true;
 }
@@ -2949,9 +2973,9 @@ function loadOverwriteFile() {
   }
   return results;
 }
-function applyOverwrite(baseConfig) {
+function applyOverwrite(baseConfig, preloadedFiles) {
   if (!isOverwriteEnabled()) return baseConfig;
-  const overwriteFiles = loadOverwriteFile();
+  const overwriteFiles = preloadedFiles || loadOverwriteFile();
   if (overwriteFiles.length === 0) return baseConfig;
   let result = { ...baseConfig };
   for (const file of overwriteFiles) {
@@ -2995,21 +3019,26 @@ function buildConfig(subRawContent, mode) {
     throw new Error("\u8BA2\u9605\u5185\u5BB9\u4E3A\u7A7A");
   }
   const overwriteEnabled = isOverwriteEnabled();
-  const withOverwrites = applyOverwrite(subscriptionConfig);
   const overwriteFiles = overwriteEnabled ? loadOverwriteFile() : [];
+  const withOverwrites = applyOverwrite(subscriptionConfig, overwriteFiles);
   const systemConfig = {};
   for (const [key, value] of Object.entries(BASE_CONFIG)) {
     if (!(key in withOverwrites)) {
       systemConfig[key] = value;
     }
   }
+  systemConfig["allow-lan"] = false;
+  systemConfig["external-controller"] = BASE_CONFIG["external-controller"];
+  delete withOverwrites["external-ui"];
+  delete withOverwrites["external-ui-name"];
+  delete withOverwrites["external-ui-url"];
   if (mode === "tun") {
     systemConfig.tun = TUN_CONFIG.tun;
     const subDns = withOverwrites.dns || {};
     const dns = {};
-    if (!subDns.enable) dns.enable = true;
-    if (!subDns["enhanced-mode"]) dns["enhanced-mode"] = "fake-ip";
-    if (!subDns["fake-ip-range"]) dns["fake-ip-range"] = "198.18.0.1/16";
+    if (!("enable" in subDns)) dns.enable = true;
+    if (!("enhanced-mode" in subDns)) dns["enhanced-mode"] = "fake-ip";
+    if (!("fake-ip-range" in subDns)) dns["fake-ip-range"] = "198.18.0.1/16";
     if (Object.keys(dns).length > 0) {
       systemConfig.dns = dns;
     }
@@ -3662,7 +3691,6 @@ function listLogs() {
       const stat = fs5.statSync(filePath);
       result.archives.push({
         name: file,
-        timestamp: match[1],
         path: filePath,
         size: stat.size,
         mtime: stat.mtime,
@@ -3834,9 +3862,10 @@ ${colors.cyan("\u754C\u9762:")}
 
 ${colors.cyan("\u8BA2\u9605:")}
   ${colors.bold("subscription")}                 \u5217\u51FA\u6240\u6709\u8BA2\u9605\uFF08\u522B\u540D sub\uFF09
+  ${colors.bold("subscription")} use <name>      \u5207\u6362\u5F53\u524D\u8BA2\u9605
   ${colors.bold("subscription")} add <url> [name]  \u6DFB\u52A0\u8BA2\u9605
   ${colors.bold("subscription")} update [name]   \u66F4\u65B0\u8BA2\u9605\uFF08\u65E0\u53C2\u66F4\u65B0\u6240\u6709\uFF09
-  ${colors.bold("subscription")} use <name>      \u5207\u6362\u5F53\u524D\u8BA2\u9605
+  ${colors.bold("subscription")} remove <name>   \u5220\u9664\u8BA2\u9605
   ${colors.bold("subscription")} web [name]      \u6253\u5F00\u8BA2\u9605\u9875\u9762
 
 ${colors.cyan("\u914D\u7F6E:")}
@@ -3938,9 +3967,8 @@ var compareVersions = (v1, v2) => {
 // src/kernel.ts
 var GITHUB_REPO = "MetaCubeX/mihomo";
 var KERNEL_HTTP_TIMEOUT = 12e4;
-var KERNEL_MAX_CONTENT_LENGTH = 200 * 1024 * 1024;
 var KERNEL_DOWNLOAD_TIMEOUT = 18e4;
-var HTTP_CLIENT = createHttpClient({ timeout: KERNEL_HTTP_TIMEOUT, maxContentLength: KERNEL_MAX_CONTENT_LENGTH });
+var HTTP_CLIENT = createHttpClient({ timeout: KERNEL_HTTP_TIMEOUT });
 function withMirror(url, mirror) {
   if (mirror && (url.startsWith("https://github.com/") || url.startsWith("https://api.github.com/"))) {
     return mirror + url;
@@ -4000,7 +4028,6 @@ async function checkUpdate(mirror) {
     latest: latestVersion,
     needsUpdate,
     assets: latest.assets,
-    htmlUrl: latest.html_url,
     release: latest
   };
 }
@@ -4241,7 +4268,7 @@ import path5 from "path";
 
 // src/subscription.ts
 var DEFAULT_UPDATE_INTERVAL_HOURS = 12;
-var HTTP_CLIENT2 = createHttpClient({ timeout: 6e4, maxContentLength: 50 * 1024 * 1024 });
+var HTTP_CLIENT2 = createHttpClient({ timeout: 6e4 });
 function parseUserInfo(header) {
   if (!header) return null;
   const info = {};
@@ -4458,7 +4485,7 @@ function printStatus() {
     console.log(`${colors.gray("\u8BA2\u9605: ")}\u672A\u914D\u7F6E`);
   }
   if (overwriteEnabled && overwriteFiles.length > 0) {
-    const names = overwriteFiles.map((f) => f.name.replace(/^overwrite\.?/, "")).join(", ");
+    const names = overwriteFiles.map((f) => f.name.replace(/^overwrite\.?/, "").replace(/\.ya?ml$/, "") || "\u4E3B\u6587\u4EF6").join(", ");
     console.log(`${colors.gray("\u8986\u5199: ")}${colors.green("\u5DF2\u542F\u7528")} (${names})`);
   } else if (overwriteEnabled) {
     console.log(`${colors.gray("\u8986\u5199: ")}${colors.green("\u5DF2\u542F\u7528")} (\u65E0\u6587\u4EF6)`);
@@ -4766,9 +4793,11 @@ async function cmdStop() {
 }
 
 // src/commands/subscription.ts
-async function printSubscriptionList() {
-  const updateResult = await autoUpdateStaleSubscription();
-  if (updateResult.total > 0) console.log("");
+async function printSubscriptionList(options) {
+  if (options?.autoUpdate !== false) {
+    const updateResult = await autoUpdateStaleSubscription();
+    if (updateResult.total > 0) console.log("");
+  }
   const subs = getSubscriptionsWithCache();
   if (subs.length === 0) {
     console.log("\u6CA1\u6709\u8BA2\u9605");
@@ -4808,9 +4837,10 @@ async function printSubscriptionList() {
   });
   console.log("");
   console.log("\u5207\u6362\u8BA2\u9605: mihomo sub use <name>");
+  console.log("\u65B0\u589E\u8BA2\u9605: mihomo sub add <url> [name]");
   console.log("\u66F4\u65B0\u8BA2\u9605: mihomo sub update [name]");
+  console.log("\u5220\u9664\u8BA2\u9605: mihomo sub remove <name>");
   console.log("\u6253\u5F00\u9875\u9762: mihomo sub web [name]");
-  console.log("\u65B0\u589E\u8BA2\u9605: mihomo sub add <url> [name]");
   console.log("");
 }
 async function cmdSubscription(args) {
@@ -4829,8 +4859,9 @@ async function cmdSubscription(args) {
     console.log(`\u6DFB\u52A0\u8BA2\u9605: ${name}`);
     try {
       addSubscription(url, name);
+      setDefaultSubscription(name);
       const info = await downloadSubscription(url, name);
-      console.log(`\u5DF2\u6DFB\u52A0 (${formatProxySummary(info)})`);
+      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);
@@ -4956,8 +4987,30 @@ async function cmdSubscription(args) {
     }
     return;
   }
+  if (action === "remove" || action === "rm" || action === "delete") {
+    const name = args[2];
+    const subs = getSubscriptions();
+    if (!name) {
+      console.error("\u9519\u8BEF: \u8BF7\u6307\u5B9A\u8981\u5220\u9664\u7684\u8BA2\u9605\u540D\u79F0");
+      if (subs.length > 0) {
+        console.log("\n\u53EF\u7528\u8BA2\u9605:");
+        for (const s of subs) console.log(`  ${s.name}`);
+      }
+      process.exit(1);
+    }
+    const matches = findSubscriptionFuzzy(subs, name);
+    const target = pickSingleSubscription(matches, name);
+    const switchedTo = removeSubscription(target.name);
+    console.log(`\u5DF2\u5220\u9664\u8BA2\u9605 "${target.name}"`);
+    if (switchedTo) {
+      console.log(`\u5DF2\u81EA\u52A8\u5207\u6362\u5230 "${switchedTo}"`);
+    }
+    console.log("");
+    await printSubscriptionList({ autoUpdate: false });
+    return;
+  }
   console.error("\u9519\u8BEF: \u672A\u77E5\u7684\u8BA2\u9605\u547D\u4EE4");
-  console.log("\u7528\u6CD5: mihomo sub [list|add|update|use|web]");
+  console.log("\u7528\u6CD5: mihomo sub [list|use|add|update|remove|web]");
   process.exit(1);
 }
 

package/package.json

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