@skrillex1224/playwright-toolkit 2.1.21 → 2.1.22

package/dist/index.js

@@ -664,7 +664,7 @@ var Humanize = {
     const restore = async () => {
       if (!scrollStateHandle) return;
       try {
-        const restoreOnce = async () => page.evaluate((state) => {
+        const restoreOnce2 = async () => page.evaluate((state) => {
           if (!Array.isArray(state) || state.length === 0) return true;
           let done = true;
           for (const item of state) {
@@ -681,7 +681,7 @@ var Humanize = {
           return done;
         }, scrollStateHandle);
         for (let i = 0; i < 10; i++) {
-          const done = await restoreOnce();
+          const done = await restoreOnce2();
           if (done) break;
           await delay2(this.jitterMs(80, 0.4));
         }
@@ -726,25 +726,24 @@ var Humanize = {
       } else {
         element = target;
       }
-      let restoreScroll = async () => {
-      };
-      let restored = false;
-      const restoreOnce = async () => {
-        if (restored) return;
-        restored = true;
+      const restoreOnce2 = async () => {
+        if (restoreOnce2.restored) return;
+        restoreOnce2.restored = true;
+        if (typeof restoreOnce2.do !== "function") return;
         try {
-          await restoreScroll();
+          await delay2(this.jitterMs(1e3));
+          await restoreOnce2.do();
         } catch (restoreError) {
           logger4.warn(`humanClick: \u6062\u590D\u6EDA\u52A8\u4F4D\u7F6E\u5931\u8D25: ${restoreError.message}`);
         }
       };
       if (scrollIfNeeded) {
-        const scrollResult = await this.humanScroll(page, element);
-        restoreScroll = scrollResult.restore || restoreScroll;
+        const { restore, didScroll } = await this.humanScroll(page, element);
+        restoreOnce2.do = didScroll ? restore : null;
       }
       const box = await element.boundingBox();
       if (!box) {
-        await restoreOnce();
+        await restoreOnce2();
         if (throwOnMissing) {
           throw new Error("\u65E0\u6CD5\u83B7\u53D6\u5143\u7D20\u4F4D\u7F6E");
         }
@@ -756,12 +755,11 @@ var Humanize = {
       await cursor.actions.move({ x, y });
       await delay2(this.jitterMs(reactionDelay, 0.4));
       await cursor.actions.click();
-      await delay2(this.jitterMs(180, 0.4));
-      await restoreOnce();
+      await restoreOnce2();
       logger4.success("humanClick");
       return true;
     } catch (error) {
-      logger4.fail("humanClick", error);
+      await restoreOnce();
       logger4.fail("humanClick", error);
       throw error;
     }