tt-help-cli-ycl 1.4.47 → 1.4.48

package/package.json

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

package/src/lib/shop-scraper.mjs

@@ -83,10 +83,7 @@ function extractJsonByKey(html, keyPattern) {
 
 /**
  * Windows: 后台服务的 Playwright 浏览器在 Session 0（隔离桌面），
- * RDP 看不到。找到交互桌面 Session，用计划任务推到那个 Session。
- * 配置环境变量（可选）：
- *   CAPTCHA_RECOVERY_USER - schtasks /ru 用户名（必需，否则无法跨 Session）
- *   CAPTCHA_RECOVERY_PASS - schtasks /rp 密码
+ * RDP 看不到。用计划任务推到交互桌面（/it 自动定位已登录用户，无需密码）。
  */
 let winRecoveryRunning = false;
 
@@ -101,30 +98,9 @@ async function resolveCaptchaWindows(url, proxyUrl) {
     const edgeUrl = url.replace("shop.tiktok.com", "www.tiktok.com/shop/pdp");
     const taskName = "TikTokCaptchaRecovery";
 
-    // 1. 找到 RDP 交互桌面 Session（Active 且非 Session 0）
-    let sessionId = null;
+    // 1. 用计划任务推到交互桌面（/it 自动定位已登录用户）
+    let taskCreated = false;
     try {
-      const sessions = execSync(
-        `powershell -NoProfile -Command "query session 2>$null | findstr Active"`,
-        { shell: "cmd.exe", timeout: 5000, encoding: "utf-8" },
-      );
-      const lines = sessions.trim().split("\n");
-      for (const line of lines) {
-        // 匹配 RDP 会话: ">rdp-tcp#1  username  2  Active"
-        const match = line.match(/\s(\d+)\s+Active/);
-        if (match && match[1] !== "0") {
-          sessionId = parseInt(match[1], 10);
-          break;
-        }
-      }
-    } catch {
-      console.error("[shop-scraper] Windows: 无法获取交互 Session");
-    }
-
-    if (sessionId) {
-      console.error(
-        `[shop-scraper] Windows: Session ${sessionId}，用计划任务启动 Edge`,
-      );
       // 清理旧任务
       try {
         execSync(`schtasks /delete /tn "${taskName}" /f 2>$null`, {
@@ -132,31 +108,30 @@ async function resolveCaptchaWindows(url, proxyUrl) {
         });
       } catch {}
 
-      const taskUser = process.env.CAPTCHA_RECOVERY_USER || "";
-      const taskPass = process.env.CAPTCHA_RECOVERY_PASS || "";
-
-      if (taskUser && taskPass) {
-        // 跨 Session：指定用户 + 交互模式
-        const today = new Date().toISOString().slice(0, 10).replace(/-/g, "/");
-        execSync(
-          `schtasks /create /tn "${taskName}" /tr "msedge \\"${edgeUrl}\\"" /sc once /sd ${today} /st 00:00 /ru "${taskUser}" /rp "${taskPass}" /it /f`,
-          { shell: "cmd.exe", timeout: 10000 },
-        );
-      } else {
-        // 回退：无凭证时只能当前 Session（如果 webserver 从 RDP 启动才能看到）
-        console.error(
-          "[shop-scraper] Windows: 未设置 CAPTCHA_RECOVERY_USER/PASS，计划任务仅限当前 Session",
-        );
-        execSync(
-          `schtasks /create /tn "${taskName}" /tr "msedge \\"${edgeUrl}\\"" /sc once /st 00:00 /it /f`,
-          { shell: "cmd.exe", timeout: 10000 },
-        );
-      }
+      // 获取当天日期，格式 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,
       });
+      taskCreated = true;
+      console.error(
+        "[shop-scraper] Windows: 计划任务已启动 Edge，请在 RDP 中完成验证码",
+      );
+    } catch (e) {
+      console.error("[shop-scraper] Windows: 计划任务失败:", e.message);
+    }
+
+    // 延迟删除任务
+    if (taskCreated) {
       setTimeout(() => {
         try {
           execSync(`schtasks /delete /tn "${taskName}" /f 2>$null`, {
@@ -164,16 +139,6 @@ async function resolveCaptchaWindows(url, proxyUrl) {
           });
         } catch {}
       }, 10000);
-    } else {
-      console.error(
-        "[shop-scraper] Windows: 未找到交互 Session，尝试直接 start",
-      );
-      try {
-        execSync(`start "" "microsoft-edge:${edgeUrl}"`, {
-          shell: "cmd.exe",
-          timeout: 5000,
-        });
-      } catch {}
     }
 
     // 2. 轮询 undici 等待 IP 信用恢复