@skrillex1224/playwright-toolkit 2.1.10 → 2.1.11

package/dist/index.js

@@ -1206,6 +1206,14 @@ import { gotScraping } from "got-scraping";
 import { Agent as HttpAgent } from "http";
 import { Agent as HttpsAgent } from "https";
 var logger9 = createLogger("Interception");
+var SHARED_HTTP_AGENT = new HttpAgent({ keepAlive: false });
+var SHARED_HTTPS_AGENT = new HttpsAgent({ keepAlive: false, rejectUnauthorized: false });
+var DirectConfig = {
+  /** 直连请求超时时间（秒） */
+  directTimeout: 12,
+  /** 静默扩展名：这些扩展名的直连成功日志用 debug 级别 */
+  silentExtensions: [".js"]
+};
 var ARCHIVE_EXTENSIONS = [".7z", ".zip", ".rar", ".gz", ".bz2", ".tar", ".zst"];
 var EXECUTABLE_EXTENSIONS = [".exe", ".apk", ".bin", ".dmg", ".jar", ".class"];
 var DOCUMENT_EXTENSIONS = [".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".csv"];
@@ -1330,14 +1338,17 @@ var Interception = {
     if (mergedBlockingConfig.blockOther) enabledCategories.push("\u5176\u4ED6");
     logger9.start("setup", hasDirectDomains ? `\u76F4\u8FDE\u57DF\u540D: [${directDomains.length} \u4E2A] | \u5C4F\u853D: [${enabledCategories.join(", ")}]` : `\u4EC5\u8D44\u6E90\u5C4F\u853D\u6A21\u5F0F | \u5C4F\u853D: [${enabledCategories.join(", ")}]`);
     await page.route("**/*", async (route) => {
+      let handled = false;
       try {
         const request = route.request();
         const url = request.url();
         const urlLower = url.toLowerCase();
         const urlPath = urlLower.split("?")[0];
+        const isSilent = DirectConfig.silentExtensions.some((ext) => urlPath.endsWith(ext));
         const shouldBlock = blockedExtensions.some((ext) => urlPath.endsWith(ext));
         if (shouldBlock) {
           await route.abort();
+          handled = true;
           return;
         }
         if (hasDirectDomains && directDomains.some((domain) => url.includes(domain))) {
@@ -1358,18 +1369,13 @@ var Interception = {
               // 强制获取 Buffer
               // 模拟浏览器 TLS 指纹
               headerGeneratorOptions: Stealth.getTlsFingerprintOptions(userAgent),
-              // 【核心修复 1】: keepAlive 设置为 false
-              // 每一个拦截请求都是独立的，使用 keepAlive 会导致 Agent 池耗尽，
-              // 从而导致后续请求一直 Pending。
+              // 使用共享的 Agent 单例（keepAlive: false，不会池化连接）
               agent: {
-                http: new HttpAgent({ keepAlive: false }),
-                https: new HttpsAgent({ keepAlive: false, rejectUnauthorized: false })
+                http: SHARED_HTTP_AGENT,
+                https: SHARED_HTTPS_AGENT
               },
-              // 设置较短的超时时间，给回退代理留出机会
-              timeout: {
-                request: 12 * 1e3
-                // 12秒超时
-              }
+              // 超时时间
+              timeout: { request: DirectConfig.directTimeout * 1e3 }
             });
             const resHeaders = {};
             for (const [key, value] of Object.entries(response.headers)) {
@@ -1384,32 +1390,37 @@ var Interception = {
             delete resHeaders["transfer-encoding"];
             delete resHeaders["connection"];
             delete resHeaders["keep-alive"];
-            logger9.info(`\u76F4\u8FDE\u6210\u529F: ${url}`);
+            isSilent ? logger9.debug(`\u76F4\u8FDE\u6210\u529F: ${url}`) : logger9.info(`\u76F4\u8FDE\u6210\u529F: ${url}`);
             await safeFulfill(route, {
               status: response.statusCode,
               headers: resHeaders,
               body: response.body
             });
+            handled = true;
             return;
           } catch (e) {
+            const isTimeout = e.code === "ETIMEDOUT" || e.message.toLowerCase().includes("timeout");
+            const action = fallbackToProxy ? "\u56DE\u9000\u4EE3\u7406" : "\u5DF2\u653E\u5F03";
+            const reason = isTimeout ? `\u8D85\u65F6(${DirectConfig.directTimeout}s)` : `\u5F02\u5E38: ${e.message}`;
+            logger9.warn(`\u76F4\u8FDE${reason}\uFF0C${action}: ${url}`);
             if (fallbackToProxy) {
-              logger9.warn(`\u76F4\u8FDE\u5F02\u5E38\uFF0C\u56DE\u9000\u4EE3\u7406: ${url} | Err: ${e.message}`);
               await safeContinue(route);
-              return;
             } else {
-              logger9.warn(`\u76F4\u8FDE\u5931\u8D25: ${url} | Err: ${e.message}`);
               await route.abort();
-              return;
             }
+            handled = true;
+            return;
           }
         }
         await safeContinue(route);
+        handled = true;
       } catch (err) {
-        try {
-          if (!route.request().failure()) {
+        logger9.warn(`\u8DEF\u7531\u5904\u7406\u5F02\u5E38: ${err.message}`);
+        if (!handled) {
+          try {
             await route.continue();
+          } catch (_) {
           }
-        } catch (_) {
         }
       }
     });