tt-help-cli-ycl 1.4.53 → 1.4.55

package/package.json

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

package/src/lib/args.js

@@ -407,7 +407,8 @@ function parseWebserverArgs(args) {
   let webserverPort = 3000;
   let webserverPoolSize = 0;
   let webserverProxy = null;
-  let webserverNotify = null;
+  // 默认汇报到 ~/.tt-help.json 中配置的 server 地址
+  let webserverNotify = defaultServer;
 
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
@@ -419,9 +420,9 @@ function parseWebserverArgs(args) {
       webserverProxy = args[++i] || null;
     } else if (arg === "--notify") {
       const next = args[i + 1];
-      // 没写地址或下一个是别的参数 → 使用默认 watch 服务器
+      // 没写地址或下一个是别的参数 → 使用配置中的 server 地址
       if (!next || next.startsWith("--")) {
-        webserverNotify = "http://117.71.53.99:17301";
+        webserverNotify = defaultServer;
       } else {
         webserverNotify = args[++i];
       }

package/src/webserver/server.mjs

@@ -222,14 +222,15 @@ async function handleTiktokProduct(req, res) {
     );
     return sendJSON(res, 200, result);
   } catch (e) {
-    // 先返回错误，不阻塞请求
     console.error(`[webserver] product FAIL | ${clientIP} | ${e.message}`);
-    sendJSON(res, 502, { error: e.message });
 
-    // 如果是 captcha，异步弹浏览器（不阻塞其他请求）
+    // 如果是 captcha，先触发上报+恢复（不阻塞其他请求）
+    // 必须在 sendJSON 之前调用，否则 sendJSON 抛异常会导致验证码通知丢失
     if (e.message?.includes("Blocked by TikTok")) {
       scheduleCaptchaRecovery(normalizedUrl, SCRAPER_CONFIG.proxyServer);
     }
+
+    sendJSON(res, 502, { error: e.message });
     return;
   }
 }
@@ -237,15 +238,17 @@ async function handleTiktokProduct(req, res) {
 // 防止重复弹浏览器
 let captchaRecoveryRunning = false;
 
-async function scheduleCaptchaRecovery(url, proxy) {
-  if (captchaRecoveryRunning) {
-    console.error("[webserver] Captcha recovery already in progress, skipping");
+// 通知 Watch Server：带重试，不受 captchaRecoveryRunning 锁限制
+// captchaNotifyUrl 默认来自 ~/.tt-help.json 的 server 配置
+async function notifyCaptchaToWatch(url, maxRetries = 3) {
+  if (!SCRAPER_CONFIG.captchaNotifyUrl) {
+    console.error(
+      "[webserver] Captcha detected but notify URL is empty, check --notify or ~/.tt-help.json server config",
+    );
     return;
   }
-  captchaRecoveryRunning = true;
 
-  // 通知 Watch Server：这台机器出现验证码需要人工处理
-  if (SCRAPER_CONFIG.captchaNotifyUrl) {
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
     try {
       await fetch(`${SCRAPER_CONFIG.captchaNotifyUrl}/api/error-report`, {
         method: "POST",
@@ -260,10 +263,35 @@ async function scheduleCaptchaRecovery(url, proxy) {
         }),
       });
       console.error("[webserver] Captcha alert sent to watch server");
+      return;
     } catch (e) {
-      console.error("[webserver] Failed to notify watch server:", e.message);
+      if (attempt < maxRetries) {
+        const delay = attempt * 2000;
+        console.error(
+          `[webserver] Failed to notify watch server (attempt ${attempt}/${maxRetries}): ${e.message}, retrying in ${delay}ms...`,
+        );
+        await new Promise((r) => setTimeout(r, delay));
+      } else {
+        console.error(
+          `[webserver] Failed to notify watch server after ${maxRetries} attempts: ${e.message}`,
+        );
+      }
     }
   }
+}
+
+async function scheduleCaptchaRecovery(url, proxy) {
+  // 通知 Watch Server — 独立于浏览器恢复，每次验证码都尝试上报（带重试）
+  await notifyCaptchaToWatch(url);
+
+  // 防止重复弹浏览器
+  if (captchaRecoveryRunning) {
+    console.error(
+      "[webserver] Captcha recovery already in progress, skipping browser",
+    );
+    return;
+  }
+  captchaRecoveryRunning = true;
 
   try {
     const { getProductInfo } = await import("../lib/shop-scraper.mjs");