@duckduckgo/autoconsent 14.81.0 → 14.83.0

package/dist/autoconsent.cjs.js

@@ -728,6 +728,7 @@ function normalizeConfig(providedConfig) {
     enableGeneratedRules: true,
     enableHeuristicDetection: false,
     enableHeuristicAction: false,
+    enablePopupMutationObserver: false,
     detectRetries: 20,
     isMainWorld: false,
     prehideTimeout: 2e3,
@@ -3963,16 +3964,29 @@ var AutoConsent = class {
     this.updateState({ selfTest: selfTestResult });
     return selfTestResult;
   }
-  // TODO: use MutationObserver like in findCmp()
   async waitForPopup(cmp, retries = 10, interval = 500) {
     const logsConfig = this.config.logs;
     logsConfig.lifecycle && console.log("checking if popup is open...", cmp.name);
+    let mutationObserver = null;
+    if (this.config.enablePopupMutationObserver) {
+      mutationObserver = this.domActions.waitForMutation("html", 1e4);
+      mutationObserver.catch(() => {
+      });
+    }
     const isOpen = await cmp.detectPopup().catch((e) => {
       logsConfig.errors && console.warn(`error detecting popup for ${cmp.name}`, e);
       return false;
     });
     if (!isOpen && retries > 0) {
-      await this.domActions.wait(interval);
+      if (mutationObserver) {
+        try {
+          await Promise.all([this.domActions.wait(interval), mutationObserver]);
+        } catch (e) {
+          logsConfig.lifecycle && console.log(cmp.name, "popup detection timed out waiting for DOM mutation");
+        }
+      } else {
+        await this.domActions.wait(interval);
+      }
       return this.waitForPopup(cmp, retries - 1, interval);
     }
     logsConfig.lifecycle && console.log(cmp.name, `popup is ${isOpen ? "open" : "not open"}`);

package/dist/autoconsent.esm.js

@@ -698,6 +698,7 @@ function normalizeConfig(providedConfig) {
     enableGeneratedRules: true,
     enableHeuristicDetection: false,
     enableHeuristicAction: false,
+    enablePopupMutationObserver: false,
     detectRetries: 20,
     isMainWorld: false,
     prehideTimeout: 2e3,
@@ -3933,16 +3934,29 @@ var AutoConsent = class {
     this.updateState({ selfTest: selfTestResult });
     return selfTestResult;
   }
-  // TODO: use MutationObserver like in findCmp()
   async waitForPopup(cmp, retries = 10, interval = 500) {
     const logsConfig = this.config.logs;
     logsConfig.lifecycle && console.log("checking if popup is open...", cmp.name);
+    let mutationObserver = null;
+    if (this.config.enablePopupMutationObserver) {
+      mutationObserver = this.domActions.waitForMutation("html", 1e4);
+      mutationObserver.catch(() => {
+      });
+    }
     const isOpen = await cmp.detectPopup().catch((e) => {
       logsConfig.errors && console.warn(`error detecting popup for ${cmp.name}`, e);
       return false;
     });
     if (!isOpen && retries > 0) {
-      await this.domActions.wait(interval);
+      if (mutationObserver) {
+        try {
+          await Promise.all([this.domActions.wait(interval), mutationObserver]);
+        } catch (e) {
+          logsConfig.lifecycle && console.log(cmp.name, "popup detection timed out waiting for DOM mutation");
+        }
+      } else {
+        await this.domActions.wait(interval);
+      }
       return this.waitForPopup(cmp, retries - 1, interval);
     }
     logsConfig.lifecycle && console.log(cmp.name, `popup is ${isOpen ? "open" : "not open"}`);

package/dist/autoconsent.extra.cjs.js

@@ -11291,6 +11291,7 @@ function normalizeConfig(providedConfig) {
     enableGeneratedRules: true,
     enableHeuristicDetection: false,
     enableHeuristicAction: false,
+    enablePopupMutationObserver: false,
     detectRetries: 20,
     isMainWorld: false,
     prehideTimeout: 2e3,
@@ -14961,16 +14962,29 @@ var AutoConsent = class {
     this.updateState({ selfTest: selfTestResult });
     return selfTestResult;
   }
-  // TODO: use MutationObserver like in findCmp()
   async waitForPopup(cmp, retries = 10, interval = 500) {
     const logsConfig = this.config.logs;
     logsConfig.lifecycle && console.log("checking if popup is open...", cmp.name);
+    let mutationObserver = null;
+    if (this.config.enablePopupMutationObserver) {
+      mutationObserver = this.domActions.waitForMutation("html", 1e4);
+      mutationObserver.catch(() => {
+      });
+    }
     const isOpen = await cmp.detectPopup().catch((e) => {
       logsConfig.errors && console.warn(`error detecting popup for ${cmp.name}`, e);
       return false;
     });
     if (!isOpen && retries > 0) {
-      await this.domActions.wait(interval);
+      if (mutationObserver) {
+        try {
+          await Promise.all([this.domActions.wait(interval), mutationObserver]);
+        } catch (e) {
+          logsConfig.lifecycle && console.log(cmp.name, "popup detection timed out waiting for DOM mutation");
+        }
+      } else {
+        await this.domActions.wait(interval);
+      }
       return this.waitForPopup(cmp, retries - 1, interval);
     }
     logsConfig.lifecycle && console.log(cmp.name, `popup is ${isOpen ? "open" : "not open"}`);

package/dist/autoconsent.extra.esm.js

@@ -11225,6 +11225,7 @@ function normalizeConfig(providedConfig) {
     enableGeneratedRules: true,
     enableHeuristicDetection: false,
     enableHeuristicAction: false,
+    enablePopupMutationObserver: false,
     detectRetries: 20,
     isMainWorld: false,
     prehideTimeout: 2e3,
@@ -14895,16 +14896,29 @@ var AutoConsent = class {
     this.updateState({ selfTest: selfTestResult });
     return selfTestResult;
   }
-  // TODO: use MutationObserver like in findCmp()
   async waitForPopup(cmp, retries = 10, interval = 500) {
     const logsConfig = this.config.logs;
     logsConfig.lifecycle && console.log("checking if popup is open...", cmp.name);
+    let mutationObserver = null;
+    if (this.config.enablePopupMutationObserver) {
+      mutationObserver = this.domActions.waitForMutation("html", 1e4);
+      mutationObserver.catch(() => {
+      });
+    }
     const isOpen = await cmp.detectPopup().catch((e) => {
       logsConfig.errors && console.warn(`error detecting popup for ${cmp.name}`, e);
       return false;
     });
     if (!isOpen && retries > 0) {
-      await this.domActions.wait(interval);
+      if (mutationObserver) {
+        try {
+          await Promise.all([this.domActions.wait(interval), mutationObserver]);
+        } catch (e) {
+          logsConfig.lifecycle && console.log(cmp.name, "popup detection timed out waiting for DOM mutation");
+        }
+      } else {
+        await this.domActions.wait(interval);
+      }
       return this.waitForPopup(cmp, retries - 1, interval);
     }
     logsConfig.lifecycle && console.log(cmp.name, `popup is ${isOpen ? "open" : "not open"}`);

package/dist/autoconsent.playwright.js

@@ -700,6 +700,7 @@
       enableGeneratedRules: true,
       enableHeuristicDetection: false,
       enableHeuristicAction: false,
+      enablePopupMutationObserver: false,
       detectRetries: 20,
       isMainWorld: false,
       prehideTimeout: 2e3,
@@ -3703,16 +3704,29 @@
       this.updateState({ selfTest: selfTestResult });
       return selfTestResult;
     }
-    // TODO: use MutationObserver like in findCmp()
     async waitForPopup(cmp, retries = 10, interval = 500) {
       const logsConfig = this.config.logs;
       logsConfig.lifecycle && console.log("checking if popup is open...", cmp.name);
+      let mutationObserver = null;
+      if (this.config.enablePopupMutationObserver) {
+        mutationObserver = this.domActions.waitForMutation("html", 1e4);
+        mutationObserver.catch(() => {
+        });
+      }
       const isOpen = await cmp.detectPopup().catch((e) => {
         logsConfig.errors && console.warn(`error detecting popup for ${cmp.name}`, e);
         return false;
       });
       if (!isOpen && retries > 0) {
-        await this.domActions.wait(interval);
+        if (mutationObserver) {
+          try {
+            await Promise.all([this.domActions.wait(interval), mutationObserver]);
+          } catch (e) {
+            logsConfig.lifecycle && console.log(cmp.name, "popup detection timed out waiting for DOM mutation");
+          }
+        } else {
+          await this.domActions.wait(interval);
+        }
         return this.waitForPopup(cmp, retries - 1, interval);
       }
       logsConfig.lifecycle && console.log(cmp.name, `popup is ${isOpen ? "open" : "not open"}`);

package/dist/types/types.d.ts

@@ -61,6 +61,7 @@ export type Config = {
     enableFilterList: boolean;
     enableHeuristicDetection: boolean;
     enableHeuristicAction: boolean;
+    enablePopupMutationObserver: boolean;
     visualTest: boolean;
     logs: {
         lifecycle: boolean;

package/lib/types.ts

@@ -65,6 +65,7 @@ export type Config = {
     enableFilterList: boolean;
     enableHeuristicDetection: boolean;
     enableHeuristicAction: boolean;
+    enablePopupMutationObserver: boolean;
     visualTest: boolean; // If true, the script will delay before every click action
     logs: {
         lifecycle: boolean;

package/lib/utils.ts

@@ -78,6 +78,7 @@ export function normalizeConfig(providedConfig: any): Config {
         enableGeneratedRules: true,
         enableHeuristicDetection: false,
         enableHeuristicAction: false,
+        enablePopupMutationObserver: false,
         detectRetries: 20,
         isMainWorld: false,
         prehideTimeout: 2000,

package/lib/web.ts

@@ -553,16 +553,30 @@ export default class AutoConsent {
         return selfTestResult;
     }
 
-    // TODO: use MutationObserver like in findCmp()
     async waitForPopup(cmp: AutoCMP, retries = 10, interval = 500): Promise<boolean> {
         const logsConfig = this.config.logs;
         logsConfig.lifecycle && console.log('checking if popup is open...', cmp.name);
+
+        let mutationObserver: Promise<boolean> | null = null;
+        if (this.config.enablePopupMutationObserver) {
+            mutationObserver = this.domActions.waitForMutation('html', 10000);
+            mutationObserver.catch(() => {});
+        }
+
         const isOpen = await cmp.detectPopup().catch((e) => {
             logsConfig.errors && console.warn(`error detecting popup for ${cmp.name}`, e);
             return false;
-        }); // ignore possible errors in one-time popup detection
+        });
         if (!isOpen && retries > 0) {
-            await this.domActions.wait(interval);
+            if (mutationObserver) {
+                try {
+                    await Promise.all([this.domActions.wait(interval), mutationObserver]);
+                } catch (e) {
+                    logsConfig.lifecycle && console.log(cmp.name, 'popup detection timed out waiting for DOM mutation');
+                }
+            } else {
+                await this.domActions.wait(interval);
+            }
             return this.waitForPopup(cmp, retries - 1, interval);
         }
         logsConfig.lifecycle && console.log(cmp.name, `popup is ${isOpen ? 'open' : 'not open'}`);

package/package.json

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

package/rules/autoconsent/facebook-mobile.json

@@ -0,0 +1,17 @@
+{
+    "name": "facebook-mobile",
+    "runContext": {
+        "urlPattern": "^https://(m|mbasic)\\.facebook\\.com/"
+    },
+    "prehideSelectors": ["[data-testid=\"cookie-policy-manage-dialog\"]"],
+    "detectCmp": [{ "exists": "[data-testid=\"cookie-policy-manage-dialog\"]" }],
+    "detectPopup": [{ "visible": "[data-testid=\"cookie-policy-manage-dialog\"]" }],
+    "optIn": [
+        { "waitForThenClick": "[data-testid=\"cookie-policy-manage-dialog-accept-button\"]" },
+        { "waitForVisible": "[data-testid=\"cookie-policy-manage-dialog\"]", "check": "none" }
+    ],
+    "optOut": [
+        { "waitForThenClick": "[data-testid=\"cookie-policy-manage-dialog-decline-button\"]" },
+        { "waitForVisible": "[data-testid=\"cookie-policy-manage-dialog\"]", "check": "none" }
+    ]
+}

package/rules/autoconsent/facebook.json

@@ -1,7 +1,7 @@
 {
     "name": "facebook",
     "runContext": {
-        "urlPattern": "^https://([a-z0-9-]+\\.)?facebook\\.com/"
+        "urlPattern": "^https://(www\\.)?facebook\\.com/"
     },
     "prehideSelectors": [],
     "detectCmp": [