@duckduckgo/autoconsent 4.4.0 → 5.0.0

package/lib/types.ts

@@ -34,6 +34,7 @@ export type Config = {
   enablePrehide: boolean;
   enableCosmeticRules: boolean;
   detectRetries: number;
+  prehideTimeout: number;
 }
 
 export type LifecycleState = 'loading' |

package/lib/web.ts

@@ -4,7 +4,7 @@ import { ConsentOMaticCMP, ConsentOMaticConfig } from './cmps/consentomatic';
 import { AutoConsentCMPRule } from './rules';
 import { enableLogs } from './config';
 import { BackgroundMessage, InitMessage } from './messages';
-import { prehide, undoPrehide } from './rule-executors';
+import { prehide, undoPrehide, wait } from './rule-executors';
 import { evalState, resolveEval } from './eval-handler';
 import { getRandomID } from './random';
 
@@ -202,12 +202,8 @@ export default class AutoConsent {
     }
 
     if (foundCMPs.length === 0 && retries > 0) {
-      return new Promise((resolve) => {
-        setTimeout(async () => {
-          const result = this.findCmp(retries - 1);
-          resolve(result);
-        }, 500);
-      });
+      await wait(500);
+      return this.findCmp(retries - 1);
     }
 
     return foundCMPs;
@@ -332,7 +328,8 @@ export default class AutoConsent {
     enableLogs && console.log('checking if popup is open...', cmp.name);
     const isOpen = await cmp.detectPopup();
     if (!isOpen && retries > 0) {
-      return new Promise((resolve) => setTimeout(() => resolve(this.waitForPopup(cmp, retries - 1, interval)), interval));
+      await wait(interval);
+      return this.waitForPopup(cmp, retries - 1, interval);
     }
     enableLogs && console.log(cmp.name, `popup is ${isOpen ? 'open' : 'not open'}`);
     return isOpen;
@@ -352,6 +349,17 @@ export default class AutoConsent {
     }, globalHidden);
 
     this.updateState({ prehideOn: true })
+    setTimeout(() => {
+      // unhide things if we are still looking for a pop-up
+      if (
+        this.config.enablePrehide &&
+        this.state.prehideOn &&
+        !['runningOptOut', 'runningOptIn'].includes(this.state.lifecycle)
+      ) {
+        enableLogs && console.log('Process is taking too long, unhiding elements');
+        this.undoPrehide();
+      }
+    }, this.config.prehideTimeout || 2000);
     return prehide(selectors);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "4.4.0",
+  "version": "5.0.0",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",
@@ -49,7 +49,7 @@
     "rollup-plugin-copy": "^3.4.0",
     "rollup-plugin-terser": "^7.0.2",
     "tslib": "^2.4.0",
-    "typescript": "^4.6.4",
+    "typescript": "^5.1.6",
     "web-ext": "^7.3.0"
   },
   "repository": "duckduckgo/autoconsent",