@skrillex1224/playwright-toolkit 2.0.79 → 2.0.81

package/dist/index.js

@@ -17,7 +17,9 @@ var Code = {
   UnknownError: -1,
   NotLogin: 30000001,
   Chaptcha: 30000002,
-  Timeout: 30000003
+  Timeout: 30000003,
+  InitialTimeout: 30000004,
+  OverallTimeout: 30000005
 };
 var Status = {
   Success: "SUCCESS",
@@ -85,10 +87,7 @@ function createLogger(moduleName) {
 // src/errors.js
 var errors_exports = {};
 __export(errors_exports, {
-  CrawlerError: () => CrawlerError,
-  InitialTimeoutError: () => InitialTimeoutError,
-  OverallTimeoutError: () => OverallTimeoutError,
-  TimeoutError: () => TimeoutError
+  CrawlerError: () => CrawlerError
 });
 import { serializeError } from "serialize-error";
 var CrawlerError = class _CrawlerError extends Error {
@@ -141,51 +140,6 @@ var CrawlerError = class _CrawlerError extends Error {
     return crawlerError;
   }
 };
-var TimeoutError = class _TimeoutError extends CrawlerError {
-  /**
-   * @param {string} message - 错误信息
-   * @param {number} timeout - 超时时间（毫秒）
-   * @param {Object} [context={}] - 上下文信息
-   */
-  constructor(message, timeout, context = {}) {
-    super({
-      message,
-      code: Code.Timeout,
-      context: { ...context, timeout }
-    });
-    this.name = "TimeoutError";
-    this.timeout = timeout;
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, _TimeoutError);
-    }
-  }
-};
-var InitialTimeoutError = class _InitialTimeoutError extends TimeoutError {
-  /**
-   * @param {number} timeout - 超时时间（毫秒）
-   * @param {Object} [context={}] - 上下文信息
-   */
-  constructor(timeout, context = {}) {
-    super(`\u521D\u59CB\u6570\u636E\u63A5\u6536\u8D85\u65F6 (${timeout}ms)`, timeout, context);
-    this.name = "InitialTimeoutError";
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, _InitialTimeoutError);
-    }
-  }
-};
-var OverallTimeoutError = class _OverallTimeoutError extends TimeoutError {
-  /**
-   * @param {number} timeout - 超时时间（毫秒）
-   * @param {Object} [context={}] - 上下文信息
-   */
-  constructor(timeout, context = {}) {
-    super(`\u6574\u4F53\u8BF7\u6C42\u8D85\u65F6 (${timeout}ms)`, timeout, context);
-    this.name = "OverallTimeoutError";
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, _OverallTimeoutError);
-    }
-  }
-};
 
 // src/apify-kit.js
 import { serializeError as serializeError2 } from "serialize-error";
@@ -1057,7 +1011,7 @@ var Sse = {
    * @param {object} options
    * @param {function(string, function, string): void} [options.onData] - (textChunk, resolve, accumulatedText) => void
    * @param {function(string, function): void} [options.onEnd] - (fullText, resolve) => void
-   * @param {function(Error, function): void} [options.onTimeout] - (error, reject) => void，error 为 InitialTimeoutError 或 OverallTimeoutError
+   * @param {function(Error, function): void} [options.onTimeout] - (error, reject) => void
    * @param {number} [options.initialTimeout=90000] - 初始数据接收超时 (ms)，默认 90s
    * @param {number} [options.timeout=180000] - 整体请求超时时间 (ms)，默认 180s
    * @returns {Promise<any>} - 返回 Promise，当流满足条件时 resolve
@@ -1079,93 +1033,91 @@ var Sse = {
       initialTimer = null;
       overallTimer = null;
     };
-    const workPromise = new Promise(async (resolve, reject) => {
-      try {
-        await page.route(urlPattern, async (route) => {
-          const request = route.request();
-          logger8.info(`[MITM] \u5DF2\u62E6\u622A\u8BF7\u6C42: ${request.url()}`);
-          try {
-            const headers = await request.allHeaders();
-            const postData = request.postData();
-            const urlObj = new URL(request.url());
-            delete headers["accept-encoding"];
-            delete headers["content-length"];
-            const reqOptions = {
-              hostname: urlObj.hostname,
-              port: 443,
-              path: urlObj.pathname + urlObj.search,
-              method: request.method(),
-              headers,
-              timeout: overallTimeout
-            };
-            const req = https.request(reqOptions, (res) => {
-              const chunks = [];
-              let accumulatedText = "";
-              res.on("data", (chunk) => {
-                if (!hasReceivedInitialData) {
-                  hasReceivedInitialData = true;
-                  if (initialTimer) {
-                    clearTimeout(initialTimer);
-                    initialTimer = null;
-                  }
-                  logger8.debug("[Intercept] \u5DF2\u63A5\u6536\u521D\u59CB\u6570\u636E");
+    const workPromise = new Promise((resolve, reject) => {
+      page.route(urlPattern, async (route) => {
+        const request = route.request();
+        logger8.info(`[MITM] \u5DF2\u62E6\u622A\u8BF7\u6C42: ${request.url()}`);
+        try {
+          const headers = await request.allHeaders();
+          const postData = request.postData();
+          const urlObj = new URL(request.url());
+          delete headers["accept-encoding"];
+          delete headers["content-length"];
+          const reqOptions = {
+            hostname: urlObj.hostname,
+            port: 443,
+            path: urlObj.pathname + urlObj.search,
+            method: request.method(),
+            headers,
+            timeout: overallTimeout
+          };
+          const req = https.request(reqOptions, (res) => {
+            const chunks = [];
+            let accumulatedText = "";
+            res.on("data", (chunk) => {
+              if (!hasReceivedInitialData) {
+                hasReceivedInitialData = true;
+                if (initialTimer) {
+                  clearTimeout(initialTimer);
+                  initialTimer = null;
                 }
-                chunks.push(chunk);
-                const textChunk = chunk.toString("utf-8");
-                accumulatedText += textChunk;
-                if (onData) {
-                  try {
-                    onData(textChunk, resolve, accumulatedText);
-                  } catch (e) {
-                    logger8.fail(`onData \u9519\u8BEF`, e);
-                  }
+                logger8.debug("[Intercept] \u5DF2\u63A5\u6536\u521D\u59CB\u6570\u636E");
+              }
+              chunks.push(chunk);
+              const textChunk = chunk.toString("utf-8");
+              accumulatedText += textChunk;
+              if (onData) {
+                try {
+                  onData(textChunk, resolve, accumulatedText);
+                } catch (e) {
+                  logger8.fail(`onData \u9519\u8BEF`, e);
                 }
-              });
-              res.on("end", () => {
-                logger8.info("[MITM] \u4E0A\u6E38\u54CD\u5E94\u7ED3\u675F");
-                clearAllTimers();
-                if (onEnd) {
-                  try {
-                    onEnd(accumulatedText, resolve);
-                  } catch (e) {
-                    logger8.fail(`onEnd \u9519\u8BEF`, e);
-                  }
-                } else if (!onData) {
-                  resolve(accumulatedText);
-                }
-                route.fulfill({
-                  status: res.statusCode,
-                  headers: res.headers,
-                  body: Buffer.concat(chunks)
-                }).catch(() => {
-                });
-              });
+              }
             });
-            req.on("error", (e) => {
+            res.on("end", () => {
+              logger8.info("[MITM] \u4E0A\u6E38\u54CD\u5E94\u7ED3\u675F");
               clearAllTimers();
-              route.abort().catch(() => {
+              if (onEnd) {
+                try {
+                  onEnd(accumulatedText, resolve);
+                } catch (e) {
+                  logger8.fail(`onEnd \u9519\u8BEF`, e);
+                }
+              } else if (!onData) {
+                resolve(accumulatedText);
+              }
+              route.fulfill({
+                status: res.statusCode,
+                headers: res.headers,
+                body: Buffer.concat(chunks)
+              }).catch(() => {
               });
-              reject(e);
             });
-            if (postData) req.write(postData);
-            req.end();
-          } catch (e) {
+          });
+          req.on("error", (e) => {
             clearAllTimers();
-            route.continue().catch(() => {
+            route.abort().catch(() => {
             });
             reject(e);
-          }
-        });
-      } catch (e) {
-        reject(e);
-      }
-    });
-    workPromise.catch(() => {
+          });
+          if (postData) req.write(postData);
+          req.end();
+        } catch (e) {
+          clearAllTimers();
+          route.continue().catch(() => {
+          });
+          reject(e);
+        }
+      }).catch(reject);
     });
     const timeoutPromise = new Promise((_, reject) => {
       initialTimer = setTimeout(() => {
         if (!hasReceivedInitialData) {
-          const error = new InitialTimeoutError(initialTimeout);
+          const error = new CrawlerError({
+            message: `\u521D\u59CB\u6570\u636E\u63A5\u6536\u8D85\u65F6 (${initialTimeout}ms)`,
+            code: Code.InitialTimeout,
+            context: { timeout: initialTimeout }
+          });
           clearAllTimers();
           if (onTimeout) {
             try {
@@ -1179,7 +1131,11 @@ var Sse = {
         }
       }, initialTimeout);
       overallTimer = setTimeout(() => {
-        const error = new OverallTimeoutError(overallTimeout);
+        const error = new CrawlerError({
+          message: `\u6574\u4F53\u8BF7\u6C42\u8D85\u65F6 (${overallTimeout}ms)`,
+          code: Code.OverallTimeout,
+          context: { timeout: overallTimeout }
+        });
         clearAllTimers();
         if (onTimeout) {
           try {
@@ -1192,11 +1148,12 @@ var Sse = {
         }
       }, overallTimeout);
     });
+    workPromise.catch(() => {
+    });
     timeoutPromise.catch(() => {
     });
     const racePromise = Promise.race([workPromise, timeoutPromise]);
-    racePromise.catch((e) => {
-      logger8.debug(`[Intercept] Race promise rejected (handled): ${e.message}`);
+    racePromise.catch(() => {
     });
     return racePromise;
   }