tt-help-cli-ycl 1.4.114 → 1.4.117

package/src/watchdog/reporter.js

@@ -4,7 +4,7 @@
  */
 
 import os from "os";
-import { existsSync, readFileSync } from "fs";
+import { existsSync, readFileSync, readdirSync } from "fs";
 import { join } from "path";
 import { homedir, tmpdir } from "os";
 
@@ -91,3 +91,34 @@ export function getClashHealth() {
   }
   return null;
 }
+
+/**
+ * 读取多控制端健康状态（daemon 多通道模式写入的 clash-health-{port}.json）
+ * @returns {Array<{port:number, stale:boolean, ageSeconds:number, ...health}>}
+ */
+export function getClashHealthChannels() {
+  const out = [];
+  try {
+    for (const name of readdirSync(tmpdir())) {
+      const m = /^clash-health-(\d+)\.json$/.exec(name);
+      if (!m) continue;
+      const port = parseInt(m[1], 10);
+      if (!port) continue;
+      try {
+        const data = JSON.parse(readFileSync(join(tmpdir(), name), "utf-8"));
+        const age = Date.now() - new Date(data.lastCheck || 0).getTime();
+        out.push({
+          ...data,
+          port,
+          stale: age > 120_000,
+          ageSeconds: Math.round(age / 1000),
+        });
+      } catch {
+        /* 单个文件解析失败跳过 */
+      }
+    }
+  } catch {
+    /* 目录不可读 */
+  }
+  return out;
+}

package/src/webserver/server.mjs

@@ -80,6 +80,28 @@ function apiLog(msg) {
   if (SCRAPER_CONFIG.enableLog) console.error(msg);
 }
 
+// 限频错误日志：同类错误在窗口内只打首条，其余计数汇总，避免 CDN 限流等高频错误刷屏
+const ERROR_LOG_THROTTLE_MS = 10000;
+let lastThrottledLogTime = 0;
+let throttledLogCount = 0;
+let throttledLogLabel = "";
+function logErrorThrottled(label, msg) {
+  const now = Date.now();
+  if (now - lastThrottledLogTime >= ERROR_LOG_THROTTLE_MS) {
+    if (throttledLogCount > 0) {
+      console.error(
+        `[webserver] ${throttledLogLabel} | 窗口内共 ${throttledLogCount} 条同类错误（已限频）`,
+      );
+    }
+    console.error(`[webserver] ${label} | ${msg}`);
+    lastThrottledLogTime = now;
+    throttledLogCount = 0;
+    throttledLogLabel = label;
+  } else {
+    throttledLogCount++;
+  }
+}
+
 let scraperInstance = null;
 let scraperClosing = false;
 let scraperInitPromise = null;
@@ -257,16 +279,19 @@ async function handleTiktokUser(req, res) {
 
   if (result.error && result.statusCode) {
     // TikTok 明确返回的状态码（209002 验证码、10202 被封、10221 不存在等）：
-    // 属业务结果而非 webserver 故障，不计入连续错误、不触发 scraper 重启
+    // 属业务结果而非 webserver 故障，不计入连续错误、不触发 scraper 重启；
+    // 返回 200 而非 503：避免 nginx 将其当作节点故障去 failover/熔断
+    //（账号/IP 级风控，切换后端无意义，只会放大对 TikTok 的访问）
     const retryable = TIKTOK_RETRYABLE_NORMAL_CODES.has(result.statusCode);
     apiLog(
       `[webserver] user business | ${clientIP} | @${body.uniqueId} | ${elapsed}ms | statusCode=${result.statusCode}${retryable ? " (可重试)" : ""}`,
     );
     recordRequest(true);
-    return sendJSON(res, 503, {
+    return sendJSON(res, 200, {
       error: `TikTok statusCode=${result.statusCode}`,
       retryable,
-      tiktokStatusCode: result.statusCode,
+      statusCode: result.statusCode, // 后端 data-store / attach 外层读取此字段
+      tiktokStatusCode: result.statusCode, // 兼容保留
     });
   }
   if (result.error) {
@@ -560,22 +585,26 @@ export async function startWebserver(
     try {
       return await route.handler(req, res);
     } catch (e) {
-      // 自动恢复：连续错误超过阈值时重启 scraper
-      consecutiveErrors++;
+      // 错误分类：CDN 限流是环境问题（代理/IP 被 TikTok CDN 拦截），重启 scraper 无法解决，
+      // 故不累计 consecutiveErrors、不触发重启；但仍计入 recentErrors（/health 展示错误率）。
+      const isCdnBlocked = e.name === "CDNBlockedError";
+      if (!isCdnBlocked) consecutiveErrors++;
       recordRequest(false);
 
       // 区分错误类型，返回正确的 HTTP 状态码供 nginx 判断
       let status = 500;
       let retryable = false;
 
-      if (e.name === "CDNBlockedError") {
-        // CDN 限流（Akamai Access Denied）→ 503 临时不可用
+      if (isCdnBlocked) {
+        // CDN 限流（Akamai Access Denied）→ 503 临时不可用（节点级，nginx 可 failover 到其他节点）
         status = 503;
         retryable = true;
+        logErrorThrottled("request CDN限流", e.message);
       } else if (e.message?.includes("Server is shutting down")) {
         // 服务正在关闭 → 503
         status = 503;
         retryable = true;
+        console.error(`[webserver] request 服务关闭中: ${e.message}`);
       } else if (
         e.message?.includes("Timeout") ||
         e.message?.includes("timeout") ||
@@ -584,6 +613,7 @@ export async function startWebserver(
         // 超时 → 504
         status = 504;
         retryable = true;
+        console.error(`[webserver] request 超时: ${e.message}`);
       } else if (
         e.message?.includes("Protocol error") ||
         e.message?.includes("Target closed") ||
@@ -593,6 +623,9 @@ export async function startWebserver(
         // 浏览器/页面崩溃 → 503
         status = 503;
         retryable = true;
+        console.error(`[webserver] request 浏览器异常: ${e.message}`);
+      } else {
+        console.error(`[webserver] request 未知错误: ${e.message}`);
       }
 
       if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {