tt-help-cli-ycl 1.4.114 → 1.4.117

package/src/clash/checker.js

@@ -22,6 +22,8 @@ import * as api from "./api.js";
 
 const IS_WIN = process.platform === "win32";
 const HEALTHY_FILE = join(tmpdir(), "clash-healthy-nodes.json");
+// 多控制端场景下按代理端口分文件（0/默认 = 单客户端旧文件）；由 applyDiscovered 切换
+let _healthyFile = HEALTHY_FILE;
 
 export const CONFIG = {
   testUrl: "https://www.tiktok.com/explore",
@@ -36,22 +38,27 @@ export const CONFIG = {
 const CURL_UA =
   "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36";
 
+// 支持的 mihomo 系客户端进程名（FR-8 存活判定扩展）
+const CLASH_PROCESS_NAMES = ["verge-mihomo", "69cloud-core"];
+
+// 国家匹配：emoji 国旗可选（Clash Verge 节点名带国旗，69cloud 节点名纯中文/英文不带），
+// 拉丁代码用词边界防误匹配（如 \bUS\b 不匹配 PLUS）
 const COUNTRY_PATTERNS = {
-  US: /[🇺🇸]\s*(美国|US|USA|United\s*States)/i,
-  GB: /[🇬🇧]\s*(英国|UK|GB|United\s*Kingdom)/i,
-  DE: /[🇩🇪]\s*(德国|DE|Germany)/i,
-  FR: /[🇫🇷]\s*(法国|FR|France)/i,
-  JP: /[🇯🇵]\s*(日本|JP|Japan)/i,
-  KR: /[🇰🇷]\s*(韩国|KR|Korea)/i,
-  SG: /[🇸🇬]\s*(新加坡|SG|Singapore)/i,
-  HK: /[🇭🇰]\s*(香港|HK|Hong\s*Kong)/i,
-  TW: /[🇹🇼]\s*(台湾|TW|Taiwan)/i,
-  RU: /[🇷🇺]\s*(俄罗斯|RU|Russia)/i,
-  NL: /[🇳🇱]\s*(荷兰|NL|Netherlands)/i,
-  IN: /[🇮🇳]\s*(印度|IN|India)/i,
-  CA: /[🇨🇦]\s*(加拿大|CA|Canada)/i,
-  AU: /[🇦🇺]\s*(澳大利亚|AU|Australia)/i,
-  MY: /[🇲🇾]\s*(马来西亚|MY|Malaysia)/i,
+  US: /(?:[🇺🇸]\s*)?(美国|USA|United\s*States|\bUS\b)/i,
+  GB: /(?:[🇬🇧]\s*)?(英国|UK|United\s*Kingdom|\bGB\b)/i,
+  DE: /(?:[🇩🇪]\s*)?(德国|Germany|\bDE\b)/i,
+  FR: /(?:[🇫🇷]\s*)?(法国|France|\bFR\b)/i,
+  JP: /(?:[🇯🇵]\s*)?(日本|Japan|\bJP\b)/i,
+  KR: /(?:[🇰🇷]\s*)?(韩国|Korea|\bKR\b)/i,
+  SG: /(?:[🇸🇬]\s*)?(新加坡|Singapore|\bSG\b)/i,
+  HK: /(?:[🇭🇰]\s*)?(香港|Hong\s*Kong|\bHK\b)/i,
+  TW: /(?:[🇹🇼]\s*)?(台湾|Taiwan|\bTW\b)/i,
+  RU: /(?:[🇷🇺]\s*)?(俄罗斯|Russia|\bRU\b)/i,
+  NL: /(?:[🇳🇱]\s*)?(荷兰|Netherlands|\bNL\b)/i,
+  IN: /(?:[🇮🇳]\s*)?(印度|India|\bIN\b)/i,
+  CA: /(?:[🇨🇦]\s*)?(加拿大|Canada|\bCA\b)/i,
+  AU: /(?:[🇦🇺]\s*)?(澳大利亚|Australia|\bAU\b)/i,
+  MY: /(?:[🇲🇾]\s*)?(马来西亚|Malaysia|\bMY\b)/i,
 };
 
 let _proxyResolved = false;
@@ -73,6 +80,26 @@ export function resetProxyUrlCache() {
   _proxyResolved = false;
 }
 
+/**
+ * 应用自动发现结果（discover.js）
+ * 控制端口写入 CONFIG.apiPort；代理端口直接采用发现到的 mixed-port，
+ * 避免 resolveProxyUrl() 再对旧端口发起探测。
+ * 多控制端场景：proxyPort 用于切换对应控制端的健康节点列表文件。
+ * @param {{port?:number, proxyUrl?:string, proxyPort?:number}} disc
+ */
+export function applyDiscovered(disc = {}) {
+  if (disc.port) CONFIG.apiPort = disc.port;
+  if (disc.proxyUrl) {
+    CONFIG.proxyUrl = disc.proxyUrl;
+    _proxyResolved = true;
+  }
+  if (disc.proxyPort) {
+    _healthyFile = join(tmpdir(), `clash-healthy-nodes-${disc.proxyPort}.json`);
+  } else {
+    _healthyFile = HEALTHY_FILE;
+  }
+}
+
 // ══════════════════════════════════════════════
 // 2. 进程 / API 可达性检测
 // ══════════════════════════════════════════════
@@ -104,19 +131,25 @@ export function checkClashAliveWithReason() {
 function _detectProcess() {
   try {
     if (IS_WIN) {
-      const r = spawnSync(
-        "tasklist",
-        ["/FI", "IMAGENAME eq verge-mihomo.exe", "/NH"],
-        { encoding: "utf-8", timeout: 5000, stdio: ["pipe", "pipe", "pipe"] },
-      );
-      return r.stdout?.includes("verge-mihomo.exe");
+      for (const name of CLASH_PROCESS_NAMES) {
+        const r = spawnSync(
+          "tasklist",
+          ["/FI", `IMAGENAME eq ${name}.exe`, "/NH"],
+          { encoding: "utf-8", timeout: 5000, stdio: ["pipe", "pipe", "pipe"] },
+        );
+        if (r.stdout?.includes(`${name}.exe`)) return true;
+      }
+      return false;
     }
-    const r = spawnSync("pgrep", ["-x", "verge-mihomo"], {
-      encoding: "utf-8",
-      timeout: 5000,
-      stdio: ["pipe", "pipe", "pipe"],
-    });
-    return r.status === 0 && !!r.stdout.trim();
+    for (const name of CLASH_PROCESS_NAMES) {
+      const r = spawnSync("pgrep", ["-x", name], {
+        encoding: "utf-8",
+        timeout: 5000,
+        stdio: ["pipe", "pipe", "pipe"],
+      });
+      if (r.status === 0 && r.stdout.trim()) return true;
+    }
+    return false;
   } catch {
     return false;
   }
@@ -367,8 +400,8 @@ export async function runDelayProbe({
  */
 export function loadHealthyList(country = null) {
   try {
-    if (!existsSync(HEALTHY_FILE)) return _emptyList();
-    const d = JSON.parse(readFileSync(HEALTHY_FILE, "utf-8"));
+    if (!existsSync(_healthyFile)) return _emptyList();
+    const d = JSON.parse(readFileSync(_healthyFile, "utf-8"));
     const allNodes = Array.isArray(d.nodes) ? d.nodes : [];
     const filter = country || CONFIG.nodeCountryFilter;
     const { filtered, excluded } = filterNodesByCountry(allNodes, filter);
@@ -388,7 +421,7 @@ export function loadHealthyList(country = null) {
 export function saveHealthyList(nodes) {
   try {
     writeFileSync(
-      HEALTHY_FILE,
+      _healthyFile,
       JSON.stringify({ updated: new Date().toISOString(), nodes }, null, 2),
       "utf-8",
     );