Ad detection behing remote config

Author: mgurgel

injected/package.json

@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@canvas/image-data": "^1.0.0",
-    "@duckduckgo/privacy-configuration": "github:duckduckgo/privacy-configuration#ca6101bb972756a87a8960ffb3029f603052ea9d",
+    "@duckduckgo/privacy-configuration": "github:duckduckgo/privacy-configuration#6e5774603200f453a9451870606f3921b76249f4",
     "@fingerprintjs/fingerprintjs": "^4.6.2",
     "@types/chrome": "^0.0.315",
     "@types/jasmine": "^5.1.7",

injected/src/features/duckplayer-native/duckplayer-native.js

@@ -143,7 +143,7 @@ export function setupDuckPlayerForYouTube(selectors, playbackPaused, environment
                 messages.notifyCurrentTimestamp(timestamp.toFixed(0));
             };
 
-            return pollTimestamp(300, handler);
+            return pollTimestamp(300, handler, selectors);
         });
 
         if (playbackPaused) {
@@ -190,7 +190,7 @@ export function setupDuckPlayerForNoCookie(selectors, environment, messages) {
                 messages.notifyCurrentTimestamp(timestamp.toFixed(0));
             };
 
-            return pollTimestamp(300, handler);
+            return pollTimestamp(300, handler, selectors);
         });
 
         logger.log('Setting up error detection');

injected/src/features/duckplayer-native/get-current-timestamp.js

@@ -1,18 +1,14 @@
+/** @import { DuckPlayerNativeSelectors } from './duckplayer-native.js'; */
+
 /**
+ * @param {string} selector - Selector for the video element
  * @returns {number}
  */
-export function getCurrentTimestamp() {
-    const video = document.querySelector('video'); // TODO: Move to remote config
+export function getCurrentTimestamp(selector) {
+    const video = /** @type {HTMLVideoElement|null} */ (document.querySelector(selector));
     return video?.currentTime || 0;
 }
 
-/**
- * @returns {boolean}
- */
-function isShowingAd() {
-    return !!document.querySelector('.html5-video-player.ad-showing'); // TODO: Move to remote config
-}
-
 /**
  * Sends the timestamp to the browser every 300ms
  * TODO: Can we not brute force this?
@@ -22,19 +18,24 @@ function isShowingAd() {
  * TODO: Can we not brute force this?
  * @param {number} interval - Polling interval
  * @param {(number) => void} callback - Callback handler for polling event
+ * @param {DuckPlayerNativeSelectors} selectors - Selectors for the player
  * @returns
  */
-export function pollTimestamp(interval = 300, callback) {
-    if (!callback) {
-        console.error('Timestamp polling failed. No callback defined');
+export function pollTimestamp(interval = 300, callback, selectors) {
+    if (!callback || !selectors) {
+        console.error('Timestamp polling failed. No callback or selectors defined');
     }
 
+    const isShowingAd = () => {
+        return selectors.adShowing && !!document.querySelector(selectors.adShowing);
+    };
+
     const timestampPolling = setInterval(() => {
         if (isShowingAd()) {
             console.log('Ad showing. Not polling timestamp');
             return;
         }
-        const timestamp = getCurrentTimestamp();
+        const timestamp = getCurrentTimestamp(selectors.videoElement);
         console.log('Polling timestamp', timestamp);
         callback(timestamp);
     }, interval);