tt-help-cli-ycl 1.4.46 → 1.4.47

package/package.json

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

package/src/lib/shop-scraper.mjs

@@ -84,6 +84,9 @@ function extractJsonByKey(html, keyPattern) {
 /**
  * Windows: 后台服务的 Playwright 浏览器在 Session 0（隔离桌面），
  * RDP 看不到。找到交互桌面 Session，用计划任务推到那个 Session。
+ * 配置环境变量（可选）：
+ *   CAPTCHA_RECOVERY_USER - schtasks /ru 用户名（必需，否则无法跨 Session）
+ *   CAPTCHA_RECOVERY_PASS - schtasks /rp 密码
  */
 let winRecoveryRunning = false;
 
@@ -98,16 +101,17 @@ async function resolveCaptchaWindows(url, proxyUrl) {
     const edgeUrl = url.replace("shop.tiktok.com", "www.tiktok.com/shop/pdp");
     const taskName = "TikTokCaptchaRecovery";
 
-    // 1. 找到交互桌面 Session
+    // 1. 找到 RDP 交互桌面 Session（Active 且非 Session 0）
     let sessionId = null;
     try {
       const sessions = execSync(
-        `powershell -NoProfile -Command "query session 2>$null | Select-String 'Active' | ForEach-Object { \\$_.Line }"`,
+        `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) {
-        const match = line.match(/>\s*(\d+)\s/);
+        // 匹配 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;
@@ -121,15 +125,34 @@ async function resolveCaptchaWindows(url, proxyUrl) {
       console.error(
         `[shop-scraper] Windows: Session ${sessionId}，用计划任务启动 Edge`,
       );
+      // 清理旧任务
       try {
         execSync(`schtasks /delete /tn "${taskName}" /f 2>$null`, {
           shell: "cmd.exe",
         });
       } catch {}
-      execSync(
-        `schtasks /create /tn "${taskName}" /tr "msedge ${edgeUrl}" /sc once /st 00:00 /it /f`,
-        { shell: "cmd.exe", timeout: 10000 },
-      );
+
+      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 },
+        );
+      }
+
       execSync(`schtasks /run /tn "${taskName}"`, {
         shell: "cmd.exe",
         timeout: 10000,