@duckduckgo/autoconsent 15.0.0 → 16.0.0

package/dist/types/cmps/base.d.ts

@@ -1,4 +1,4 @@
-import { AutoCMP, DomActionsProvider, PopupData, PopupHandlingMode } from '../types';
+import { AutoCMP, DomActionsProvider, HeuristicLevel, PopupData } from '../types';
 import { AutoConsentCMPRule, AutoConsentRuleStep, ElementSelector, HideMethod, RunContext, VisibilityCheck } from '../rules';
 import AutoConsent from '../web';
 import { snippets } from '../eval-snippets';
@@ -62,8 +62,8 @@ export declare class AutoConsentCMP extends AutoConsentCMPBase {
 }
 export declare class AutoConsentHeuristicCMP extends AutoConsentCMPBase {
     popups: PopupData[];
-    mode: PopupHandlingMode;
-    constructor(autoconsentInstance: AutoConsent, mode?: PopupHandlingMode);
+    mode: HeuristicLevel;
+    constructor(autoconsentInstance: AutoConsent, mode?: HeuristicLevel);
     get hasSelfTest(): boolean;
     get isIntermediate(): boolean;
     get isCosmetic(): boolean;

package/dist/types/cmps/trustarc-top.d.ts

@@ -5,7 +5,7 @@ export default class TrustArcTop extends AutoConsentCMPBase {
     name: string;
     prehideSelectors: string[];
     runContext: RunContext;
-    _shortcutButton: HTMLElement;
+    _shortcutButton: HTMLElement | null;
     _optInDone: boolean;
     constructor(autoconsentInstance: AutoConsent);
     get hasSelfTest(): boolean;

package/dist/types/eval-handler.d.ts

@@ -3,14 +3,14 @@ import { ContentScriptMessage } from './messages';
 declare class Deferred<T> {
     id: string;
     promise: Promise<T>;
-    resolve: (value?: T) => void;
-    reject: (reason?: any) => void;
+    resolve: (value: T) => void;
+    reject: (reason?: unknown) => void;
     timer: number;
     constructor(id: string, timeout?: number);
 }
 type EvalState = {
     pending: Map<string, Deferred<boolean>>;
-    sendContentMessage: (message: ContentScriptMessage) => void;
+    sendContentMessage: ((message: ContentScriptMessage) => void) | null;
 };
 export declare const evalState: EvalState;
 export declare function requestEval(code: string, snippetId?: keyof typeof snippets): Promise<boolean>;

package/dist/types/heuristics.d.ts

@@ -1,9 +1,9 @@
-import { ButtonData, ButtonRegexClassification, PopupData, PopupHandlingMode } from './types';
+import { ButtonData, ButtonRegexClassification, HeuristicLevel, PopupData } from './types';
 export declare function checkHeuristicPatterns(allText: string, detectPatterns?: RegExp[]): {
     patterns: string[];
     snippets: string[];
 };
-export declare function getActionablePopups(mode?: PopupHandlingMode, timeout?: number): PopupData[];
+export declare function getActionablePopups(mode?: HeuristicLevel, timeout?: number): PopupData[];
 export declare function classifyButtons(buttons: ButtonData[]): void;
 export declare function cleanButtonText(buttonText: string): string;
 export declare function classifyButtonTextRegex(buttonText: string): ButtonRegexClassification;

package/dist/types/types.d.ts

@@ -1,5 +1,4 @@
 import { ContentScriptMessage } from './messages';
-import { ConsentOMaticConfig } from './cmps/consentomatic';
 import { AutoConsentCMPRule, ElementSelector, HideMethod, RunContext, VisibilityCheck } from './rules';
 import { CompactCMPRuleset } from './encoding';
 export type MessageSender = (message: ContentScriptMessage) => Promise<void>;
@@ -43,9 +42,6 @@ export interface DomActionsProvider {
 export type RuleBundle = {
     autoconsent: AutoConsentCMPRule[];
     compact?: CompactCMPRuleset;
-    consentomatic?: {
-        [name: string]: ConsentOMaticConfig;
-    };
 };
 export type AutoAction = 'optOut' | 'optIn' | null;
 export type Config = {
@@ -58,9 +54,7 @@ export type Config = {
     detectRetries: number;
     isMainWorld: boolean;
     prehideTimeout: number;
-    enableFilterList: boolean;
     enableHeuristicDetection: boolean;
-    enableHeuristicAction: boolean;
     enablePopupMutationObserver: boolean;
     visualTest: boolean;
     logs: {
@@ -74,12 +68,10 @@ export type Config = {
     };
     performanceLoggingEnabled: boolean;
     heuristicPopupSearchTimeout: number;
-    heuristicMode: PopupHandlingMode;
+    heuristicMode: HeuristicLevel;
 };
-export type LifecycleState = 'loading' | 'initialized' | 'waitingForInitResponse' | 'started' | 'nothingDetected' | 'cosmeticFiltersDetected' | 'cmpDetected' | 'openPopupDetected' | 'runningOptOut' | 'runningOptIn' | 'optOutSucceeded' | 'optOutFailed' | 'optInSucceeded' | 'optInFailed' | 'done';
+export type LifecycleState = 'loading' | 'initialized' | 'waitingForInitResponse' | 'started' | 'nothingDetected' | 'cmpDetected' | 'openPopupDetected' | 'runningOptOut' | 'runningOptIn' | 'optOutSucceeded' | 'optOutFailed' | 'optInSucceeded' | 'optInFailed' | 'done';
 export type ConsentState = {
-    cosmeticFiltersOn: boolean;
-    filterListReported: boolean;
     lifecycle: LifecycleState;
     prehideOn: boolean;
     findCmpAttempts: number;
@@ -103,19 +95,14 @@ export interface PopupData {
     text: string;
     element: HTMLElement;
     buttons: ButtonData[];
-    regexClassification?: PopupHandlingMode;
+    regexClassification?: PopupClassification;
 }
 /**
- * Controls the behavior of the heuristic popup detection.
- *  - Reject: Will click the reject button on a popup if it exists.
- *  - Tier1: Will also click the acknowledge button on a popup if it exists, and no Reject button exists.
- *  - Tier2: Will also click the accept button on a popup if it exists, and no Reject or Acknowledge button exists.
- *  - None: Disabled
+ * The user setting for autoconsent and heuristic detection.
+ *  - off: Heuristic detection is disabled.
+ *  - reject: Heuristic detection is enabled, and will click the reject button on a popup if it exists.
+ *  - tier1: Heuristic detection is enabled, and will click the acknowledge button on a popup if it exists, and no Reject or Settings button exists.
+ *  - tier2: Heuristic detection is enabled, and will click the accept button on a popup if it exists, and no Reject, Acknowledge, or Settings button exists.
  */
-export declare const PopupHandlingModes: {
-    readonly None: -1;
-    readonly Reject: 0;
-    readonly Tier1: 1;
-    readonly Tier2: 2;
-};
-export type PopupHandlingMode = (typeof PopupHandlingModes)[keyof typeof PopupHandlingModes];
+export type HeuristicLevel = 'off' | 'reject' | 'tier1' | 'tier2';
+export type PopupClassification = 'none' | 'reject' | 'tier1' | 'tier2';

package/dist/types/web.d.ts

@@ -1,9 +1,7 @@
 import { MessageSender, AutoCMP, RuleBundle, Config, ConsentState } from './types';
-import { ConsentOMaticConfig } from './cmps/consentomatic';
 import { AutoConsentCMPRule } from './rules';
 import { BackgroundMessage } from './messages';
 import { DomActions } from './dom-actions';
-import { FiltersEngine } from '@ghostery/adblocker';
 export { snippets as evalSnippets } from './eval-snippets';
 export { filterCompactRules, encodeRules, decodeRules } from './encoding';
 export type { CompactRuleStep, CompactCMPRuleStep, CompactCMPRule, CompactCMPRuleset, IndexedCMPRuleset } from './encoding';
@@ -18,21 +16,17 @@ export default class AutoConsent {
     foundCmp?: AutoCMP;
     state: ConsentState;
     domActions: DomActions;
-    filtersEngine?: FiltersEngine;
     sendContentMessage: MessageSender;
-    protected cosmeticStyleSheet?: CSSStyleSheet;
     protected focusedElement?: HTMLElement;
     constructor(sendContentMessage: MessageSender, config?: Partial<Config> | null, declarativeRules?: RuleBundle | null);
     get config(): Config;
     initialize(config: Partial<Config>, declarativeRules: RuleBundle | null): void;
-    initializeFilterList(): void;
     get shouldPrehide(): boolean;
     saveFocus(): void;
     restoreFocus(): void;
     addDynamicRules(): void;
     parseDeclarativeRules(declarativeRules: RuleBundle): void;
     addDeclarativeCMP(ruleset: AutoConsentCMPRule): void;
-    addConsentomaticCMP(name: string, config: ConsentOMaticConfig): void;
     start(): void;
     _start(): Promise<boolean>;
     findCmp(retries: number): Promise<AutoCMP[]>;
@@ -52,9 +46,6 @@ export default class AutoConsent {
     waitForPopup(cmp: AutoCMP, retries?: number, interval?: number): Promise<boolean>;
     prehideElements(): boolean;
     undoPrehide(): void;
-    undoCosmetics(): void;
-    reportFilterlist(): void;
-    filterListFallback(): boolean;
     updateState(change: Partial<ConsentState>): void;
     receiveMessageCallback(message: BackgroundMessage): Promise<void>;
     measurePerformance(): {

package/docs/api.md

@@ -12,7 +12,6 @@ const consent = new AutoConsent( // make sure not to leak anything to the page g
         disabledCmps: [],
         enablePrehide: true,
         enableCosmeticRules: true,
-        enableFilterList: false,
         detectRetries: 20,
         isMainWorld: false,
         prehideTimeout: 2000,
@@ -27,7 +26,6 @@ const consent = new AutoConsent( // make sure not to leak anything to the page g
     },
     { // optionally, pass JSON rules
         autoconsent: [ ... ],
-        consentomatic: [ ... ],
     }
 );
 
@@ -59,14 +57,9 @@ sequenceDiagram
 
     activate CS
     Note right of CS: Parse rules and initialize autoconsent code
-    Note right of CS: apply prehideSelectors and filterlist rules (if enabled)
+    Note right of CS: apply prehideSelectors (if enabled)
     Note right of CS: wait for DOMContentLoaded
 
-    opt if filterlist enabled and filterlist selectors matched
-        CS -->> BG: cmpDetected (with cmp: "filterList")
-        CS -->> BG: popupFound (with cmp: "filterList")
-    end
-
     Note right of CS: detect a CMP presence (not necessarily visible)
 
     CS ->> BG: cmpDetected

package/docs/puppeteer.md

@@ -40,7 +40,6 @@ const autoconsentConfig = {
   detectRetries: 20,
   isMainWorld: false,
   prehideTimeout: 2000,
-  enableFilterList: false,
   enableHeuristicDetection: true,
   enableHeuristicAction: true,
   logs: {
@@ -144,13 +143,12 @@ Key options:
 | `enableCosmeticRules` | boolean | — | Enable rules that hide popups via CSS |
 | `enableGeneratedRules` | boolean | — | Include auto-generated rules |
 | `detectRetries` | number | — | How many times to retry CMP detection |
-| `enableFilterList` | boolean | — | Enable ABP/uBO cosmetic filter support (requires the `/extra` build) |
 
 ## Rules
 
 The `initResp` message **must** include a `rules` object. Without rules, no CMPs will be detected. The package ships pre-built rule bundles:
 
-- `@duckduckgo/autoconsent/rules/rules.json` — full rules (includes `autoconsent` and `consentomatic` arrays)
+- `@duckduckgo/autoconsent/rules/rules.json` — full rules (includes `autoconsent` array)
 - `@duckduckgo/autoconsent/rules/compact-rules.json` — compact encoding for opt-out only (smaller payload)
 
 Load either file and pass it as the `rules` field in the `initResp` message.

package/docs/rule-syntax.md

@@ -225,23 +225,6 @@ Sometimes the opt-out process requires actions that span across multiple pages o
 
 Some rules do not interact with the page, and only hide the cookie pop-ups with CSS. These rules are marked with the `cosmetic: true` flag. They are useful for pop-ups that do not provide a Reject button. Cosmetic rules can be disabled with the `enableCosmeticRules` config option.
 
-### Filterlist
-Autoconsent supports cosmetic filters in common ABP/uBO format. For performance reasons, it needs to be bundled at build time. At the moment we include cosmetic filters from [Easylist Cookie](https://github.com/easylist/easylist/tree/master/easylist_cookie).
-Note that by default filterlist rules are not included, as this significantly increases the resulting bundle size. To use filterlist rules, you need to explicitly import the "extra" version of the library (`@duckduckgo/autoconsent/extra`), and set the `enableFilterlist` config option to `true`.
-
-```javascript
-// import the library version with bundled filterlist rules
-import AutoConsent from '@duckduckgo/autoconsent/extra'
-
-// ...
-
-new AutoConsent({
-  enableFilterlist: true,
-  // other options
-})
-
-```
-
 ## Context filters
 
 By default, rules will be executed in all top-level documents. Some rules are designed for specific contexts (e.g. only nested iframes, or only specific URLs). This can be configured in `runContext` field (see [runContext](#rule-syntax-reference) above).

package/eslint.config.mjs

@@ -8,7 +8,7 @@ const c = tseslint.config(
     ...ddgConfig,
 
     {
-        ignores: ['lib/consentomatic/**/*', 'dist/**/*', '.agents/**/*'],
+        ignores: ['dist/**/*', '.agents/**/*'],
     },
 
     {

package/lib/cmps/base.ts

@@ -1,4 +1,4 @@
-import { AutoCMP, DomActionsProvider, PopupData, PopupHandlingMode, PopupHandlingModes } from '../types';
+import { AutoCMP, DomActionsProvider, HeuristicLevel, PopupData } from '../types';
 import { AutoConsentCMPRule, AutoConsentRuleStep, ElementSelector, HideMethod, RunContext, VisibilityCheck } from '../rules';
 import { requestEval } from '../eval-handler';
 import AutoConsent from '../web';
@@ -419,9 +419,9 @@ export class AutoConsentCMP extends AutoConsentCMPBase {
 
 export class AutoConsentHeuristicCMP extends AutoConsentCMPBase {
     popups: PopupData[] = [];
-    mode: PopupHandlingMode;
+    mode: HeuristicLevel;
 
-    constructor(autoconsentInstance: AutoConsent, mode: PopupHandlingMode = PopupHandlingModes.Reject) {
+    constructor(autoconsentInstance: AutoConsent, mode: HeuristicLevel = 'reject') {
         super(autoconsentInstance);
         this.name = 'HEURISTIC';
         this.runContext = {
@@ -453,7 +453,7 @@ export class AutoConsentHeuristicCMP extends AutoConsentCMPBase {
             performance.measure('heuristicDetector', 'heuristicDetectorStart', 'heuristicDetectorEnd');
 
         if (this.popups.length > 0) {
-            this.name = `HEURISTIC-TIER${this.popups[0].regexClassification}`;
+            this.name = `HEURISTIC-${this.popups[0].regexClassification?.toUpperCase()}`;
             return Promise.resolve(true);
         }
         return Promise.resolve(false);
@@ -473,8 +473,7 @@ export class AutoConsentHeuristicCMP extends AutoConsentCMPBase {
         const popup = this.popups[0];
         const level = popup.regexClassification;
         const buttons = popup.buttons;
-        const targetButtonType =
-            level === PopupHandlingModes.Reject ? 'reject' : level === PopupHandlingModes.Tier1 ? 'acknowledge' : 'accept';
+        const targetButtonType = level === 'reject' ? 'reject' : level === 'tier1' ? 'acknowledge' : 'accept';
         return buttons.find((button) => button.regexClassification === targetButtonType);
     }
 

package/lib/cmps/conversant.ts

@@ -41,12 +41,15 @@ export default class Conversant extends AutoConsentCMPBase {
             (<HTMLElement>item.querySelector('.cmp-accordion-item-title')).click();
             await waitFor(() => !!item.querySelector('.cmp-accordion-item-content.cmp-active'), 10, 50);
             const content = item.querySelector('.cmp-accordion-item-content.cmp-active');
+            if (!content) {
+                return false;
+            }
             content
-                .querySelectorAll('.cmp-toggle-actions .cmp-toggle-deny:not(.cmp-toggle-deny--active)')
-                .forEach((e: HTMLElement) => e.click());
+                .querySelectorAll<HTMLElement>('.cmp-toggle-actions .cmp-toggle-deny:not(.cmp-toggle-deny--active)')
+                .forEach((e) => e.click());
             content
-                .querySelectorAll('.cmp-toggle-actions .cmp-toggle-checkbox:not(.cmp-toggle-checkbox--active)')
-                .forEach((e: HTMLElement) => e.click());
+                .querySelectorAll<HTMLElement>('.cmp-toggle-actions .cmp-toggle-checkbox:not(.cmp-toggle-checkbox--active)')
+                .forEach((e) => e.click());
             // await waitFor(() => !item.querySelector('.cmp-toggle-deny--active,.cmp-toggle-checkbox--active'), 5, 50); // this may take a long time
         }
         await this.click('.cmp-main-button:not(.cmp-main-button--primary)');

package/lib/cmps/trustarc-top.ts

@@ -18,7 +18,7 @@ export default class TrustArcTop extends AutoConsentCMPBase {
         frame: false,
     };
 
-    _shortcutButton: HTMLElement;
+    _shortcutButton: HTMLElement | null;
     _optInDone: boolean;
 
     constructor(autoconsentInstance: AutoConsent) {

package/lib/cmps/uniconsent.ts

@@ -29,8 +29,8 @@ export default class Uniconsent extends AutoConsentCMPBase {
 
     async optOut() {
         await this.waitForElement('.unic button', 1000);
-        document.querySelectorAll('.unic button').forEach((button: HTMLButtonElement) => {
-            const text = button.textContent;
+        document.querySelectorAll<HTMLButtonElement>('.unic button').forEach((button) => {
+            const text = button.textContent || '';
             if (text.includes('Manage Options') || text.includes('Optionen verwalten')) {
                 button.click();
             }
@@ -39,14 +39,14 @@ export default class Uniconsent extends AutoConsentCMPBase {
         if (await this.waitForElement('.unic input[type=checkbox]', 1000)) {
             await this.waitForElement('.unic button', 1000);
 
-            document.querySelectorAll('.unic input[type=checkbox]').forEach((c: HTMLInputElement) => {
+            document.querySelectorAll<HTMLInputElement>('.unic input[type=checkbox]').forEach((c) => {
                 if (c.checked) {
                     c.click();
                 }
             });
 
             for (const b of <NodeListOf<HTMLButtonElement>>document.querySelectorAll('.unic button')) {
-                const text = b.textContent;
+                const text = b.textContent || '';
                 for (const pattern of ['Confirm Choices', 'Save Choices', 'Auswahl speichern']) {
                     if (text.includes(pattern)) {
                         b.click();

package/lib/eval-handler.ts

@@ -5,8 +5,8 @@ import { getRandomID } from './random';
 class Deferred<T> {
     id: string;
     promise: Promise<T>;
-    resolve: (value?: T) => void;
-    reject: (reason?: any) => void;
+    resolve!: (value: T) => void;
+    reject!: (reason?: unknown) => void;
     timer: number;
 
     constructor(id: string, timeout = 1000) {
@@ -23,7 +23,7 @@ class Deferred<T> {
 
 type EvalState = {
     pending: Map<string, Deferred<boolean>>;
-    sendContentMessage: (message: ContentScriptMessage) => void;
+    sendContentMessage: ((message: ContentScriptMessage) => void) | null;
 };
 
 export const evalState: EvalState = {
@@ -32,6 +32,9 @@ export const evalState: EvalState = {
 };
 
 export function requestEval(code: string, snippetId?: keyof typeof snippets): Promise<boolean> {
+    if (!evalState.sendContentMessage) {
+        return Promise.reject(new Error('AutoConsent is not initialized yet'));
+    }
     const id = getRandomID();
     evalState.sendContentMessage({
         type: 'eval',

package/lib/heuristics.ts

@@ -6,7 +6,7 @@ import {
     REJECT_PATTERNS,
     SETTINGS_PATTERNS,
 } from './heuristic-patterns';
-import { ButtonData, ButtonRegexClassification, PopupData, PopupHandlingMode, PopupHandlingModes } from './types';
+import { ButtonData, ButtonRegexClassification, HeuristicLevel, PopupClassification, PopupData } from './types';
 import { isElementVisible, isTopFrame } from './utils';
 
 const BUTTON_LIKE_ELEMENT_SELECTOR = 'button, input[type="button"], input[type="submit"], a, [role="button"], [class*="button"]';
@@ -28,7 +28,12 @@ export function checkHeuristicPatterns(allText: string, detectPatterns = DETECT_
     return { patterns, snippets };
 }
 
-export function getActionablePopups(mode: PopupHandlingMode = PopupHandlingModes.Reject, timeout = POPUP_SEARCH_MAX_TIME): PopupData[] {
+export function getActionablePopups(mode: HeuristicLevel = 'reject', timeout = POPUP_SEARCH_MAX_TIME): PopupData[] {
+    const acceptedLevels: PopupClassification[] =
+        mode === 'tier2' ? ['reject', 'tier1', 'tier2'] : mode === 'tier1' ? ['reject', 'tier1'] : ['reject'];
+    if (acceptedLevels.length === 0) {
+        return [];
+    }
     const popups = getPotentialPopups(timeout);
     const result = popups.reduce((acc, popup) => {
         const popupText = popup.text?.trim();
@@ -46,13 +51,8 @@ export function getActionablePopups(mode: PopupHandlingMode = PopupHandlingModes
     }, [] as PopupData[]);
     // popups filtered by mode and sorted so a popup with reject will always win.
     return result
-        .filter(
-            (popup) =>
-                popup.regexClassification !== undefined &&
-                popup.regexClassification !== PopupHandlingModes.None &&
-                popup.regexClassification <= mode,
-        )
-        .sort((a, b) => (a.regexClassification ?? 0) - (b.regexClassification ?? 0));
+        .filter((popup) => popup.regexClassification !== undefined && acceptedLevels.includes(popup.regexClassification))
+        .sort((a, b) => ((a.regexClassification ?? '') > (b.regexClassification ?? '') ? 1 : -1));
 }
 
 export function classifyButtons(buttons: ButtonData[]) {
@@ -61,7 +61,7 @@ export function classifyButtons(buttons: ButtonData[]) {
     }
 }
 
-function classifyPopup(buttons: ButtonData[]): PopupHandlingMode {
+function classifyPopup(buttons: ButtonData[]): PopupClassification {
     const { reject, settings, accept, acknowledge } = buttons.reduce(
         (acc, button) => {
             if (button.regexClassification && button.regexClassification !== 'other') {
@@ -72,18 +72,18 @@ function classifyPopup(buttons: ButtonData[]): PopupHandlingMode {
         { reject: 0, settings: 0, accept: 0, acknowledge: 0 },
     );
     if (reject > 0) {
-        return PopupHandlingModes.Reject;
+        return 'reject';
     }
     if (settings > 0) {
-        return PopupHandlingModes.None;
+        return 'none';
     }
     if (acknowledge > 0) {
-        return PopupHandlingModes.Tier1;
+        return 'tier1';
     }
     if (accept > 0) {
-        return accept === 1 ? PopupHandlingModes.Tier2 : PopupHandlingModes.None;
+        return accept === 1 ? 'tier2' : 'none';
     }
-    return PopupHandlingModes.None;
+    return 'none';
 }
 
 /**

package/lib/types.ts

@@ -1,5 +1,4 @@
 import { ContentScriptMessage } from './messages';
-import { ConsentOMaticConfig } from './cmps/consentomatic';
 import { AutoConsentCMPRule, ElementSelector, HideMethod, RunContext, VisibilityCheck } from './rules';
 import { CompactCMPRuleset } from './encoding';
 
@@ -47,7 +46,6 @@ export interface DomActionsProvider {
 export type RuleBundle = {
     autoconsent: AutoConsentCMPRule[];
     compact?: CompactCMPRuleset;
-    consentomatic?: { [name: string]: ConsentOMaticConfig };
 };
 
 export type AutoAction = 'optOut' | 'optIn' | null;
@@ -62,9 +60,7 @@ export type Config = {
     detectRetries: number;
     isMainWorld: boolean;
     prehideTimeout: number;
-    enableFilterList: boolean;
     enableHeuristicDetection: boolean;
-    enableHeuristicAction: boolean;
     enablePopupMutationObserver: boolean;
     visualTest: boolean; // If true, the script will delay before every click action
     logs: {
@@ -78,7 +74,7 @@ export type Config = {
     };
     performanceLoggingEnabled: boolean;
     heuristicPopupSearchTimeout: number;
-    heuristicMode: PopupHandlingMode; // controls the behavior of the heuristic popup detection. Has no effect if enableHeuristicDetection is false.
+    heuristicMode: HeuristicLevel; // controls the behavior of the heuristic popup detection.
 };
 
 export type LifecycleState =
@@ -87,7 +83,6 @@ export type LifecycleState =
     | 'waitingForInitResponse'
     | 'started'
     | 'nothingDetected'
-    | 'cosmeticFiltersDetected'
     | 'cmpDetected'
     | 'openPopupDetected'
     | 'runningOptOut'
@@ -99,8 +94,6 @@ export type LifecycleState =
     | 'done';
 
 export type ConsentState = {
-    cosmeticFiltersOn: boolean; // true if cosmetic filter rules are currently applied.
-    filterListReported: boolean; // true if the cosmetic filter list has been reported to the user.
     lifecycle: LifecycleState; // What point in the autoconsent lifecycle this script is at.
     prehideOn: boolean; // If the script is currently hiding preHide elements.
     findCmpAttempts: number; // Number of times we tried to find CMPs in this frame.
@@ -127,20 +120,15 @@ export interface PopupData {
     text: string;
     element: HTMLElement;
     buttons: ButtonData[];
-    regexClassification?: PopupHandlingMode;
+    regexClassification?: PopupClassification;
 }
 
 /**
- * Controls the behavior of the heuristic popup detection.
- *  - Reject: Will click the reject button on a popup if it exists.
- *  - Tier1: Will also click the acknowledge button on a popup if it exists, and no Reject button exists.
- *  - Tier2: Will also click the accept button on a popup if it exists, and no Reject or Acknowledge button exists.
- *  - None: Disabled
+ * The user setting for autoconsent and heuristic detection.
+ *  - off: Heuristic detection is disabled.
+ *  - reject: Heuristic detection is enabled, and will click the reject button on a popup if it exists.
+ *  - tier1: Heuristic detection is enabled, and will click the acknowledge button on a popup if it exists, and no Reject or Settings button exists.
+ *  - tier2: Heuristic detection is enabled, and will click the accept button on a popup if it exists, and no Reject, Acknowledge, or Settings button exists.
  */
-export const PopupHandlingModes = {
-    None: -1,
-    Reject: 0,
-    Tier1: 1,
-    Tier2: 2,
-} as const;
-export type PopupHandlingMode = (typeof PopupHandlingModes)[keyof typeof PopupHandlingModes];
+export type HeuristicLevel = 'off' | 'reject' | 'tier1' | 'tier2';
+export type PopupClassification = 'none' | 'reject' | 'tier1' | 'tier2';

package/lib/utils.ts

@@ -1,5 +1,5 @@
 import { HideMethod } from './rules';
-import { Config, PopupHandlingModes } from './types';
+import { Config } from './types';
 
 // get or create a style container for CSS overrides
 export function getStyleElement(styleOverrideElementId = 'autoconsent-css-rules'): HTMLStyleElement {
@@ -77,12 +77,10 @@ export function normalizeConfig(providedConfig: any): Config {
         enableCosmeticRules: true,
         enableGeneratedRules: true,
         enableHeuristicDetection: false,
-        enableHeuristicAction: false,
         enablePopupMutationObserver: false,
         detectRetries: 20,
         isMainWorld: false,
         prehideTimeout: 2000,
-        enableFilterList: false,
         visualTest: false,
         logs: {
             lifecycle: false,
@@ -95,7 +93,7 @@ export function normalizeConfig(providedConfig: any): Config {
         },
         performanceLoggingEnabled: false,
         heuristicPopupSearchTimeout: 100,
-        heuristicMode: PopupHandlingModes.Reject,
+        heuristicMode: 'off', // heuristic disabled by default
     };
     const updatedConfig: Config = copyObject(defaultConfig);
     // filter out any unknown entries
@@ -117,13 +115,18 @@ export function scheduleWhenIdle(callback: () => void, timeout = 500) {
     }
 }
 
+type HighlightedHTMLElement = HTMLElement & {
+    __oldStyles?: string;
+};
+
 export function highlightNode(node: HTMLElement) {
+    const highlightedNode = node as HighlightedHTMLElement;
     if (!node.style) return;
-    if (node.__oldStyles !== undefined) {
+    if (highlightedNode.__oldStyles !== undefined) {
         return; // already highlighted
     }
     if (node.hasAttribute('style')) {
-        node.__oldStyles = node.style.cssText;
+        highlightedNode.__oldStyles = node.style.cssText;
     }
     node.style.animation = 'pulsate .5s infinite';
     node.style.outline = 'solid red';
@@ -154,10 +157,11 @@ export function highlightNode(node: HTMLElement) {
 }
 
 export function unhighlightNode(node: HTMLElement) {
+    const highlightedNode = node as HighlightedHTMLElement;
     if (!node.style || !node.hasAttribute('style')) return;
-    if (node.__oldStyles !== undefined) {
-        node.style.cssText = node.__oldStyles;
-        delete node.__oldStyles;
+    if (highlightedNode.__oldStyles !== undefined) {
+        node.style.cssText = highlightedNode.__oldStyles;
+        delete highlightedNode.__oldStyles;
     } else {
         node.removeAttribute('style');
     }