channel-worker 2.5.31 → 2.5.33

package/package.json

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

package/scripts/warmup_facebook.js

@@ -140,8 +140,20 @@ async function focusFbSearch(page, log) {
       if (box) {
         try {
           await box.click({ timeout: 2500 });
-          await page.keyboard.down('Control'); await page.keyboard.press('A'); await page.keyboard.up('Control');
-          await page.keyboard.press('Backspace');
+          // CLEAR the previous keyword first. FB's search is a React-controlled
+          // input — Ctrl+A+Backspace didn't reset its value (keywords appended:
+          // "kw1kw2"). locator.fill('') dispatches the input events React needs,
+          // reliably emptying it; verify + fall back to mass-Backspace.
+          await box.fill('').catch(() => {});
+          let cur = await box.evaluate(el => (el.value != null ? el.value : (el.textContent || ''))).catch(() => '');
+          if (cur && cur.trim()) {
+            await page.keyboard.press('End').catch(() => {});
+            for (let i = 0; i < cur.length + 8; i++) await page.keyboard.press('Backspace').catch(() => {});
+            cur = await box.evaluate(el => (el.value != null ? el.value : (el.textContent || ''))).catch(() => '');
+          }
+          if (cur && cur.trim()) { log('info', `[warmup-fb] search box not fully cleared (still "${cur.slice(0, 20)}") — typing anyway`); }
+          // Re-focus so the subsequent human-typing lands in the box.
+          await box.click({ timeout: 2000 }).catch(() => {});
           return true;
         } catch {}
       }
@@ -247,9 +259,30 @@ async function readVideoState(page) {
   }).catch(() => null);
 }
 
-// Watch whatever reel/video is currently open (after clicking a result): ensure
-// the <video> plays, watch a random span — but ADVANCE EARLY if a non-looping
-// video ends/stalls (don't sit on a finished video). Mid-view scroll. Best-effort.
+// Is the currently-open reel/video SPONSORED (an ad)? Looks for a visible
+// "Được tài trợ"/"Sponsored" label in the viewport (the reel viewer is
+// fullscreen, so a visible sponsored tag means THIS reel is the ad). Best-effort.
+async function isSponsoredReel(page) {
+  return page.evaluate(() => {
+    const re = /^(được tài trợ|sponsored|tài trợ)$/i;
+    for (const el of document.querySelectorAll("a, span, div")) {
+      const t = (el.innerText || el.textContent || '').trim();
+      if (!re.test(t)) continue;
+      if (el.offsetParent === null) continue;
+      const r = el.getBoundingClientRect();
+      if (r.width > 0 && r.height > 0 && r.top >= 0 && r.top < window.innerHeight && r.left < window.innerWidth) return true;
+    }
+    return false;
+  }).catch(() => false);
+}
+
+// Watch whatever reel/video is currently open (after clicking a result). Rules:
+//  - SKIP sponsored/ad reels entirely (don't count) — user: ads shouldn't count.
+//  - Count ONLY seconds the video actually ADVANCES — a frozen/buffering video
+//    no longer accrues watch time (user: "video đơ vẫn đếm giây"). Loop wrap
+//    (currentTime jumps back to ~0) counts as progress.
+//  - Advance early if a non-looping video ends; bail if frozen too long.
+// Returns true only if real progressing playback was counted.
 async function watchCurrent(page, minSec, maxSec, log) {
   try {
     await page.waitForTimeout(randInt(2500, 4500)); // let the reel viewer mount
@@ -262,27 +295,39 @@ async function watchCurrent(page, minSec, maxSec, log) {
     }).catch(() => false);
     if (!hasVideo) { log('info', '[warmup-fb] no <video> after click — skipping'); return false; }
 
+    // Skip ads — don't watch, don't count.
+    if (await isSponsoredReel(page)) { log('info', '[warmup-fb] sponsored/ad reel — skipping (not counted)'); return false; }
+
     const watchMs = randInt(minSec, maxSec) * 1000;
     log('info', `[warmup-fb] watching reel for ~${Math.round(watchMs / 1000)}s (url=${page.url().slice(-28)})`);
     const TICK = 1000;
-    let watched = 0, scrolled = false, lastT = -1, stallTicks = 0;
+    let watched = 0;          // counts ONLY progressing seconds
+    let scrolled = false, lastT = -1, frozenTicks = 0, adReChecks = 0;
     while (watched < watchMs) {
       const st = await readVideoState(page);
-      // A non-looping video that ended/stalled → stop waiting, go to next.
-      if (st && !st.loop) {
-        if (st.ended || (st.duration > 0 && st.currentTime >= st.duration - 0.6)) {
-          log('info', `[warmup-fb] reel ended at ${Math.round(st.currentTime)}s — advancing`);
-          break;
-        }
-        if (Math.abs(st.currentTime - lastT) < 0.15) { stallTicks++; if (stallTicks >= 6) { log('info', '[warmup-fb] reel stalled — advancing'); break; } }
-        else stallTicks = 0;
-        lastT = st.currentTime;
+      // Non-looping video finished → go to next.
+      if (st && !st.loop && (st.ended || (st.duration > 0 && st.currentTime >= st.duration - 0.6))) {
+        log('info', `[warmup-fb] reel ended at ${Math.round(st.currentTime)}s — advancing`);
+        break;
       }
-      if (!scrolled && watched >= watchMs / 2) { await organicScroll(page, randInt(1, 2)); scrolled = true; }
+      // Progress = currentTime moved forward, OR wrapped back (loop restart).
+      const advanced = !!st && (st.currentTime > lastT + 0.2 || st.currentTime < lastT - 0.5);
+      if (advanced) {
+        watched += TICK;
+        frozenTicks = 0;
+        if (!scrolled && watched >= watchMs / 2) { await organicScroll(page, randInt(1, 2)); scrolled = true; }
+      } else {
+        // Not progressing (frozen / buffering / paused-and-won't-play) — do NOT
+        // count this second; bail after ~8s stuck.
+        frozenTicks++;
+        if (frozenTicks >= 8) { log('info', `[warmup-fb] video frozen ~${frozenTicks}s (counted ${Math.round(watched/1000)}s) — advancing`); break; }
+      }
+      lastT = st ? st.currentTime : lastT;
+      // Re-check sponsored a couple times (a mid-scroll ad reel can swap in).
+      if (adReChecks < 2 && watched > 0 && watched % 8000 === 0) { adReChecks++; if (await isSponsoredReel(page)) { log('info', '[warmup-fb] became sponsored mid-watch — advancing'); break; } }
       await page.waitForTimeout(TICK);
-      watched += TICK;
     }
-    return true;
+    return watched > 0; // only a video with real progressing playback counts
   } catch (e) {
     log('info', `[warmup-fb] watch failed: ${String(e.message || e).slice(0, 90)}`);
     return false;