feat: TCP sequential retry, deploy to sub branch, add AGENTS.md

- TCP retries now run in 3 sequential rounds with 3s buffer between each
- Deploy target changed from main to sub branch
- Commit message format: pure timestamp with seconds
- Remove updated.txt from output
- Add AGENTS.md with workflow conventions (CLAUDE.md symlink)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: adaex

.github/workflows/update.yml

@@ -45,12 +45,12 @@ jobs:
       - name: Generate output
         run: npx tsx src/output.ts
 
-      - name: Deploy to main branch
+      - name: Deploy to sub branch
         run: |
           cd output
           git init
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git add -A
-          git commit -m "$(date -u '+%Y-%m-%d %H:%M') update"
-          git push --force "https://x-access-token:${{ github.token }}@github.com/${{ github.repository }}.git" HEAD:main
+          git commit -m "$(date -u '+%Y-%m-%d %H:%M:%S')"
+          git push --force "https://x-access-token:${{ github.token }}@github.com/${{ github.repository }}.git" HEAD:sub

AGENTS.md

@@ -0,0 +1,18 @@
+# Agents Guide
+
+## Workflow
+
+- Always ask before pushing to remote. Never push without user confirmation.
+- After pushing, monitor CI run status (`gh run watch`) and report the result to the user.
+- Commit messages and PR descriptions in English.
+
+## Branch Strategy
+
+- `dev` branch: source code, CI workflow triggers on push
+- `sub` branch: output files only (subscriptions), deployed by CI via force-push
+
+## Code Style
+
+- TypeScript, strict mode
+- No comments unless explaining a non-obvious WHY
+- Shared utilities go in `src/utils.ts`

CLAUDE.md

@@ -0,0 +1 @@
+AGENTS.md

README.md

@@ -6,14 +6,14 @@ Free Mihomo/Clash/sing-box subscription aggregator, updated hourly.
 
 | Description | URL |
 |-------------|-----|
-| Curated mihomo config | `https://raw.githubusercontent.com/imaex/free-sub/main/curated.yaml` |
-| Curated sing-box config | `https://raw.githubusercontent.com/imaex/free-sub/main/curated-singbox.json` |
-| Curated nodes only | `https://raw.githubusercontent.com/imaex/free-sub/main/curated-nodes.yaml` |
-| ACL4SSR config | `https://raw.githubusercontent.com/imaex/free-sub/main/acl4ssr.yaml` |
-| ACL4SSR nodes only | `https://raw.githubusercontent.com/imaex/free-sub/main/acl4ssr-nodes.yaml` |
-| freeSub config | `https://raw.githubusercontent.com/imaex/free-sub/main/freesub.yaml` |
-| freeSub nodes only | `https://raw.githubusercontent.com/imaex/free-sub/main/freesub-nodes.yaml` |
-| All nodes | `https://raw.githubusercontent.com/imaex/free-sub/main/all-nodes.yaml` |
+| Curated mihomo config | `https://raw.githubusercontent.com/imaex/free-sub/sub/curated.yaml` |
+| Curated sing-box config | `https://raw.githubusercontent.com/imaex/free-sub/sub/curated-singbox.json` |
+| Curated nodes only | `https://raw.githubusercontent.com/imaex/free-sub/sub/curated-nodes.yaml` |
+| ACL4SSR config | `https://raw.githubusercontent.com/imaex/free-sub/sub/acl4ssr.yaml` |
+| ACL4SSR nodes only | `https://raw.githubusercontent.com/imaex/free-sub/sub/acl4ssr-nodes.yaml` |
+| FreeSub config | `https://raw.githubusercontent.com/imaex/free-sub/sub/freesub.yaml` |
+| FreeSub nodes only | `https://raw.githubusercontent.com/imaex/free-sub/sub/freesub-nodes.yaml` |
+| All nodes | `https://raw.githubusercontent.com/imaex/free-sub/sub/all-nodes.yaml` |
 
 CN mirror: replace `https://raw.githubusercontent.com/` with `https://gh-proxy.org/raw.githubusercontent.com/`
 
@@ -22,4 +22,4 @@ CN mirror: replace `https://raw.githubusercontent.com/` with `https://gh-proxy.o
 1. Fetch 25 sources hourly, normalize node names, deduplicate by `type|server|port`
 2. TCP connectivity test (5s timeout, 3 retries) to filter dead nodes
 3. Curated category sorted by speed / multiplier / loss rate, top-N per country (HK 100, US 50, others 20)
-4. Generate full configs, node lists and sing-box format, push to main branch
+4. Generate full configs, node lists and sing-box format, push to sub branch

src/fetch.ts

@@ -171,6 +171,7 @@ function buildNodesOnly(proxies: Proxy[]): { proxies: Proxy[] } {
 const TCP_TIMEOUT = 5000;
 const TCP_CONCURRENCY = 50;
 const TCP_RETRIES = 3;
+const TCP_RETRY_DELAY = 3000;
 
 function tcpCheckOnce(host: string, port: number): Promise<boolean> {
   return new Promise((resolve) => {
@@ -181,14 +182,21 @@ function tcpCheckOnce(host: string, port: number): Promise<boolean> {
   });
 }
 
-async function tcpCheck(host: string, port: number): Promise<boolean> {
-  try {
-    return await Promise.any(
-      Array.from({ length: TCP_RETRIES }, () => tcpCheckOnce(host, port)),
-    );
-  } catch {
-    return false;
+async function tcpBatch(endpoints: [string, { host: string; port: number }][]): Promise<Set<string>> {
+  const aliveSet = new Set<string>();
+  let tested = 0;
+  for (let i = 0; i < endpoints.length; i += TCP_CONCURRENCY) {
+    const batch = endpoints.slice(i, i + TCP_CONCURRENCY);
+    const results = await Promise.all(batch.map(async ([key, ep]) => ({ key, ok: await tcpCheckOnce(ep.host, ep.port) })));
+    for (const r of results) {
+      if (r.ok) aliveSet.add(r.key);
+    }
+    tested += batch.length;
+    const pct = Math.round((tested / endpoints.length) * 100);
+    process.stdout.write(`\r    ${tested}/${endpoints.length} (${pct}%)  存活: ${aliveSet.size}`);
   }
+  process.stdout.write('\n');
+  return aliveSet;
 }
 
 async function tcpFilterAll(proxies: Proxy[]): Promise<Set<string>> {
@@ -198,24 +206,25 @@ async function tcpFilterAll(proxies: Proxy[]): Promise<Set<string>> {
     if (!uniqueEndpoints.has(key)) uniqueEndpoints.set(key, { host: p.server, port: p.port });
   }
 
-  const endpoints = [...uniqueEndpoints.entries()];
+  const allEndpoints = [...uniqueEndpoints.entries()];
   const aliveSet = new Set<string>();
-  let tested = 0;
+  let remaining = allEndpoints;
 
-  console.log(`\nTCP 连通性测试 (${endpoints.length} 个唯一端点)...`);
+  console.log(`\nTCP 连通性测试 (${allEndpoints.length} 个唯一端点, ${TCP_RETRIES} 轮)...`);
 
-  for (let i = 0; i < endpoints.length; i += TCP_CONCURRENCY) {
-    const batch = endpoints.slice(i, i + TCP_CONCURRENCY);
-    const results = await Promise.all(batch.map(async ([key, ep]) => ({ key, ok: await tcpCheck(ep.host, ep.port) })));
-    for (const r of results) {
-      if (r.ok) aliveSet.add(r.key);
+  for (let round = 1; round <= TCP_RETRIES; round++) {
+    if (remaining.length === 0) break;
+    if (round > 1) {
+      console.log(`  等待 ${TCP_RETRY_DELAY / 1000}s 后重试...`);
+      await new Promise(r => setTimeout(r, TCP_RETRY_DELAY));
     }
-    tested += batch.length;
-    const pct = Math.round((tested / endpoints.length) * 100);
-    process.stdout.write(`\r  TCP: ${tested}/${endpoints.length} (${pct}%)  存活: ${aliveSet.size}`);
+    console.log(`  第 ${round} 轮 (${remaining.length} 个端点):`);
+    const roundAlive = await tcpBatch(remaining);
+    for (const key of roundAlive) aliveSet.add(key);
+    remaining = remaining.filter(([key]) => !roundAlive.has(key));
   }
-  process.stdout.write('\n');
-  console.log(`TCP 连通率: ${aliveSet.size}/${endpoints.length} (${Math.round((aliveSet.size / endpoints.length) * 100)}%)`);
+
+  console.log(`TCP 连通率: ${aliveSet.size}/${allEndpoints.length} (${Math.round((aliveSet.size / allEndpoints.length) * 100)}%)`);
   return aliveSet;
 }
 

src/output.ts

@@ -421,9 +421,6 @@ function main() {
   // all nodes
   writeYaml(path.join(OUTPUT_DIR, 'all-nodes.yaml'), { proxies: allProxies });
   console.log(`已写入 output/all-nodes.yaml (${allProxies.length} 节点)`);
-
-  // timestamp
-  fs.writeFileSync(path.join(OUTPUT_DIR, 'updated.txt'), new Date().toISOString(), 'utf-8');
 }
 
 main();