@duckduckgo/autoconsent 8.1.0 → 9.0.0

package/dist/addon-mv3/manifest.json

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

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

@@ -29,8 +29,34 @@
     return chrome.storage.local.remove(key);
   }
 
-  // lib/config.ts
-  var enableLogs = false;
+  // lib/utils.ts
+  function normalizeConfig(providedConfig) {
+    const defaultConfig = {
+      enabled: true,
+      autoAction: "optOut",
+      // if falsy, the extension will wait for an explicit user signal before opting in/out
+      disabledCmps: [],
+      enablePrehide: true,
+      enableCosmeticRules: true,
+      detectRetries: 20,
+      isMainWorld: false,
+      prehideTimeout: 2e3,
+      logs: {
+        lifecycle: false,
+        rulesteps: false,
+        evals: false,
+        errors: true,
+        messages: false
+      }
+    };
+    const updatedConfig = structuredClone(defaultConfig);
+    for (const key of Object.keys(defaultConfig)) {
+      if (typeof providedConfig[key] !== "undefined") {
+        updatedConfig[key] = providedConfig[key];
+      }
+    }
+    return updatedConfig;
+  }
 
   // addon/utils.ts
   async function showOptOutStatus(tabId, status, cmp = "") {
@@ -55,7 +81,7 @@
       title = `Click to opt out (${cmp})`;
       icon = "icons/cookie.png";
     }
-    enableLogs && console.log("Setting action state to", status);
+    console.log("Setting action state to", status);
     const action = chrome.action || chrome.pageAction;
     if (chrome.pageAction) {
       chrome.pageAction.show(tabId);
@@ -70,36 +96,13 @@
     });
   }
   async function initConfig() {
-    const storedConfig = await storageGet("config");
-    enableLogs && console.log("storedConfig", storedConfig);
-    const defaultConfig = {
-      enabled: true,
-      autoAction: "optOut",
-      // if falsy, the extension will wait for an explicit user signal before opting in/out
-      disabledCmps: [],
-      enablePrehide: true,
-      enableCosmeticRules: true,
-      detectRetries: 20,
-      isMainWorld: false,
-      prehideTimeout: 2e3
-    };
-    if (!storedConfig) {
-      enableLogs && console.log("new config", defaultConfig);
-      await storageSet({
-        config: defaultConfig
-      });
-    } else {
-      const updatedConfig = structuredClone(defaultConfig);
-      for (const key of Object.keys(defaultConfig)) {
-        if (typeof storedConfig[key] !== "undefined") {
-          updatedConfig[key] = storedConfig[key];
-        }
-      }
-      enableLogs && console.log("updated config", updatedConfig);
-      await storageSet({
-        config: updatedConfig
-      });
-    }
+    const storedConfig = await storageGet("config") || {};
+    console.log("storedConfig", storedConfig);
+    const updatedConfig = normalizeConfig(storedConfig);
+    console.log("updated config", updatedConfig);
+    await storageSet({
+      config: updatedConfig
+    });
   }
 
   // addon/popup.ts
@@ -114,6 +117,11 @@
     const cosmeticOnRadio = document.querySelector("input#cosmetic-on");
     const cosmeticOffRadio = document.querySelector("input#cosmetic-off");
     const retriesInput = document.querySelector("input#retries");
+    const logsLifecycleCheckbox = document.querySelector("input#logs-lifecycle");
+    const logsRulestepsCheckbox = document.querySelector("input#logs-rulesteps");
+    const logsEvalsCheckbox = document.querySelector("input#logs-evals");
+    const logsErrorsCheckbox = document.querySelector("input#logs-errors");
+    const logsMessagesCheckbox = document.querySelector("input#logs-messages");
     const ruleReloadButton = document.querySelector("#reload");
     const resetButton = document.querySelector("#reset");
     const [currentTab] = await chrome.tabs.query({ active: true, lastFocusedWindow: true });
@@ -140,6 +148,11 @@
       document.body.prepend(proceedButton);
     }
     enabledCheckbox.checked = autoconsentConfig.enabled;
+    logsLifecycleCheckbox.checked = autoconsentConfig.logs.lifecycle;
+    logsRulestepsCheckbox.checked = autoconsentConfig.logs.rulesteps;
+    logsEvalsCheckbox.checked = autoconsentConfig.logs.evals;
+    logsErrorsCheckbox.checked = autoconsentConfig.logs.errors;
+    logsMessagesCheckbox.checked = autoconsentConfig.logs.messages;
     retriesInput.value = autoconsentConfig.detectRetries.toString();
     if (autoconsentConfig.autoAction === "optIn") {
       optInRadio.checked = true;
@@ -191,6 +204,31 @@
     }
     cosmeticOnRadio.addEventListener("change", cosmeticChange);
     cosmeticOffRadio.addEventListener("change", cosmeticChange);
+    function updateLogsConfig() {
+      autoconsentConfig.logs = {
+        lifecycle: logsLifecycleCheckbox.checked,
+        rulesteps: logsRulestepsCheckbox.checked,
+        evals: logsEvalsCheckbox.checked,
+        errors: logsErrorsCheckbox.checked,
+        messages: logsMessagesCheckbox.checked
+      };
+      storageSet({ config: autoconsentConfig });
+    }
+    logsLifecycleCheckbox.addEventListener("change", () => {
+      updateLogsConfig();
+    });
+    logsRulestepsCheckbox.addEventListener("change", () => {
+      updateLogsConfig();
+    });
+    logsEvalsCheckbox.addEventListener("change", () => {
+      updateLogsConfig();
+    });
+    logsErrorsCheckbox.addEventListener("change", () => {
+      updateLogsConfig();
+    });
+    logsMessagesCheckbox.addEventListener("change", () => {
+      updateLogsConfig();
+    });
     ruleReloadButton.addEventListener("click", async () => {
       const res = await fetch("./rules.json");
       storageSet({

package/dist/addon-mv3/popup.html

@@ -29,6 +29,7 @@
       <label for="enabled">Enable autoconsent</label>
     </div>
   </fieldset>
+
   <fieldset>
     <legend>Select autoconsent mode:</legend>
 
@@ -48,6 +49,7 @@
       <label for="prompt">Prompt every time</label>
     </div>
   </fieldset>
+
   <fieldset>
     <legend>Hide popups during operation</legend>
 
@@ -62,6 +64,7 @@
       <label for="prehide-off">Off</label>
     </div>
   </fieldset>
+
   <fieldset>
     <legend>Apply cosmetic rules</legend>
 
@@ -76,6 +79,31 @@
       <label for="cosmetic-off">Off</label>
     </div>
   </fieldset>
+
+  <fieldset>
+    <legend>Debug logging</legend>
+    <div>
+      <input type="checkbox" id="logs-lifecycle" name="logs-lifecycle" checked>
+      <label for="logs-lifecycle">Lifecycle</label>
+    </div>
+    <div>
+      <input type="checkbox" id="logs-rulesteps" name="logs-rulesteps" checked>
+      <label for="logs-rulesteps">Rule steps</label>
+    </div>
+    <div>
+      <input type="checkbox" id="logs-evals" name="logs-evals" checked>
+      <label for="logs-evals">Evals</label>
+    </div>
+    <div>
+      <input type="checkbox" id="logs-errors" name="logs-errors" checked>
+      <label for="logs-errors">Errors</label>
+    </div>
+    <div>
+      <input type="checkbox" id="logs-messages" name="logs-messages" checked>
+      <label for="logs-messages">Internal messages</label>
+    </div>
+  </fieldset>
+
   <fieldset>
     <legend>Other</legend>
     <div>