tt-help-cli-ycl 1.4.49 → 1.4.50

package/package.json

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

package/src/lib/shop-scraper.mjs

@@ -17,7 +17,6 @@
  */
 
 import { ProxyAgent, request } from "undici";
-import { execSync } from "child_process";
 import { DEFAULT_PROXY } from "./constants.js";
 
 const PDP_HEADERS = {
@@ -81,62 +80,6 @@ function extractJsonByKey(html, keyPattern) {
   return null;
 }
 
-/**
- * Windows: 后台服务的 Playwright 浏览器在 Session 0（隔离桌面），
- * RDP 看不到。改为用 start 命令推到交互桌面，然后轮询 undici 等 IP 恢复信用。
- */
-async function resolveCaptchaWindows(url, proxyUrl) {
-  // 用 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);
-  }
-
-  // 轮询 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();
-
-  while (Date.now() - start < 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 {
-      // 继续轮询
-    }
-    // 每 60 秒打印一次状态
-    if (Math.round((Date.now() - start) / 60000) % 5 === 0) {
-      console.error(
-        `[shop-scraper] 等待验证码解决中... 已等待 ${Math.round((Date.now() - start) / 60000)} 分钟`,
-      );
-    }
-  }
-
-  console.error("[shop-scraper] Windows: 等待验证码超时");
-  return false;
-}
-
 /**
  * Open a headed browser for manual captcha solving, extract cookies
  * so undici can reuse them for a while.
@@ -147,12 +90,6 @@ async function resolveCaptchaWindows(url, proxyUrl) {
 export async function resolveCaptchaWithBrowser(url, proxyUrl) {
   const { chromium } = await import("playwright");
 
-  // Windows 后台服务启动的浏览器在 Session 0，RDP 看不到。
-  // 用 start 命令推到当前交互桌面。
-  if (process.platform === "win32") {
-    return resolveCaptchaWindows(url, proxyUrl);
-  }
-
   const args = ["--no-sandbox"];
   if (proxyUrl) {
     args.push(`--proxy-server=${proxyUrl.replace("http://", "http://")}`);