@skrillex1224/playwright-toolkit 2.1.25 → 2.1.27

package/README.md

@@ -23,7 +23,7 @@ import { usePlaywrightToolKit } from '@skrillex1224/playwright-toolkit';
 await Actor.init();
 
 // 初始化工具箱
-const { ApifyKit: KitHook, Launch, AntiDetect, Humanize, Captcha, LiveView, Constants } = usePlaywrightToolKit();
+const { ApifyKit: KitHook, Launch, AntiCheat, Humanize, Captcha, LiveView, Constants } = usePlaywrightToolKit();
 
 // ⚠️ ApifyKit 需要异步初始化
 const ApifyKit = await KitHook.useApifyKit();
@@ -39,7 +39,7 @@ const crawler = new PlaywrightCrawler({
     preNavigationHooks: [
         async ({ page }) => {
             // 统一反爬：时区/语言/权限/视口
-            await AntiDetect.applyPage(page);
+            await AntiCheat.applyPage(page);
             
             // 验证码监控
             Captcha.useCaptchaMonitor(page, {
@@ -77,32 +77,32 @@ await Actor.exit();
 
 ### 架构
 
-| 层次 | 问题 | 解决方案 |
-|------|------|----------|
-| **指纹层** | UA/屏幕/语言/时区一致性 | Crawlee `useFingerprints` + `AntiDetect` |
-| **行为层** | 机械输入/点击/滚动 | `ghost-cursor-playwright` + Humanize |
-| **页面层** | 验证码/风控检测 | Captcha 监控器 |
+| 层次       | 问题                    | 解决方案                                |
+| ---------- | ----------------------- | --------------------------------------- |
+| **指纹层** | UA/屏幕/语言/时区一致性 | Crawlee `useFingerprints` + `AntiCheat` |
+| **行为层** | 机械输入/点击/滚动      | `ghost-cursor-playwright` + Humanize    |
+| **页面层** | 验证码/风控检测         | Captcha 监控器                          |
 
 ### API 一览
 
-| 模块 | 方法 | 说明 |
-|------|------|------|
-| `Launch` | `getAdvancedLaunchOptions()` | 增强版启动参数 |
-| `Launch` | `getLaunchOptions()` | 基础启动参数 |
-| `Launch` | `getFingerprintGeneratorOptions()` | 指纹生成器选项 |
-| `AntiDetect` | `applyPage(page, options?)` | 应用时区/语言/权限/视口 |
-| `AntiDetect` | `applyContext(context, options?)` | 仅应用 Context 设置 |
-| `AntiDetect` | `syncViewportWithScreen(page)` | 同步视口与屏幕 |
-| `AntiDetect` | `getTlsFingerprintOptions(userAgent?)` | got-scraping TLS 指纹 |
-| `Humanize` | `initializeCursor(page)` | 初始化 Cursor (必须先调用) |
-| `Humanize` | `jitterMs(base, jitterPercent?)` | 生成带抖动的毫秒数 (同步，返回 number) |
-| `Humanize` | `humanType(page, selector, text, options?)` | 人类化输入 (baseDelay=180ms ±40%) |
-| `Humanize` | `humanClick(page, selector, options?)` | 人类化点击 (reactionDelay=250ms ±40%) |
-| `Humanize` | `warmUpBrowsing(page, baseDuration?)` | 页面预热 (3500ms ±40%) |
-| `Humanize` | `naturalScroll(page, direction?, distance?, steps?)` | 自然滚动 (带惯性+抖动) |
-| `Humanize` | `simulateGaze(page, baseDurationMs?)` | 模拟注视 (2500ms ±40%) |
-| `Humanize` | `randomSleep(baseMs, jitterPercent?)` | 随机延迟 (±30% 抖动) |
-| `Captcha` | `useCaptchaMonitor(page, options)` | 验证码监控 |
+| 模块        | 方法                                                 | 说明                                   |
+| ----------- | ---------------------------------------------------- | -------------------------------------- |
+| `Launch`    | `getAdvancedLaunchOptions()`                         | 增强版启动参数                         |
+| `Launch`    | `getLaunchOptions()`                                 | 基础启动参数                           |
+| `Launch`    | `getFingerprintGeneratorOptions()`                   | 指纹生成器选项                         |
+| `AntiCheat` | `applyPage(page, options?)`                          | 应用时区/语言/权限/视口                |
+| `AntiCheat` | `applyContext(context, options?)`                    | 仅应用 Context 设置                    |
+| `AntiCheat` | `syncViewportWithScreen(page)`                       | 同步视口与屏幕                         |
+| `AntiCheat` | `getTlsFingerprintOptions(userAgent?)`               | got-scraping TLS 指纹                  |
+| `Humanize`  | `initializeCursor(page)`                             | 初始化 Cursor (必须先调用)             |
+| `Humanize`  | `jitterMs(base, jitterPercent?)`                     | 生成带抖动的毫秒数 (同步，返回 number) |
+| `Humanize`  | `humanType(page, selector, text, options?)`          | 人类化输入 (baseDelay=180ms ±40%)      |
+| `Humanize`  | `humanClick(page, selector, options?)`               | 人类化点击 (reactionDelay=250ms ±40%)  |
+| `Humanize`  | `warmUpBrowsing(page, baseDuration?)`                | 页面预热 (3500ms ±40%)                 |
+| `Humanize`  | `naturalScroll(page, direction?, distance?, steps?)` | 自然滚动 (带惯性+抖动)                 |
+| `Humanize`  | `simulateGaze(page, baseDurationMs?)`                | 模拟注视 (2500ms ±40%)                 |
+| `Humanize`  | `randomSleep(baseMs, jitterPercent?)`                | 随机延迟 (±30% 抖动)                   |
+| `Captcha`   | `useCaptchaMonitor(page, options)`                   | 验证码监控                             |
 
 ---
 

package/dist/index.cjs

@@ -351,8 +351,8 @@ var Utils = {
   }
 };
 
-// src/stealth.js
-var logger3 = createLogger("AntiDetect");
+// src/anti-cheat.js
+var logger3 = createLogger("AntiCheat");
 var BASE_CONFIG = Object.freeze({
   locale: "zh-CN",
   acceptLanguage: "zh-CN,zh;q=0.9",
@@ -474,7 +474,7 @@ function resolveConfig(overrides = {}) {
     geolocation: overrides.geolocation === null ? null : overrides.geolocation || BASE_CONFIG.geolocation
   };
 }
-var AntiDetect = {
+var AntiCheat = {
   /**
    * 获取统一的基础配置（中国、桌面端、中文语言）。
    */
@@ -1076,7 +1076,7 @@ var Launch = {
   getLaunchOptions(customArgs = []) {
     return {
       args: [
-        ...AntiDetect.getLaunchArgs(),
+        ...AntiCheat.getLaunchArgs(),
         ...customArgs
       ],
       ignoreDefaultArgs: ["--enable-automation"]
@@ -1088,7 +1088,7 @@ var Launch = {
   getAdvancedLaunchOptions(customArgs = []) {
     return {
       args: [
-        ...AntiDetect.getAdvancedLaunchArgs(),
+        ...AntiCheat.getAdvancedLaunchArgs(),
         ...customArgs
       ],
       ignoreDefaultArgs: ["--enable-automation"]
@@ -1099,7 +1099,7 @@ var Launch = {
    * 确保生成的是桌面端、较新的 Chrome，以匹配我们的脚本逻辑
    */
   getFingerprintGeneratorOptions() {
-    return AntiDetect.getFingerprintGeneratorOptions();
+    return AntiCheat.getFingerprintGeneratorOptions();
   }
 };
 
@@ -1282,9 +1282,18 @@ var Captcha = {
 };
 
 // src/sse.js
-var import_https = __toESM(require("https"), 1);
-var import_url = require("url");
+var import_got_scraping = require("got-scraping");
+var import_http = require("http");
+var import_https = require("https");
 var logger7 = createLogger("Sse");
+var SHARED_HTTP_AGENT = new import_http.Agent({ keepAlive: false });
+var SHARED_HTTPS_AGENT = new import_https.Agent({ keepAlive: false, rejectUnauthorized: false });
+var SHARED_GOT_OPTIONS = {
+  http2: false,
+  retry: { limit: 0 },
+  throwHttpErrors: false,
+  decompress: false
+};
 var Sse = {
   /**
   * 解析 SSE 流文本
@@ -1311,7 +1320,7 @@ var Sse = {
     return events;
   },
   /**
-   * 拦截网络请求并使用 Node.js 原生 https 模块转发，以解决流式数据捕获问题。
+   * 拦截网络请求并使用 got-scraping 转发，以解决流式数据捕获问题。
    * @param {import('playwright').Page} page
    * @param {string|RegExp} urlPattern - 拦截的 URL 模式
    * @param {object} options
@@ -1319,7 +1328,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.timeout=180000] - 整体请求超时时间 (ms)，默认 180s
+   * @param {number} [options.overallTimeout=180000] - 整体请求超时时间 (ms)，默认 180s
    * @returns {Promise<any>} - 返回 Promise，当流满足条件时 resolve
    */
   async intercept(page, urlPattern, options = {}) {
@@ -1345,19 +1354,39 @@ var Sse = {
         logger7.info(`[MITM] \u5DF2\u62E6\u622A\u8BF7\u6C42: ${request.url()}`);
         try {
           const headers = await request.allHeaders();
-          const postData = request.postData();
-          const urlObj = new import_url.URL(request.url());
+          delete headers["host"];
           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 = {
-            hostname: urlObj.hostname,
-            port: 443,
-            path: urlObj.pathname + urlObj.search,
-            method: request.method(),
+            ...SHARED_GOT_OPTIONS,
+            url: request.url(),
+            method,
             headers,
-            timeout: overallTimeout
+            headerGeneratorOptions: AntiCheat.getTlsFingerprintOptions(userAgent, resolvedAcceptLanguage),
+            agent: {
+              http: SHARED_HTTP_AGENT,
+              https: SHARED_HTTPS_AGENT
+            },
+            timeout: { request: overallTimeout }
+          };
+          if (postData) {
+            reqOptions.body = postData;
+          }
+          const stream = import_got_scraping.gotScraping.stream(reqOptions);
+          const handleStreamError = (error) => {
+            clearAllTimers();
+            stream.destroy();
+            route.abort().catch(() => {
+            });
+            reject(error);
           };
-          const req = import_https.default.request(reqOptions, (res) => {
+          stream.on("response", (res) => {
             const chunks = [];
             let accumulatedText = "";
             res.on("data", (chunk) => {
@@ -1380,6 +1409,7 @@ var Sse = {
                 }
               }
             });
+            res.on("error", handleStreamError);
             res.on("end", () => {
               logger7.info("[MITM] \u4E0A\u6E38\u54CD\u5E94\u7ED3\u675F");
               clearAllTimers();
@@ -1392,22 +1422,28 @@ 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,
-                headers: res.headers,
+                status: res.statusCode || 200,
+                headers: resHeaders,
                 body: Buffer.concat(chunks)
               }).catch(() => {
               });
             });
           });
-          req.on("error", (e) => {
-            clearAllTimers();
-            route.abort().catch(() => {
-            });
-            reject(e);
-          });
-          if (postData) req.write(postData);
-          req.end();
+          stream.on("error", handleStreamError);
         } catch (e) {
           clearAllTimers();
           route.continue().catch(() => {
@@ -1466,12 +1502,12 @@ var Sse = {
 };
 
 // src/interception.js
-var import_got_scraping = require("got-scraping");
-var import_http = require("http");
+var import_got_scraping2 = require("got-scraping");
+var import_http2 = require("http");
 var import_https2 = require("https");
 var logger8 = createLogger("Interception");
-var SHARED_HTTP_AGENT = new import_http.Agent({ keepAlive: false });
-var SHARED_HTTPS_AGENT = new import_https2.Agent({ keepAlive: false, rejectUnauthorized: false });
+var SHARED_HTTP_AGENT2 = new import_http2.Agent({ keepAlive: false });
+var SHARED_HTTPS_AGENT2 = new import_https2.Agent({ keepAlive: false, rejectUnauthorized: false });
 var DirectConfig = {
   /** 直连请求超时时间（秒） */
   directTimeout: 12,
@@ -1524,7 +1560,7 @@ var DEFAULT_BLOCKING_CONFIG = {
   /** 额外自定义扩展名列表 */
   customExtensions: []
 };
-var SHARED_GOT_OPTIONS = {
+var SHARED_GOT_OPTIONS2 = {
   http2: false,
   // 禁用 HTTP2 避免在拦截场景下的握手兼容性问题
   retry: { limit: 0 },
@@ -1628,13 +1664,13 @@ var Interception = {
             const reqHeaders = await request.allHeaders();
             delete reqHeaders["host"];
             const currentAcceptLanguage = reqHeaders["accept-language"] || "";
-            AntiDetect.applyLocaleHeaders(reqHeaders, currentAcceptLanguage);
+            AntiCheat.applyLocaleHeaders(reqHeaders, currentAcceptLanguage);
             const resolvedAcceptLanguage = reqHeaders["accept-language"] || "";
             const userAgent = reqHeaders["user-agent"] || "";
             const method = request.method();
             const postData = method !== "GET" && method !== "HEAD" ? request.postDataBuffer() : void 0;
-            const response = await (0, import_got_scraping.gotScraping)({
-              ...SHARED_GOT_OPTIONS,
+            const response = await (0, import_got_scraping2.gotScraping)({
+              ...SHARED_GOT_OPTIONS2,
               // 应用通用配置
               url,
               method,
@@ -1643,11 +1679,11 @@ var Interception = {
               responseType: "buffer",
               // 强制获取 Buffer
               // 模拟浏览器 TLS 指纹
-              headerGeneratorOptions: AntiDetect.getTlsFingerprintOptions(userAgent, resolvedAcceptLanguage),
+              headerGeneratorOptions: AntiCheat.getTlsFingerprintOptions(userAgent, resolvedAcceptLanguage),
               // 使用共享的 Agent 单例（keepAlive: false，不会池化连接）
               agent: {
-                http: SHARED_HTTP_AGENT,
-                https: SHARED_HTTPS_AGENT
+                http: SHARED_HTTP_AGENT2,
+                https: SHARED_HTTPS_AGENT2
               },
               // 超时时间
               timeout: { request: DirectConfig.directTimeout * 1e3 }
@@ -1727,7 +1763,7 @@ function isIgnorableError(error) {
 var usePlaywrightToolKit = () => {
   return {
     ApifyKit,
-    AntiDetect,
+    AntiCheat,
     Humanize,
     Launch,
     LiveView,