channel-worker 2.5.18 → 2.5.20

package/package.json

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

package/scripts/upload_facebook.js

@@ -283,7 +283,7 @@ async function run({ page, payload, log }) {
   } = payload || {};
   if (!video_url) throw new Error('No video_url provided');
 
-  log('info', '[fb-pw] selectors version=2026.06.18b-thumb-required');
+  log('info', '[fb-pw] selectors version=2026.06.19a-thumb-advance');
 
   page.on('dialog', (d) => { d.accept().catch(() => {}); });
 
@@ -510,11 +510,41 @@ async function run({ page, payload, log }) {
       throw new Error('FB Reels modal: "Thêm video"/"Tải lên" trigger not found — could not start video upload');
     }
 
-    // 4) Wait for the video to finish processing on FB's side before we can
-    //    fill the caption + advance. FB shows a progress indicator and only
-    //    enables the "Tiếp" button once upload + thumbnail extraction is done.
-    log('info', '[fb-pw] waiting for video upload to process (up to 60s)…');
-    await page.waitForTimeout(30000); // FB processes 10-60s for short Reels
+    // 4) Wait for FB to finish processing the uploaded video before filling the
+    //    caption + advancing. FB disables "Tiếp" (and hides the caption field)
+    //    until upload + frame-extraction is done; processing time scales with
+    //    video size/length. Instead of a blind fixed sleep (wasted idle for
+    //    small clips, too short for big ones), POLL for an ENABLED "Tiếp" —
+    //    proceed the instant it's ready, but give large clips up to 120s.
+    log('info', '[fb-pw] waiting for FB to finish processing the video…');
+    const procT0 = Date.now();
+    const procDeadline = procT0 + 120_000;
+    await page.waitForTimeout(2500); // let the upload register first
+    let procReady = false;
+    while (Date.now() < procDeadline) {
+      procReady = await page.evaluate(() => {
+        const dlgs = document.querySelectorAll("[role='dialog']");
+        const roots = dlgs.length ? Array.from(dlgs) : [document];
+        const verbs = ['Tiếp', 'Tiếp theo', 'Next', 'Continue'];
+        for (const root of roots) {
+          for (const el of root.querySelectorAll("button, [role='button']")) {
+            const t = (el.innerText || '').trim();
+            if (!verbs.includes(t)) continue;
+            const r = el.getBoundingClientRect();
+            if (r.width < 8 || r.height < 8) continue;
+            const cs = getComputedStyle(el);
+            if (cs.visibility === 'hidden' || cs.display === 'none') continue;
+            if (el.getAttribute('aria-disabled') === 'true' || el.disabled) continue;
+            return true; // an enabled Tiếp/Next → processing done, can advance
+          }
+        }
+        return false;
+      }).catch(() => false);
+      if (procReady) break;
+      await page.waitForTimeout(2500);
+    }
+    if (procReady) log('info', `[fb-pw] video processed in ~${Math.round((Date.now() - procT0) / 1000)}s — caption step ready`);
+    else log('warn', '[fb-pw] processing wait hit 120s cap — proceeding (Tiếp click auto-waits anyway)');
 
     // 5) Fill metadata. FB Reels has THREE separate fields (verified visually
     //    by user — different from how YT lumps everything into title + desc):
@@ -918,7 +948,6 @@ async function run({ page, payload, log }) {
     // iterations, throw with diagnostics.
     let published = false;
     let customThumbDone = false;
-    let thumbWaitDone = false; // poll for the thumb-edit pill at most once
     let pubWaitDone = false; // guard: wait for a disabled "Đăng" at most once
     for (let step = 0; step < 7 && !published; step++) {
       await page.waitForTimeout(3000);
@@ -971,17 +1000,18 @@ async function run({ page, payload, log }) {
           return null;
         }).catch(() => null);
         let editBtn = await findThumbBtn();
-        // The "Chỉnh sửa hình thu nhỏ" pill only appears AFTER FB finishes
-        // processing the uploaded video (frame extraction). For larger clips
-        // that lags past the 30s upload-wait, so a single check often misses it.
-        // Poll once (up to 75s) for it before giving up.
-        if (!editBtn && !thumbWaitDone) {
-          log('info', '[fb-pw] thumb-edit pill not visible yet — waiting for video processing (up to 75s)…');
-          const tdl = Date.now() + 75_000;
-          while (!editBtn && Date.now() < tdl) { await page.waitForTimeout(4000); editBtn = await findThumbBtn(); }
+        // The "Chỉnh sửa hình thu nhỏ" pill appears AFTER FB finishes processing
+        // the video AND, on the Page-wall composer, only on a LATER step (the
+        // cover/caption step AFTER clicking "Tiếp" from the video step) — NOT on
+        // the first video step. So poll briefly on THIS step; if it never shows,
+        // fall through to click "Tiếp" and look again on the next step. Per-step
+        // (not one-time) so the pill is caught on whichever step it renders.
+        if (!editBtn) {
+          log('info', '[fb-pw] thumb-edit pill not visible on this step — polling up to 18s…');
+          const tdl = Date.now() + 18_000;
+          while (!editBtn && Date.now() < tdl) { await page.waitForTimeout(3000); editBtn = await findThumbBtn(); }
           if (editBtn) log('info', '[fb-pw] thumb-edit pill appeared after wait');
         }
-        thumbWaitDone = true;
 
         let thumbApplied = false;
         if (editBtn) {
@@ -1128,14 +1158,14 @@ async function run({ page, payload, log }) {
           }
           customThumbDone = thumbApplied;
         }
-        // The idea HAS a thumbnail → it is REQUIRED. If the pill never showed
-        // (after the wait) or applying it failed, REFUSE to publish with FB's
-        // auto-thumb. Fail HERE — at the caption step, BEFORE any "Tiếp"/publish
-        // — so nothing ships and a retry can't double-post.
+        // Pill not on THIS step (e.g. the video step before "Tiếp", or the
+        // cover step hasn't rendered yet). Do NOT hard-fail here — click "Tiếp"
+        // to advance and retry the thumb flow on the next step. The pre-publish
+        // check below (before clicking "Đăng") hard-fails if the thumb was never
+        // applied across ANY step, so nothing ships with FB's auto-thumb and a
+        // retry can't double-post.
         if (!customThumbDone) {
-          await dumpInventory(page, log, 'thumb-required-missing');
-          await dumpFailure(page, 'thumb-required-missing', log);
-          throw new Error('Custom thumbnail required but could not be applied (FB "Chỉnh sửa hình thu nhỏ" not available, or upload/save failed) — refusing to publish with FB auto-thumb');
+          log('info', '[fb-pw] thumb-edit pill not on this step yet — advancing via "Tiếp" to retry on the next step');
         }
       }