channel-worker 2.5.32 → 2.5.34

package/package.json

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

package/scripts/upload_facebook.js

@@ -1743,6 +1743,62 @@ async function run({ page, payload, log }) {
       throw new Error(`FB rate-limited / spam-blocked this account — publish was NOT accepted. Detected phrase: "${blockHit}". Cool down account before retry.`);
     }
 
+    // 7b) COMMIT VERIFY + RETRY. A Playwright click on an enabled "Đăng" can
+    //     register without FB actually publishing (handler no-op / transient
+    //     glitch) — the composer modal ("Cài đặt thước phim") just stays open
+    //     (this is the "đứng ở nút Đăng" the user reported). We used to still
+    //     return ok:true with an empty post_url → FALSE SUCCESS. Detect the
+    //     still-open composer, re-click "Đăng" a few times, and fail loudly if
+    //     it refuses to commit (so the cmd is marked failed, not done).
+    const composerStillOpen = () => page.evaluate((verbs) => {
+      const dlgs = document.querySelectorAll("[role='dialog']");
+      for (const dlg of dlgs) {
+        const r = dlg.getBoundingClientRect();
+        if (r.width < 8 || r.height < 8) continue;
+        const cs = getComputedStyle(dlg);
+        if (cs.visibility === 'hidden' || cs.display === 'none') continue;
+        const hay = ((dlg.getAttribute('aria-label') || '') + ' ' + (dlg.innerText || '')).toLowerCase();
+        if (!/cài đặt thước phim|reel settings|tạo thước phim|create reel|create a reel|tạo bài viết|create post/.test(hay)) continue;
+        const btns = dlg.querySelectorAll("button, [role='button']");
+        for (const b of btns) {
+          const t = ((b.innerText || '') + ' ' + (b.getAttribute('aria-label') || '')).trim();
+          if (verbs.some((v) => t === v || t.split('\n').includes(v))) return true; // publish CTA still present → not committed
+        }
+      }
+      return false;
+    }, publishVerbs).catch(() => false);
+
+    for (let commitTry = 0; commitTry < 3 && (await composerStillOpen()); commitTry++) {
+      log('warn', `[fb-pw] composer STILL open after publish click — re-clicking "Đăng" (retry ${commitTry + 1}/3)`);
+      const reClicked = await page.evaluate((verbs) => {
+        const dlgs = document.querySelectorAll("[role='dialog']");
+        for (const dlg of dlgs) {
+          const btns = dlg.querySelectorAll("button, [role='button']");
+          for (const v of verbs) {
+            for (const b of btns) {
+              const t = (b.innerText || '').trim();
+              const a = (b.getAttribute('aria-label') || '').trim();
+              if ((t === v || a === v) && b.getAttribute('aria-disabled') !== 'true') {
+                b.setAttribute('__fbpw_recommit__', '1');
+                return true;
+              }
+            }
+          }
+        }
+        return false;
+      }, publishVerbs).catch(() => false);
+      if (reClicked) {
+        await page.locator("[__fbpw_recommit__='1']").click({ timeout: 5000 }).catch(() => {});
+        await page.evaluate(() => document.querySelectorAll("[__fbpw_recommit__]").forEach((el) => el.removeAttribute('__fbpw_recommit__'))).catch(() => {});
+      }
+      await page.waitForTimeout(8000);
+    }
+    if (await composerStillOpen()) {
+      await dumpInventory(page, log, 'composer-stuck-open');
+      await dumpFailure(page, 'composer-stuck-open', log);
+      throw new Error('FB publish KHÔNG commit — composer vẫn mở ở nút "Đăng" sau 3 lần thử (video CHƯA được đăng). Thử lại sau.');
+    }
+
     let postUrl = '';
 
     // (a) Title-anchored page-wall scrape — FB renders the just-published

package/scripts/warmup_facebook.js

@@ -259,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
@@ -274,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;