@duckduckgo/autoconsent 14.93.0 → 14.94.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v14.94.0 (Fri Jun 12 2026)
+
+#### 🚀 Enhancement
+
+- Improve heuristic detection performance [#1381](https://github.com/duckduckgo/autoconsent/pull/1381) ([@sammacbeth](https://github.com/sammacbeth))
+
+#### Authors: 1
+
+- Sam Macbeth ([@sammacbeth](https://github.com/sammacbeth))
+
+---
+
 # v14.93.0 (Wed Jun 10 2026)
 
 #### 🚀 Enhancement

package/dist/addon-firefox/background.bundle.js

@@ -712,7 +712,8 @@
         messages: false,
         waits: false
       },
-      performanceLoggingEnabled: false
+      performanceLoggingEnabled: false,
+      heuristicPopupSearchTimeout: 100
     };
     const updatedConfig = copyObject(defaultConfig);
     for (const key of Object.keys(defaultConfig)) {

package/dist/addon-firefox/content.bundle.js

@@ -708,7 +708,8 @@
         messages: false,
         waits: false
       },
-      performanceLoggingEnabled: false
+      performanceLoggingEnabled: false,
+      heuristicPopupSearchTimeout: 100
     };
     const updatedConfig = copyObject(defaultConfig);
     for (const key of Object.keys(defaultConfig)) {
@@ -1460,6 +1461,7 @@
   // lib/heuristics.ts
   var BUTTON_LIKE_ELEMENT_SELECTOR = 'button, input[type="button"], input[type="submit"], a, [role="button"], [class*="button"]';
   var TEXT_LIMIT = 1e5;
+  var POPUP_SEARCH_MAX_TIME = 100;
   function checkHeuristicPatterns(allText, detectPatterns = DETECT_PATTERNS) {
     allText = allText.slice(0, TEXT_LIMIT);
     const patterns = [];
@@ -1473,8 +1475,8 @@
     }
     return { patterns, snippets: snippets2 };
   }
-  function getActionablePopups() {
-    const popups = getPotentialPopups();
+  function getActionablePopups(timeout = POPUP_SEARCH_MAX_TIME) {
+    const popups = getPotentialPopups(timeout);
     const result = popups.reduce((acc, popup) => {
       const popupText = popup.text?.trim();
       if (popupText) {
@@ -1528,17 +1530,17 @@
     result = result.trim();
     return result;
   }
-  function getPotentialPopups() {
+  function getPotentialPopups(timeout = POPUP_SEARCH_MAX_TIME) {
     const isFramed = !isTopFrame();
     if (isFramed && window.parent && window.parent !== window.top) {
       return [];
     }
-    return collectPotentialPopups(isFramed);
+    return collectPotentialPopups(isFramed, timeout);
   }
-  function collectPotentialPopups(isFramed) {
+  function collectPotentialPopups(isFramed, timeout = POPUP_SEARCH_MAX_TIME) {
     let elements = [];
     if (!isFramed) {
-      elements = getPopupLikeElements();
+      elements = getPopupLikeElements(timeout);
     } else {
       const doc = document.body || document.documentElement;
       if (doc && isElementVisible(doc) && doc.innerText) {
@@ -1566,7 +1568,8 @@
     }
     return false;
   }
-  function getPopupLikeElements() {
+  function getPopupLikeElements(timeout = POPUP_SEARCH_MAX_TIME) {
+    const startTime = performance.now();
     const walker = document.createTreeWalker(
       document.documentElement,
       NodeFilter.SHOW_ELEMENT,
@@ -1585,6 +1588,9 @@
               return NodeFilter.FILTER_ACCEPT;
             }
           }
+          if (performance.now() - startTime > timeout) {
+            return NodeFilter.FILTER_REJECT;
+          }
           return NodeFilter.FILTER_SKIP;
         }
       }
@@ -1988,9 +1994,10 @@
     get isCosmetic() {
       return false;
     }
-    detectCmp() {
+    async detectCmp() {
+      await new Promise((resolve) => setTimeout(resolve, 0));
       this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorStart");
-      this.popups = getActionablePopups();
+      this.popups = getActionablePopups(this.autoconsent.config.heuristicPopupSearchTimeout);
       this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorEnd");
       this.autoconsent.config.performanceLoggingEnabled && performance.measure("heuristicDetector", "heuristicDetectorStart", "heuristicDetectorEnd");
       if (this.popups.length > 0) {
@@ -3490,7 +3497,7 @@
           }
         }
       });
-      const heuristicRules = isTop && this.config.enableHeuristicAction ? [new AutoConsentHeuristicCMP(this)] : [];
+      const heuristicRules = isTop && this.config.enableHeuristicAction && this.state.findCmpAttempts % 2 === 0 ? [new AutoConsentHeuristicCMP(this)] : [];
       const rulesPriorityStages = [
         ["site-specific", siteSpecificRules],
         ["generic", genericRules],
@@ -3530,8 +3537,12 @@
       }
       this.detectHeuristics();
       if (foundCMPs.length === 0 && retries > 0) {
+        const waitFor2 = [this.domActions.wait(500)];
+        if (this.state.findCmpAttempts > 1) {
+          waitFor2.push(mutationObserver);
+        }
         try {
-          await Promise.all([this.domActions.wait(500), mutationObserver]);
+          await Promise.all(waitFor2);
         } catch (e) {
           return [];
         }

package/dist/addon-firefox/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Autoconsent",
-  "version": "2026.6.9",
+  "version": "2026.6.10",
   "background": {
     "scripts": [
       "background.bundle.js"

package/dist/addon-firefox/popup.bundle.js

@@ -539,7 +539,8 @@
         messages: false,
         waits: false
       },
-      performanceLoggingEnabled: false
+      performanceLoggingEnabled: false,
+      heuristicPopupSearchTimeout: 100
     };
     const updatedConfig = copyObject(defaultConfig);
     for (const key of Object.keys(defaultConfig)) {

package/dist/addon-mv3/background.bundle.js

@@ -712,7 +712,8 @@
         messages: false,
         waits: false
       },
-      performanceLoggingEnabled: false
+      performanceLoggingEnabled: false,
+      heuristicPopupSearchTimeout: 100
     };
     const updatedConfig = copyObject(defaultConfig);
     for (const key of Object.keys(defaultConfig)) {

package/dist/addon-mv3/content.bundle.js

@@ -708,7 +708,8 @@
         messages: false,
         waits: false
       },
-      performanceLoggingEnabled: false
+      performanceLoggingEnabled: false,
+      heuristicPopupSearchTimeout: 100
     };
     const updatedConfig = copyObject(defaultConfig);
     for (const key of Object.keys(defaultConfig)) {
@@ -1460,6 +1461,7 @@
   // lib/heuristics.ts
   var BUTTON_LIKE_ELEMENT_SELECTOR = 'button, input[type="button"], input[type="submit"], a, [role="button"], [class*="button"]';
   var TEXT_LIMIT = 1e5;
+  var POPUP_SEARCH_MAX_TIME = 100;
   function checkHeuristicPatterns(allText, detectPatterns = DETECT_PATTERNS) {
     allText = allText.slice(0, TEXT_LIMIT);
     const patterns = [];
@@ -1473,8 +1475,8 @@
     }
     return { patterns, snippets: snippets2 };
   }
-  function getActionablePopups() {
-    const popups = getPotentialPopups();
+  function getActionablePopups(timeout = POPUP_SEARCH_MAX_TIME) {
+    const popups = getPotentialPopups(timeout);
     const result = popups.reduce((acc, popup) => {
       const popupText = popup.text?.trim();
       if (popupText) {
@@ -1528,17 +1530,17 @@
     result = result.trim();
     return result;
   }
-  function getPotentialPopups() {
+  function getPotentialPopups(timeout = POPUP_SEARCH_MAX_TIME) {
     const isFramed = !isTopFrame();
     if (isFramed && window.parent && window.parent !== window.top) {
       return [];
     }
-    return collectPotentialPopups(isFramed);
+    return collectPotentialPopups(isFramed, timeout);
   }
-  function collectPotentialPopups(isFramed) {
+  function collectPotentialPopups(isFramed, timeout = POPUP_SEARCH_MAX_TIME) {
     let elements = [];
     if (!isFramed) {
-      elements = getPopupLikeElements();
+      elements = getPopupLikeElements(timeout);
     } else {
       const doc = document.body || document.documentElement;
       if (doc && isElementVisible(doc) && doc.innerText) {
@@ -1566,7 +1568,8 @@
     }
     return false;
   }
-  function getPopupLikeElements() {
+  function getPopupLikeElements(timeout = POPUP_SEARCH_MAX_TIME) {
+    const startTime = performance.now();
     const walker = document.createTreeWalker(
       document.documentElement,
       NodeFilter.SHOW_ELEMENT,
@@ -1585,6 +1588,9 @@
               return NodeFilter.FILTER_ACCEPT;
             }
           }
+          if (performance.now() - startTime > timeout) {
+            return NodeFilter.FILTER_REJECT;
+          }
           return NodeFilter.FILTER_SKIP;
         }
       }
@@ -1988,9 +1994,10 @@
     get isCosmetic() {
       return false;
     }
-    detectCmp() {
+    async detectCmp() {
+      await new Promise((resolve) => setTimeout(resolve, 0));
       this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorStart");
-      this.popups = getActionablePopups();
+      this.popups = getActionablePopups(this.autoconsent.config.heuristicPopupSearchTimeout);
       this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorEnd");
       this.autoconsent.config.performanceLoggingEnabled && performance.measure("heuristicDetector", "heuristicDetectorStart", "heuristicDetectorEnd");
       if (this.popups.length > 0) {
@@ -3490,7 +3497,7 @@
           }
         }
       });
-      const heuristicRules = isTop && this.config.enableHeuristicAction ? [new AutoConsentHeuristicCMP(this)] : [];
+      const heuristicRules = isTop && this.config.enableHeuristicAction && this.state.findCmpAttempts % 2 === 0 ? [new AutoConsentHeuristicCMP(this)] : [];
       const rulesPriorityStages = [
         ["site-specific", siteSpecificRules],
         ["generic", genericRules],
@@ -3530,8 +3537,12 @@
       }
       this.detectHeuristics();
       if (foundCMPs.length === 0 && retries > 0) {
+        const waitFor2 = [this.domActions.wait(500)];
+        if (this.state.findCmpAttempts > 1) {
+          waitFor2.push(mutationObserver);
+        }
         try {
-          await Promise.all([this.domActions.wait(500), mutationObserver]);
+          await Promise.all(waitFor2);
         } catch (e) {
           return [];
         }

package/dist/addon-mv3/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Autoconsent",
-  "version": "2026.6.9",
+  "version": "2026.6.10",
   "background": {
     "service_worker": "background.bundle.js"
   },

package/dist/addon-mv3/popup.bundle.js

@@ -539,7 +539,8 @@
         messages: false,
         waits: false
       },
-      performanceLoggingEnabled: false
+      performanceLoggingEnabled: false,
+      heuristicPopupSearchTimeout: 100
     };
     const updatedConfig = copyObject(defaultConfig);
     for (const key of Object.keys(defaultConfig)) {

package/dist/autoconsent.cjs.js

@@ -743,7 +743,8 @@ function normalizeConfig(providedConfig) {
       messages: false,
       waits: false
     },
-    performanceLoggingEnabled: false
+    performanceLoggingEnabled: false,
+    heuristicPopupSearchTimeout: 100
   };
   const updatedConfig = copyObject(defaultConfig);
   for (const key of Object.keys(defaultConfig)) {
@@ -1495,6 +1496,7 @@ var NEVER_MATCH_PATTERNS = [
 // lib/heuristics.ts
 var BUTTON_LIKE_ELEMENT_SELECTOR = 'button, input[type="button"], input[type="submit"], a, [role="button"], [class*="button"]';
 var TEXT_LIMIT = 1e5;
+var POPUP_SEARCH_MAX_TIME = 100;
 function checkHeuristicPatterns(allText, detectPatterns = DETECT_PATTERNS) {
   allText = allText.slice(0, TEXT_LIMIT);
   const patterns = [];
@@ -1508,8 +1510,8 @@ function checkHeuristicPatterns(allText, detectPatterns = DETECT_PATTERNS) {
   }
   return { patterns, snippets: snippets2 };
 }
-function getActionablePopups() {
-  const popups = getPotentialPopups();
+function getActionablePopups(timeout = POPUP_SEARCH_MAX_TIME) {
+  const popups = getPotentialPopups(timeout);
   const result = popups.reduce((acc, popup) => {
     const popupText = popup.text?.trim();
     if (popupText) {
@@ -1563,17 +1565,17 @@ function cleanButtonText(buttonText) {
   result = result.trim();
   return result;
 }
-function getPotentialPopups() {
+function getPotentialPopups(timeout = POPUP_SEARCH_MAX_TIME) {
   const isFramed = !isTopFrame();
   if (isFramed && window.parent && window.parent !== window.top) {
     return [];
   }
-  return collectPotentialPopups(isFramed);
+  return collectPotentialPopups(isFramed, timeout);
 }
-function collectPotentialPopups(isFramed) {
+function collectPotentialPopups(isFramed, timeout = POPUP_SEARCH_MAX_TIME) {
   let elements = [];
   if (!isFramed) {
-    elements = getPopupLikeElements();
+    elements = getPopupLikeElements(timeout);
   } else {
     const doc = document.body || document.documentElement;
     if (doc && isElementVisible(doc) && doc.innerText) {
@@ -1601,7 +1603,8 @@ function isDialogLikeElement(node) {
   }
   return false;
 }
-function getPopupLikeElements() {
+function getPopupLikeElements(timeout = POPUP_SEARCH_MAX_TIME) {
+  const startTime = performance.now();
   const walker = document.createTreeWalker(
     document.documentElement,
     NodeFilter.SHOW_ELEMENT,
@@ -1620,6 +1623,9 @@ function getPopupLikeElements() {
             return NodeFilter.FILTER_ACCEPT;
           }
         }
+        if (performance.now() - startTime > timeout) {
+          return NodeFilter.FILTER_REJECT;
+        }
         return NodeFilter.FILTER_SKIP;
       }
     }
@@ -2023,9 +2029,10 @@ var AutoConsentHeuristicCMP = class extends AutoConsentCMPBase {
   get isCosmetic() {
     return false;
   }
-  detectCmp() {
+  async detectCmp() {
+    await new Promise((resolve) => setTimeout(resolve, 0));
     this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorStart");
-    this.popups = getActionablePopups();
+    this.popups = getActionablePopups(this.autoconsent.config.heuristicPopupSearchTimeout);
     this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorEnd");
     this.autoconsent.config.performanceLoggingEnabled && performance.measure("heuristicDetector", "heuristicDetectorStart", "heuristicDetectorEnd");
     if (this.popups.length > 0) {
@@ -3758,7 +3765,7 @@ var AutoConsent = class {
         }
       }
     });
-    const heuristicRules = isTop && this.config.enableHeuristicAction ? [new AutoConsentHeuristicCMP(this)] : [];
+    const heuristicRules = isTop && this.config.enableHeuristicAction && this.state.findCmpAttempts % 2 === 0 ? [new AutoConsentHeuristicCMP(this)] : [];
     const rulesPriorityStages = [
       ["site-specific", siteSpecificRules],
       ["generic", genericRules],
@@ -3798,8 +3805,12 @@ var AutoConsent = class {
     }
     this.detectHeuristics();
     if (foundCMPs.length === 0 && retries > 0) {
+      const waitFor2 = [this.domActions.wait(500)];
+      if (this.state.findCmpAttempts > 1) {
+        waitFor2.push(mutationObserver);
+      }
       try {
-        await Promise.all([this.domActions.wait(500), mutationObserver]);
+        await Promise.all(waitFor2);
       } catch (e) {
         return [];
       }

package/dist/autoconsent.esm.js

@@ -713,7 +713,8 @@ function normalizeConfig(providedConfig) {
       messages: false,
       waits: false
     },
-    performanceLoggingEnabled: false
+    performanceLoggingEnabled: false,
+    heuristicPopupSearchTimeout: 100
   };
   const updatedConfig = copyObject(defaultConfig);
   for (const key of Object.keys(defaultConfig)) {
@@ -1465,6 +1466,7 @@ var NEVER_MATCH_PATTERNS = [
 // lib/heuristics.ts
 var BUTTON_LIKE_ELEMENT_SELECTOR = 'button, input[type="button"], input[type="submit"], a, [role="button"], [class*="button"]';
 var TEXT_LIMIT = 1e5;
+var POPUP_SEARCH_MAX_TIME = 100;
 function checkHeuristicPatterns(allText, detectPatterns = DETECT_PATTERNS) {
   allText = allText.slice(0, TEXT_LIMIT);
   const patterns = [];
@@ -1478,8 +1480,8 @@ function checkHeuristicPatterns(allText, detectPatterns = DETECT_PATTERNS) {
   }
   return { patterns, snippets: snippets2 };
 }
-function getActionablePopups() {
-  const popups = getPotentialPopups();
+function getActionablePopups(timeout = POPUP_SEARCH_MAX_TIME) {
+  const popups = getPotentialPopups(timeout);
   const result = popups.reduce((acc, popup) => {
     const popupText = popup.text?.trim();
     if (popupText) {
@@ -1533,17 +1535,17 @@ function cleanButtonText(buttonText) {
   result = result.trim();
   return result;
 }
-function getPotentialPopups() {
+function getPotentialPopups(timeout = POPUP_SEARCH_MAX_TIME) {
   const isFramed = !isTopFrame();
   if (isFramed && window.parent && window.parent !== window.top) {
     return [];
   }
-  return collectPotentialPopups(isFramed);
+  return collectPotentialPopups(isFramed, timeout);
 }
-function collectPotentialPopups(isFramed) {
+function collectPotentialPopups(isFramed, timeout = POPUP_SEARCH_MAX_TIME) {
   let elements = [];
   if (!isFramed) {
-    elements = getPopupLikeElements();
+    elements = getPopupLikeElements(timeout);
   } else {
     const doc = document.body || document.documentElement;
     if (doc && isElementVisible(doc) && doc.innerText) {
@@ -1571,7 +1573,8 @@ function isDialogLikeElement(node) {
   }
   return false;
 }
-function getPopupLikeElements() {
+function getPopupLikeElements(timeout = POPUP_SEARCH_MAX_TIME) {
+  const startTime = performance.now();
   const walker = document.createTreeWalker(
     document.documentElement,
     NodeFilter.SHOW_ELEMENT,
@@ -1590,6 +1593,9 @@ function getPopupLikeElements() {
             return NodeFilter.FILTER_ACCEPT;
           }
         }
+        if (performance.now() - startTime > timeout) {
+          return NodeFilter.FILTER_REJECT;
+        }
         return NodeFilter.FILTER_SKIP;
       }
     }
@@ -1993,9 +1999,10 @@ var AutoConsentHeuristicCMP = class extends AutoConsentCMPBase {
   get isCosmetic() {
     return false;
   }
-  detectCmp() {
+  async detectCmp() {
+    await new Promise((resolve) => setTimeout(resolve, 0));
     this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorStart");
-    this.popups = getActionablePopups();
+    this.popups = getActionablePopups(this.autoconsent.config.heuristicPopupSearchTimeout);
     this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorEnd");
     this.autoconsent.config.performanceLoggingEnabled && performance.measure("heuristicDetector", "heuristicDetectorStart", "heuristicDetectorEnd");
     if (this.popups.length > 0) {
@@ -3728,7 +3735,7 @@ var AutoConsent = class {
         }
       }
     });
-    const heuristicRules = isTop && this.config.enableHeuristicAction ? [new AutoConsentHeuristicCMP(this)] : [];
+    const heuristicRules = isTop && this.config.enableHeuristicAction && this.state.findCmpAttempts % 2 === 0 ? [new AutoConsentHeuristicCMP(this)] : [];
     const rulesPriorityStages = [
       ["site-specific", siteSpecificRules],
       ["generic", genericRules],
@@ -3768,8 +3775,12 @@ var AutoConsent = class {
     }
     this.detectHeuristics();
     if (foundCMPs.length === 0 && retries > 0) {
+      const waitFor2 = [this.domActions.wait(500)];
+      if (this.state.findCmpAttempts > 1) {
+        waitFor2.push(mutationObserver);
+      }
       try {
-        await Promise.all([this.domActions.wait(500), mutationObserver]);
+        await Promise.all(waitFor2);
       } catch (e) {
         return [];
       }

package/dist/autoconsent.extra.cjs.js

@@ -11306,7 +11306,8 @@ function normalizeConfig(providedConfig) {
       messages: false,
       waits: false
     },
-    performanceLoggingEnabled: false
+    performanceLoggingEnabled: false,
+    heuristicPopupSearchTimeout: 100
   };
   const updatedConfig = copyObject(defaultConfig);
   for (const key of Object.keys(defaultConfig)) {
@@ -12725,6 +12726,7 @@ var NEVER_MATCH_PATTERNS = [
 // lib/heuristics.ts
 var BUTTON_LIKE_ELEMENT_SELECTOR = 'button, input[type="button"], input[type="submit"], a, [role="button"], [class*="button"]';
 var TEXT_LIMIT = 1e5;
+var POPUP_SEARCH_MAX_TIME = 100;
 function checkHeuristicPatterns(allText, detectPatterns = DETECT_PATTERNS) {
   allText = allText.slice(0, TEXT_LIMIT);
   const patterns = [];
@@ -12738,8 +12740,8 @@ function checkHeuristicPatterns(allText, detectPatterns = DETECT_PATTERNS) {
   }
   return { patterns, snippets: snippets2 };
 }
-function getActionablePopups() {
-  const popups = getPotentialPopups();
+function getActionablePopups(timeout = POPUP_SEARCH_MAX_TIME) {
+  const popups = getPotentialPopups(timeout);
   const result = popups.reduce((acc, popup) => {
     const popupText = popup.text?.trim();
     if (popupText) {
@@ -12793,17 +12795,17 @@ function cleanButtonText(buttonText) {
   result = result.trim();
   return result;
 }
-function getPotentialPopups() {
+function getPotentialPopups(timeout = POPUP_SEARCH_MAX_TIME) {
   const isFramed = !isTopFrame();
   if (isFramed && window.parent && window.parent !== window.top) {
     return [];
   }
-  return collectPotentialPopups(isFramed);
+  return collectPotentialPopups(isFramed, timeout);
 }
-function collectPotentialPopups(isFramed) {
+function collectPotentialPopups(isFramed, timeout = POPUP_SEARCH_MAX_TIME) {
   let elements = [];
   if (!isFramed) {
-    elements = getPopupLikeElements();
+    elements = getPopupLikeElements(timeout);
   } else {
     const doc = document.body || document.documentElement;
     if (doc && isElementVisible(doc) && doc.innerText) {
@@ -12831,7 +12833,8 @@ function isDialogLikeElement(node) {
   }
   return false;
 }
-function getPopupLikeElements() {
+function getPopupLikeElements(timeout = POPUP_SEARCH_MAX_TIME) {
+  const startTime = performance.now();
   const walker = document.createTreeWalker(
     document.documentElement,
     NodeFilter.SHOW_ELEMENT,
@@ -12850,6 +12853,9 @@ function getPopupLikeElements() {
             return NodeFilter.FILTER_ACCEPT;
           }
         }
+        if (performance.now() - startTime > timeout) {
+          return NodeFilter.FILTER_REJECT;
+        }
         return NodeFilter.FILTER_SKIP;
       }
     }
@@ -13253,9 +13259,10 @@ var AutoConsentHeuristicCMP = class extends AutoConsentCMPBase {
   get isCosmetic() {
     return false;
   }
-  detectCmp() {
+  async detectCmp() {
+    await new Promise((resolve) => setTimeout(resolve, 0));
     this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorStart");
-    this.popups = getActionablePopups();
+    this.popups = getActionablePopups(this.autoconsent.config.heuristicPopupSearchTimeout);
     this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorEnd");
     this.autoconsent.config.performanceLoggingEnabled && performance.measure("heuristicDetector", "heuristicDetectorStart", "heuristicDetectorEnd");
     if (this.popups.length > 0) {
@@ -14756,7 +14763,7 @@ var AutoConsent = class {
         }
       }
     });
-    const heuristicRules = isTop && this.config.enableHeuristicAction ? [new AutoConsentHeuristicCMP(this)] : [];
+    const heuristicRules = isTop && this.config.enableHeuristicAction && this.state.findCmpAttempts % 2 === 0 ? [new AutoConsentHeuristicCMP(this)] : [];
     const rulesPriorityStages = [
       ["site-specific", siteSpecificRules],
       ["generic", genericRules],
@@ -14796,8 +14803,12 @@ var AutoConsent = class {
     }
     this.detectHeuristics();
     if (foundCMPs.length === 0 && retries > 0) {
+      const waitFor2 = [this.domActions.wait(500)];
+      if (this.state.findCmpAttempts > 1) {
+        waitFor2.push(mutationObserver);
+      }
       try {
-        await Promise.all([this.domActions.wait(500), mutationObserver]);
+        await Promise.all(waitFor2);
       } catch (e) {
         return [];
       }

package/dist/autoconsent.extra.esm.js

@@ -11240,7 +11240,8 @@ function normalizeConfig(providedConfig) {
       messages: false,
       waits: false
     },
-    performanceLoggingEnabled: false
+    performanceLoggingEnabled: false,
+    heuristicPopupSearchTimeout: 100
   };
   const updatedConfig = copyObject(defaultConfig);
   for (const key of Object.keys(defaultConfig)) {
@@ -12659,6 +12660,7 @@ var NEVER_MATCH_PATTERNS = [
 // lib/heuristics.ts
 var BUTTON_LIKE_ELEMENT_SELECTOR = 'button, input[type="button"], input[type="submit"], a, [role="button"], [class*="button"]';
 var TEXT_LIMIT = 1e5;
+var POPUP_SEARCH_MAX_TIME = 100;
 function checkHeuristicPatterns(allText, detectPatterns = DETECT_PATTERNS) {
   allText = allText.slice(0, TEXT_LIMIT);
   const patterns = [];
@@ -12672,8 +12674,8 @@ function checkHeuristicPatterns(allText, detectPatterns = DETECT_PATTERNS) {
   }
   return { patterns, snippets: snippets2 };
 }
-function getActionablePopups() {
-  const popups = getPotentialPopups();
+function getActionablePopups(timeout = POPUP_SEARCH_MAX_TIME) {
+  const popups = getPotentialPopups(timeout);
   const result = popups.reduce((acc, popup) => {
     const popupText = popup.text?.trim();
     if (popupText) {
@@ -12727,17 +12729,17 @@ function cleanButtonText(buttonText) {
   result = result.trim();
   return result;
 }
-function getPotentialPopups() {
+function getPotentialPopups(timeout = POPUP_SEARCH_MAX_TIME) {
   const isFramed = !isTopFrame();
   if (isFramed && window.parent && window.parent !== window.top) {
     return [];
   }
-  return collectPotentialPopups(isFramed);
+  return collectPotentialPopups(isFramed, timeout);
 }
-function collectPotentialPopups(isFramed) {
+function collectPotentialPopups(isFramed, timeout = POPUP_SEARCH_MAX_TIME) {
   let elements = [];
   if (!isFramed) {
-    elements = getPopupLikeElements();
+    elements = getPopupLikeElements(timeout);
   } else {
     const doc = document.body || document.documentElement;
     if (doc && isElementVisible(doc) && doc.innerText) {
@@ -12765,7 +12767,8 @@ function isDialogLikeElement(node) {
   }
   return false;
 }
-function getPopupLikeElements() {
+function getPopupLikeElements(timeout = POPUP_SEARCH_MAX_TIME) {
+  const startTime = performance.now();
   const walker = document.createTreeWalker(
     document.documentElement,
     NodeFilter.SHOW_ELEMENT,
@@ -12784,6 +12787,9 @@ function getPopupLikeElements() {
             return NodeFilter.FILTER_ACCEPT;
           }
         }
+        if (performance.now() - startTime > timeout) {
+          return NodeFilter.FILTER_REJECT;
+        }
         return NodeFilter.FILTER_SKIP;
       }
     }
@@ -13187,9 +13193,10 @@ var AutoConsentHeuristicCMP = class extends AutoConsentCMPBase {
   get isCosmetic() {
     return false;
   }
-  detectCmp() {
+  async detectCmp() {
+    await new Promise((resolve) => setTimeout(resolve, 0));
     this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorStart");
-    this.popups = getActionablePopups();
+    this.popups = getActionablePopups(this.autoconsent.config.heuristicPopupSearchTimeout);
     this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorEnd");
     this.autoconsent.config.performanceLoggingEnabled && performance.measure("heuristicDetector", "heuristicDetectorStart", "heuristicDetectorEnd");
     if (this.popups.length > 0) {
@@ -14690,7 +14697,7 @@ var AutoConsent = class {
         }
       }
     });
-    const heuristicRules = isTop && this.config.enableHeuristicAction ? [new AutoConsentHeuristicCMP(this)] : [];
+    const heuristicRules = isTop && this.config.enableHeuristicAction && this.state.findCmpAttempts % 2 === 0 ? [new AutoConsentHeuristicCMP(this)] : [];
     const rulesPriorityStages = [
       ["site-specific", siteSpecificRules],
       ["generic", genericRules],
@@ -14730,8 +14737,12 @@ var AutoConsent = class {
     }
     this.detectHeuristics();
     if (foundCMPs.length === 0 && retries > 0) {
+      const waitFor2 = [this.domActions.wait(500)];
+      if (this.state.findCmpAttempts > 1) {
+        waitFor2.push(mutationObserver);
+      }
       try {
-        await Promise.all([this.domActions.wait(500), mutationObserver]);
+        await Promise.all(waitFor2);
       } catch (e) {
         return [];
       }

package/dist/autoconsent.playwright.js

@@ -715,7 +715,8 @@
         messages: false,
         waits: false
       },
-      performanceLoggingEnabled: false
+      performanceLoggingEnabled: false,
+      heuristicPopupSearchTimeout: 100
     };
     const updatedConfig = copyObject(defaultConfig);
     for (const key of Object.keys(defaultConfig)) {
@@ -1467,6 +1468,7 @@
   // lib/heuristics.ts
   var BUTTON_LIKE_ELEMENT_SELECTOR = 'button, input[type="button"], input[type="submit"], a, [role="button"], [class*="button"]';
   var TEXT_LIMIT = 1e5;
+  var POPUP_SEARCH_MAX_TIME = 100;
   function checkHeuristicPatterns(allText, detectPatterns = DETECT_PATTERNS) {
     allText = allText.slice(0, TEXT_LIMIT);
     const patterns = [];
@@ -1480,8 +1482,8 @@
     }
     return { patterns, snippets: snippets2 };
   }
-  function getActionablePopups() {
-    const popups = getPotentialPopups();
+  function getActionablePopups(timeout = POPUP_SEARCH_MAX_TIME) {
+    const popups = getPotentialPopups(timeout);
     const result = popups.reduce((acc, popup) => {
       const popupText = popup.text?.trim();
       if (popupText) {
@@ -1535,17 +1537,17 @@
     result = result.trim();
     return result;
   }
-  function getPotentialPopups() {
+  function getPotentialPopups(timeout = POPUP_SEARCH_MAX_TIME) {
     const isFramed = !isTopFrame();
     if (isFramed && window.parent && window.parent !== window.top) {
       return [];
     }
-    return collectPotentialPopups(isFramed);
+    return collectPotentialPopups(isFramed, timeout);
   }
-  function collectPotentialPopups(isFramed) {
+  function collectPotentialPopups(isFramed, timeout = POPUP_SEARCH_MAX_TIME) {
     let elements = [];
     if (!isFramed) {
-      elements = getPopupLikeElements();
+      elements = getPopupLikeElements(timeout);
     } else {
       const doc = document.body || document.documentElement;
       if (doc && isElementVisible(doc) && doc.innerText) {
@@ -1573,7 +1575,8 @@
     }
     return false;
   }
-  function getPopupLikeElements() {
+  function getPopupLikeElements(timeout = POPUP_SEARCH_MAX_TIME) {
+    const startTime = performance.now();
     const walker = document.createTreeWalker(
       document.documentElement,
       NodeFilter.SHOW_ELEMENT,
@@ -1592,6 +1595,9 @@
               return NodeFilter.FILTER_ACCEPT;
             }
           }
+          if (performance.now() - startTime > timeout) {
+            return NodeFilter.FILTER_REJECT;
+          }
           return NodeFilter.FILTER_SKIP;
         }
       }
@@ -1995,9 +2001,10 @@
     get isCosmetic() {
       return false;
     }
-    detectCmp() {
+    async detectCmp() {
+      await new Promise((resolve) => setTimeout(resolve, 0));
       this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorStart");
-      this.popups = getActionablePopups();
+      this.popups = getActionablePopups(this.autoconsent.config.heuristicPopupSearchTimeout);
       this.autoconsent.config.performanceLoggingEnabled && performance.mark("heuristicDetectorEnd");
       this.autoconsent.config.performanceLoggingEnabled && performance.measure("heuristicDetector", "heuristicDetectorStart", "heuristicDetectorEnd");
       if (this.popups.length > 0) {
@@ -3498,7 +3505,7 @@
           }
         }
       });
-      const heuristicRules = isTop && this.config.enableHeuristicAction ? [new AutoConsentHeuristicCMP(this)] : [];
+      const heuristicRules = isTop && this.config.enableHeuristicAction && this.state.findCmpAttempts % 2 === 0 ? [new AutoConsentHeuristicCMP(this)] : [];
       const rulesPriorityStages = [
         ["site-specific", siteSpecificRules],
         ["generic", genericRules],
@@ -3538,8 +3545,12 @@
       }
       this.detectHeuristics();
       if (foundCMPs.length === 0 && retries > 0) {
+        const waitFor2 = [this.domActions.wait(500)];
+        if (this.state.findCmpAttempts > 1) {
+          waitFor2.push(mutationObserver);
+        }
         try {
-          await Promise.all([this.domActions.wait(500), mutationObserver]);
+          await Promise.all(waitFor2);
         } catch (e) {
           return [];
         }

package/dist/types/heuristics.d.ts

@@ -3,7 +3,7 @@ export declare function checkHeuristicPatterns(allText: string, detectPatterns?:
     patterns: string[];
     snippets: string[];
 };
-export declare function getActionablePopups(): PopupData[];
+export declare function getActionablePopups(timeout?: number): PopupData[];
 export declare function classifyButtons(buttons: ButtonData[]): {
     rejectButtons: ButtonData[];
     otherButtons: ButtonData[];

package/dist/types/types.d.ts

@@ -73,6 +73,7 @@ export type Config = {
         waits: boolean;
     };
     performanceLoggingEnabled: boolean;
+    heuristicPopupSearchTimeout: number;
 };
 export type LifecycleState = 'loading' | 'initialized' | 'waitingForInitResponse' | 'started' | 'nothingDetected' | 'cosmeticFiltersDetected' | 'cmpDetected' | 'openPopupDetected' | 'runningOptOut' | 'runningOptIn' | 'optOutSucceeded' | 'optOutFailed' | 'optInSucceeded' | 'optInFailed' | 'done';
 export type ConsentState = {

package/lib/cmps/base.ts

@@ -441,9 +441,11 @@ export class AutoConsentHeuristicCMP extends AutoConsentCMPBase {
         return false;
     }
 
-    detectCmp(): Promise<boolean> {
+    async detectCmp(): Promise<boolean> {
+        // wait for one tick to deprioritize heavy DOM operations
+        await new Promise((resolve) => setTimeout(resolve, 0));
         this.autoconsent.config.performanceLoggingEnabled && performance.mark('heuristicDetectorStart');
-        this.popups = getActionablePopups();
+        this.popups = getActionablePopups(this.autoconsent.config.heuristicPopupSearchTimeout);
         this.autoconsent.config.performanceLoggingEnabled && performance.mark('heuristicDetectorEnd');
         this.autoconsent.config.performanceLoggingEnabled &&
             performance.measure('heuristicDetector', 'heuristicDetectorStart', 'heuristicDetectorEnd');

package/lib/heuristics.ts

@@ -4,6 +4,7 @@ import { isElementVisible, isTopFrame } from './utils';
 
 const BUTTON_LIKE_ELEMENT_SELECTOR = 'button, input[type="button"], input[type="submit"], a, [role="button"], [class*="button"]';
 const TEXT_LIMIT = 100000;
+const POPUP_SEARCH_MAX_TIME = 100;
 
 export function checkHeuristicPatterns(allText: string, detectPatterns = DETECT_PATTERNS) {
     allText = allText.slice(0, TEXT_LIMIT);
@@ -20,8 +21,8 @@ export function checkHeuristicPatterns(allText: string, detectPatterns = DETECT_
     return { patterns, snippets };
 }
 
-export function getActionablePopups(): PopupData[] {
-    const popups = getPotentialPopups();
+export function getActionablePopups(timeout = POPUP_SEARCH_MAX_TIME): PopupData[] {
+    const popups = getPotentialPopups(timeout);
     const result = popups.reduce((acc, popup) => {
         const popupText = popup.text?.trim();
         if (popupText) {
@@ -88,20 +89,20 @@ export function cleanButtonText(buttonText: string): string {
     return result;
 }
 
-function getPotentialPopups() {
+function getPotentialPopups(timeout = POPUP_SEARCH_MAX_TIME) {
     const isFramed = !isTopFrame();
     // do not inspect frames that are more than one level deep
     if (isFramed && window.parent && window.parent !== window.top) {
         return [];
     }
 
-    return collectPotentialPopups(isFramed);
+    return collectPotentialPopups(isFramed, timeout);
 }
 
-function collectPotentialPopups(isFramed: boolean): PopupData[] {
+function collectPotentialPopups(isFramed: boolean, timeout = POPUP_SEARCH_MAX_TIME): PopupData[] {
     let elements = [];
     if (!isFramed) {
-        elements = getPopupLikeElements();
+        elements = getPopupLikeElements(timeout);
     } else {
         // for iframes, just take the whole document
         const doc = document.body || document.documentElement;
@@ -140,7 +141,8 @@ export function isDialogLikeElement(node: HTMLElement): boolean {
  * Heuristic to get all elements that look like "popups"
  * TODO: this heuristic is too strict, not all popups are actually sticky/fixed
  */
-function getPopupLikeElements(): HTMLElement[] {
+function getPopupLikeElements(timeout = POPUP_SEARCH_MAX_TIME): HTMLElement[] {
+    const startTime = performance.now();
     const walker = document.createTreeWalker(
         document.documentElement,
         NodeFilter.SHOW_ELEMENT, // visit only element nodes
@@ -158,11 +160,14 @@ function getPopupLikeElements(): HTMLElement[] {
                         return NodeFilter.FILTER_ACCEPT;
                     }
                 }
+                // start rejecting after POPUP_SEARCH_MAX_TIME to avoid blocking the main thread
+                if (performance.now() - startTime > timeout) {
+                    return NodeFilter.FILTER_REJECT;
+                }
                 return NodeFilter.FILTER_SKIP;
             },
         },
     );
-
     const found = [];
     for (let node = walker.nextNode(); node; node = walker.nextNode()) {
         found.push(node as HTMLElement);

package/lib/types.ts

@@ -77,6 +77,7 @@ export type Config = {
         waits: boolean;
     };
     performanceLoggingEnabled: boolean;
+    heuristicPopupSearchTimeout: number;
 };
 
 export type LifecycleState =

package/lib/utils.ts

@@ -94,6 +94,7 @@ export function normalizeConfig(providedConfig: any): Config {
             waits: false,
         },
         performanceLoggingEnabled: false,
+        heuristicPopupSearchTimeout: 100,
     };
     const updatedConfig: Config = copyObject(defaultConfig);
     // filter out any unknown entries

package/lib/web.ts

@@ -294,8 +294,9 @@ export default class AutoConsent {
                 }
             }
         });
-        // heuristic CMP is only run in the top frame and only if heuristic action is enabled
-        const heuristicRules = isTop && this.config.enableHeuristicAction ? [new AutoConsentHeuristicCMP(this)] : [];
+        // heuristic CMP is only run in the top frame and only if heuristic action is enabled and retries is odd
+        const heuristicRules =
+            isTop && this.config.enableHeuristicAction && this.state.findCmpAttempts % 2 === 0 ? [new AutoConsentHeuristicCMP(this)] : [];
 
         const rulesPriorityStages: [string, AutoCMP[]][] = [
             ['site-specific', siteSpecificRules],
@@ -347,8 +348,12 @@ export default class AutoConsent {
             // if we didn't find a CMP, try again
             // We wait 500ms, and also for some kind of dom mutation to happen before
             // rerunning the findCmp check
+            const waitFor: Promise<boolean>[] = [this.domActions.wait(500)];
+            if (this.state.findCmpAttempts > 1) {
+                waitFor.push(mutationObserver);
+            }
             try {
-                await Promise.all([this.domActions.wait(500), mutationObserver]);
+                await Promise.all(waitFor);
             } catch (e) {
                 // timeout waiting for mutation - break out of detection
                 return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "14.93.0",
+  "version": "14.94.0",
   "description": "",
   "types": "./dist/types/web.d.ts",
   "exports": {

package/tests-wtr/lifecycle/find-cmp.ts

@@ -156,7 +156,9 @@ describe('Autoconsent.findCmp', () => {
                 optIn: [],
                 optOut: [],
             });
-            const found = await autoconsent.findCmp(0);
+            // force findCmpAttempts to 1 so heuristic CMP is run on the first attempt
+            autoconsent.state.findCmpAttempts = 1;
+            const found = await autoconsent.findCmp(1);
 
             expect(found).to.have.length(1);
             expect(found[0].name).to.equal('HEURISTIC');