tt-help-cli-ycl 1.4.78 → 1.4.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.4.78",
+  "version": "1.4.79",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {

package/src/webserver/server.mjs

@@ -35,6 +35,14 @@ function sendJSON(res, status, data) {
 
 const MAX_BODY_SIZE = 10 * 1024 * 1024; // 10MB
 
+function getClientIP(req) {
+  return (
+    req.headers["x-forwarded-for"]?.split(",")[0]?.trim() ||
+    req.socket.remoteAddress ||
+    ""
+  );
+}
+
 function readBody(req) {
   return new Promise((resolve, reject) => {
     let body = "";
@@ -73,6 +81,11 @@ let consecutiveErrors = 0;
 const MAX_CONSECUTIVE_ERRORS = 10;
 let warmTimer = null;
 let lastWarmTime = 0;
+// 滑动窗口错误率追踪（用于 /health 上报，不触发重启）
+let recentTotal = 0;
+let recentErrors = 0;
+let recentWindowStart = Date.now();
+const RECENT_WINDOW_MS = 60000; // 60 秒滑动窗口
 
 async function getScraper() {
   if (scraperInstance && !scraperClosing) {
@@ -100,6 +113,23 @@ async function getScraper() {
   }
 }
 
+function recordRequest(success) {
+  const now = Date.now();
+  if (now - recentWindowStart > RECENT_WINDOW_MS) {
+    recentTotal = 0;
+    recentErrors = 0;
+    recentWindowStart = now;
+  }
+  recentTotal++;
+  if (!success) recentErrors++;
+  if (success) consecutiveErrors = 0;
+}
+
+function isDegraded() {
+  // 仅当 scraper 正在恢复/关闭中才算降级，初始冷状态不算
+  return scraperClosing || scraperInitPromise !== null;
+}
+
 async function restartScraper(reason) {
   console.error(`[webserver] 重启 scraper: ${reason}`);
   if (scraperInstance) {
@@ -156,13 +186,39 @@ async function handleTiktokUser(req, res) {
   if (!body.uniqueId) {
     return sendJSON(res, 400, { error: "missing uniqueId" });
   }
+  const clientIP = getClientIP(req);
+  const startTime = Date.now();
   const scraper = await getScraper();
   const result = await scraper.getUserInfo(body.uniqueId);
+  const elapsed = Date.now() - startTime;
+
   if (!result) {
-    return sendJSON(res, 404, {
-      error: "User not found or failed to parse data",
+    console.error(
+      `[webserver] user FAIL | ${clientIP} | @${body.uniqueId} | ${elapsed}ms | empty SSR / parse failed`,
+    );
+    recordRequest(false);
+    return sendJSON(res, 503, {
+      error: "Temporary failure: unable to fetch user data",
+      retryable: true,
     });
   }
+
+  if (result.error) {
+    console.error(
+      `[webserver] user FAIL | ${clientIP} | @${body.uniqueId} | ${elapsed}ms | TikTok statusCode=${result.statusCode}`,
+    );
+    recordRequest(false);
+    return sendJSON(res, 502, {
+      error: `TikTok error (statusCode=${result.statusCode})`,
+      retryable: false,
+      tiktokStatusCode: result.statusCode,
+    });
+  }
+
+  console.error(
+    `[webserver] user OK | ${clientIP} | @${body.uniqueId} | ${elapsed}ms | verified=${result.verified} followers=${result.followerCount}`,
+  );
+  recordRequest(true);
   return sendJSON(res, 200, result);
 }
 
@@ -171,13 +227,27 @@ async function handleTiktokVideo(req, res) {
   if (!body.videoUrl) {
     return sendJSON(res, 400, { error: "missing videoUrl" });
   }
+  const clientIP = getClientIP(req);
+  const startTime = Date.now();
   const scraper = await getScraper();
   const result = await scraper.getVideoInfo(body.videoUrl);
+  const elapsed = Date.now() - startTime;
+
   if (!result) {
-    return sendJSON(res, 404, {
-      error: "Video not found or failed to parse data",
+    console.error(
+      `[webserver] video FAIL | ${clientIP} | ${body.videoUrl.slice(0, 60)} | ${elapsed}ms | empty SSR / parse failed`,
+    );
+    recordRequest(false);
+    return sendJSON(res, 503, {
+      error: "Temporary failure: unable to fetch video data",
+      retryable: true,
     });
   }
+
+  console.error(
+    `[webserver] video OK | ${clientIP} | @${result.author?.uniqueId || "?"} | ${elapsed}ms | plays=${result.stats?.playCount}`,
+  );
+  recordRequest(true);
   return sendJSON(res, 200, result);
 }
 
@@ -186,13 +256,27 @@ async function handleTiktokLookup(req, res) {
   if (!body.videoUrl) {
     return sendJSON(res, 400, { error: "missing videoUrl" });
   }
+  const clientIP = getClientIP(req);
+  const startTime = Date.now();
   const scraper = await getScraper();
   const result = await scraper.getUserAndVideo(body.videoUrl);
+  const elapsed = Date.now() - startTime;
+
   if (!result) {
-    return sendJSON(res, 404, {
-      error: "Video not found or failed to parse data",
+    console.error(
+      `[webserver] lookup FAIL | ${clientIP} | ${body.videoUrl.slice(0, 60)} | ${elapsed}ms | empty SSR / parse failed`,
+    );
+    recordRequest(false);
+    return sendJSON(res, 503, {
+      error: "Temporary failure: unable to fetch video/user data",
+      retryable: true,
     });
   }
+
+  console.error(
+    `[webserver] lookup OK | ${clientIP} | @${result.user?.uniqueId || "?"} | ${elapsed}ms | videoId=${result.video?.id}`,
+  );
+  recordRequest(true);
   return sendJSON(res, 200, result);
 }
 
@@ -201,10 +285,7 @@ async function handleTiktokProduct(req, res) {
   if (!body.url) {
     return sendJSON(res, 400, { error: "missing url" });
   }
-  const clientIP =
-    req.headers["x-forwarded-for"]?.split(",")[0]?.trim() ||
-    req.socket.remoteAddress ||
-    "";
+  const clientIP = getClientIP(req);
   // URL 标准化：www.tiktok.com/shop/pdp → shop.tiktok.com/us/pdp
   const normalizedUrl = body.url.replace(
     "www.tiktok.com/shop/pdp",
@@ -221,18 +302,41 @@ async function handleTiktokProduct(req, res) {
     console.error(
       `[webserver] product OK | ${clientIP} | rating=${result.rating ?? "-"} sold=${result.soldCount ?? "-"} name=${(result.productName || "").slice(0, 40)}`,
     );
+    recordRequest(true);
     return sendJSON(res, 200, result);
   } catch (e) {
     console.error(`[webserver] product FAIL | ${clientIP} | ${e.message}`);
+    recordRequest(false);
 
-    // 如果是 captcha，先触发上报+恢复（不阻塞其他请求）
-    // 必须在 sendJSON 之前调用，否则 sendJSON 抛异常会导致验证码通知丢失
+    // captcha：触发上报+恢复（不阻塞其他请求），返回 503 让 nginx 可 failover
     if (e.message?.includes("Blocked by TikTok")) {
       scheduleCaptchaRecovery(normalizedUrl, SCRAPER_CONFIG.proxyServer);
+      return sendJSON(res, 503, {
+        error: "Blocked by TikTok security check (captcha)",
+        retryable: true,
+      });
     }
 
-    sendJSON(res, 502, { error: e.message });
-    return;
+    // 网络超时类错误 → 504
+    if (
+      e.name === "HeadersTimeoutError" ||
+      e.name === "BodyTimeoutError" ||
+      e.message?.includes("timeout") ||
+      e.message?.includes("ETIMEDOUT") ||
+      e.message?.includes("ECONNREFUSED") ||
+      e.message?.includes("ECONNRESET")
+    ) {
+      return sendJSON(res, 504, {
+        error: `Upstream timeout or network error: ${e.message}`,
+        retryable: true,
+      });
+    }
+
+    // 其他上游错误 → 502
+    return sendJSON(res, 502, {
+      error: e.message,
+      retryable: true,
+    });
   }
 }
 
@@ -311,10 +415,16 @@ async function scheduleCaptchaRecovery(url, proxy) {
 }
 
 function handleHealth(req, res) {
-  return sendJSON(res, 200, {
-    status: "ok",
+  const degraded = isDegraded();
+  const recentErrorRate = recentTotal > 0 ? recentErrors / recentTotal : 0;
+  return sendJSON(res, degraded ? 503 : 200, {
+    status: degraded ? "degraded" : "ok",
     scraperReady: scraperInstance !== null && !scraperClosing,
+    scraperInitializing: scraperInitPromise !== null,
     consecutiveErrors,
+    recentErrorRate: Math.round(recentErrorRate * 100) / 100,
+    recentTotal,
+    recentErrors,
     lastWarmSec: lastWarmTime
       ? Math.round((Date.now() - lastWarmTime) / 1000)
       : null,
@@ -384,11 +494,48 @@ export async function startWebserver(
     } catch (e) {
       // 自动恢复：连续错误超过阈值时重启 scraper
       consecutiveErrors++;
+      recordRequest(false);
+
+      // 区分错误类型，返回正确的 HTTP 状态码供 nginx 判断
+      let status = 500;
+      let retryable = false;
+
+      if (e.name === "CDNBlockedError") {
+        // CDN 限流（Akamai Access Denied）→ 503 临时不可用
+        status = 503;
+        retryable = true;
+      } else if (e.message?.includes("Server is shutting down")) {
+        // 服务正在关闭 → 503
+        status = 503;
+        retryable = true;
+      } else if (
+        e.message?.includes("Timeout") ||
+        e.message?.includes("timeout") ||
+        e.name === "TimeoutError"
+      ) {
+        // 超时 → 504
+        status = 504;
+        retryable = true;
+      } else if (
+        e.message?.includes("Protocol error") ||
+        e.message?.includes("Target closed") ||
+        e.message?.includes("Browser closed") ||
+        e.message?.includes("Session closed")
+      ) {
+        // 浏览器/页面崩溃 → 503
+        status = 503;
+        retryable = true;
+      }
+
       if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {
         await restartScraper(`连续 ${consecutiveErrors} 次错误`);
       }
+
       if (!res.headersSent) {
-        return sendJSON(res, 500, { error: e.message });
+        return sendJSON(res, status, {
+          error: e.message,
+          retryable,
+        });
       }
       // 响应已发送（流式等场景），记录日志并销毁 socket
       console.error(