@duckduckgo/autoconsent 1.0.5 → 1.0.8

package/lib/puppet/tab.js

@@ -1,6 +1,7 @@
 import { waitFor } from '../cmps/base';
 import Tools from '../web/consentomatic/tools';
 import { matches } from '../web/consentomatic/index';
+import { hideElementsUtil, getStyleElementUtil } from '../web/content-utils';
 const DEBUG = false;
 export default class Tab {
     constructor(page, url, frames) {
@@ -9,6 +10,10 @@ export default class Tab {
         this.page = page;
         this.url = url;
         this.frames = frames;
+        this._utilsSnippet = `
+      ${getStyleElementUtil.toString()}
+      ${hideElementsUtil.toString()}
+    `;
     }
     async elementExists(selector, frameId = 0) {
         const elements = await this.frames[frameId].$$(selector);
@@ -84,9 +89,11 @@ export default class Tab {
         }
         return false;
     }
-    async hideElements(selectors, frameId = 0) {
-        // TODO implement this
-        return Promise.resolve(true);
+    async hideElements(selectors, frameId = 0, method = 'display') {
+        return await this.frames[frameId].evaluate(`(() => {
+      ${this._utilsSnippet}
+      return hideElementsUtil(${JSON.stringify(selectors)}, '${method}');
+    })()`);
     }
     undoHideElements(frameId) {
         return Promise.resolve(true);

package/lib/puppet/tab.ts

@@ -2,6 +2,8 @@ import { waitFor } from '../cmps/base';
 import { TabActor } from '../types';
 import Tools from '../web/consentomatic/tools';
 import { matches } from '../web/consentomatic/index';
+import { HideMethod } from '../messages';
+import { hideElementsUtil, getStyleElementUtil } from '../web/content-utils';
 
 const DEBUG = false;
 
@@ -17,10 +19,16 @@ export default class Tab implements TabActor {
     url: string
   }
 
+  _utilsSnippet: string // serialized RPC functions borrowed from content script
+
   constructor(page: any, url: string, frames: { [id: number]: any }) {
     this.page = page;
     this.url = url;
     this.frames = frames;
+    this._utilsSnippet = `
+      ${getStyleElementUtil.toString()}
+      ${hideElementsUtil.toString()}
+    `;
   }
 
   async elementExists(selector: string, frameId = 0) {
@@ -101,9 +109,11 @@ export default class Tab implements TabActor {
     return false;
   }
 
-  async hideElements(selectors: string[], frameId = 0) {
-    // TODO implement this
-    return Promise.resolve(true)
+  async hideElements(selectors: string[], frameId = 0, method: HideMethod = 'display') {
+    return await this.frames[frameId].evaluate(`(() => {
+      ${this._utilsSnippet}
+      return hideElementsUtil(${JSON.stringify(selectors)}, '${method}');
+    })()`);
   }
 
   undoHideElements(frameId?: number): Promise<boolean> {

package/lib/tabwrapper.js

@@ -1,3 +1,4 @@
+import { enableLogs } from './config';
 export default class TabConsent {
     constructor(tab, ruleCheckPromise) {
         this.tab = tab;
@@ -12,23 +13,28 @@ export default class TabConsent {
         return null;
     }
     async isPopupOpen(retries = 1, interval = 1000) {
+        enableLogs && console.log('checking if popup is open...', this.tab.id, this.rule.name);
         const isOpen = await this.rule.detectPopup(this.tab);
         if (!isOpen && retries > 0) {
             return new Promise((resolve) => setTimeout(() => resolve(this.isPopupOpen(retries - 1, interval)), interval));
         }
+        enableLogs && console.log(`popup is ${isOpen ? 'open' : 'not open'}`);
         return isOpen;
     }
     async doOptOut() {
         try {
+            enableLogs && console.log(`doing opt out ${this.getCMPName()} in tab ${this.tab.id}`);
             this.optOutStatus = await this.rule.optOut(this.tab);
             return this.optOutStatus;
         }
         catch (e) {
+            console.error('error during opt out', e);
             this.optOutStatus = e;
             throw e;
         }
         finally {
             if (!this.rule.isHidingRule) {
+                enableLogs && console.log('unhiding elements');
                 if (this.getCMPName().startsWith('com_')) {
                     this.tab.wait(5000).then(() => this.tab.undoHideElements());
                 }

package/lib/tabwrapper.ts

@@ -1,3 +1,4 @@
+import { enableLogs } from './config';
 import { AutoCMP, TabActor } from './types';
 
 export default class TabConsent {
@@ -18,22 +19,27 @@ export default class TabConsent {
     }
   
     async isPopupOpen(retries = 1, interval = 1000): Promise<boolean> {
+      enableLogs && console.log('checking if popup is open...', this.tab.id, this.rule.name);
       const isOpen = await this.rule.detectPopup(this.tab);
       if (!isOpen && retries > 0) {
         return new Promise((resolve) => setTimeout(() => resolve(this.isPopupOpen(retries - 1, interval)), interval));
       }
+      enableLogs && console.log(`popup is ${isOpen ? 'open' : 'not open'}`);
       return isOpen;
     }
   
     async doOptOut() {
       try {
+        enableLogs && console.log(`doing opt out ${this.getCMPName()} in tab ${this.tab.id}`);
         this.optOutStatus = await this.rule.optOut(this.tab);
         return this.optOutStatus;
       } catch (e) {
+        console.error('error during opt out', e);
         this.optOutStatus = e;
         throw e;
       } finally {
         if (!this.rule.isHidingRule) {
+          enableLogs && console.log('unhiding elements');
           if (this.getCMPName().startsWith('com_')) {
             this.tab.wait(5000).then(() => this.tab.undoHideElements())
           } else {

package/lib/types.d.ts

@@ -1,4 +1,4 @@
-import { ContentScriptMessage } from "./messages";
+import { ContentScriptMessage, HideMethod } from "./messages";
 
 type Tab = {
   url: string
@@ -27,7 +27,7 @@ export interface TabActor {
   eval(script: string, frameId?: number): Promise<boolean>
   waitForElement(selector: string, timeout: number, frameId?: number): Promise<boolean>
   waitForThenClick(selector: string, timeout?: number, frameId?: number): Promise<boolean>
-  hideElements(selectors: string[], frameId?: number): Promise<boolean>
+  hideElements(selectors: string[], frameId?: number, method?: HideMethod): Promise<boolean>
   undoHideElements(frameId?: number): Promise<boolean>
   goto(url: string): Promise<void>
   wait(ms: number): Promise<true>

package/lib/web/content-utils.js

@@ -0,0 +1,29 @@
+// get or create a style container for CSS overrides
+export function getStyleElementUtil() {
+    const styleOverrideElementId = "autoconsent-css-rules";
+    const styleSelector = `style#${styleOverrideElementId}`;
+    const existingElement = document.querySelector(styleSelector);
+    if (existingElement && existingElement instanceof HTMLStyleElement) {
+        return existingElement;
+    }
+    else {
+        const parent = document.head ||
+            document.getElementsByTagName("head")[0] ||
+            document.documentElement;
+        const css = document.createElement("style");
+        css.id = styleOverrideElementId;
+        parent.appendChild(css);
+        return css;
+    }
+}
+// hide elements with a CSS rule
+export function hideElementsUtil(selectors, method) {
+    const hidingSnippet = method === 'display' ? `display: none` : `opacity: 0`;
+    const rule = `${selectors.join(",")} { ${hidingSnippet} !important; z-index: -1 !important; pointer-events: none !important; } `;
+    const styleEl = getStyleElementUtil();
+    if (styleEl instanceof HTMLStyleElement) {
+        styleEl.innerText += rule;
+        return selectors.length > 0;
+    }
+    return false;
+}

package/lib/web/content-utils.ts

@@ -0,0 +1,31 @@
+import { HideMethod } from "../messages";
+
+// get or create a style container for CSS overrides
+export function getStyleElementUtil(): HTMLStyleElement {
+  const styleOverrideElementId = "autoconsent-css-rules";
+  const styleSelector = `style#${styleOverrideElementId}`;
+  const existingElement = document.querySelector(styleSelector);
+  if (existingElement && existingElement instanceof HTMLStyleElement) {
+    return existingElement;
+  } else {
+    const parent = document.head ||
+      document.getElementsByTagName("head")[0] ||
+      document.documentElement;
+    const css = document.createElement("style");
+    css.id = styleOverrideElementId;
+    parent.appendChild(css);
+    return css;
+  }
+}
+
+// hide elements with a CSS rule
+export function hideElementsUtil(selectors: string[], method: HideMethod): boolean {
+  const hidingSnippet = method === 'display' ? `display: none` : `opacity: 0`;
+  const rule = `${selectors.join(",")} { ${hidingSnippet} !important; z-index: -1 !important; pointer-events: none !important; } `;
+  const styleEl = getStyleElementUtil();
+  if (styleEl instanceof HTMLStyleElement) {
+    styleEl.innerText += rule;
+    return selectors.length > 0;
+  }
+  return false;
+}

package/lib/web/content.js

@@ -1,7 +1,6 @@
 import { matches, executeAction } from "./consentomatic/index";
+import { hideElementsUtil, getStyleElementUtil } from "./content-utils";
 let actionQueue = Promise.resolve(null);
-const styleOverrideElementId = "autoconsent-css-rules";
-const styleSelector = `style#${styleOverrideElementId}`;
 export default function handleMessage(message, debug = false) {
     if (message.type === "click") {
         const elem = document.querySelectorAll(message.selector);
@@ -25,8 +24,19 @@ export default function handleMessage(message, debug = false) {
         const elem = document.querySelectorAll(message.selector);
         const results = new Array(elem.length);
         elem.forEach((e, i) => {
-            results[i] = e.offsetParent !== null || window.getComputedStyle(e).display !== "none" || e.style?.display !== "none";
+            // check for display: none
+            results[i] = false;
+            if (e.offsetParent !== null) {
+                results[i] = true;
+            }
+            else {
+                const css = window.getComputedStyle(e);
+                if (css.position === 'fixed' && css.display !== "none") { // fixed elements may be visible even if the parent is not
+                    results[i] = true;
+                }
+            }
         });
+        debug && console.log("[visible?]", message.selector, elem, results);
         if (results.length === 0) {
             return false;
         }
@@ -41,6 +51,7 @@ export default function handleMessage(message, debug = false) {
     }
     else if (message.type === "getAttribute") {
         const elem = document.querySelector(message.selector);
+        debug && console.log("[getAttribute]", message.selector, elem);
         if (!elem) {
             return false;
         }
@@ -48,31 +59,16 @@ export default function handleMessage(message, debug = false) {
     }
     else if (message.type === "eval") {
         // TODO: chrome support
+        debug && console.log("about to [eval]", message.script); // this will not show in Webkit console
         const result = window.eval(message.script); // eslint-disable-line no-eval
-        debug && console.log("[eval]", message.script, result);
         return result;
     }
     else if (message.type === "hide") {
-        const parent = document.head ||
-            document.getElementsByTagName("head")[0] ||
-            document.documentElement;
-        const rule = `${message.selectors.join(",")} { display: none !important; z-index: -1 !important; } `;
-        const existingElement = document.querySelector(styleSelector);
-        debug && console.log("[hide]", message.selectors, !!existingElement);
-        if (existingElement && existingElement instanceof HTMLStyleElement) {
-            existingElement.innerText += rule;
-        }
-        else {
-            const css = document.createElement("style");
-            css.type = "text/css";
-            css.id = styleOverrideElementId;
-            css.appendChild(document.createTextNode(rule));
-            parent.appendChild(css);
-        }
-        return message.selectors.length > 0;
+        debug && console.log("[hide]", message.selectors);
+        return hideElementsUtil(message.selectors, message.method);
     }
     else if (message.type === "undohide") {
-        const existingElement = document.querySelector(styleSelector);
+        const existingElement = getStyleElementUtil();
         debug && console.log("[unhide]", !!existingElement);
         if (existingElement) {
             existingElement.remove();
@@ -81,9 +77,11 @@ export default function handleMessage(message, debug = false) {
     }
     else if (message.type === "matches") {
         const matched = matches(message.config);
+        debug && console.log("[matches?]", message.config.type, JSON.stringify(message.config), matched);
         return matched;
     }
     else if (message.type === "executeAction") {
+        debug && console.log("[executeAction]", message);
         actionQueue = actionQueue.then(() => executeAction(message.config, message.param));
         return true;
     }

package/lib/web/content.ts

@@ -1,9 +1,8 @@
 import { matches, executeAction } from "./consentomatic/index";
 import { ContentScriptMessage } from "../messages";
+import { hideElementsUtil, getStyleElementUtil } from "./content-utils";
 
 let actionQueue = Promise.resolve(null);
-const styleOverrideElementId = "autoconsent-css-rules";
-const styleSelector = `style#${styleOverrideElementId}`;
 
 export default function handleMessage(message: ContentScriptMessage, debug = false) {
   if (message.type === "click") {
@@ -25,8 +24,18 @@ export default function handleMessage(message: ContentScriptMessage, debug = fal
     const elem = document.querySelectorAll<HTMLElement>(message.selector);
     const results = new Array(elem.length);
     elem.forEach((e, i) => {
-      results[i] = e.offsetParent !== null || window.getComputedStyle(e).display !== "none" || e.style?.display !== "none";
+      // check for display: none
+      results[i] = false;
+      if (e.offsetParent !== null) {
+        results[i] = true;
+      } else {
+        const css = window.getComputedStyle(e);
+        if (css.position === 'fixed' && css.display !== "none") { // fixed elements may be visible even if the parent is not
+          results[i] = true;
+        }
+      }
     });
+    debug && console.log("[visible?]", message.selector, elem, results);
     if (results.length === 0) {
       return false;
     } else if (message.check === "any") {
@@ -38,35 +47,21 @@ export default function handleMessage(message: ContentScriptMessage, debug = fal
     return results.every(r => r);
   } else if (message.type === "getAttribute") {
     const elem = document.querySelector(message.selector);
+    debug && console.log("[getAttribute]", message.selector, elem);
     if (!elem) {
       return false;
     }
     return elem.getAttribute(message.attribute);
   } else if (message.type === "eval") {
     // TODO: chrome support
+    debug && console.log("about to [eval]", message.script); // this will not show in Webkit console
     const result = window.eval(message.script); // eslint-disable-line no-eval
-    debug && console.log("[eval]", message.script, result);
     return result;
   } else if (message.type === "hide") {
-    const parent =
-      document.head ||
-      document.getElementsByTagName("head")[0] ||
-      document.documentElement;
-    const rule = `${message.selectors.join(",")} { display: none !important; z-index: -1 !important; } `;
-    const existingElement = document.querySelector(styleSelector);
-    debug && console.log("[hide]", message.selectors, !!existingElement);
-    if (existingElement && existingElement instanceof HTMLStyleElement) {
-      existingElement.innerText += rule;
-    } else {
-      const css = document.createElement("style");
-      css.type = "text/css";
-      css.id = styleOverrideElementId;
-      css.appendChild(document.createTextNode(rule));
-      parent.appendChild(css);
-    }
-    return message.selectors.length > 0;
+    debug && console.log("[hide]", message.selectors);
+    return hideElementsUtil(message.selectors, message.method);
   } else if (message.type === "undohide") {
-    const existingElement = document.querySelector(styleSelector);
+    const existingElement = getStyleElementUtil();
     debug && console.log("[unhide]", !!existingElement);
     if (existingElement) {
       existingElement.remove();
@@ -74,8 +69,10 @@ export default function handleMessage(message: ContentScriptMessage, debug = fal
     return !!existingElement
   } else if (message.type === "matches") {
     const matched = matches(message.config);
+    debug && console.log("[matches?]", message.config.type, JSON.stringify(message.config), matched);
     return matched;
   } else if (message.type === "executeAction") {
+    debug && console.log("[executeAction]", message);
     actionQueue = actionQueue.then(() => executeAction(message.config, message.param));
     return true;
   }

package/lib/web/tab.js

@@ -1,4 +1,5 @@
 import { waitFor } from "../cmps/base";
+import { enableLogs } from "../config";
 export default class TabActions {
     constructor(tabId, frame, sendContentMessage, browser) {
         this.frame = frame;
@@ -7,7 +8,6 @@ export default class TabActions {
         this.id = tabId;
     }
     async elementExists(selector, frameId = 0) {
-        console.log(`check for  ${selector} in tab ${this.id}, frame ${frameId}`);
         return this.sendContentMessage(this.id, {
             type: "elemExists",
             selector
@@ -16,7 +16,7 @@ export default class TabActions {
         });
     }
     async clickElement(selector, frameId = 0) {
-        console.log(`click element ${selector} in tab ${this.id}`);
+        enableLogs && console.log(`click element ${selector} in tab ${this.id}`);
         return this.sendContentMessage(this.id, {
             type: "click",
             selector
@@ -25,7 +25,7 @@ export default class TabActions {
         });
     }
     async clickElements(selector, frameId = 0) {
-        console.log(`click elements ${selector} in tab ${this.id}`);
+        enableLogs && console.log(`click elements ${selector} in tab ${this.id}`);
         return this.sendContentMessage(this.id, {
             type: "click",
             all: true,
@@ -68,10 +68,12 @@ export default class TabActions {
         }
         return false;
     }
-    async hideElements(selectors, frameId = 0) {
+    async hideElements(selectors, frameId = 0, method = 'display') {
+        enableLogs && console.log('Sending hide elements to', this.id, selectors);
         return this.sendContentMessage(this.id, {
             type: "hide",
-            selectors
+            selectors,
+            method,
         }, { frameId });
     }
     async undoHideElements(frameId = 0) {
@@ -86,8 +88,12 @@ export default class TabActions {
         return this.browser.tabs.update(this.id, { url });
     }
     wait(ms) {
+        enableLogs && console.log(`waiting for ${ms}ms in tab ${this.id}`);
         return new Promise(resolve => {
-            setTimeout(() => resolve(true), ms);
+            setTimeout(() => {
+                enableLogs && console.log(`done waiting in tab ${this.id}`);
+                resolve(true);
+            }, ms);
         });
     }
     matches(matcherConfig) {

package/lib/web/tab.ts

@@ -1,4 +1,6 @@
 import { waitFor } from "../cmps/base";
+import { enableLogs } from "../config";
+import { HideMethod } from "../messages";
 import { TabActor, MessageSender, Browser } from "../types";
 
 export default class TabActions implements TabActor {
@@ -14,7 +16,6 @@ export default class TabActions implements TabActor {
   }
 
   async elementExists(selector: string, frameId = 0) {
-    console.log(`check for  ${selector} in tab ${this.id}, frame ${frameId}`);
     return this.sendContentMessage(
       this.id,
       {
@@ -28,7 +29,7 @@ export default class TabActions implements TabActor {
   }
 
   async clickElement(selector: string, frameId = 0) {
-    console.log(`click element ${selector} in tab ${this.id}`);
+    enableLogs && console.log(`click element ${selector} in tab ${this.id}`);
     return this.sendContentMessage(
       this.id,
       {
@@ -42,7 +43,7 @@ export default class TabActions implements TabActor {
   }
 
   async clickElements(selector: string, frameId = 0) {
-    console.log(`click elements ${selector} in tab ${this.id}`);
+    enableLogs && console.log(`click elements ${selector} in tab ${this.id}`);
     return this.sendContentMessage(
       this.id,
       {
@@ -111,12 +112,14 @@ export default class TabActions implements TabActor {
     return false;
   }
 
-  async hideElements(selectors: string[], frameId = 0) {
+  async hideElements(selectors: string[], frameId = 0, method: HideMethod = 'display') {
+    enableLogs && console.log('Sending hide elements to', this.id, selectors);
     return this.sendContentMessage(
       this.id,
       {
         type: "hide",
-        selectors
+        selectors,
+        method,
       },
       { frameId }
     );
@@ -141,8 +144,12 @@ export default class TabActions implements TabActor {
   }
 
   wait(ms: number): Promise<true> {
+    enableLogs && console.log(`waiting for ${ms}ms in tab ${this.id}`);
     return new Promise(resolve => {
-      setTimeout(() => resolve(true), ms);
+      setTimeout(() => {
+        enableLogs && console.log(`done waiting in tab ${this.id}`);
+        resolve(true);
+      }, ms);
     });
   }
 

package/lib/web.js

@@ -5,6 +5,7 @@ import detectDialog from './detector';
 import { rules, createAutoCMP } from './index';
 import { ConsentOMaticCMP } from './consentomatic/index';
 import prehideElements from './hider';
+import { enableLogs } from './config';
 export * from './index';
 export { Tab, handleContentMessage, };
 export default class AutoConsent {
@@ -29,6 +30,7 @@ export default class AutoConsent {
         return new Tab(tabId, this.consentFrames.get(tabId), this.sendContentMessage, this.browser);
     }
     async checkTab(tabId, prehide = true) {
+        enableLogs && console.log('checking tab', tabId, this.consentFrames, this.tabCmps);
         const tab = this.createTab(tabId);
         if (prehide) {
             this.prehideElements(tab);
@@ -39,12 +41,15 @@ export default class AutoConsent {
         consent.checked.then((rule) => {
             if (this.consentFrames.has(tabId) && rule) {
                 const frame = this.consentFrames.get(tabId);
+                enableLogs && console.log(`Found ${rule.name} in a nested iframe ${frame.id} inside tab ${tabId}`);
                 if (frame.type === rule.name) {
                     consent.tab.frame = frame;
                 }
             }
+            enableLogs && console.log('finished checking tab', tabId, this.consentFrames, this.tabCmps);
             // no CMP detected, undo hiding
             if (!rule && prehide) {
+                enableLogs && console.log('no CMP detected, undo hiding');
                 tab.undoHideElements();
             }
         });

package/lib/web.ts

@@ -7,6 +7,7 @@ import { Browser, MessageSender, AutoCMP, TabActor } from './types';
 import { ConsentOMaticCMP, ConsentOMaticConfig } from './consentomatic/index';
 import { AutoConsentCMPRule } from './rules';
 import prehideElements from './hider';
+import { enableLogs } from './config';
 
 export * from './index';
 export {
@@ -44,6 +45,7 @@ export default class AutoConsent {
   }
 
   async checkTab(tabId: number, prehide = true) {
+    enableLogs && console.log('checking tab', tabId, this.consentFrames, this.tabCmps);
     const tab = this.createTab(tabId);
     if (prehide) {
       this.prehideElements(tab);
@@ -54,12 +56,15 @@ export default class AutoConsent {
     consent.checked.then((rule) => {
       if (this.consentFrames.has(tabId) && rule) {
         const frame = this.consentFrames.get(tabId);
+        enableLogs && console.log(`Found ${rule.name} in a nested iframe ${frame.id} inside tab ${tabId}`);
         if (frame.type === rule.name) {
           consent.tab.frame = frame;
         }
       }
+      enableLogs && console.log('finished checking tab', tabId, this.consentFrames, this.tabCmps);
       // no CMP detected, undo hiding
       if (!rule && prehide) {
+        enableLogs && console.log('no CMP detected, undo hiding');
         tab.undoHideElements();
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "1.0.5",
+  "version": "1.0.8",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",

package/readme.md

@@ -84,7 +84,7 @@ Returns true if an element returned from `document.querySelect(selector)` is cur
   "eval": "code"
 }
 ```
-Evaluates `code` in the context of the page and returns the truthiness of the result.
+Evaluates `code` in the context of the page. NB: the result of this action depends on the truthiness of the evaluated expression, make sure it returns `true` in case of success.
 
 #### Wait for element
 

package/rules/autoconsent/192.json

@@ -0,0 +1,17 @@
+{
+  "name": "192.com",
+  "detectCmp": [{ "exists": ".ont-cookies"}],
+  "detectPopup": [{ "visible": ".ont-cookies" }],
+  "optIn": [{ "click": ".ont-btn-main.ont-cookies-btn.js-ont-btn-ok2" }],
+  "optOut": [
+      {
+          "click": ".ont-cookes-btn-manage"
+      },
+      {
+          "click": ".ont-btn-main.ont-cookies-btn.js-ont-btn-choose"
+      }
+  ],
+  "test": [
+      {"eval": "document.cookie.includes('CC_ADVERTISING=NO') && document.cookie.includes('CC_ANALYTICS=NO')"}
+  ]
+}

package/rules/autoconsent/ausopen.json

@@ -0,0 +1,7 @@
+{
+  "name": "ausopen.com",
+  "isHidingRule": true,
+  "detectCmp": [{ "exists": ".gdpr-popup__message" }],
+  "detectPopup": [{ "visible": ".gdpr-popup__message" }],
+  "optOut": [{ "hide": [".gdpr-popup__message"]}]
+}

package/rules/autoconsent/aws-amazon.json

@@ -1,6 +1,6 @@
 {
   "name": "aws.amazon.com",
-  "prehideSelectors": ["#awsccc-cb-content", "#awsccc-cs-container-inner"],
+  "prehideSelectors": ["#awsccc-cb-content", "#awsccc-cs-container", "#awsccc-cs-modalOverlay", "#awsccc-cs-container-inner"],
   "detectCmp": [{ "exists": "#awsccc-cb-content" }],
   "detectPopup": [{ "visible": "#awsccc-cb-content" }],
   "optIn": [{ "click": "button[data-id=awsccc-cb-btn-accept" }],

package/rules/autoconsent/bing.json

@@ -0,0 +1,14 @@
+{
+  "name": "bing.com",
+  "prehideSelectors": ["#bnp_container"],
+  "detectCmp": [{ "exists": "#bnp_cookie_banner"}],
+  "detectPopup": [{ "visible": "#bnp_cookie_banner" }],
+  "optIn": [{ "click": "#bnp_btn_accept" }],
+  "optOut": [
+      { "click": "#bnp_btn_preference"},
+      { "click": "#mcp_savesettings"}
+  ],
+  "test": [
+      { "eval": "document.cookie.includes('AL=0') && document.cookie.includes('AD=0') && document.cookie.includes('SM=0')"}
+  ]
+}

package/rules/autoconsent/bundesregierung-de.json

@@ -2,7 +2,7 @@
   "name": "bundesregierung.de",
   "prehideSelectors": [".bpa-cookie-banner"],
   "detectCmp": [{ "exists": ".bpa-cookie-banner" }],
-  "detectPopup": [{ "visible": ".bpa-module-full-hero" }],
+  "detectPopup": [{ "visible": ".bpa-cookie-banner .bpa-module-full-hero" }],
   "optIn": [{ "click": ".bpa-accept-all-button" }],
   "optOut": [
       {