tt-help-cli-ycl 1.4.39 → 1.4.40

package/package.json

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

package/src/webserver/server.mjs

@@ -66,6 +66,10 @@ const SCRAPER_CONFIG = {
 let scraperInstance = null;
 let scraperClosing = false;
 let scraperInitPromise = null;
+let consecutiveErrors = 0;
+const MAX_CONSECUTIVE_ERRORS = 10;
+let warmTimer = null;
+let lastWarmTime = 0;
 
 async function getScraper() {
   if (scraperInstance && !scraperClosing) {
@@ -82,6 +86,8 @@ async function getScraper() {
     const scraper = new TikTokScraper(SCRAPER_CONFIG);
     await scraper.init();
     scraperInstance = scraper;
+    consecutiveErrors = 0;
+    lastWarmTime = Date.now();
     return scraper;
   })();
   try {
@@ -91,6 +97,47 @@ async function getScraper() {
   }
 }
 
+async function restartScraper(reason) {
+  console.error(`[webserver] 重启 scraper: ${reason}`);
+  if (scraperInstance) {
+    try {
+      await scraperInstance.close();
+    } catch {}
+    scraperInstance = null;
+  }
+  scraperInitPromise = null;
+  consecutiveErrors = 0;
+  // 下次请求时懒初始化
+}
+
+async function warmScraper() {
+  if (scraperClosing || !scraperInstance) return;
+  const now = Date.now();
+  if (now - lastWarmTime < SCRAPER_CONFIG.wafTTL) return;
+  try {
+    await scraperInstance.warmWaf();
+    lastWarmTime = Date.now();
+  } catch (e) {
+    console.error(`[webserver] warmWaf 失败: ${e.message}`);
+  }
+}
+
+function startWarmTimer() {
+  if (warmTimer) return;
+  // 每 wafTTL/2 检查一次是否需要预热
+  warmTimer = setInterval(() => {
+    warmScraper().catch(() => {});
+  }, SCRAPER_CONFIG.wafTTL / 2);
+  warmTimer.unref?.();
+}
+
+function stopWarmTimer() {
+  if (warmTimer) {
+    clearInterval(warmTimer);
+    warmTimer = null;
+  }
+}
+
 // ---- API 处理器 ----
 
 const AVAILABLE_APIS = [
@@ -149,6 +196,10 @@ function handleHealth(req, res) {
   return sendJSON(res, 200, {
     status: "ok",
     scraperReady: scraperInstance !== null && !scraperClosing,
+    consecutiveErrors,
+    lastWarmSec: lastWarmTime
+      ? Math.round((Date.now() - lastWarmTime) / 1000)
+      : null,
     uptime: process.uptime(),
   });
 }
@@ -208,6 +259,11 @@ export async function startWebserver(
     try {
       return await route.handler(req, res);
     } catch (e) {
+      // 自动恢复：连续错误超过阈值时重启 scraper
+      consecutiveErrors++;
+      if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {
+        await restartScraper(`连续 ${consecutiveErrors} 次错误`);
+      }
       if (!res.headersSent) {
         return sendJSON(res, 500, { error: e.message });
       }
@@ -242,6 +298,9 @@ export async function startWebserver(
     });
     server.once("error", reject);
   });
+
+  // 启动定期 WAF 预热
+  startWarmTimer();
 }
 
 export async function closeServer(server) {
@@ -255,6 +314,7 @@ export async function closeServer(server) {
 }
 
 export async function closeScraper() {
+  stopWarmTimer();
   if (scraperInstance && !scraperClosing) {
     scraperClosing = true;
     await scraperInstance.close();