@duckduckgo/autoconsent 4.3.2 → 4.4.0

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

@@ -108,14 +108,8 @@
             return false;
         });
     }
-    function click(selectorOrElements, all = false) {
-        let elem = [];
-        if (typeof selectorOrElements === 'string') {
-            elem = Array.from(document.querySelectorAll(selectorOrElements));
-        }
-        else {
-            elem = selectorOrElements;
-        }
+    function click(selector, all = false) {
+        const elem = elementSelector(selector);
         if (elem.length > 0) {
             if (all) {
                 elem.forEach((e) => e.click());
@@ -127,12 +121,12 @@
         return elem.length > 0;
     }
     function elementExists(selector) {
-        const exists = document.querySelector(selector) !== null;
+        const exists = elementSelector(selector).length > 0;
         // enableLogs && console.log("[exists?]", selector, exists);
         return exists;
     }
     function elementVisible(selector, check) {
-        const elem = document.querySelectorAll(selector);
+        const elem = elementSelector(selector);
         const results = new Array(elem.length);
         elem.forEach((e, i) => {
             // check for display: none
@@ -155,7 +149,7 @@
         const interval = 200;
         const times = Math.ceil((timeout) / interval);
         // enableLogs && console.log("[waitFor]", ruleStep.waitFor);
-        return waitFor(() => document.querySelector(selector) !== null, times, interval);
+        return waitFor(() => elementSelector(selector).length > 0, times, interval);
     }
     function waitForVisible(selector, timeout = 10000, check = 'any') {
         const interval = 200;
@@ -193,6 +187,50 @@
         }
         return !!existingElement;
     }
+    function querySingleReplySelector(selector, parent = document) {
+        if (selector.startsWith('aria/')) {
+            return [];
+        }
+        if (selector.startsWith('xpath/')) {
+            const xpath = selector.slice(6);
+            const result = document.evaluate(xpath, parent, null, XPathResult.ANY_TYPE, null);
+            let node = null;
+            const elements = [];
+            // eslint-disable-next-line no-cond-assign
+            while (node = result.iterateNext()) {
+                elements.push(node);
+            }
+            return elements;
+        }
+        if (selector.startsWith('text/')) {
+            return [];
+        }
+        if (selector.startsWith('pierce/')) {
+            return [];
+        }
+        if (parent.shadowRoot) {
+            return Array.from(parent.shadowRoot.querySelectorAll(selector));
+        }
+        return Array.from(parent.querySelectorAll(selector));
+    }
+    function querySelectorChain(selectors) {
+        let parent = document;
+        let matches;
+        for (const selector of selectors) {
+            matches = querySingleReplySelector(selector, parent);
+            if (matches.length === 0) {
+                return [];
+            }
+            parent = matches[0];
+        }
+        return matches;
+    }
+    function elementSelector(selector) {
+        if (typeof selector === 'string') {
+            return querySingleReplySelector(selector);
+        }
+        return querySelectorChain(selector);
+    }
 
     /* eslint-disable no-restricted-syntax,no-await-in-loop,no-underscore-dangle */
     const defaultRunContext = {
@@ -294,6 +332,14 @@
                 results.push(_runRulesSequentially(rule.else));
             }
         }
+        if (rule.any) {
+            for (const step of rule.any) {
+                if (await evaluateRuleStep(step)) {
+                    return true;
+                }
+            }
+            return false;
+        }
         if (results.length === 0) {
             return false;
         }
@@ -664,12 +710,12 @@
                 // toggles with 2 buttons
                 const toggles = document.querySelectorAll('.priv-purpose-container .sp-switch-arrow-block a.neutral.on .right');
                 for (const t of toggles) {
-                    click([t]);
+                    t.click();
                 }
                 // switch toggles
                 const switches = document.querySelectorAll('.priv-purpose-container .sp-switch-arrow-block a.switch-bg.on');
                 for (const t of switches) {
-                    click([t]);
+                    t.click();
                 }
                 return click('.priv-save-btn');
             }

package/dist/addon-firefox/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Autoconsent",
-  "version": "2023.6.20",
+  "version": "2023.6.22",
   "background": {
     "scripts": [
       "background.bundle.js"

package/dist/addon-firefox/rules.json

@@ -4181,9 +4181,6 @@
         "#truyo-consent-module"
       ],
       "detectCmp": [
-        {
-          "wait": 1000
-        },
         {
           "exists": "#truyo-cookieBarContent"
         }
@@ -4267,6 +4264,80 @@
         }
       ]
     },
+    {
+      "name": "ubuntu.com",
+      "prehideSelectors": [
+        "dialog.cookie-policy"
+      ],
+      "detectCmp": [
+        {
+          "any": [
+            {
+              "exists": "dialog.cookie-policy header"
+            },
+            {
+              "exists": "xpath///*[@id=\"modal\"]/div/header"
+            }
+          ]
+        }
+      ],
+      "detectPopup": [
+        {
+          "any": [
+            {
+              "visible": "dialog header"
+            },
+            {
+              "visible": "xpath///*[@id=\"modal\"]/div/header"
+            }
+          ]
+        }
+      ],
+      "optIn": [
+        {
+          "any": [
+            {
+              "waitForThenClick": "#cookie-policy-button-accept"
+            },
+            {
+              "waitForThenClick": "xpath///*[@id=\"cookie-policy-button-accept\"]"
+            }
+          ]
+        }
+      ],
+      "optOut": [
+        {
+          "any": [
+            {
+              "waitForThenClick": "button.p-button"
+            },
+            {
+              "waitForThenClick": "xpath///*[@id=\"cookie-policy-content\"]/p[4]/button[2]"
+            }
+          ]
+        },
+        {
+          "waitForThenClick": ".p-switch__input:checked",
+          "optional": true,
+          "all": true
+        },
+        {
+          "any": [
+            {
+              "waitForThenClick": "div > button"
+            },
+            {
+              "waitForThenClick": "xpath///*[@id=\"modal\"]/div/button"
+            }
+          ]
+        }
+      ],
+      "test": [
+        {
+          "eval": "document.cookie === '_cookies_accepted=essential'"
+        }
+      ]
+    },
     {
       "name": "UK Cookie Consent",
       "prehideSelectors": [

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

@@ -108,14 +108,8 @@
             return false;
         });
     }
-    function click(selectorOrElements, all = false) {
-        let elem = [];
-        if (typeof selectorOrElements === 'string') {
-            elem = Array.from(document.querySelectorAll(selectorOrElements));
-        }
-        else {
-            elem = selectorOrElements;
-        }
+    function click(selector, all = false) {
+        const elem = elementSelector(selector);
         if (elem.length > 0) {
             if (all) {
                 elem.forEach((e) => e.click());
@@ -127,12 +121,12 @@
         return elem.length > 0;
     }
     function elementExists(selector) {
-        const exists = document.querySelector(selector) !== null;
+        const exists = elementSelector(selector).length > 0;
         // enableLogs && console.log("[exists?]", selector, exists);
         return exists;
     }
     function elementVisible(selector, check) {
-        const elem = document.querySelectorAll(selector);
+        const elem = elementSelector(selector);
         const results = new Array(elem.length);
         elem.forEach((e, i) => {
             // check for display: none
@@ -155,7 +149,7 @@
         const interval = 200;
         const times = Math.ceil((timeout) / interval);
         // enableLogs && console.log("[waitFor]", ruleStep.waitFor);
-        return waitFor(() => document.querySelector(selector) !== null, times, interval);
+        return waitFor(() => elementSelector(selector).length > 0, times, interval);
     }
     function waitForVisible(selector, timeout = 10000, check = 'any') {
         const interval = 200;
@@ -193,6 +187,50 @@
         }
         return !!existingElement;
     }
+    function querySingleReplySelector(selector, parent = document) {
+        if (selector.startsWith('aria/')) {
+            return [];
+        }
+        if (selector.startsWith('xpath/')) {
+            const xpath = selector.slice(6);
+            const result = document.evaluate(xpath, parent, null, XPathResult.ANY_TYPE, null);
+            let node = null;
+            const elements = [];
+            // eslint-disable-next-line no-cond-assign
+            while (node = result.iterateNext()) {
+                elements.push(node);
+            }
+            return elements;
+        }
+        if (selector.startsWith('text/')) {
+            return [];
+        }
+        if (selector.startsWith('pierce/')) {
+            return [];
+        }
+        if (parent.shadowRoot) {
+            return Array.from(parent.shadowRoot.querySelectorAll(selector));
+        }
+        return Array.from(parent.querySelectorAll(selector));
+    }
+    function querySelectorChain(selectors) {
+        let parent = document;
+        let matches;
+        for (const selector of selectors) {
+            matches = querySingleReplySelector(selector, parent);
+            if (matches.length === 0) {
+                return [];
+            }
+            parent = matches[0];
+        }
+        return matches;
+    }
+    function elementSelector(selector) {
+        if (typeof selector === 'string') {
+            return querySingleReplySelector(selector);
+        }
+        return querySelectorChain(selector);
+    }
 
     /* eslint-disable no-restricted-syntax,no-await-in-loop,no-underscore-dangle */
     const defaultRunContext = {
@@ -294,6 +332,14 @@
                 results.push(_runRulesSequentially(rule.else));
             }
         }
+        if (rule.any) {
+            for (const step of rule.any) {
+                if (await evaluateRuleStep(step)) {
+                    return true;
+                }
+            }
+            return false;
+        }
         if (results.length === 0) {
             return false;
         }
@@ -664,12 +710,12 @@
                 // toggles with 2 buttons
                 const toggles = document.querySelectorAll('.priv-purpose-container .sp-switch-arrow-block a.neutral.on .right');
                 for (const t of toggles) {
-                    click([t]);
+                    t.click();
                 }
                 // switch toggles
                 const switches = document.querySelectorAll('.priv-purpose-container .sp-switch-arrow-block a.switch-bg.on');
                 for (const t of switches) {
-                    click([t]);
+                    t.click();
                 }
                 return click('.priv-save-btn');
             }

package/dist/addon-mv3/devtools/loader.js

@@ -1,2 +1,65 @@
 /* global chrome */
-chrome.devtools.panels.create('Autoconsent', '/icons/cookie.png', "/devtools/panel.html")
+chrome.devtools.panels.create(
+  "Autoconsent",
+  "/icons/cookie.png",
+  "/devtools/panel.html"
+);
+
+if (chrome.devtools?.recorder) {
+  class MyPlugin {
+    stringify(recording) {
+      const autoconsentSteps = recording.steps
+        .filter((step) => ["click"].includes(step.type))
+        .map(({ selectors }) => this.convertStep(selectors));
+      return Promise.resolve(JSON.stringify(autoconsentSteps, undefined, 4));
+    }
+    stringifyStep(step) {
+      return Promise.resolve(
+        JSON.stringify(
+          this.convertStep(step.selectors),
+          undefined,
+          4
+        )
+      );
+    }
+    convertStep(selectors) {
+      return {
+        any: selectors.filter((s) => {
+          return this.isSupportedSelector(s)
+        }).map(s => {
+          if (s.length === 1) {
+            return {
+              waitForThenClick: s[0]
+            }
+          }
+          return {
+            waitForThenClick: s
+          }
+        })
+      }
+    }
+
+    /**
+     * 
+     * @param {string | string[]} selector 
+     * @returns 
+     */
+    isSupportedSelector(selector) {
+      const unsupportedPrefixes = ['aria/', 'pierce/', 'text/']
+      if (!Array.isArray(selector)) {
+        return !unsupportedPrefixes.some(p => selector.startsWith(p))
+      }
+      // Chained xpath selectors are not supported
+      if (selector.length > 1 && selector.some(s => s.startsWith('xpath/'))) {
+        return false
+      }
+      return selector.every(s => this.isSupportedSelector(s))
+    }
+  }
+
+  chrome.devtools.recorder.registerRecorderExtensionPlugin(
+    new MyPlugin(),
+    /*name=*/ "Autoconsent",
+    /*mediaType=*/ "application/json"
+  );
+}

package/dist/addon-mv3/manifest.json

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

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

@@ -83,6 +83,7 @@
         const cosmeticOnRadio = document.querySelector('input#cosmetic-on');
         const cosmeticOffRadio = document.querySelector('input#cosmetic-off');
         const retriesInput = document.querySelector('input#retries');
+        const ruleReloadButton = document.querySelector('#reload');
         // enable proceed button when necessary
         const [currentTab] = await chrome.tabs.query({ active: true, lastFocusedWindow: true });
         const tabId = currentTab.id;
@@ -167,6 +168,12 @@
         }
         cosmeticOnRadio.addEventListener('change', cosmeticChange);
         cosmeticOffRadio.addEventListener('change', cosmeticChange);
+        ruleReloadButton.addEventListener('click', async () => {
+            const res = await fetch("./rules.json");
+            storageSet({
+                rules: await res.json(),
+            });
+        });
     }
     init();
 

package/dist/addon-mv3/popup.html

@@ -13,6 +13,13 @@
       cursor: pointer;
       border-radius: 3px;
     }
+    #reload {
+      width: 100%;
+      height: 2em;
+      margin: 0.5em auto;
+      cursor: pointer;
+      border-radius: 2px;
+    }
   </style>
 </head>
 <body>
@@ -75,6 +82,7 @@
       <input type="number" id="retries" name="retries" value="20">
       <label for="retries">Detection attempts</label>
     </div>
+    <button id="reload">Reload rules</button>
   </fieldset>
   <script src="popup.bundle.js"></script>
 </body>

package/dist/addon-mv3/rules.json

@@ -4181,9 +4181,6 @@
         "#truyo-consent-module"
       ],
       "detectCmp": [
-        {
-          "wait": 1000
-        },
         {
           "exists": "#truyo-cookieBarContent"
         }
@@ -4267,6 +4264,80 @@
         }
       ]
     },
+    {
+      "name": "ubuntu.com",
+      "prehideSelectors": [
+        "dialog.cookie-policy"
+      ],
+      "detectCmp": [
+        {
+          "any": [
+            {
+              "exists": "dialog.cookie-policy header"
+            },
+            {
+              "exists": "xpath///*[@id=\"modal\"]/div/header"
+            }
+          ]
+        }
+      ],
+      "detectPopup": [
+        {
+          "any": [
+            {
+              "visible": "dialog header"
+            },
+            {
+              "visible": "xpath///*[@id=\"modal\"]/div/header"
+            }
+          ]
+        }
+      ],
+      "optIn": [
+        {
+          "any": [
+            {
+              "waitForThenClick": "#cookie-policy-button-accept"
+            },
+            {
+              "waitForThenClick": "xpath///*[@id=\"cookie-policy-button-accept\"]"
+            }
+          ]
+        }
+      ],
+      "optOut": [
+        {
+          "any": [
+            {
+              "waitForThenClick": "button.p-button"
+            },
+            {
+              "waitForThenClick": "xpath///*[@id=\"cookie-policy-content\"]/p[4]/button[2]"
+            }
+          ]
+        },
+        {
+          "waitForThenClick": ".p-switch__input:checked",
+          "optional": true,
+          "all": true
+        },
+        {
+          "any": [
+            {
+              "waitForThenClick": "div > button"
+            },
+            {
+              "waitForThenClick": "xpath///*[@id=\"modal\"]/div/button"
+            }
+          ]
+        }
+      ],
+      "test": [
+        {
+          "eval": "document.cookie === '_cookies_accepted=essential'"
+        }
+      ]
+    },
     {
       "name": "UK Cookie Consent",
       "prehideSelectors": [