@skrillex1224/playwright-toolkit 2.1.26 → 2.1.27

package/dist/index.cjs

@@ -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 },
@@ -1633,8 +1669,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 (0, import_got_scraping.gotScraping)({
-              ...SHARED_GOT_OPTIONS,
+            const response = await (0, import_got_scraping2.gotScraping)({
+              ...SHARED_GOT_OPTIONS2,
               // 应用通用配置
               url,
               method,
@@ -1646,8 +1682,8 @@ var Interception = {
               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 }