@duckduckgo/autoconsent 4.4.0 → 5.0.1

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

@@ -1,148 +1,142 @@
-(function () {
-    'use strict';
-
-    const manifestVersion = chrome.runtime.getManifest().manifest_version;
-    // Storage abstraction: MV2 keeps everything in memory, MV3 uses chrome.storage
-    const storage = {};
-    async function storageSet(obj) {
-        if (manifestVersion === 2) {
-            Object.assign(storage, obj);
-            return;
-        }
-        return chrome.storage.local.set(obj);
-    }
-    async function storageGet(key) {
-        if (key === null) {
-            if (manifestVersion === 2) {
-                return storage;
-            }
-            return await chrome.storage.local.get(null);
-        }
-        if (manifestVersion === 2) {
-            return storage[key];
-        }
-        return (await chrome.storage.local.get(key))?.[key];
+(() => {
+  // addon/mv-compat.ts
+  var manifestVersion = chrome.runtime.getManifest().manifest_version;
+  var storage = {};
+  async function storageSet(obj) {
+    if (manifestVersion === 2) {
+      Object.assign(storage, obj);
+      return;
     }
-
-    let backgroundPageConnection;
-    function sendBackgroundMessage(msg) {
-        backgroundPageConnection.postMessage(msg);
+    return chrome.storage.local.set(obj);
+  }
+  async function storageGet(key) {
+    if (key === null) {
+      if (manifestVersion === 2) {
+        return storage;
+      }
+      return await chrome.storage.local.get(null);
     }
-    function getRowForInstance(instanceId) {
-        const rowId = `instance-${instanceId}`;
-        if (document.getElementById(rowId) !== null) {
-            // update existing row
-            const td = document.getElementById(rowId).querySelectorAll("td");
-            return td;
-        }
-        else {
-            const template = document.querySelector("#row");
-            const table = document.querySelector("tbody");
-            const clone = template.content.cloneNode(true);
-            const td = clone.querySelectorAll("td");
-            table.appendChild(clone);
-            table.lastElementChild.id = rowId;
-            return td;
-        }
+    if (manifestVersion === 2) {
+      return storage[key];
     }
-    function reconnect() {
-        backgroundPageConnection = chrome.runtime.connect({
-            name: "devtools-panel",
-        });
-        sendBackgroundMessage({
-            type: "init",
-            tabId: chrome.devtools.inspectedWindow.tabId,
-        });
-        backgroundPageConnection.onMessage.addListener(function (message) {
-            if (message.type === "report") {
-                const td = getRowForInstance(message.instanceId);
-                td[0].innerText = `${message.frameId}`;
-                td[1].innerText = message.url;
-                td[2].innerText = message.state.lifecycle;
-                td[3].innerText = message.state.prehideOn ? "yes" : "no";
-                td[4].innerText = `${message.state.findCmpAttempts}`;
-                td[5].innerText = message.state.detectedCmps.join(", ");
-                td[6].innerText = message.state.detectedPopups.join(", ");
-            }
-            else if (message.type === "instanceTerminated") {
-                document
-                    .getElementById(`instance-${message.instanceId}`)
-                    ?.classList.add("dead");
-            }
-        });
-        backgroundPageConnection.onDisconnect.addListener(() => {
-            reconnect();
-        });
-        return backgroundPageConnection;
+    return (await chrome.storage.local.get(key))?.[key];
+  }
+
+  // addon/devtools/panel.ts
+  var backgroundPageConnection;
+  function sendBackgroundMessage(msg) {
+    backgroundPageConnection.postMessage(msg);
+  }
+  function getRowForInstance(instanceId) {
+    const rowId = `instance-${instanceId}`;
+    if (document.getElementById(rowId) !== null) {
+      const td = document.getElementById(rowId).querySelectorAll("td");
+      return td;
+    } else {
+      const template = document.querySelector("#row");
+      const table = document.querySelector("tbody");
+      const clone = template.content.cloneNode(true);
+      const td = clone.querySelectorAll("td");
+      table.appendChild(clone);
+      table.lastElementChild.id = rowId;
+      return td;
     }
-    const clearStorageCheckbox = document.querySelector("#clear-storage");
-    const clearPanel = () => {
-        const tbody = document.querySelector("tbody");
-        while (tbody.firstChild) {
-            tbody.removeChild(tbody.firstChild);
-        }
-    };
-    document.getElementById("clear").addEventListener("click", clearPanel);
-    document.getElementById("reload").addEventListener("click", async () => {
-        if (clearStorageCheckbox.checked) {
-            const tab = await chrome.tabs.get(chrome.devtools.inspectedWindow.tabId);
-            const url = new URL(tab.url);
-            await chrome.browsingData.remove({
-                origins: [url.origin],
-            }, {
-                cookies: true,
-                localStorage: true,
-                indexedDB: true,
-            });
-        }
-        clearPanel();
-        chrome.devtools.inspectedWindow.reload({});
+  }
+  function reconnect() {
+    backgroundPageConnection = chrome.runtime.connect({
+      name: "devtools-panel"
     });
-    document.getElementById("mode").addEventListener("change", async () => {
-        const storedConfig = await storageGet("config");
-        let autoAction = document
-            .querySelector("#mode > option:checked")
-            .getAttribute("data-autoaction");
-        if (autoAction === "null") {
-            autoAction = null;
-        }
-        storedConfig.autoAction = autoAction;
-        storageSet({
-            config: storedConfig,
-        });
+    sendBackgroundMessage({
+      type: "init",
+      tabId: chrome.devtools.inspectedWindow.tabId
     });
-    document.getElementById("optin").addEventListener("click", () => {
-        chrome.tabs.sendMessage(chrome.devtools.inspectedWindow.tabId, {
-            type: "optIn",
-        });
+    backgroundPageConnection.onMessage.addListener(function(message) {
+      if (message.type === "report") {
+        const td = getRowForInstance(message.instanceId);
+        td[0].innerText = `${message.frameId}`;
+        td[1].innerText = message.url;
+        td[2].innerText = message.state.lifecycle;
+        td[3].innerText = message.state.prehideOn ? "yes" : "no";
+        td[4].innerText = `${message.state.findCmpAttempts}`;
+        td[5].innerText = message.state.detectedCmps.join(", ");
+        td[6].innerText = message.state.detectedPopups.join(", ");
+      } else if (message.type === "instanceTerminated") {
+        document.getElementById(`instance-${message.instanceId}`)?.classList.add("dead");
+      }
     });
-    document.getElementById("optout").addEventListener("click", () => {
-        chrome.tabs.sendMessage(chrome.devtools.inspectedWindow.tabId, {
-            type: "optOut",
-        });
+    backgroundPageConnection.onDisconnect.addListener(() => {
+      reconnect();
     });
-    function onConfigUpdated(config) {
-        const modeOptions = document.querySelectorAll("#mode > option");
-        switch (config.autoAction) {
-            case "optIn":
-                modeOptions[1].selected = true;
-                break;
-            case "optOut":
-                modeOptions[2].selected = true;
-                break;
-            default:
-                modeOptions[0].selected = true;
-        }
+    return backgroundPageConnection;
+  }
+  var clearStorageCheckbox = document.querySelector("#clear-storage");
+  var clearPanel = () => {
+    const tbody = document.querySelector("tbody");
+    while (tbody.firstChild) {
+      tbody.removeChild(tbody.firstChild);
     }
-    chrome.storage.local.onChanged.addListener((changes) => {
-        if (changes.config) {
-            onConfigUpdated(changes.config.newValue);
+  };
+  document.getElementById("clear").addEventListener("click", clearPanel);
+  document.getElementById("reload").addEventListener("click", async () => {
+    if (clearStorageCheckbox.checked) {
+      const tab = await chrome.tabs.get(chrome.devtools.inspectedWindow.tabId);
+      const url = new URL(tab.url);
+      await chrome.browsingData.remove(
+        {
+          origins: [url.origin]
+        },
+        {
+          cookies: true,
+          localStorage: true,
+          indexedDB: true
         }
+      );
+    }
+    clearPanel();
+    chrome.devtools.inspectedWindow.reload({});
+  });
+  document.getElementById("mode").addEventListener("change", async () => {
+    const storedConfig = await storageGet("config");
+    let autoAction = document.querySelector("#mode > option:checked").getAttribute("data-autoaction");
+    if (autoAction === "null") {
+      autoAction = null;
+    }
+    storedConfig.autoAction = autoAction;
+    storageSet({
+      config: storedConfig
     });
-    (async () => {
-        const config = await storageGet("config");
-        onConfigUpdated(config);
-    })();
-    reconnect();
-
+  });
+  document.getElementById("optin").addEventListener("click", () => {
+    chrome.tabs.sendMessage(chrome.devtools.inspectedWindow.tabId, {
+      type: "optIn"
+    });
+  });
+  document.getElementById("optout").addEventListener("click", () => {
+    chrome.tabs.sendMessage(chrome.devtools.inspectedWindow.tabId, {
+      type: "optOut"
+    });
+  });
+  function onConfigUpdated(config) {
+    const modeOptions = document.querySelectorAll("#mode > option");
+    switch (config.autoAction) {
+      case "optIn":
+        modeOptions[1].selected = true;
+        break;
+      case "optOut":
+        modeOptions[2].selected = true;
+        break;
+      default:
+        modeOptions[0].selected = true;
+    }
+  }
+  chrome.storage.local.onChanged.addListener((changes) => {
+    if (changes.config) {
+      onConfigUpdated(changes.config.newValue);
+    }
+  });
+  (async () => {
+    const config = await storageGet("config");
+    onConfigUpdated(config);
+  })();
+  reconnect();
 })();

package/dist/addon-mv3/manifest.json

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

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

@@ -1,180 +1,169 @@
-(function () {
-    'use strict';
-
-    const manifestVersion = chrome.runtime.getManifest().manifest_version;
-    // Storage abstraction: MV2 keeps everything in memory, MV3 uses chrome.storage
-    const storage = {};
-    async function storageSet(obj) {
-        if (manifestVersion === 2) {
-            Object.assign(storage, obj);
-            return;
-        }
-        return chrome.storage.local.set(obj);
+(() => {
+  // addon/mv-compat.ts
+  var manifestVersion = chrome.runtime.getManifest().manifest_version;
+  var storage = {};
+  async function storageSet(obj) {
+    if (manifestVersion === 2) {
+      Object.assign(storage, obj);
+      return;
+    }
+    return chrome.storage.local.set(obj);
+  }
+  async function storageGet(key) {
+    if (key === null) {
+      if (manifestVersion === 2) {
+        return storage;
+      }
+      return await chrome.storage.local.get(null);
     }
-    async function storageGet(key) {
-        if (key === null) {
-            if (manifestVersion === 2) {
-                return storage;
-            }
-            return await chrome.storage.local.get(null);
-        }
-        if (manifestVersion === 2) {
-            return storage[key];
-        }
-        return (await chrome.storage.local.get(key))?.[key];
+    if (manifestVersion === 2) {
+      return storage[key];
     }
-    async function storageRemove(key) {
-        if (manifestVersion === 2) {
-            delete storage[key];
-            return;
-        }
-        return chrome.storage.local.remove(key);
+    return (await chrome.storage.local.get(key))?.[key];
+  }
+  async function storageRemove(key) {
+    if (manifestVersion === 2) {
+      delete storage[key];
+      return;
     }
+    return chrome.storage.local.remove(key);
+  }
 
-    async function showOptOutStatus(tabId, status, cmp = '') {
-        let title = "";
-        let icon = "icons/cookie-idle.png";
-        if (status === "success") {
-            title = `Opt out successful! (${cmp})`;
-            icon = "icons/party.png";
-        }
-        else if (status === "complete") {
-            title = `Opt out complete! (${cmp})`;
-            icon = "icons/tick.png";
-        }
-        else if (status === "working") {
-            title = `Processing... (${cmp})`;
-            icon = "icons/cog.png";
-        }
-        else if (status === "verified") {
-            title = `Verified (${cmp})`;
-            icon = "icons/verified.png";
-        }
-        else if (status === "idle") {
-            title = "Idle";
-            icon = "icons/cookie-idle.png";
-        }
-        else if (status === "available") {
-            title = `Click to opt out (${cmp})`;
-            icon = "icons/cookie.png";
-        }
-        const action = chrome.action || chrome.pageAction;
-        if (chrome.pageAction) {
-            chrome.pageAction.show(tabId);
-        }
-        await action.setTitle({
-            tabId,
-            title,
-        });
-        await action.setIcon({
-            tabId,
-            path: icon,
-        });
+  // lib/config.ts
+  var enableLogs = false;
+
+  // addon/utils.ts
+  async function showOptOutStatus(tabId, status, cmp = "") {
+    let title = "";
+    let icon = "icons/cookie-idle.png";
+    if (status === "success") {
+      title = `Opt out successful! (${cmp})`;
+      icon = "icons/party.png";
+    } else if (status === "complete") {
+      title = `Opt out complete! (${cmp})`;
+      icon = "icons/tick.png";
+    } else if (status === "working") {
+      title = `Processing... (${cmp})`;
+      icon = "icons/cog.png";
+    } else if (status === "verified") {
+      title = `Verified (${cmp})`;
+      icon = "icons/verified.png";
+    } else if (status === "idle") {
+      title = "Idle";
+      icon = "icons/cookie-idle.png";
+    } else if (status === "available") {
+      title = `Click to opt out (${cmp})`;
+      icon = "icons/cookie.png";
+    }
+    enableLogs && console.log("Setting action state to", status);
+    const action = chrome.action || chrome.pageAction;
+    if (chrome.pageAction) {
+      chrome.pageAction.show(tabId);
     }
+    await action.setTitle({
+      tabId,
+      title
+    });
+    await action.setIcon({
+      tabId,
+      path: icon
+    });
+  }
 
-    async function init() {
-        const autoconsentConfig = await storageGet('config');
-        const enabledCheckbox = document.querySelector('input#enabled');
-        const optOutRadio = document.querySelector('input#optout');
-        const optInRadio = document.querySelector('input#optin');
-        const promptRadio = document.querySelector('input#prompt');
-        const prehideOnRadio = document.querySelector('input#prehide-on');
-        const prehideOffRadio = document.querySelector('input#prehide-off');
-        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;
-        const detectedKey = `detected${tabId}`;
-        console.log('detectedKey', detectedKey);
-        const frameId = await storageGet(detectedKey);
-        console.log('frameId', frameId, typeof frameId);
-        if (typeof frameId === 'number') {
-            const proceedButton = document.createElement('button');
-            proceedButton.innerText = 'Manage popup';
-            proceedButton.id = 'proceed';
-            proceedButton.addEventListener('click', () => {
-                storageRemove(detectedKey);
-                showOptOutStatus(tabId, "working");
-                chrome.tabs.sendMessage(tabId, {
-                    type: "optOut",
-                }, {
-                    frameId,
-                });
-                proceedButton.remove();
-                window.close();
-            });
-            document.body.prepend(proceedButton);
-        }
-        // set form initial values
-        enabledCheckbox.checked = autoconsentConfig.enabled;
-        retriesInput.value = autoconsentConfig.detectRetries.toString();
-        if (autoconsentConfig.autoAction === 'optIn') {
-            optInRadio.checked = true;
-        }
-        else if (autoconsentConfig.autoAction === 'optOut') {
-            optOutRadio.checked = true;
-        }
-        else {
-            promptRadio.checked = true;
-        }
-        if (autoconsentConfig.enablePrehide) {
-            prehideOnRadio.checked = true;
-        }
-        else {
-            prehideOffRadio.checked = true;
-        }
-        if (autoconsentConfig.enableCosmeticRules) {
-            cosmeticOnRadio.checked = true;
-        }
-        else {
-            cosmeticOffRadio.checked = true;
-        }
-        // set form event listeners
-        enabledCheckbox.addEventListener('change', () => {
-            autoconsentConfig.enabled = enabledCheckbox.checked;
-            storageSet({ config: autoconsentConfig });
-        });
-        retriesInput.addEventListener('change', () => {
-            autoconsentConfig.detectRetries = parseInt(retriesInput.value, 10);
-            storageSet({ config: autoconsentConfig });
-        });
-        function modeChange() {
-            if (optInRadio.checked) {
-                autoconsentConfig.autoAction = 'optIn';
-            }
-            else if (optOutRadio.checked) {
-                autoconsentConfig.autoAction = 'optOut';
-            }
-            else {
-                autoconsentConfig.autoAction = null;
-            }
-            storageSet({ config: autoconsentConfig });
-        }
-        optInRadio.addEventListener('change', modeChange);
-        optOutRadio.addEventListener('change', modeChange);
-        promptRadio.addEventListener('change', modeChange);
-        function prehideChange() {
-            autoconsentConfig.enablePrehide = prehideOnRadio.checked;
-            storageSet({ config: autoconsentConfig });
-        }
-        prehideOnRadio.addEventListener('change', prehideChange);
-        prehideOffRadio.addEventListener('change', prehideChange);
-        function cosmeticChange() {
-            autoconsentConfig.enableCosmeticRules = cosmeticOnRadio.checked;
-            storageSet({ config: autoconsentConfig });
-        }
-        cosmeticOnRadio.addEventListener('change', cosmeticChange);
-        cosmeticOffRadio.addEventListener('change', cosmeticChange);
-        ruleReloadButton.addEventListener('click', async () => {
-            const res = await fetch("./rules.json");
-            storageSet({
-                rules: await res.json(),
-            });
+  // addon/popup.ts
+  async function init() {
+    const autoconsentConfig = await storageGet("config");
+    const enabledCheckbox = document.querySelector("input#enabled");
+    const optOutRadio = document.querySelector("input#optout");
+    const optInRadio = document.querySelector("input#optin");
+    const promptRadio = document.querySelector("input#prompt");
+    const prehideOnRadio = document.querySelector("input#prehide-on");
+    const prehideOffRadio = document.querySelector("input#prehide-off");
+    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");
+    const [currentTab] = await chrome.tabs.query({ active: true, lastFocusedWindow: true });
+    const tabId = currentTab.id;
+    const detectedKey = `detected${tabId}`;
+    console.log("detectedKey", detectedKey);
+    const frameId = await storageGet(detectedKey);
+    console.log("frameId", frameId, typeof frameId);
+    if (typeof frameId === "number") {
+      const proceedButton = document.createElement("button");
+      proceedButton.innerText = "Manage popup";
+      proceedButton.id = "proceed";
+      proceedButton.addEventListener("click", () => {
+        storageRemove(detectedKey);
+        showOptOutStatus(tabId, "working");
+        chrome.tabs.sendMessage(tabId, {
+          type: "optOut"
+        }, {
+          frameId
         });
+        proceedButton.remove();
+        window.close();
+      });
+      document.body.prepend(proceedButton);
     }
-    init();
-
+    enabledCheckbox.checked = autoconsentConfig.enabled;
+    retriesInput.value = autoconsentConfig.detectRetries.toString();
+    if (autoconsentConfig.autoAction === "optIn") {
+      optInRadio.checked = true;
+    } else if (autoconsentConfig.autoAction === "optOut") {
+      optOutRadio.checked = true;
+    } else {
+      promptRadio.checked = true;
+    }
+    if (autoconsentConfig.enablePrehide) {
+      prehideOnRadio.checked = true;
+    } else {
+      prehideOffRadio.checked = true;
+    }
+    if (autoconsentConfig.enableCosmeticRules) {
+      cosmeticOnRadio.checked = true;
+    } else {
+      cosmeticOffRadio.checked = true;
+    }
+    enabledCheckbox.addEventListener("change", () => {
+      autoconsentConfig.enabled = enabledCheckbox.checked;
+      storageSet({ config: autoconsentConfig });
+    });
+    retriesInput.addEventListener("change", () => {
+      autoconsentConfig.detectRetries = parseInt(retriesInput.value, 10);
+      storageSet({ config: autoconsentConfig });
+    });
+    function modeChange() {
+      if (optInRadio.checked) {
+        autoconsentConfig.autoAction = "optIn";
+      } else if (optOutRadio.checked) {
+        autoconsentConfig.autoAction = "optOut";
+      } else {
+        autoconsentConfig.autoAction = null;
+      }
+      storageSet({ config: autoconsentConfig });
+    }
+    optInRadio.addEventListener("change", modeChange);
+    optOutRadio.addEventListener("change", modeChange);
+    promptRadio.addEventListener("change", modeChange);
+    function prehideChange() {
+      autoconsentConfig.enablePrehide = prehideOnRadio.checked;
+      storageSet({ config: autoconsentConfig });
+    }
+    prehideOnRadio.addEventListener("change", prehideChange);
+    prehideOffRadio.addEventListener("change", prehideChange);
+    function cosmeticChange() {
+      autoconsentConfig.enableCosmeticRules = cosmeticOnRadio.checked;
+      storageSet({ config: autoconsentConfig });
+    }
+    cosmeticOnRadio.addEventListener("change", cosmeticChange);
+    cosmeticOffRadio.addEventListener("change", cosmeticChange);
+    ruleReloadButton.addEventListener("click", async () => {
+      const res = await fetch("./rules.json");
+      storageSet({
+        rules: await res.json()
+      });
+    });
+  }
+  init();
 })();