@duckduckgo/autoconsent 16.15.0 → 16.16.0

package/dist/types/cmps/admiral.d.ts

@@ -1,6 +1,10 @@
 import AutoConsentCMPBase from './base';
 export default class Admiral extends AutoConsentCMPBase {
     name: string;
+    private readonly consentCardSelector;
+    private getVrmNotice;
+    private isVisibleElement;
+    private getVrmCloseButton;
     get hasSelfTest(): boolean;
     get isIntermediate(): boolean;
     get isCosmetic(): boolean;

package/lib/cmps/admiral.ts

@@ -3,6 +3,40 @@ import AutoConsentCMPBase from './base';
 export default class Admiral extends AutoConsentCMPBase {
     name = 'Admiral';
 
+    private readonly consentCardSelector =
+        'div > div[class*=Card] > div[class*=Frame] > div[class*=Pills] > button[class*=Pills__StyledPill]';
+
+    private getVrmNotice() {
+        return Array.from(document.querySelectorAll<HTMLElement>('body > div')).find((element) => {
+            const text = element.innerText || '';
+            const rect = element.getBoundingClientRect();
+            const style = getComputedStyle(element);
+
+            return (
+                style.position === 'fixed' &&
+                rect.width > 0 &&
+                rect.height > 0 &&
+                text.includes('Your Privacy') &&
+                text.includes('VRM') &&
+                text.includes('Admiral')
+            );
+        });
+    }
+
+    private isVisibleElement(element: HTMLElement) {
+        const rect = element.getBoundingClientRect();
+        const style = getComputedStyle(element);
+
+        return rect.width > 0 && rect.height > 0 && style.display !== 'none' && style.visibility !== 'hidden';
+    }
+
+    private getVrmCloseButton() {
+        const notice = this.getVrmNotice();
+        const closeButton = notice?.querySelector<HTMLElement>('button[aria-label="Close"]');
+
+        return closeButton && this.isVisibleElement(closeButton) ? closeButton : null;
+    }
+
     get hasSelfTest(): boolean {
         return false;
     }
@@ -16,14 +50,11 @@ export default class Admiral extends AutoConsentCMPBase {
     }
 
     async detectCmp() {
-        return this.elementExists('div > div[class*=Card] > div[class*=Frame] > div[class*=Pills] > button[class*=Pills__StyledPill]');
+        return (await this.elementExists(this.consentCardSelector)) || Boolean(this.getVrmNotice());
     }
 
     async detectPopup() {
-        return this.elementVisible(
-            'div > div[class*=Card] > div[class*=Frame] > div[class*=Pills] > button[class*=Pills__StyledPill]',
-            'any',
-        );
+        return (await this.elementVisible(this.consentCardSelector, 'any')) || Boolean(this.getVrmNotice());
     }
 
     async optOut() {
@@ -34,6 +65,11 @@ export default class Admiral extends AutoConsentCMPBase {
             return await this.click(rejectAllSelector);
         }
 
+        const vrmCloseButton = this.getVrmCloseButton();
+        if (vrmCloseButton) {
+            return await this.clickElement(vrmCloseButton);
+        }
+
         const purposesButtonSelector =
             "xpath///button[contains(., 'Zwecke') or contains(., 'Σκοποί') or contains(., 'Purposes') or contains(., 'Цели') or contains(., 'Eesmärgid') or contains(., 'Tikslai') or contains(., 'Svrhe') or contains(., 'Cele') or contains(., 'Účely') or contains(., 'Finalidades') or contains(., 'Mērķi') or contains(., 'Scopuri') or contains(., 'Fines') or contains(., 'Ändamål') or contains(., 'Finalités') or contains(., 'Doeleinden') or contains(., 'Tarkoitukset') or contains(., 'Scopi') or contains(., 'Amaçlar') or contains(., 'Nameni') or contains(., 'Célok') or contains(., 'Formål')]";
 

package/package.json

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

package/rules/autoconsent/pandectes.json

@@ -20,10 +20,12 @@
     "optOut": [
         {
             "if": { "visible": "#pandectes-banner .cc-deny" },
-            "then": [{ "click": "#pandectes-banner .cc-deny" }],
+            "then": [{ "waitForThenClick": "#pandectes-banner .cc-deny" }],
             "else": [
-                { "click": "#pandectes-banner .cc-settings" },
-                { "waitForThenClick": ".pd-cp-ui-rejectAll" },
+                { "waitForThenClick": "#pandectes-banner .cc-settings" },
+                { "waitForVisible": ".pd-cp-ui-rejectAll" },
+                { "click": ".pd-cp-ui-rejectAll" },
+                { "waitForVisible": ".pd-cp-ui-save" },
                 { "click": ".pd-cp-ui-save" }
             ]
         }