@duckduckgo/autoconsent 16.27.0 → 16.29.0

package/dist/autoconsent.cjs.js

@@ -37,7 +37,7 @@ __export(web_exports, {
 module.exports = __toCommonJS(web_exports);
 
 // lib/rules.ts
-var SUPPORTED_RULE_STEP_VERSION = 2;
+var SUPPORTED_RULE_STEP_VERSION = 3;
 
 // lib/random.ts
 function getRandomID() {
@@ -116,6 +116,20 @@ function hideElements(styleEl, selector, method = "display") {
   }
   return false;
 }
+function appendStylesheetRule(styleEl, cssRule, marker) {
+  if (!(styleEl instanceof HTMLStyleElement) || cssRule.length === 0) {
+    return false;
+  }
+  const markerComment = marker ? `/* autoconsent:${marker} */` : "";
+  if (markerComment && styleEl.innerText.includes(markerComment)) {
+    return true;
+  }
+  if (!markerComment && styleEl.innerText.includes(cssRule.trim())) {
+    return true;
+  }
+  styleEl.innerText += `${markerComment}${markerComment ? " " : ""}${cssRule} `;
+  return true;
+}
 async function waitFor(predicate, maxTimes, interval) {
   const result = await predicate();
   if (!result && maxTimes > 0) {
@@ -1484,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);
@@ -1497,6 +1511,9 @@ var AutoConsentCMPBase = class {
   hide(selector, method) {
     return this.autoconsent.domActions.hide(selector, method);
   }
+  stylesheet(cssRule, stylesheetId) {
+    return this.autoconsent.domActions.stylesheet(cssRule, stylesheetId);
+  }
   removeClass(selector, className) {
     return this.autoconsent.domActions.removeClass(selector, className);
   }
@@ -1610,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));
@@ -1618,6 +1635,9 @@ var AutoConsentCMP = class extends AutoConsentCMPBase {
     if (rule.hide) {
       results.push(this.hide(rule.hide, rule.method));
     }
+    if (rule.stylesheet !== void 0) {
+      results.push(this.stylesheet(rule.stylesheet, rule.stylesheetId));
+    }
     if (rule.removeClass !== void 0) {
       results.push(rule.selector ? this.removeClass(rule.selector, rule.removeClass) : false);
     }
@@ -2569,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;
@@ -2624,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);
@@ -2644,6 +2676,11 @@ var DomActions = class {
     const styleEl = getStyleElement();
     return hideElements(styleEl, selector, method);
   }
+  stylesheet(cssRule, stylesheetId) {
+    this.autoconsentInstance.config.logs.rulesteps && console.log("[stylesheet]", cssRule, stylesheetId);
+    const styleEl = getStyleElement();
+    return appendStylesheetRule(styleEl, cssRule, stylesheetId);
+  }
   removeClass(selector, className) {
     const elements = this.elementSelector(selector);
     this.autoconsentInstance.config.logs.rulesteps && console.log("[removeClass]", selector, className, elements);

package/dist/autoconsent.esm.js

@@ -7,7 +7,7 @@ var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 
 // lib/rules.ts
-var SUPPORTED_RULE_STEP_VERSION = 2;
+var SUPPORTED_RULE_STEP_VERSION = 3;
 
 // lib/random.ts
 function getRandomID() {
@@ -86,6 +86,20 @@ function hideElements(styleEl, selector, method = "display") {
   }
   return false;
 }
+function appendStylesheetRule(styleEl, cssRule, marker) {
+  if (!(styleEl instanceof HTMLStyleElement) || cssRule.length === 0) {
+    return false;
+  }
+  const markerComment = marker ? `/* autoconsent:${marker} */` : "";
+  if (markerComment && styleEl.innerText.includes(markerComment)) {
+    return true;
+  }
+  if (!markerComment && styleEl.innerText.includes(cssRule.trim())) {
+    return true;
+  }
+  styleEl.innerText += `${markerComment}${markerComment ? " " : ""}${cssRule} `;
+  return true;
+}
 async function waitFor(predicate, maxTimes, interval) {
   const result = await predicate();
   if (!result && maxTimes > 0) {
@@ -1454,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);
@@ -1467,6 +1481,9 @@ var AutoConsentCMPBase = class {
   hide(selector, method) {
     return this.autoconsent.domActions.hide(selector, method);
   }
+  stylesheet(cssRule, stylesheetId) {
+    return this.autoconsent.domActions.stylesheet(cssRule, stylesheetId);
+  }
   removeClass(selector, className) {
     return this.autoconsent.domActions.removeClass(selector, className);
   }
@@ -1580,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));
@@ -1588,6 +1605,9 @@ var AutoConsentCMP = class extends AutoConsentCMPBase {
     if (rule.hide) {
       results.push(this.hide(rule.hide, rule.method));
     }
+    if (rule.stylesheet !== void 0) {
+      results.push(this.stylesheet(rule.stylesheet, rule.stylesheetId));
+    }
     if (rule.removeClass !== void 0) {
       results.push(rule.selector ? this.removeClass(rule.selector, rule.removeClass) : false);
     }
@@ -2539,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;
@@ -2594,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);
@@ -2614,6 +2646,11 @@ var DomActions = class {
     const styleEl = getStyleElement();
     return hideElements(styleEl, selector, method);
   }
+  stylesheet(cssRule, stylesheetId) {
+    this.autoconsentInstance.config.logs.rulesteps && console.log("[stylesheet]", cssRule, stylesheetId);
+    const styleEl = getStyleElement();
+    return appendStylesheetRule(styleEl, cssRule, stylesheetId);
+  }
   removeClass(selector, className) {
     const elements = this.elementSelector(selector);
     this.autoconsentInstance.config.logs.rulesteps && console.log("[removeClass]", selector, className, elements);

package/dist/autoconsent.playwright.js

@@ -9,7 +9,7 @@
   var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 
   // lib/rules.ts
-  var SUPPORTED_RULE_STEP_VERSION = 2;
+  var SUPPORTED_RULE_STEP_VERSION = 3;
 
   // lib/random.ts
   function getRandomID() {
@@ -88,6 +88,20 @@
     }
     return false;
   }
+  function appendStylesheetRule(styleEl, cssRule, marker) {
+    if (!(styleEl instanceof HTMLStyleElement) || cssRule.length === 0) {
+      return false;
+    }
+    const markerComment = marker ? `/* autoconsent:${marker} */` : "";
+    if (markerComment && styleEl.innerText.includes(markerComment)) {
+      return true;
+    }
+    if (!markerComment && styleEl.innerText.includes(cssRule.trim())) {
+      return true;
+    }
+    styleEl.innerText += `${markerComment}${markerComment ? " " : ""}${cssRule} `;
+    return true;
+  }
   async function waitFor(predicate, maxTimes, interval) {
     const result = await predicate();
     if (!result && maxTimes > 0) {
@@ -1456,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);
@@ -1469,6 +1483,9 @@
     hide(selector, method) {
       return this.autoconsent.domActions.hide(selector, method);
     }
+    stylesheet(cssRule, stylesheetId) {
+      return this.autoconsent.domActions.stylesheet(cssRule, stylesheetId);
+    }
     removeClass(selector, className) {
       return this.autoconsent.domActions.removeClass(selector, className);
     }
@@ -1582,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));
@@ -1590,6 +1607,9 @@
       if (rule.hide) {
         results.push(this.hide(rule.hide, rule.method));
       }
+      if (rule.stylesheet !== void 0) {
+        results.push(this.stylesheet(rule.stylesheet, rule.stylesheetId));
+      }
       if (rule.removeClass !== void 0) {
         results.push(rule.selector ? this.removeClass(rule.selector, rule.removeClass) : false);
       }
@@ -2541,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;
@@ -2596,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);
@@ -2616,6 +2648,11 @@
       const styleEl = getStyleElement();
       return hideElements(styleEl, selector, method);
     }
+    stylesheet(cssRule, stylesheetId) {
+      this.autoconsentInstance.config.logs.rulesteps && console.log("[stylesheet]", cssRule, stylesheetId);
+      const styleEl = getStyleElement();
+      return appendStylesheetRule(styleEl, cssRule, stylesheetId);
+    }
     removeClass(selector, className) {
       const elements = this.elementSelector(selector);
       this.autoconsentInstance.config.logs.rulesteps && console.log("[removeClass]", selector, className, elements);