@duckduckgo/autoconsent 6.4.0 → 6.4.1

package/lib/cmps/base.ts

@@ -63,7 +63,6 @@ export default class AutoConsentCMPBase implements AutoCMP {
     }
 
     const snippetSrc = getFunctionBody(snippet);
-    enableLogs && console.log('async eval:', snippetId, snippetSrc);
     return requestEval(snippetSrc).catch((e) => {
       enableLogs && console.error('error evaluating rule', snippetId, e);
       return false;

package/lib/cmps/sourcepoint-frame.ts

@@ -1,5 +1,5 @@
 import { enableLogs } from "../config";
-import { click, elementExists, wait, waitForElement } from "../rule-executors";
+import { click, elementExists, wait, waitForElement, waitForThenClick } from "../rule-executors";
 import { RunContext } from "../rules";
 import { waitFor } from "../utils";
 import AutoConsentCMPBase from "./base";
@@ -38,7 +38,7 @@ export default class SourcePoint extends AutoConsentCMPBase {
       this.ccpaPopup = true;
       return true;
     }
-    return (url.pathname === '/index.html' || url.pathname === '/privacy-manager/index.html')
+    return (url.pathname === '/index.html' || url.pathname === '/privacy-manager/index.html' || url.pathname === '/ccpa_pm/index.html')
         && (url.searchParams.has('message_id') || url.searchParams.has('requestUUID') || url.searchParams.has('consentUUID'));
   }
 
@@ -50,7 +50,7 @@ export default class SourcePoint extends AutoConsentCMPBase {
       return await waitForElement('.priv-save-btn', 2000);
     }
     // check for the paywall button, and bail if it exists to prevent broken opt out
-    await waitForElement(".sp_choice_type_11,.sp_choice_type_12,.sp_choice_type_13,.sp_choice_type_ACCEPT_ALL", 2000);
+    await waitForElement(".sp_choice_type_11,.sp_choice_type_12,.sp_choice_type_13,.sp_choice_type_ACCEPT_ALL,.sp_choice_type_SAVE_AND_EXIT", 2000);
     return !elementExists('.sp_choice_type_9');
   }
 
@@ -67,7 +67,7 @@ export default class SourcePoint extends AutoConsentCMPBase {
   }
 
   isManagerOpen() {
-    return location.pathname === "/privacy-manager/index.html";
+    return location.pathname === "/privacy-manager/index.html" || location.pathname === '/ccpa_pm/index.html';
   }
 
   async optOut() {
@@ -104,6 +104,10 @@ export default class SourcePoint extends AutoConsentCMPBase {
     }
 
     await waitForElement('.type-modal', 20000);
+
+    // check "Do Not Sell" (CCPA) toggle if it exists
+    waitForThenClick('.ccpa-stack .pm-switch[aria-checked=true] .slider', 500, true); // the UI is reversed: "unchecked" switch displays as an enabled toggle
+
     // reject all button is offered by some sites
     try {
       const rejectSelector1 = '.sp_choice_type_REJECT_ALL';
@@ -127,7 +131,7 @@ export default class SourcePoint extends AutoConsentCMPBase {
     } catch (e) {
       enableLogs && console.warn(e);
     }
-    // TODO: race condition: the popup disappears very quickly, so the background script may not receive a success report.
+    // TODO: race condition: if the reject button was clicked, the popup disappears very quickly, so the background script may not receive a success report.
     return click('.sp_choice_type_SAVE_AND_EXIT');
   }
 }

package/lib/config.ts

@@ -1 +1,2 @@
+// TODO: make this configurable through DevTools (and possibly toggleable per rule step type)
 export const enableLogs = false; // change this to enable debug logs

package/lib/rule-executors.ts

@@ -43,7 +43,7 @@ export function elementVisible(selector: ElementSelector, check: VisibilityCheck
 export function waitForElement(selector: ElementSelector, timeout = 10000): Promise<boolean> {
   const interval = 200;
   const times = Math.ceil((timeout) / interval);
-  // enableLogs && console.log("[waitFor]", ruleStep.waitFor);
+  enableLogs && console.log("[waitForElement]", selector);
   return waitFor(
     () => elementSelector(selector).length > 0,
     times,

package/lib/web.ts

@@ -110,7 +110,6 @@ export default class AutoConsent {
     declarativeRules.autoconsent.forEach((ruleset) => {
       this.addDeclarativeCMP(ruleset);
     });
-    enableLogs && console.log("added rules", this.rules);
   }
 
   addDeclarativeCMP(ruleset: AutoConsentCMPRule) {
@@ -397,7 +396,7 @@ export default class AutoConsent {
   }
 
   async receiveMessageCallback(message: BackgroundMessage) {
-    if (enableLogs && ['evalResp', 'report'].includes(message.type) /* evals are noisy */) {
+    if (enableLogs && !['evalResp', 'report'].includes(message.type) /* evals are noisy */) {
       console.log('received from background', message, window.location.href);
     }
     switch (message.type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",
@@ -33,10 +33,10 @@
     "@playwright/test": "^1.17.1",
     "@puppeteer/replay": "^2.11.0",
     "@types/chai": "^4.3.1",
-    "@types/chrome": "^0.0.251",
+    "@types/chrome": "^0.0.253",
     "@types/mocha": "^10.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.42.1",
-    "@typescript-eslint/parser": "^5.42.1",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
     "auto": "^11.0.1",
     "bulma": "^0.9.4",
     "chai": "^4.2.0",

package/tests/sourcepoint.spec.ts

@@ -3,6 +3,7 @@ import generateCMPTests from "../playwright/runner";
 generateCMPTests('Sourcepoint-frame', [
   'https://www.theguardian.com/',
   'https://news.sky.com/',
+  'https://www.economist.com/',
 ]);
 
 generateCMPTests('Sourcepoint-frame', [