@duckduckgo/autoconsent 16.46.0 → 16.47.0

package/lib/encoding.ts

@@ -13,14 +13,7 @@ export type CompactRuleStep = {
 
 export type CompactCMPRuleStep = AutoConsentRuleStep & Partial<CompactRuleStep>;
 type CompactableRuleStepKey =
-    | 'exists'
-    | 'visible'
-    | 'waitForThenClick'
-    | 'click'
-    | 'waitFor'
-    | 'waitForVisible'
-    | 'hide'
-    | 'cookieContains';
+    'exists' | 'visible' | 'waitForThenClick' | 'click' | 'waitFor' | 'waitForVisible' | 'hide' | 'cookieContains';
 type CompactNullableBoolean = 0 | 1 | 2;
 
 export type CompactCMPRule = [

package/lib/messages.ts

@@ -2,12 +2,7 @@ import { snippets } from './eval-snippets';
 import { Config, ConsentState, RuleBundle } from './types';
 
 export type BackgroundMessage =
-    | InitResponseMessage
-    | EvalResponseMessage
-    | OptOutMessage
-    | OptInMessage
-    | SelfTestMessage
-    | MeasurePerformanceMessage;
+    InitResponseMessage | EvalResponseMessage | OptOutMessage | OptInMessage | SelfTestMessage | MeasurePerformanceMessage;
 
 export type ContentScriptMessage =
     | InitMessage

package/lib/web.ts

@@ -274,10 +274,9 @@ export default class AutoConsent {
             }
         });
         // heuristic CMP is only run in the top frame and only if heuristic action is enabled and retries is odd
+        const heuristicEnabled = isTop && this.config.heuristicMode !== 'off';
         const heuristicRules =
-            isTop && this.config.heuristicMode !== 'off' && this.state.findCmpAttempts % 2 === 0
-                ? [new AutoConsentHeuristicCMP(this, this.config.heuristicMode)]
-                : [];
+            heuristicEnabled && this.state.findCmpAttempts % 2 === 0 ? [new AutoConsentHeuristicCMP(this, this.config.heuristicMode)] : [];
 
         const rulesPriorityStages: [string, AutoCMP[]][] = [
             ['site-specific', siteSpecificRules],
@@ -330,7 +329,9 @@ export default class AutoConsent {
             // We wait 500ms, and also for some kind of dom mutation to happen before
             // rerunning the findCmp check
             const waitFor: Promise<boolean>[] = [this.domActions.wait(500)];
-            if (this.state.findCmpAttempts > 1) {
+            // a skipped heuristic has not seen the current DOM yet, so the next attempt must not wait for another mutation
+            const heuristicSkipped = heuristicEnabled && heuristicRules.length === 0;
+            if (this.state.findCmpAttempts > 1 && !heuristicSkipped) {
                 waitFor.push(mutationObserver);
             }
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "16.46.0",
+  "version": "16.47.0",
   "description": "",
   "types": "./dist/types/web.d.ts",
   "exports": {
@@ -42,7 +42,7 @@
   "author": "Sam Macbeth",
   "license": "MPL-2.0",
   "devDependencies": {
-    "@duckduckgo/eslint-config": "github:duckduckgo/eslint-config#v0.3.0",
+    "@duckduckgo/eslint-config": "github:duckduckgo/eslint-config#v0.3.1",
     "@esm-bundle/chai": "^4.3.4-fix.0",
     "@octokit/rest": "^22.0.1",
     "@playwright/test": "^1.63.0",
@@ -65,13 +65,13 @@
     "jsonc-parser": "^3.3.1",
     "markdown-it": "^15.0.2",
     "mocha": "^12.0.3",
-    "prettier": "3.8.3",
+    "prettier": "3.9.9",
     "randexp": "^0.5.3",
     "sinon": "^22.0.0",
     "ts-json-schema-generator": "^2.3.0",
     "ts-node": "^10.9.2",
     "tslib": "^2.4.0",
-    "typescript": "^5.1.6",
+    "typescript": "^6.0.3",
     "typescript-eslint": "^8.12.2",
     "web-ext": "^10.0.0"
   },
@@ -182,10 +182,10 @@
         "color": "#ededed"
       },
       {
-        "name": "code-update-needed",
+        "name": "needs-code-update",
         "description": "Changes the autoconsent library code, so consuming browsers need a version update",
         "releaseType": "none",
-        "color": "#fbca04"
+        "color": "#0b591c"
       }
     ],
     "plugins": [

package/rules/autoconsent/controlgame.json

@@ -0,0 +1,12 @@
+{
+    "name": "controlgame",
+    "vendorUrl": "https://controlgame.com/",
+    "runContext": {
+        "urlPattern": "^https?://(www\\.)?controlgame\\.com/"
+    },
+    "detectCmp": [{ "exists": "[data-consent-button][data-value=accept_partial]" }],
+    "detectPopup": [{ "visible": "[data-consent-button][data-value=accept_partial]" }],
+    "optIn": [{ "waitForThenClick": "[data-consent-button][data-value=accept_all]", "retry": 10, "retryInterval": 500 }],
+    "optOut": [{ "waitForThenClick": "[data-consent-button][data-value=accept_partial]", "retry": 10, "retryInterval": 500 }],
+    "test": [{ "cookieContains": "advertisement:no" }]
+}

package/rules/autoconsent/dalecarnegie.json

@@ -0,0 +1,44 @@
+{
+    "name": "dalecarnegie",
+    "vendorUrl": "https://www.dalecarnegie.com/",
+    "runContext": {
+        "urlPattern": "^https?://(\\w+\\.)?dalecarnegie\\.com/"
+    },
+    "prehideSelectors": [],
+    "detectCmp": [
+        {
+            "exists": "[class*=\"PrivacyBar_gdprAgreement\"] [class*=\"PrivacyBar_managePrefsBtn\"]"
+        }
+    ],
+    "detectPopup": [
+        {
+            "visible": "[class*=\"PrivacyBar_gdprAgreement\"]"
+        }
+    ],
+    "optIn": [
+        {
+            "waitForThenClick": "[class*=\"PrivacyBar_gdprAgreement\"] [class*=\"PrivacyBar_allowBtn\"]"
+        }
+    ],
+    "optOut": [
+        {
+            "waitForThenClick": "[class*=\"PrivacyBar_gdprAgreement\"] [class*=\"PrivacyBar_managePrefsBtn\"]"
+        },
+        {
+            "waitForVisible": "[class*=\"CookieManagementModal_confirmBtn\"]"
+        },
+        {
+            "click": "[class*=\"CookieManagementModal_dropdownHeader\"] [class*=\"SwitchButton_toggleSwitch\"] input:checked",
+            "all": true,
+            "optional": true
+        },
+        {
+            "click": "[class*=\"CookieManagementModal_confirmBtn\"]"
+        }
+    ],
+    "test": [
+        {
+            "cookieContains": "%22targeting%22:false"
+        }
+    ]
+}

package/rules/autoconsent/jpmorgan-chase.json

@@ -0,0 +1,10 @@
+{
+    "name": "jpmorgan-chase",
+    "vendorUrl": "https://www.jpmorganchase.com/",
+    "prehideSelectors": [".consent-banner:has(.consent-close-icon-wrapper)"],
+    "detectCmp": [{ "exists": ".consent-banner a.consent-close-icon-wrapper[data-pt-name=\"consent-closed\"]" }],
+    "detectPopup": [{ "visible": ".consent-banner a.consent-close-icon-wrapper[data-pt-name=\"consent-closed\"]" }],
+    "optIn": [{ "waitForThenClick": ".consent-banner a.consent-close-icon-wrapper[data-pt-name=\"consent-closed\"]" }],
+    "optOut": [{ "waitForThenClick": ".consent-banner a.consent-close-icon-wrapper[data-pt-name=\"consent-closed\"]" }],
+    "test": [{ "cookieContains": "cbc=true" }]
+}