channel-worker 2.5.26 → 2.5.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "channel-worker",
-  "version": "2.5.26",
+  "version": "2.5.28",
   "description": "Channel Manager worker daemon — runs on remote machines to execute video pipeline jobs",
   "main": "lib/daemon.js",
   "bin": {

package/scripts/warmup_youtube.js

@@ -114,36 +114,34 @@ async function collectResultVideoUrls(page) {
 // skippable ad; non-skippable ads have no button (we wait them out). Multiple
 // pre-rolls can chain, so this is called every tick of the watch loop.
 async function trySkipAd(page) {
-  return page.evaluate(() => {
-    const sels = [
-      '.ytp-ad-skip-button-modern',
-      '.ytp-ad-skip-button',
-      '.ytp-skip-ad-button',
-      'button.ytp-ad-skip-button-modern',
-      '.ytp-ad-skip-button-container button',
-    ];
-    for (const s of sels) {
-      const btn = document.querySelector(s);
-      if (btn && btn.offsetParent !== null) { btn.click(); return true; }
-    }
-    // Text-based fallback (locale-proof) — any visible button whose label is a
-    // skip-ad phrase.
-    const phrases = /bỏ qua quảng cáo|bỏ qua|skip ad|skip ads|skip/i;
-    for (const b of document.querySelectorAll('button, .ytp-ad-skip-button-text')) {
-      const t = (b.innerText || b.textContent || '').trim();
-      if (t && phrases.test(t) && b.offsetParent !== null) { b.click(); return true; }
+  // Use Playwright's real .click() (trusted pointer event) — a synthetic
+  // el.click() from page.evaluate is ignored by YouTube's player, so the ad
+  // never actually skipped (saw 52 "skips" with the ad still playing). The
+  // skip button only becomes clickable ~5s into the ad; an early click times
+  // out → return false → retried next tick.
+  const sels = [
+    '.ytp-ad-skip-button-modern',
+    '.ytp-ad-skip-button',
+    '.ytp-skip-ad-button',
+    '.ytp-ad-skip-button-container button',
+  ];
+  for (const s of sels) {
+    const loc = page.locator(s).first();
+    if (await loc.isVisible().catch(() => false)) {
+      try { await loc.click({ timeout: 1500 }); return true; } catch { /* not yet clickable */ }
     }
-    return false;
-  }).catch(() => false);
+  }
+  return false;
 }
 
-// True while an ad is playing on the watch page (pre/mid-roll). Used so the
-// watch budget only counts REAL video time, not ad time.
+// True while an ad is ACTUALLY playing (pre/mid-roll). Relies on the player's
+// `ad-showing` class — the canonical signal YouTube toggles only during ad
+// playback. Do NOT key off .ytp-ad-module (a persistent container that exists
+// even with no ad → false positive that pinned the watch loop at "0s real").
 async function isAdShowing(page) {
   return page.evaluate(() => {
     const player = document.querySelector('#movie_player, .html5-video-player');
-    if (player && player.classList.contains('ad-showing')) return true;
-    return !!document.querySelector('.ytp-ad-player-overlay, .ytp-ad-module, .ad-showing');
+    return !!(player && player.classList.contains('ad-showing'));
   }).catch(() => false);
 }
 
@@ -165,7 +163,7 @@ async function watchVideo(page, url, minSec, maxSec, log) {
     log('info', `[warmup] watching ${url.slice(-11)} for ~${Math.round(watchMs / 1000)}s of REAL video (skipping ads)`);
 
     const TICK = 1000;
-    const MAX_AD_WAIT_MS = 90_000; // cap total ad-waiting so a non-skippable ad reel can't hang the session
+    const MAX_AD_WAIT_MS = 60_000; // cap total ad-waiting so a non-skippable ad reel can't hang the session
     let realWatched = 0;     // ms of actual (non-ad) playback counted
     let adWaited = 0;        // ms spent sitting through/again skipping ads
     let scrolled = false;
@@ -185,7 +183,8 @@ async function watchVideo(page, url, minSec, maxSec, log) {
       await page.waitForTimeout(TICK);
     }
     if (skips) log('info', `[warmup] ${url.slice(-11)} — skipped ${skips} ad tick(s), real watch ${Math.round(realWatched/1000)}s`);
-    return true;
+    // Only count as a watched video if real (non-ad) content actually played.
+    return realWatched > 0;
   } catch (e) {
     log('warn', `[warmup] watch failed (${url.slice(-11)}): ${String(e.message || e).slice(0, 100)}`);
     return false;