channel-worker 2.5.69 → 2.5.70

package/package.json

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

package/scripts/upload_facebook.js

@@ -76,6 +76,22 @@ const REEL_ENTRY_SELECTORS = [
 // 20 minutes, so give the real upload enough room instead of failing while FB
 // is visibly still processing it.
 const PUBLISH_ENABLE_TIMEOUT_MS = 10 * 60 * 1000;
+// Facebook can spend several seconds tearing down the nested custom-thumbnail
+// editor before it mounts the final Reel settings CTA. During that transition
+// there is neither a visible "Tiếp" nor "Đăng" button. The old four-poll
+// (~10s) shortcut returned false just before the CTA appeared, producing a
+// false no-advance failure even though the final blue "Đăng" button was ready.
+const PUBLISH_CTA_ABSENT_GRACE_MS = 30 * 1000;
+
+// Text observed in the two thumbnail-editor cohorts. The nested variant has no
+// useful dialog aria-label, so checking only "Chỉnh sửa hình thu nhỏ" misses it
+// while Facebook is processing the saved image.
+const THUMBNAIL_EDITOR_TEXT_MARKERS = [
+  'Chỉnh sửa hình thu nhỏ',
+  'Edit thumbnail',
+  'Tải hình thu nhỏ của riêng bạn lên',
+  'Upload your own thumbnail',
+];
 
 async function firstVisible(locator, max = 5) {
   const n = Math.min(await locator.count().catch(() => 0), max);
@@ -474,11 +490,14 @@ async function setVideoFile(page, inputHandle, filePath, log, tag = 'fb-pw') {
 // well past the 30s upload-wait, so findByVerbs (which skips disabled buttons)
 // finds no publish CTA — and with no "Tiếp" on the last step the loop would
 // throw no-advance. Poll until a bottom-half publish-verb button is present
-// AND enabled. Returns true once enabled; false on timeout, or fast-false if no
-// publish button ever appears (we're not actually on the final step).
-async function waitForPublishEnabled(page, verbs, log, timeoutMs, tag = 'fb-pw', { onPoll = null } = {}) {
+// AND enabled. Returns true once enabled; false on timeout, or after a guarded
+// absence window when no publish button ever appears (not the final step).
+async function waitForPublishEnabled(page, verbs, log, timeoutMs, tag = 'fb-pw', {
+  onPoll = null,
+  absentGraceMs = PUBLISH_CTA_ABSENT_GRACE_MS,
+} = {}) {
   const deadline = Date.now() + timeoutMs;
-  let announced = false, sawPresent = false, absent = 0;
+  let announced = false, sawPresent = false, absentSince = 0;
   while (Date.now() < deadline) {
     // The final metadata form mounts lazily on some FB cohorts. The first
     // fillMetadata() immediately after Tiếp can run before its textbox exists,
@@ -513,9 +532,16 @@ async function waitForPublishEnabled(page, verbs, log, timeoutMs, tag = 'fb-pw',
     }
     if (st.present) {
       sawPresent = true;
+      absentSince = 0;
       if (!announced) { log('info', `[${tag}] final step: "Đăng" disabled (video still processing) — waiting up to ${Math.round(timeoutMs / 1000)}s…`); announced = true; }
-    } else if (!sawPresent && ++absent >= 4) {
-      return { enabled: false, sawPresent: false }; // no publish CTA after ~10s → not the final step
+    } else if (!sawPresent) {
+      if (!absentSince) absentSince = Date.now();
+      // The final settings form mounts lazily after the thumbnail editor closes.
+      // Give that transition a real time-based grace period instead of assuming
+      // four polls means this is not the final step.
+      if (Date.now() - absentSince >= absentGraceMs) {
+        return { enabled: false, sawPresent: false };
+      }
     }
     await pause(page, 2500);
   }
@@ -523,6 +549,31 @@ async function waitForPublishEnabled(page, verbs, log, timeoutMs, tag = 'fb-pw',
   return { enabled: false, sawPresent };
 }
 
+async function isThumbnailEditorVisible(page) {
+  return page.evaluate((textMarkers) => {
+    const isVisible = (el) => {
+      const r = el.getBoundingClientRect();
+      if (r.width < 8 || r.height < 8) return false;
+      const cs = getComputedStyle(el);
+      return cs.visibility !== 'hidden' && cs.display !== 'none' && cs.opacity !== '0';
+    };
+    const markers = textMarkers.map((s) => s.toLocaleLowerCase());
+    for (const dlg of document.querySelectorAll("[role='dialog']")) {
+      if (!isVisible(dlg)) continue;
+      const txt = (dlg.innerText || '').toLocaleLowerCase();
+      if (markers.some((marker) => txt.includes(marker))) return true;
+    }
+    // Some cohorts render the editor as a nested form instead of a dialog.
+    // Its upload control is the most stable signal while the save is pending.
+    for (const el of document.querySelectorAll('[aria-label]')) {
+      if (!isVisible(el)) continue;
+      const al = (el.getAttribute('aria-label') || '').toLocaleLowerCase();
+      if ((/tải hình thu nhỏ|thumbnail/.test(al)) && (/tải|upload/.test(al))) return true;
+    }
+    return false;
+  }, THUMBNAIL_EDITOR_TEXT_MARKERS).catch(() => false);
+}
+
 const SAFE_RETRY_COMPOSER_CLOSED = 'FB_SAFE_RETRY_COMPOSER_CLOSED';
 
 function safeComposerRetryError(message) {
@@ -580,7 +631,7 @@ async function runOnce({ page, payload, log }) {
   } = payload || {};
   if (!video_url) throw new Error('No video_url provided');
 
-  log('info', '[fb-pw] selectors version=2026.08.28-icon-only-create-route-fallback');
+  log('info', '[fb-pw] selectors version=2026.09.01-thumb-final-cta-race');
 
   page.on('dialog', (d) => { d.accept().catch(() => {}); });
 
@@ -1602,6 +1653,7 @@ async function runOnce({ page, payload, log }) {
                 // disabled while FB was still hashing the upload).
                 const closeDeadline = Date.now() + 60_000;
                 let modalClosed = false;
+                let closedPolls = 0;
                 let retryCount = 0;
                 const RETRY_AFTER_MS = 12_000;
                 let lastRetryAt = Date.now();
@@ -1611,27 +1663,16 @@ async function runOnce({ page, payload, log }) {
                   // nested form (no own dialog — its upload button, aria
                   // "Tải hình thu nhỏ tùy chỉnh lên…", only exists while the
                   // editor is showing).
-                  const still = await page.evaluate(() => {
-                    const dlgs = document.querySelectorAll("[role='dialog']");
-                    for (const dlg of dlgs) {
-                      const txt = (dlg.innerText || '').slice(0, 200);
-                      if (/Chỉnh sửa hình thu nhỏ|Edit thumbnail/i.test(txt)) {
-                        const r = dlg.getBoundingClientRect();
-                        if (r.width > 8 && r.height > 8) return true;
-                      }
-                    }
-                    for (const el of document.querySelectorAll('[aria-label]')) {
-                      const al = el.getAttribute('aria-label') || '';
-                      if (!(/Tải hình thu nhỏ|thumbnail/i.test(al) && /Tải|upload/i.test(al))) continue;
-                      const r = el.getBoundingClientRect();
-                      if (r.width < 8 || r.height < 8) continue;
-                      const cs = getComputedStyle(el);
-                      if (cs.visibility === 'hidden' || cs.display === 'none' || cs.opacity === '0') continue;
-                      return true;
-                    }
-                    return false;
-                  }).catch(() => false);
-                  if (!still) { modalClosed = true; break; }
+                  const still = await isThumbnailEditorVisible(page);
+                  if (!still) {
+                    // Require two consecutive closed samples. Facebook briefly
+                    // unmounts the nested form while swapping it for a
+                    // processing overlay; treating that single gap as closed
+                    // races the final "Đăng" button mount.
+                    if (++closedPolls >= 2) { modalClosed = true; break; }
+                  } else {
+                    closedPolls = 0;
+                  }
                   // Retry Lưu click after RETRY_AFTER_MS without progress —
                   // limit to 3 retries (so we still leave time for FB to
                   // finish processing on the last attempt).
@@ -2801,11 +2842,14 @@ module.exports.__testables = {
   muteClickInterceptors,
   unmuteClickInterceptors,
   waitForPublishEnabled,
+  isThumbnailEditorVisible,
   hasVisibleReelComposer,
   SAFE_RETRY_COMPOSER_CLOSED,
   navigateFacebookHome,
   navigateFacebookReelCreate,
   PUBLISH_ENABLE_TIMEOUT_MS,
+  PUBLISH_CTA_ABSENT_GRACE_MS,
+  THUMBNAIL_EDITOR_TEXT_MARKERS,
   REEL_CREATE_SELECTORS,
   REEL_ENTRY_SELECTORS,
   ADD_VIDEO_SELECTORS,