channel-worker 2.5.26 → 2.5.27

package/package.json

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

package/scripts/warmup_youtube.js

@@ -115,21 +115,22 @@ async function collectResultVideoUrls(page) {
 // pre-rolls can chain, so this is called every tick of the watch loop.
 async function trySkipAd(page) {
   return page.evaluate(() => {
+    // ONLY click inside the player's real skip-ad button (stable YT classes).
+    // A loose text match like /skip/i clicked random buttons every tick on
+    // videos with no ad — keep it strict to the ad-skip control.
     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')) {
+    // Strict text fallback — require an ad-specific phrase, NOT bare "skip"/"bỏ qua".
+    const phrases = /bỏ qua quảng cáo|skip ad\b|skip ads/i;
+    for (const b of document.querySelectorAll('.ytp-ad-skip-button-text, .ytp-ad-skip-button button, button')) {
       const t = (b.innerText || b.textContent || '').trim();
       if (t && phrases.test(t) && b.offsetParent !== null) { b.click(); return true; }
     }
@@ -137,13 +138,14 @@ async function trySkipAd(page) {
   }).catch(() => 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 +167,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;