@skrillex1224/playwright-toolkit 2.1.96 → 2.1.97

package/dist/index.cjs

@@ -1331,15 +1331,17 @@ var Sse = {
    * @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>, function(): void]} - 返回 [promise, cancel] 元组，promise 为流数据，cancel 为取消监听的函数
+   * @param {boolean} [options.autoUnroute=true] - resolve/reject 后是否自动取消拦截
+   * @returns {Promise<any>} - 返回 Promise，当流满足条件时 resolve
    */
-  intercept(page, urlPattern, options = {}) {
+  async intercept(page, urlPattern, options = {}) {
     const {
       onData,
       onEnd,
       onTimeout,
       initialTimeout = 9e4,
-      overallTimeout = 18e4
+      overallTimeout = 18e4,
+      autoUnroute = true
     } = options;
     let initialTimer = null;
     let overallTimer = null;
@@ -1350,15 +1352,31 @@ var Sse = {
       initialTimer = null;
       overallTimer = null;
     };
-    let routeHandler = null;
-    let isCancelled = false;
     const workPromise = new Promise((resolve, reject) => {
-      routeHandler = async (route) => {
-        if (isCancelled) {
-          route.continue().catch(() => {
-          });
-          return;
-        }
+      let finished = false;
+      let unrouteRequested = false;
+      const safeUnroute = () => {
+        if (!autoUnroute) return;
+        if (unrouteRequested) return;
+        unrouteRequested = true;
+        page.unroute(urlPattern, routeHandler).catch(() => {
+        });
+      };
+      const safeResolve = (value) => {
+        if (finished) return;
+        finished = true;
+        clearAllTimers();
+        safeUnroute();
+        resolve(value);
+      };
+      const safeReject2 = (error) => {
+        if (finished) return;
+        finished = true;
+        clearAllTimers();
+        safeUnroute();
+        reject(error);
+      };
+      const routeHandler = async (route) => {
         const request = route.request();
         logger8.info(`[MITM] \u5DF2\u62E6\u622A\u8BF7\u6C42: ${request.url()}`);
         try {
@@ -1392,7 +1410,7 @@ var Sse = {
               accumulatedText += textChunk;
               if (onData) {
                 try {
-                  onData(textChunk, resolve, accumulatedText);
+                  onData(textChunk, safeResolve, accumulatedText);
                 } catch (e) {
                   logger8.fail(`onData \u9519\u8BEF`, e);
                 }
@@ -1403,12 +1421,12 @@ var Sse = {
               clearAllTimers();
               if (onEnd) {
                 try {
-                  onEnd(accumulatedText, resolve);
+                  onEnd(accumulatedText, safeResolve);
                 } catch (e) {
                   logger8.fail(`onEnd \u9519\u8BEF`, e);
                 }
               } else if (!onData) {
-                resolve(accumulatedText);
+                safeResolve(accumulatedText);
               }
               route.fulfill({
                 status: res.statusCode,
@@ -1422,7 +1440,7 @@ var Sse = {
             clearAllTimers();
             route.abort().catch(() => {
             });
-            reject(e);
+            safeReject2(e);
           });
           if (postData) req.write(postData);
           req.end();
@@ -1430,10 +1448,10 @@ var Sse = {
           clearAllTimers();
           route.continue().catch(() => {
           });
-          reject(e);
+          safeReject2(e);
         }
       };
-      page.route(urlPattern, routeHandler).catch(reject);
+      page.route(urlPattern, routeHandler).catch(safeReject2);
     });
     const timeoutPromise = new Promise((_, reject) => {
       initialTimer = setTimeout(() => {
@@ -1446,12 +1464,12 @@ var Sse = {
           clearAllTimers();
           if (onTimeout) {
             try {
-              onTimeout(error, reject);
+              onTimeout(error, (err) => safeReject(err));
             } catch (e) {
-              reject(e);
+              safeReject(e);
             }
           } else {
-            reject(error);
+            safeReject(error);
           }
         }
       }, initialTimeout);
@@ -1464,12 +1482,12 @@ var Sse = {
         clearAllTimers();
         if (onTimeout) {
           try {
-            onTimeout(error, reject);
+            onTimeout(error, (err) => safeReject(err));
           } catch (e) {
-            reject(e);
+            safeReject(e);
           }
         } else {
-          reject(error);
+          safeReject(error);
         }
       }, overallTimeout);
     });
@@ -1480,20 +1498,7 @@ var Sse = {
     const racePromise = Promise.race([workPromise, timeoutPromise]);
     racePromise.catch(() => {
     });
-    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];
+    return racePromise;
   }
 };