channel-worker 2.5.16 → 2.5.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "channel-worker",
-  "version": "2.5.16",
+  "version": "2.5.18",
   "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.14b-pub-wait');
+  log('info', '[fb-pw] selectors version=2026.06.18b-thumb-required');
 
   page.on('dialog', (d) => { d.accept().catch(() => {}); });
 
@@ -525,7 +525,19 @@ async function run({ page, payload, log }) {
     //    (some FB builds only show them on the final Chia sẻ step). The
     //    helper is idempotent: it tracks per-field "done" so we don't
     //    re-fill on subsequent steps.
-    const fillState = { title: false, description: false, tags: false };
+    // FB Reels page-wall composer has ONLY one caption field ("Mô tả thước
+    // phim") — no separate Title or Tags input (those were BS-composer fields,
+    // now gone). Per product decision the reel caption = title + hashtags
+    // (the description is dropped). Hashtags are collapsed to single #tokens
+    // since FB caption hashtags can't contain spaces ("gia dung" → "#giadung").
+    const fbHashtags = (tags || [])
+      .map(t => '#' + String(t || '').trim().replace(/[#\s]+/g, ''))
+      .filter(h => h.length > 1);
+    const fbCaption = [String(title || '').trim(), fbHashtags.join(' ')]
+      .filter(Boolean).join('\n\n');
+    // Pre-mark title+tags "done" so the legacy BS title/tags probes are skipped;
+    // only the description field is filled — with fbCaption (title + hashtags).
+    const fillState = { title: true, description: false, tags: true };
     const fillMetadata = async () => {
       // Title (Tiêu đề thước phim). Variant-A input is shown by default in the
       // BS composer — NO reveal click needed. Earlier `revealCandidates` clicks
@@ -677,7 +689,7 @@ async function run({ page, payload, log }) {
           if (!f) continue;
           try {
             await f.click({ timeout: 3000 });
-            const descText = (description || title || '').toString().slice(0, 2100);
+            const descText = (fbCaption || description || title || '').toString().slice(0, 2100);
             if (!descText) break;
             await f.type(descText, { delay: 12 });
             fillState.description = true;
@@ -906,6 +918,7 @@ 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);
@@ -916,7 +929,7 @@ async function run({ page, payload, log }) {
       // file picker → "Lưu"). Per user screenshots, this is the only way to
       // attach a custom thumbnail in the Page-wall composer.
       if (!customThumbDone && thumbPath && /^https?:\/\/(www\.)?facebook\.com\/?($|\?|#)/.test(page.url())) {
-        const editBtn = await page.evaluate(() => {
+        const findThumbBtn = () => page.evaluate(() => {
           // Look for the thumbnail-edit button inside the REEL COMPOSER dialog
           // only — scanning all dialogs risked matching a button on the
           // page-wall photo composer (which would post a separate "Tin dạng
@@ -957,7 +970,20 @@ 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(); }
+          if (editBtn) log('info', '[fb-pw] thumb-edit pill appeared after wait');
+        }
+        thumbWaitDone = true;
 
+        let thumbApplied = false;
         if (editBtn) {
           log('info', `[fb-pw] page-wall thumb — opening "Chỉnh sửa hình thu nhỏ" modal (via=${editBtn.via}, aria="${editBtn.aria}", text="${editBtn.text}"${editBtn.size ? `, size=${editBtn.size}` : ''})…`);
           try {
@@ -1078,6 +1104,7 @@ async function run({ page, payload, log }) {
                   await page.waitForTimeout(1000);
                 }
                 if (modalClosed) {
+                  thumbApplied = true;
                   log('info', `[fb-pw] page-wall thumb — modal closed after save (retries=${retryCount})`);
                 } else {
                   log('warn', '[fb-pw] page-wall thumb — modal still open 60s after Lưu click; trying ESC + click Hủy fallback');
@@ -1099,7 +1126,16 @@ async function run({ page, payload, log }) {
           } catch (e) {
             log('warn', `[fb-pw] page-wall thumb flow failed: ${e.message.slice(0, 100)}`);
           }
-          customThumbDone = true;
+          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.
+        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');
         }
       }
 
@@ -1423,12 +1459,13 @@ async function run({ page, payload, log }) {
         // output. (Observed on reel 1506614811005729: step 1 → click Tiếp
         // → publish, the thumb-edit pill never appeared.)
         if (thumbPath && !customThumbDone) {
-          // Custom thumb couldn't be applied (FB didn't render the "Chỉnh sửa
-          // hình thu nhỏ" overlay). DON'T refuse to publish — the strict
-          // failure shipped false "failed" results (the reel still published)
-          // and double-posts on retry. Publish with FB's auto-thumbnail; the
-          // custom artwork is a nice-to-have, not worth a hard failure.
-          log('warn', `[fb-pw] custom thumb skipped — "Chỉnh sửa hình thu nhỏ" overlay never appeared (step ${step + 1}); publishing with FB auto-thumb`);
+          // Defensive: we normally fail at the caption step (before any Tiếp)
+          // when a required custom thumb can't be applied. If we somehow reach
+          // here without it, refuse to publish — but BEFORE clicking Đăng, so
+          // nothing ships and a retry can't double-post. (The v2.5.14 double-post
+          // came from failing AFTER publish; this throw is pre-publish.)
+          await dumpFailure(page, 'thumb-required-at-publish', log);
+          throw new Error('Custom thumbnail required but not applied — refusing to publish with FB auto-thumb');
         }
         log('info', `[fb-pw] click publish "${pub.verb}" via "${pub.sel}" (step ${step + 1})`);
         // Snapshot the captured-IDs list RIGHT BEFORE the publish click. The