@skrillex1224/playwright-toolkit 2.1.27 → 2.1.29

package/dist/index.js

@@ -684,16 +684,26 @@ var Humanize = {
       while (current) {
         if (isScrollable(current)) {
           const crect = current.getBoundingClientRect();
-          if (rect.top < crect.top || rect.bottom > crect.bottom) {
+          if (rect.top < crect.top + 2 || rect.bottom > crect.bottom - 2) {
             return true;
           }
         }
         current = current.parentElement;
       }
+      const cx = rect.left + rect.width / 2;
+      const cy = rect.top + rect.height / 2;
+      if (cx < 0 || cx > window.innerWidth || cy < 0 || cy > window.innerHeight) return true;
+      const pointElement = document.elementFromPoint(cx, cy);
+      if (pointElement) {
+        if (el.contains(pointElement) || pointElement.contains(el)) {
+          return false;
+        }
+        return true;
+      }
       return false;
     });
     if (!needsScroll) {
-      logger4.debug("humanScroll", "Element already in view");
+      logger4.debug("humanScroll", "Element already in view (and unobstructed)");
       return { element, didScroll: false, restore: async () => {
       } };
     }
@@ -742,9 +752,21 @@ var Humanize = {
         }
         const scrollingElement = document.scrollingElement || document.documentElement;
         if (scrollingElement) scrollables.push(scrollingElement);
+        const cx = rect.left + rect.width / 2;
+        const cy = rect.top + rect.height / 2;
+        const viewH = window.innerHeight;
+        let isObstructed = false;
+        if (cy < 0 || cy > viewH) {
+          isObstructed = true;
+        } else {
+          const pointElement = document.elementFromPoint(cx, cy);
+          if (pointElement && !el.contains(pointElement) && !pointElement.contains(el)) {
+            isObstructed = true;
+          }
+        }
         let target2 = null;
         for (const container of scrollables) {
-          const crect = container === scrollingElement ? { top: 0, bottom: window.innerHeight } : container.getBoundingClientRect();
+          const crect = container === scrollingElement ? { top: 0, bottom: viewH } : container.getBoundingClientRect();
           if (rect.top < crect.top + 2) {
             target2 = { container, direction: -1 };
             break;
@@ -753,26 +775,39 @@ var Humanize = {
             target2 = { container, direction: 1 };
             break;
           }
+          if (isObstructed) {
+            const containerCenter = (crect.top + crect.bottom) / 2;
+            const elementCenter = (rect.top + rect.bottom) / 2;
+            const forceDirection = elementCenter > containerCenter ? 1 : -1;
+            const canScroll = forceDirection === 1 ? container.scrollTop < container.scrollHeight - container.clientHeight : container.scrollTop > 0;
+            if (canScroll) {
+              target2 = { container, direction: forceDirection };
+              break;
+            }
+          }
         }
         if (!target2) {
-          return { moved: false, inView: true };
+          return { moved: false, inView: !isObstructed };
         }
         const maxScroll = target2.container.scrollHeight - target2.container.clientHeight;
         if (maxScroll <= 0) {
-          return { moved: false, inView: false };
+          return { moved: false, inView: !isObstructed };
         }
         const before = target2.container.scrollTop;
         let next = before + target2.direction * stepPx;
         if (next < 0) next = 0;
         if (next > maxScroll) next = maxScroll;
-        if (next === before) {
-          return { moved: false, inView: false };
+        if (Math.abs(next - before) < 1) {
+          return { moved: false, inView: !isObstructed };
         }
         target2.container.scrollTop = next;
         return { moved: true, inView: false };
       }, step);
       if (result.inView) break;
-      if (!result.moved) break;
+      if (!result.moved && !result.inView) {
+        logger4.warn("humanScroll", "Stuck: cannot scroll further but element still obstructed/hidden");
+        break;
+      }
       await delay2(this.jitterMs(120, 0.4));
     }
     const restore = async () => {
@@ -1253,18 +1288,9 @@ var Captcha = {
 };
 
 // src/sse.js
-import { gotScraping } from "got-scraping";
-import { Agent as HttpAgent } from "http";
-import { Agent as HttpsAgent } from "https";
+import https from "https";
+import { URL as URL2 } from "url";
 var logger7 = createLogger("Sse");
-var SHARED_HTTP_AGENT = new HttpAgent({ keepAlive: false });
-var SHARED_HTTPS_AGENT = new HttpsAgent({ keepAlive: false, rejectUnauthorized: false });
-var SHARED_GOT_OPTIONS = {
-  http2: false,
-  retry: { limit: 0 },
-  throwHttpErrors: false,
-  decompress: false
-};
 var Sse = {
   /**
   * 解析 SSE 流文本
@@ -1291,7 +1317,7 @@ var Sse = {
     return events;
   },
   /**
-   * 拦截网络请求并使用 got-scraping 转发，以解决流式数据捕获问题。
+   * 拦截网络请求并使用 Node.js 原生 https 模块转发，以解决流式数据捕获问题。
    * @param {import('playwright').Page} page
    * @param {string|RegExp} urlPattern - 拦截的 URL 模式
    * @param {object} options
@@ -1299,7 +1325,7 @@ var Sse = {
    * @param {function(string, function): void} [options.onEnd] - (fullText, resolve) => void
    * @param {function(Error, function): void} [options.onTimeout] - (error, reject) => void
    * @param {number} [options.initialTimeout=90000] - 初始数据接收超时 (ms)，默认 90s
-   * @param {number} [options.overallTimeout=180000] - 整体请求超时时间 (ms)，默认 180s
+   * @param {number} [options.timeout=180000] - 整体请求超时时间 (ms)，默认 180s
    * @returns {Promise<any>} - 返回 Promise，当流满足条件时 resolve
    */
   async intercept(page, urlPattern, options = {}) {
@@ -1325,39 +1351,19 @@ var Sse = {
         logger7.info(`[MITM] \u5DF2\u62E6\u622A\u8BF7\u6C42: ${request.url()}`);
         try {
           const headers = await request.allHeaders();
-          delete headers["host"];
+          const postData = request.postData();
+          const urlObj = new URL2(request.url());
           delete headers["accept-encoding"];
           delete headers["content-length"];
-          const currentAcceptLanguage = headers["accept-language"] || "";
-          AntiCheat.applyLocaleHeaders(headers, currentAcceptLanguage);
-          const resolvedAcceptLanguage = headers["accept-language"] || "";
-          const userAgent = headers["user-agent"] || "";
-          const method = request.method();
-          const postData = method !== "GET" && method !== "HEAD" ? request.postDataBuffer() : void 0;
           const reqOptions = {
-            ...SHARED_GOT_OPTIONS,
-            url: request.url(),
-            method,
+            hostname: urlObj.hostname,
+            port: 443,
+            path: urlObj.pathname + urlObj.search,
+            method: request.method(),
             headers,
-            headerGeneratorOptions: AntiCheat.getTlsFingerprintOptions(userAgent, resolvedAcceptLanguage),
-            agent: {
-              http: SHARED_HTTP_AGENT,
-              https: SHARED_HTTPS_AGENT
-            },
-            timeout: { request: overallTimeout }
-          };
-          if (postData) {
-            reqOptions.body = postData;
-          }
-          const stream = gotScraping.stream(reqOptions);
-          const handleStreamError = (error) => {
-            clearAllTimers();
-            stream.destroy();
-            route.abort().catch(() => {
-            });
-            reject(error);
+            timeout: overallTimeout
           };
-          stream.on("response", (res) => {
+          const req = https.request(reqOptions, (res) => {
             const chunks = [];
             let accumulatedText = "";
             res.on("data", (chunk) => {
@@ -1380,7 +1386,6 @@ var Sse = {
                 }
               }
             });
-            res.on("error", handleStreamError);
             res.on("end", () => {
               logger7.info("[MITM] \u4E0A\u6E38\u54CD\u5E94\u7ED3\u675F");
               clearAllTimers();
@@ -1393,28 +1398,22 @@ var Sse = {
               } else if (!onData) {
                 resolve(accumulatedText);
               }
-              const resHeaders = {};
-              for (const [key, value] of Object.entries(res.headers || {})) {
-                if (Array.isArray(value)) {
-                  resHeaders[key] = value.join(", ");
-                } else if (value) {
-                  resHeaders[key] = String(value);
-                }
-              }
-              delete resHeaders["content-encoding"];
-              delete resHeaders["content-length"];
-              delete resHeaders["transfer-encoding"];
-              delete resHeaders["connection"];
-              delete resHeaders["keep-alive"];
               route.fulfill({
-                status: res.statusCode || 200,
-                headers: resHeaders,
+                status: res.statusCode,
+                headers: res.headers,
                 body: Buffer.concat(chunks)
               }).catch(() => {
               });
             });
           });
-          stream.on("error", handleStreamError);
+          req.on("error", (e) => {
+            clearAllTimers();
+            route.abort().catch(() => {
+            });
+            reject(e);
+          });
+          if (postData) req.write(postData);
+          req.end();
         } catch (e) {
           clearAllTimers();
           route.continue().catch(() => {
@@ -1473,12 +1472,12 @@ var Sse = {
 };
 
 // src/interception.js
-import { gotScraping as gotScraping2 } from "got-scraping";
-import { Agent as HttpAgent2 } from "http";
-import { Agent as HttpsAgent2 } from "https";
+import { gotScraping } from "got-scraping";
+import { Agent as HttpAgent } from "http";
+import { Agent as HttpsAgent } from "https";
 var logger8 = createLogger("Interception");
-var SHARED_HTTP_AGENT2 = new HttpAgent2({ keepAlive: false });
-var SHARED_HTTPS_AGENT2 = new HttpsAgent2({ keepAlive: false, rejectUnauthorized: false });
+var SHARED_HTTP_AGENT = new HttpAgent({ keepAlive: false });
+var SHARED_HTTPS_AGENT = new HttpsAgent({ keepAlive: false, rejectUnauthorized: false });
 var DirectConfig = {
   /** 直连请求超时时间（秒） */
   directTimeout: 12,
@@ -1531,7 +1530,7 @@ var DEFAULT_BLOCKING_CONFIG = {
   /** 额外自定义扩展名列表 */
   customExtensions: []
 };
-var SHARED_GOT_OPTIONS2 = {
+var SHARED_GOT_OPTIONS = {
   http2: false,
   // 禁用 HTTP2 避免在拦截场景下的握手兼容性问题
   retry: { limit: 0 },
@@ -1640,8 +1639,8 @@ var Interception = {
             const userAgent = reqHeaders["user-agent"] || "";
             const method = request.method();
             const postData = method !== "GET" && method !== "HEAD" ? request.postDataBuffer() : void 0;
-            const response = await gotScraping2({
-              ...SHARED_GOT_OPTIONS2,
+            const response = await gotScraping({
+              ...SHARED_GOT_OPTIONS,
               // 应用通用配置
               url,
               method,
@@ -1653,8 +1652,8 @@ var Interception = {
               headerGeneratorOptions: AntiCheat.getTlsFingerprintOptions(userAgent, resolvedAcceptLanguage),
               // 使用共享的 Agent 单例（keepAlive: false，不会池化连接）
               agent: {
-                http: SHARED_HTTP_AGENT2,
-                https: SHARED_HTTPS_AGENT2
+                http: SHARED_HTTP_AGENT,
+                https: SHARED_HTTPS_AGENT
               },
               // 超时时间
               timeout: { request: DirectConfig.directTimeout * 1e3 }