feat: replace curated with best1/best2 tiers and add base config

adaex · claude · adaex · commit b4baa2e9fabd · 2026-05-03T17:17:27.000+08:00
- best1: speed-tested nodes only (HK:50, US:30, others:20)
- best2: all qualified nodes from 7 sources, no cap
- Each outputs 3 formats: .yaml, -nodes.yaml, -singbox.json
- Fix AI group name: OpenAi/Ai平台 → AI平台
- Add mihomo base config for best: mixed-port, unified-delay,
  tcp-concurrent, profile, fake-ip DNS
- Remove unused USEFUL_TAGS_RE and COUNTRY_GROUPS.prefix
- Data-driven topByCountry limits instead of stringly-typed dispatch

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/src/check.ts b/src/check.ts
@@ -161,8 +161,8 @@ const COUNTRY_FLAGS: Record<string, string> = {
   HK: '🇭🇰', JP: '🇯🇵', US: '🇺🇸', TW: '🇨🇳', SG: '🇸🇬', KR: '🇰🇷',
 };
 
-const CURATED_LIMITS: Record<string, number> = { HK: 100, US: 50 };
-const CURATED_DEFAULT_LIMIT = 20;
+const BEST1_LIMITS: Record<string, number> = { HK: 50, US: 30 };
+const BEST1_DEFAULT_LIMIT = 20;
 
 function parseSpeed(name: string): number {
   const m = name.match(/(\d+(?:\.\d+)?)\s*(MB|KB)\/s/);
@@ -203,7 +203,7 @@ function extractTags(name: string): string {
   return `${speed}${multStr}${lossStr}`;
 }
 
-function topByCountry(proxies: Proxy[]): Proxy[] {
+function topByCountry(proxies: Proxy[], limits?: Record<string, number>, defaultLimit?: number): Proxy[] {
   const groups = new Map<string, Proxy[]>();
   for (const p of proxies) {
     const code = extractCountryCode(p.name) ?? '??';
@@ -212,9 +212,14 @@ function topByCountry(proxies: Proxy[]): Proxy[] {
   }
   const result: Proxy[] = [];
   for (const [code, members] of groups) {
-    const limit = CURATED_LIMITS[code] ?? CURATED_DEFAULT_LIMIT;
     members.sort((a, b) => sortScore(b.name) - sortScore(a.name));
-    const top = members.slice(0, limit);
+    let top: Proxy[];
+    if (limits && defaultLimit !== undefined) {
+      const limit = limits[code] ?? defaultLimit;
+      top = members.slice(0, limit);
+    } else {
+      top = members;
+    }
     for (let i = 0; i < top.length; i++) {
       const flag = COUNTRY_FLAGS[code] ?? '';
       const tags = extractTags(top[i].name);
@@ -232,22 +237,23 @@ async function main() {
   ensureTempDir();
 
   try {
-    const categories = [
+    const categories: Array<{ name: string; file: string; limits?: Record<string, number>; defaultLimit?: number }> = [
       { name: '全部', file: 'all-raw.yaml' },
       { name: 'ACL4SSR', file: 'acl4ssr-raw.yaml' },
       { name: 'freeSub', file: 'freesub-raw.yaml' },
-      { name: '精选', file: 'curated-raw.yaml' },
+      { name: 'best1', file: 'best1-raw.yaml', limits: BEST1_LIMITS, defaultLimit: BEST1_DEFAULT_LIMIT },
+      { name: 'best2', file: 'best2-raw.yaml', limits: {} },
     ];
 
-    console.log(`\n精选 Top 筛选\n`);
+    console.log(`\nbest Top 筛选\n`);
 
     for (const cat of categories) {
       const filePath = path.join(DATA_DIR, cat.file);
       let proxies = readYaml<{ proxies: Proxy[] }>(filePath).proxies;
       console.log(`${cat.name}节点 (${proxies.length}):`);
-      if (cat.file === 'curated-raw.yaml') {
+      if (cat.limits) {
         const before = proxies.length;
-        proxies = topByCountry(proxies);
+        proxies = topByCountry(proxies, cat.limits, cat.defaultLimit);
         console.log(`  Top 筛选: ${proxies.length}/${before}`);
       }
       writeYaml(filePath, { proxies });
diff --git a/src/fetch.ts b/src/fetch.ts
@@ -119,11 +119,10 @@ function matchCuratedCountry(name: string): boolean {
   return code ? CURATED_COUNTRIES.has(code) : false;
 }
 
-const USEFUL_TAGS_RE = /\|(?:GPT⁺?|GM|YT)/;
+const HAS_SPEED_RE = /\d+(?:\.\d+)?\s*[MK]B\/s/;
 
-function isCuratedQualified(name: string): boolean {
-  const hasSpeed = /\d+(?:\.\d+)?\s*[MK]B\/s/.test(name);
-  if (hasSpeed) return true;
+function isBest2Qualified(name: string): boolean {
+  if (HAS_SPEED_RE.test(name)) return true;
   const mult = parseMultiplier(name);
   if (mult !== 2 && mult !== 1) return false;
   const lossMatch = name.match(/\|(\d+)%/);
@@ -132,10 +131,15 @@ function isCuratedQualified(name: string): boolean {
   return true;
 }
 
+function isBest1Qualified(name: string): boolean {
+  return HAS_SPEED_RE.test(name);
+}
+
 function dedup(results: FetchResult[]): {
   acl4ssr: Proxy[];
   freesub: Proxy[];
-  curated: Proxy[];
+  best1: Proxy[];
+  best2: Proxy[];
   all: Proxy[];
   templateAcl4ssr: ParsedConfig | null;
   templateFreesub: ParsedConfig | null;
@@ -149,8 +153,11 @@ function dedup(results: FetchResult[]): {
 
   const acl4ssr = collectProxies(results, (s) => s.category === 'acl4ssr');
   const freesub = collectProxies(results, (s) => s.category === 'freesub');
-  const curated = collectProxies(results, (s, p) =>
-    CURATED_SOURCES.has(s.name) && matchCuratedCountry(p.name) && isCuratedQualified(p.name),
+  const best1 = collectProxies(results, (s, p) =>
+    CURATED_SOURCES.has(s.name) && matchCuratedCountry(p.name) && isBest1Qualified(p.name),
+  );
+  const best2 = collectProxies(results, (s, p) =>
+    CURATED_SOURCES.has(s.name) && matchCuratedCountry(p.name) && isBest2Qualified(p.name),
   );
   const all = collectProxies(results, () => true);
 
@@ -161,7 +168,7 @@ function dedup(results: FetchResult[]): {
     if (source.category === 'freesub' && !templateFreesub) templateFreesub = config;
   }
 
-  return { acl4ssr, freesub, curated, all, templateAcl4ssr, templateFreesub };
+  return { acl4ssr, freesub, best1, best2, all, templateAcl4ssr, templateFreesub };
 }
 
 function buildNodesOnly(proxies: Proxy[]): { proxies: Proxy[] } {
@@ -241,26 +248,28 @@ async function main() {
 
   console.log(`\n成功 ${results.length}/${sources.length} 个源`);
 
-  const { acl4ssr, freesub, curated, all, templateAcl4ssr, templateFreesub } = dedup(results);
+  const { acl4ssr, freesub, best1, best2, all, templateAcl4ssr, templateFreesub } = dedup(results);
 
-  console.log(`\n去重后: ACL4SSR ${acl4ssr.length}, freeSub ${freesub.length}, 精选 ${curated.length}, 全部 ${all.length}`);
+  console.log(`\n去重后: ACL4SSR ${acl4ssr.length}, freeSub ${freesub.length}, best1 ${best1.length}, best2 ${best2.length}, 全部 ${all.length}`);
 
   const aliveSet = await tcpFilterAll(all);
 
   const acl4ssrAlive = filterByAlive(acl4ssr, aliveSet);
   const freesubAlive = filterByAlive(freesub, aliveSet);
-  const curatedAlive = filterByAlive(curated, aliveSet);
+  const best1Alive = filterByAlive(best1, aliveSet);
+  const best2Alive = filterByAlive(best2, aliveSet);
   const allAlive = filterByAlive(all, aliveSet);
 
-  console.log(`\nTCP 过滤后: ACL4SSR ${acl4ssrAlive.length}, freeSub ${freesubAlive.length}, 精选 ${curatedAlive.length}, 全部 ${allAlive.length}`);
+  console.log(`\nTCP 过滤后: ACL4SSR ${acl4ssrAlive.length}, freeSub ${freesubAlive.length}, best1 ${best1Alive.length}, best2 ${best2Alive.length}, 全部 ${allAlive.length}`);
 
   // save intermediate data
   fs.mkdirSync(DATA_DIR, { recursive: true });
 
   writeYaml(path.join(DATA_DIR, 'all-raw.yaml'), buildNodesOnly(allAlive));
   writeYaml(path.join(DATA_DIR, 'acl4ssr-raw.yaml'), buildNodesOnly(acl4ssrAlive));
   writeYaml(path.join(DATA_DIR, 'freesub-raw.yaml'), buildNodesOnly(freesubAlive));
-  writeYaml(path.join(DATA_DIR, 'curated-raw.yaml'), buildNodesOnly(curatedAlive));
+  writeYaml(path.join(DATA_DIR, 'best1-raw.yaml'), buildNodesOnly(best1Alive));
+  writeYaml(path.join(DATA_DIR, 'best2-raw.yaml'), buildNodesOnly(best2Alive));
 
   // save templates
   if (templateAcl4ssr) {
diff --git a/src/output.ts b/src/output.ts
@@ -218,13 +218,13 @@ function convertProxy(p: Proxy): SingboxOutbound | null {
   }
 }
 
-const COUNTRY_GROUPS: Array<{ tag: string; prefix: string; re: RegExp }> = [
-  { tag: '🇭🇰 香港', prefix: 'HK', re: /HK_\d+/ },
-  { tag: '🇯🇵 日本', prefix: 'JP', re: /JP_\d+/ },
-  { tag: '🇺🇸 美国', prefix: 'US', re: /US_\d+/ },
-  { tag: '🇨🇳 台湾', prefix: 'TW', re: /TW_\d+/ },
-  { tag: '🇸🇬 新加坡', prefix: 'SG', re: /SG_\d+/ },
-  { tag: '🇰🇷 韩国', prefix: 'KR', re: /KR_\d+/ },
+const COUNTRY_GROUPS: Array<{ tag: string; re: RegExp }> = [
+  { tag: '🇭🇰 香港', re: /HK_\d+/ },
+  { tag: '🇯🇵 日本', re: /JP_\d+/ },
+  { tag: '🇺🇸 美国', re: /US_\d+/ },
+  { tag: '🇨🇳 台湾', re: /TW_\d+/ },
+  { tag: '🇸🇬 新加坡', re: /SG_\d+/ },
+  { tag: '🇰🇷 韩国', re: /KR_\d+/ },
 ];
 
 function mihomoToSingbox(proxies: Proxy[]): Record<string, unknown> {
@@ -333,15 +333,28 @@ function mihomoToSingbox(proxies: Proxy[]): Record<string, unknown> {
   };
 }
 
+function fixAiName(s: string): string {
+  return s.replace('💬 Ai平台', '💬 AI平台').replace('💬 OpenAi', '💬 AI平台');
+}
+
+function fixAiGroupName(groups: Record<string, unknown>[]): Record<string, unknown>[] {
+  return groups.map(g => ({ ...g, name: fixAiName(String(g.name)) }));
+}
+
+function fixAiRules(rules: string[]): string[] {
+  return rules.map(fixAiName);
+}
+
 // --- main ---
 
 function main() {
   const acl4ssrProxies = readYaml<{ proxies: Proxy[] }>(path.join(DATA_DIR, 'acl4ssr-raw.yaml')).proxies;
   const freesubProxies = readYaml<{ proxies: Proxy[] }>(path.join(DATA_DIR, 'freesub-raw.yaml')).proxies;
-  const curatedProxies = readYaml<{ proxies: Proxy[] }>(path.join(DATA_DIR, 'curated-raw.yaml')).proxies;
+  const best1Proxies = readYaml<{ proxies: Proxy[] }>(path.join(DATA_DIR, 'best1-raw.yaml')).proxies;
+  const best2Proxies = readYaml<{ proxies: Proxy[] }>(path.join(DATA_DIR, 'best2-raw.yaml')).proxies;
   const allProxies = readYaml<{ proxies: Proxy[] }>(path.join(DATA_DIR, 'all-raw.yaml')).proxies;
 
-  console.log(`ACL4SSR: ${acl4ssrProxies.length}, freeSub: ${freesubProxies.length}, 精选: ${curatedProxies.length}, 全部: ${allProxies.length}`);
+  console.log(`ACL4SSR: ${acl4ssrProxies.length}, freeSub: ${freesubProxies.length}, best1: ${best1Proxies.length}, best2: ${best2Proxies.length}, 全部: ${allProxies.length}`);
 
   fs.mkdirSync(OUTPUT_DIR, { recursive: true });
 
@@ -386,36 +399,60 @@ function main() {
     console.log(`已写入 output/freesub-nodes.yaml`);
   }
 
-  // curated full config (uses acl4ssr template)
-  if (acl4ssrTemplate && curatedProxies.length > 0) {
-    writeYaml(path.join(OUTPUT_DIR, 'curated.yaml'), {
-      proxies: curatedProxies,
-      'proxy-groups': acl4ssrTemplate['proxy-groups'],
-      rules: acl4ssrTemplate.rules,
-      'rule-providers': acl4ssrTemplate['rule-providers'],
-      dns: acl4ssrTemplate.dns,
-    });
-    console.log(`已写入 output/curated.yaml (${curatedProxies.length} 节点)`);
-  }
+  // best1/best2 outputs (both use acl4ssr template with OpenAi→AI平台 fix)
+  const fixedGroups = acl4ssrTemplate ? fixAiGroupName(acl4ssrTemplate['proxy-groups'] as Record<string, unknown>[]) : null;
+  const fixedRules = acl4ssrTemplate ? fixAiRules(acl4ssrTemplate.rules as string[]) : null;
+
+  const bestBase = {
+    'mixed-port': 7890,
+    'allow-lan': false,
+    mode: 'rule',
+    'log-level': 'warning',
+    'unified-delay': true,
+    'tcp-concurrent': true,
+    profile: { 'store-selected': true },
+    dns: {
+      enable: true,
+      'enhanced-mode': 'fake-ip',
+      'fake-ip-range': '198.18.0.1/16',
+      'fake-ip-filter': ['*.lan', '*.local', '+.msftconnecttest.com', '+.msftncsi.com', 'localhost.ptlogin2.qq.com'],
+      'default-nameserver': ['223.5.5.5', '119.29.29.29'],
+      nameserver: ['https://dns.alidns.com/dns-query', 'https://doh.pub/dns-query'],
+    },
+  };
 
-  // curated nodes only
-  if (curatedProxies.length > 0) {
-    writeYaml(path.join(OUTPUT_DIR, 'curated-nodes.yaml'), { proxies: curatedProxies });
-    console.log(`已写入 output/curated-nodes.yaml`);
-  }
+  const bestGroups: Array<{ label: string; proxies: Proxy[] }> = [
+    { label: 'best1', proxies: best1Proxies },
+    { label: 'best2', proxies: best2Proxies },
+  ];
+
+  for (const { label, proxies } of bestGroups) {
+    if (proxies.length === 0) continue;
+
+    if (acl4ssrTemplate && fixedGroups && fixedRules) {
+      writeYaml(path.join(OUTPUT_DIR, `${label}.yaml`), {
+        ...bestBase,
+        proxies,
+        'proxy-groups': fixedGroups,
+        rules: fixedRules,
+        'rule-providers': acl4ssrTemplate['rule-providers'],
+      });
+      console.log(`已写入 output/${label}.yaml (${proxies.length} 节点)`);
+    }
+
+    writeYaml(path.join(OUTPUT_DIR, `${label}-nodes.yaml`), { proxies });
+    console.log(`已写入 output/${label}-nodes.yaml`);
 
-  // curated sing-box format
-  if (curatedProxies.length > 0) {
-    const singboxConfig = mihomoToSingbox(curatedProxies);
+    const singboxConfig = mihomoToSingbox(proxies);
     fs.writeFileSync(
-      path.join(OUTPUT_DIR, 'curated-singbox.json'),
+      path.join(OUTPUT_DIR, `${label}-singbox.json`),
       JSON.stringify(singboxConfig, null, 2),
       'utf-8',
     );
     const proxyCount = (singboxConfig.outbounds as unknown[]).filter(
       (o: unknown) => !['selector', 'urltest', 'direct', 'block', 'dns'].includes((o as Record<string, string>).type),
     ).length;
-    console.log(`已写入 output/curated-singbox.json (${proxyCount} 节点)`);
+    console.log(`已写入 output/${label}-singbox.json (${proxyCount} 节点)`);
   }
 
   // all nodes
