@skrillex1224/playwright-toolkit 2.1.92 → 2.1.94

package/dist/index.js

@@ -1306,7 +1306,7 @@ var Sse = {
    * @param {number} [options.timeout=180000] - 整体请求超时时间 (ms)，默认 180s
    * @returns {Promise<any>} - 返回 Promise，当流满足条件时 resolve
    */
-  async intercept(page, urlPattern, options = {}) {
+  intercept(page, urlPattern, options = {}) {
     const {
       onData,
       onEnd,
@@ -1323,8 +1323,15 @@ var Sse = {
       initialTimer = null;
       overallTimer = null;
     };
+    let routeHandler = null;
+    let isCancelled = false;
     const workPromise = new Promise((resolve, reject) => {
-      page.route(urlPattern, async (route) => {
+      routeHandler = async (route) => {
+        if (isCancelled) {
+          route.continue().catch(() => {
+          });
+          return;
+        }
         const request = route.request();
         logger8.info(`[MITM] \u5DF2\u62E6\u622A\u8BF7\u6C42: ${request.url()}`);
         try {
@@ -1398,7 +1405,8 @@ var Sse = {
           });
           reject(e);
         }
-      }).catch(reject);
+      };
+      page.route(urlPattern, routeHandler).catch(reject);
     });
     const timeoutPromise = new Promise((_, reject) => {
       initialTimer = setTimeout(() => {
@@ -1445,7 +1453,20 @@ var Sse = {
     const racePromise = Promise.race([workPromise, timeoutPromise]);
     racePromise.catch(() => {
     });
-    return racePromise;
+    const cancel = async () => {
+      if (isCancelled) return;
+      isCancelled = true;
+      clearAllTimers();
+      if (routeHandler) {
+        try {
+          await page.unroute(urlPattern, routeHandler);
+          logger8.info("[MITM] \u5DF2\u53D6\u6D88 SSE \u6D41\u76D1\u542C");
+        } catch (e) {
+          logger8.debug("[MITM] \u53D6\u6D88\u76D1\u542C\u65F6\u51FA\u9519\uFF08\u53EF\u80FD\u5DF2\u53D6\u6D88\uFF09");
+        }
+      }
+    };
+    return [racePromise, cancel];
   }
 };