@duckduckgo/autoconsent 16.28.0 → 16.30.0

package/dist/autoconsent.cjs.js

@@ -1498,12 +1498,12 @@ var AutoConsentCMPBase = class {
   waitForVisible(selector, timeout, check) {
     return this.autoconsent.domActions.waitForVisible(selector, timeout, check);
   }
-  async waitForThenClick(selector, timeout, all) {
+  async waitForThenClick(selector, timeout, all, retries, retryInterval) {
     if (this.autoconsent.config.visualTest) {
       await this.highlightElements(this.elementSelector(selector), all);
     }
     this.autoconsent.updateState({ clicks: this.autoconsent.state.clicks + 1 });
-    return this.autoconsent.domActions.waitForThenClick(selector, timeout, all);
+    return this.autoconsent.domActions.waitForThenClick(selector, timeout, all, retries, retryInterval);
   }
   wait(ms) {
     return this.autoconsent.domActions.wait(ms);
@@ -1627,7 +1627,7 @@ var AutoConsentCMP = class extends AutoConsentCMPBase {
       results.push(this.click(rule.click, rule.all));
     }
     if (rule.waitForThenClick) {
-      results.push(this.waitForThenClick(rule.waitForThenClick, rule.timeout, rule.all));
+      results.push(this.waitForThenClick(rule.waitForThenClick, rule.timeout, rule.all, rule.retry, rule.retryInterval));
     }
     if (rule.wait) {
       results.push(this.wait(rule.wait));
@@ -2589,6 +2589,8 @@ var dynamicCMPs = [
 ];
 
 // lib/dom-actions.ts
+var DEFAULT_CLICK_RETRY_INTERVAL = 300;
+var CLICK_RETRY_POLL_INTERVAL = 50;
 var DomActions = class {
   constructor(autoconsentInstance) {
     this.autoconsentInstance = autoconsentInstance;
@@ -2644,9 +2646,19 @@ var DomActions = class {
     this.autoconsentInstance.config.logs.rulesteps && console.log("[waitForVisible]", selector);
     return waitFor(() => this.elementVisible(selector, check), times, interval);
   }
-  async waitForThenClick(selector, timeout = 1e4, all = false) {
+  async waitForThenClick(selector, timeout = 1e4, all = false, retries = 0, retryInterval = DEFAULT_CLICK_RETRY_INTERVAL) {
     await this.waitForElement(selector, timeout);
-    return await this.click(selector, all);
+    let clicked = await this.click(selector, all);
+    for (let attempt = 0; clicked && attempt < retries; attempt++) {
+      const pollTimes = Math.ceil(retryInterval / CLICK_RETRY_POLL_INTERVAL);
+      const isGone = await waitFor(() => !this.elementVisible(selector, "any"), pollTimes, CLICK_RETRY_POLL_INTERVAL);
+      if (isGone) {
+        break;
+      }
+      this.autoconsentInstance.config.logs.rulesteps && console.log("[waitForThenClick] retrying click", selector);
+      clicked = await this.click(selector, all);
+    }
+    return clicked;
   }
   wait(ms) {
     this.autoconsentInstance.config.logs.rulesteps && this.autoconsentInstance.config.logs.waits && console.log("[wait]", ms);

package/dist/autoconsent.esm.js

@@ -1468,12 +1468,12 @@ var AutoConsentCMPBase = class {
   waitForVisible(selector, timeout, check) {
     return this.autoconsent.domActions.waitForVisible(selector, timeout, check);
   }
-  async waitForThenClick(selector, timeout, all) {
+  async waitForThenClick(selector, timeout, all, retries, retryInterval) {
     if (this.autoconsent.config.visualTest) {
       await this.highlightElements(this.elementSelector(selector), all);
     }
     this.autoconsent.updateState({ clicks: this.autoconsent.state.clicks + 1 });
-    return this.autoconsent.domActions.waitForThenClick(selector, timeout, all);
+    return this.autoconsent.domActions.waitForThenClick(selector, timeout, all, retries, retryInterval);
   }
   wait(ms) {
     return this.autoconsent.domActions.wait(ms);
@@ -1597,7 +1597,7 @@ var AutoConsentCMP = class extends AutoConsentCMPBase {
       results.push(this.click(rule.click, rule.all));
     }
     if (rule.waitForThenClick) {
-      results.push(this.waitForThenClick(rule.waitForThenClick, rule.timeout, rule.all));
+      results.push(this.waitForThenClick(rule.waitForThenClick, rule.timeout, rule.all, rule.retry, rule.retryInterval));
     }
     if (rule.wait) {
       results.push(this.wait(rule.wait));
@@ -2559,6 +2559,8 @@ var dynamicCMPs = [
 ];
 
 // lib/dom-actions.ts
+var DEFAULT_CLICK_RETRY_INTERVAL = 300;
+var CLICK_RETRY_POLL_INTERVAL = 50;
 var DomActions = class {
   constructor(autoconsentInstance) {
     this.autoconsentInstance = autoconsentInstance;
@@ -2614,9 +2616,19 @@ var DomActions = class {
     this.autoconsentInstance.config.logs.rulesteps && console.log("[waitForVisible]", selector);
     return waitFor(() => this.elementVisible(selector, check), times, interval);
   }
-  async waitForThenClick(selector, timeout = 1e4, all = false) {
+  async waitForThenClick(selector, timeout = 1e4, all = false, retries = 0, retryInterval = DEFAULT_CLICK_RETRY_INTERVAL) {
     await this.waitForElement(selector, timeout);
-    return await this.click(selector, all);
+    let clicked = await this.click(selector, all);
+    for (let attempt = 0; clicked && attempt < retries; attempt++) {
+      const pollTimes = Math.ceil(retryInterval / CLICK_RETRY_POLL_INTERVAL);
+      const isGone = await waitFor(() => !this.elementVisible(selector, "any"), pollTimes, CLICK_RETRY_POLL_INTERVAL);
+      if (isGone) {
+        break;
+      }
+      this.autoconsentInstance.config.logs.rulesteps && console.log("[waitForThenClick] retrying click", selector);
+      clicked = await this.click(selector, all);
+    }
+    return clicked;
   }
   wait(ms) {
     this.autoconsentInstance.config.logs.rulesteps && this.autoconsentInstance.config.logs.waits && console.log("[wait]", ms);

package/dist/autoconsent.playwright.js

@@ -1470,12 +1470,12 @@
     waitForVisible(selector, timeout, check) {
       return this.autoconsent.domActions.waitForVisible(selector, timeout, check);
     }
-    async waitForThenClick(selector, timeout, all) {
+    async waitForThenClick(selector, timeout, all, retries, retryInterval) {
       if (this.autoconsent.config.visualTest) {
         await this.highlightElements(this.elementSelector(selector), all);
       }
       this.autoconsent.updateState({ clicks: this.autoconsent.state.clicks + 1 });
-      return this.autoconsent.domActions.waitForThenClick(selector, timeout, all);
+      return this.autoconsent.domActions.waitForThenClick(selector, timeout, all, retries, retryInterval);
     }
     wait(ms) {
       return this.autoconsent.domActions.wait(ms);
@@ -1599,7 +1599,7 @@
         results.push(this.click(rule.click, rule.all));
       }
       if (rule.waitForThenClick) {
-        results.push(this.waitForThenClick(rule.waitForThenClick, rule.timeout, rule.all));
+        results.push(this.waitForThenClick(rule.waitForThenClick, rule.timeout, rule.all, rule.retry, rule.retryInterval));
       }
       if (rule.wait) {
         results.push(this.wait(rule.wait));
@@ -2561,6 +2561,8 @@
   ];
 
   // lib/dom-actions.ts
+  var DEFAULT_CLICK_RETRY_INTERVAL = 300;
+  var CLICK_RETRY_POLL_INTERVAL = 50;
   var DomActions = class {
     constructor(autoconsentInstance) {
       this.autoconsentInstance = autoconsentInstance;
@@ -2616,9 +2618,19 @@
       this.autoconsentInstance.config.logs.rulesteps && console.log("[waitForVisible]", selector);
       return waitFor(() => this.elementVisible(selector, check), times, interval);
     }
-    async waitForThenClick(selector, timeout = 1e4, all = false) {
+    async waitForThenClick(selector, timeout = 1e4, all = false, retries = 0, retryInterval = DEFAULT_CLICK_RETRY_INTERVAL) {
       await this.waitForElement(selector, timeout);
-      return await this.click(selector, all);
+      let clicked = await this.click(selector, all);
+      for (let attempt = 0; clicked && attempt < retries; attempt++) {
+        const pollTimes = Math.ceil(retryInterval / CLICK_RETRY_POLL_INTERVAL);
+        const isGone = await waitFor(() => !this.elementVisible(selector, "any"), pollTimes, CLICK_RETRY_POLL_INTERVAL);
+        if (isGone) {
+          break;
+        }
+        this.autoconsentInstance.config.logs.rulesteps && console.log("[waitForThenClick] retrying click", selector);
+        clicked = await this.click(selector, all);
+      }
+      return clicked;
     }
     wait(ms) {
       this.autoconsentInstance.config.logs.rulesteps && this.autoconsentInstance.config.logs.waits && console.log("[wait]", ms);