tt-help-cli-ycl 1.4.48 → 1.4.49

package/package.json

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

package/src/lib/shop-scraper.mjs

@@ -83,100 +83,58 @@ function extractJsonByKey(html, keyPattern) {
 
 /**
  * Windows: 后台服务的 Playwright 浏览器在 Session 0（隔离桌面），
- * RDP 看不到。用计划任务推到交互桌面（/it 自动定位已登录用户，无需密码）。
+ * RDP 看不到。改为用 start 命令推到交互桌面，然后轮询 undici 等 IP 恢复信用。
  */
-let winRecoveryRunning = false;
-
 async function resolveCaptchaWindows(url, proxyUrl) {
-  if (winRecoveryRunning) {
-    console.error("[shop-scraper] Windows: 验证码恢复已在运行，跳过");
-    return false;
+  // 用 Windows start 命令在交互桌面打开 Edge
+  const edgeUrl = url.replace("shop.tiktok.com", "www.tiktok.com/shop/pdp");
+  try {
+    execSync(`start "" "microsoft-edge:${edgeUrl}"`, {
+      shell: "cmd.exe",
+      timeout: 5000,
+    });
+    console.error(
+      "[shop-scraper] Windows: 已用 start 命令在交互桌面打开 Edge，请在 RDP 中完成验证码",
+    );
+  } catch (e) {
+    console.error("[shop-scraper] Windows: start 命令失败:", e.message);
   }
-  winRecoveryRunning = true;
 
-  try {
-    const edgeUrl = url.replace("shop.tiktok.com", "www.tiktok.com/shop/pdp");
-    const taskName = "TikTokCaptchaRecovery";
+  // 轮询 undici 等待 IP 信用恢复（用户解完验证码后代理 IP 就有信用了）
+  const proxy = proxyUrl || DEFAULT_PROXY;
+  const agent = proxy ? new ProxyAgent(proxy) : null;
+  const POLL_MS = 5000;
+  const MAX_WAIT_MS = 3600_000; // 最长等 1 小时
+  const start = Date.now();
 
-    // 1. 用计划任务推到交互桌面（/it 自动定位已登录用户）
-    let taskCreated = false;
+  while (Date.now() - start < MAX_WAIT_MS) {
+    await new Promise((r) => setTimeout(r, POLL_MS));
     try {
-      // 清理旧任务
-      try {
-        execSync(`schtasks /delete /tn "${taskName}" /f 2>$null`, {
-          shell: "cmd.exe",
-        });
-      } catch {}
-
-      // 获取当天日期，格式 yyyy/MM/dd
-      const today = execSync(
-        `powershell -NoProfile -Command "Get-Date -Format yyyy/MM/dd"`,
-        { shell: "cmd.exe", timeout: 3000, encoding: "utf-8" },
-      ).trim();
-
-      execSync(
-        `schtasks /create /tn "${taskName}" /tr "msedge \\"${edgeUrl}\\"" /sc once /sd ${today} /st 23:59 /it /f`,
-        { shell: "cmd.exe", timeout: 10000 },
-      );
-      execSync(`schtasks /run /tn "${taskName}"`, {
-        shell: "cmd.exe",
-        timeout: 10000,
+      const { body } = await request(url, {
+        headers: PDP_HEADERS,
+        ...(agent ? { dispatcher: agent } : {}),
       });
-      taskCreated = true;
+      const html = await body.text();
+      if (
+        html.includes('"product_model"') ||
+        html.includes('"review_ratings"')
+      ) {
+        console.error("[shop-scraper] Captcha solved, IP credit restored");
+        return true;
+      }
+    } catch {
+      // 继续轮询
+    }
+    // 每 60 秒打印一次状态
+    if (Math.round((Date.now() - start) / 60000) % 5 === 0) {
       console.error(
-        "[shop-scraper] Windows: 计划任务已启动 Edge，请在 RDP 中完成验证码",
+        `[shop-scraper] 等待验证码解决中... 已等待 ${Math.round((Date.now() - start) / 60000)} 分钟`,
       );
-    } catch (e) {
-      console.error("[shop-scraper] Windows: 计划任务失败:", e.message);
-    }
-
-    // 延迟删除任务
-    if (taskCreated) {
-      setTimeout(() => {
-        try {
-          execSync(`schtasks /delete /tn "${taskName}" /f 2>$null`, {
-            shell: "cmd.exe",
-          });
-        } catch {}
-      }, 10000);
-    }
-
-    // 2. 轮询 undici 等待 IP 信用恢复
-    const proxy = proxyUrl || DEFAULT_PROXY;
-    const agent = proxy ? new ProxyAgent(proxy) : null;
-    const POLL_MS = 5000;
-    const MAX_WAIT_MS = 3600_000;
-    const startTime = Date.now();
-
-    while (Date.now() - startTime < MAX_WAIT_MS) {
-      await new Promise((r) => setTimeout(r, POLL_MS));
-      try {
-        const { body } = await request(url, {
-          headers: PDP_HEADERS,
-          ...(agent ? { dispatcher: agent } : {}),
-        });
-        const html = await body.text();
-        if (
-          html.includes('"product_model"') ||
-          html.includes('"review_ratings"')
-        ) {
-          console.error("[shop-scraper] Captcha solved, IP credit restored");
-          return true;
-        }
-      } catch {}
-      const waited = Math.round((Date.now() - startTime) / 60000);
-      if (waited > 0 && waited % 5 === 0) {
-        console.error(
-          `[shop-scraper] 等待验证码解决中... 已等待 ${waited} 分钟`,
-        );
-      }
     }
-
-    console.error("[shop-scraper] Windows: 等待验证码超时");
-    return false;
-  } finally {
-    winRecoveryRunning = false;
   }
+
+  console.error("[shop-scraper] Windows: 等待验证码超时");
+  return false;
 }
 
 /**