channel-worker 2.5.19 → 2.5.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "channel-worker",
-  "version": "2.5.19",
+  "version": "2.5.21",
   "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.18c-proc-wait');
+  log('info', '[fb-pw] selectors version=2026.06.19b-thumb-diag');
 
   page.on('dialog', (d) => { d.accept().catch(() => {}); });
 
@@ -948,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);
@@ -969,7 +968,9 @@ async function run({ page, payload, log }) {
           const dlgs = [];
           for (const d of allDlgs) {
             const txt = (d.innerText || '').slice(0, 400);
-            if (/Tạo thước phim|Create reel|Create a reel/i.test(txt)) dlgs.push(d);
+            // Match ALL reel-composer steps: "Tạo thước phim" (video step),
+            // the caption/cover step, and "Cài đặt thước phim" (settings step).
+            if (/thước phim|create reel|create a reel|reel settings/i.test(txt)) dlgs.push(d);
           }
           if (dlgs.length === 0) return null;
           for (const dlg of dlgs) {
@@ -1001,17 +1002,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) {
@@ -1158,14 +1160,35 @@ 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');
+          // DIAG: dump the reel-dialog buttons on this step so we can locate the
+          // cover/thumbnail control when detection misses it (different UI variant).
+          try {
+            const diag = await page.evaluate(() => {
+              const dlgs = [...document.querySelectorAll("[role='dialog']")]
+                .filter(d => /thước phim|create reel|reel settings/i.test((d.innerText || '').slice(0, 400)));
+              const out = [];
+              for (const d of dlgs) {
+                const hdr = (d.innerText || '').split('\n')[0].slice(0, 40);
+                for (const el of d.querySelectorAll("[role='button'],button,[aria-label],img")) {
+                  const t = (el.innerText || '').trim().slice(0, 28);
+                  const al = (el.getAttribute('aria-label') || '').trim().slice(0, 40);
+                  const r = el.getBoundingClientRect();
+                  if (r.width < 10 || r.height < 10) continue;
+                  if (t || al) out.push(`[${hdr}] <${el.tagName.toLowerCase()}> t="${t}" al="${al}" ${Math.round(r.width)}x${Math.round(r.height)}`);
+                }
+              }
+              return out.slice(0, 45);
+            }).catch(() => []);
+            log('info', `[fb-pw] thumb-diag step ${step + 1}: ${JSON.stringify(diag)}`);
+          } catch { /* diag best-effort */ }
+          log('info', '[fb-pw] thumb-edit pill not on this step yet — advancing via "Tiếp" to retry on the next step');
         }
       }