channel-worker 2.5.35 → 2.5.37

package/package.json

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

package/scripts/upload_facebook_photo.js

@@ -221,45 +221,86 @@ async function run({ page, payload, log }) {
 
     // 6) Click "Đăng".
     log('info', '[fbphoto] clicking publish…');
-    const clickPublish = async () => page.evaluate((vbs) => {
-      const dlg = document.querySelector("[role='dialog']") || document;
-      for (const v of vbs) {
-        for (const b of dlg.querySelectorAll("div[role='button'], button, [role='button']")) {
-          const t = (b.innerText || '').trim();
-          const a = (b.getAttribute('aria-label') || '').trim();
-          if ((t === v || a === v) && b.getAttribute('aria-disabled') !== 'true') {
-            b.setAttribute('__fbphoto_pub__', '1');
-            return true;
+    // Tag the first VISIBLE + ENABLED button matching `verbs`. Mirrors the
+    // proven upload_facebook.js findByVerbs: searches ALL [role='dialog']
+    // (not just the first — FB renders extra hidden dialogs), matches
+    // innerText||textContent (button label often lives in a nested span), then
+    // falls back to the whole document. Returns the matched verb, or null.
+    const tagCta = async (verbs) => page.evaluate((vbs) => {
+      const tryScope = (roots, verb) => {
+        for (const root of roots) {
+          let best = null;
+          for (const el of root.querySelectorAll("button, [role='button']")) {
+            const t = (el.innerText || el.textContent || '').trim();
+            const a = (el.getAttribute('aria-label') || '').trim();
+            if (t !== verb && a !== verb) 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;
+            if (el.getAttribute('aria-disabled') === 'true' || el.disabled) continue;
+            best = el;
           }
+          if (best) return best;
         }
+        return null;
+      };
+      for (const v of vbs) {
+        const dlgs = Array.from(document.querySelectorAll("[role='dialog']"));
+        let el = tryScope(dlgs, v) || tryScope([document], v);
+        if (el) { el.setAttribute('__fbphoto_cta__', '1'); return v; }
       }
-      return false;
-    }, publishVerbs).catch(() => false);
+      return null;
+    }, verbs).catch(() => null);
+    const clickTaggedCta = async () => {
+      await page.locator("[__fbphoto_cta__='1']").click({ timeout: 5000 }).catch(() => {});
+      await page.evaluate(() => document.querySelectorAll('[__fbphoto_cta__]').forEach((e) => e.removeAttribute('__fbphoto_cta__'))).catch(() => {});
+    };
 
-    // Wait for the publish button to enable (image still processing).
-    let clicked = false;
-    for (let i = 0; i < 30 && !clicked; i++) {
-      if (await clickPublish()) {
-        await page.locator("[__fbphoto_pub__='1']").click({ timeout: 5000 }).catch(() => {});
-        await page.evaluate(() => document.querySelectorAll('[__fbphoto_pub__]').forEach((e) => e.removeAttribute('__fbphoto_pub__'))).catch(() => {});
-        clicked = true;
-      } else {
-        await page.waitForTimeout(2000);
+    // Step loop: the FB photo composer is MULTI-STEP — "Tiếp" advances through
+    // audience/settings screens; only the LAST step shows "Đăng"/"Chia sẻ ngay"
+    // (the failing run stopped here: it saw a "Tiếp", not a publish button).
+    // Prefer a publish button when present; else advance via "Tiếp". Retry a
+    // few times when neither is enabled yet (FB disables while ingesting).
+    const nextVerbs = ['Tiếp', 'Tiếp theo', 'Next', 'Continue'];
+    let published = false;
+    let stalls = 0;
+    for (let step = 0; step < 8 && !published; step++) {
+      const pubHit = await tagCta(publishVerbs);
+      if (pubHit) { log('info', `[fbphoto] publish via "${pubHit}" (step ${step + 1})`); await clickTaggedCta(); published = true; break; }
+      const nextHit = await tagCta(nextVerbs);
+      if (nextHit) { log('info', `[fbphoto] advance via "${nextHit}" (step ${step + 1})`); await clickTaggedCta(); await page.waitForTimeout(2800); stalls = 0; continue; }
+      // Neither publish nor Tiếp enabled — FB still ingesting the photo. Wait.
+      if (++stalls > 10) break; // ~30s of no CTA → give up
+      if (stalls === 1 || stalls === 6) {
+        // Diagnostic: what buttons ARE in the composer right now?
+        const btns = await page.evaluate(() => {
+          const out = [];
+          for (const dlg of document.querySelectorAll("[role='dialog']")) {
+            for (const el of dlg.querySelectorAll("button, [role='button']")) {
+              const t = (el.innerText || el.textContent || '').trim().slice(0, 30);
+              const r = el.getBoundingClientRect();
+              if (t && r.width > 20 && r.height > 8) out.push(`${t}${el.getAttribute('aria-disabled') === 'true' ? '(disabled)' : ''}`);
+            }
+          }
+          return [...new Set(out)].slice(0, 20);
+        }).catch(() => []);
+        log('info', `[fbphoto] composer buttons: ${JSON.stringify(btns)}`);
       }
+      log('info', `[fbphoto] no CTA yet at step ${step + 1} — waiting…`);
+      step--; // don't count a pure wait against the step budget
+      await page.waitForTimeout(3000);
     }
-    if (!clicked) {
+    if (!published) {
       await dumpFailure(page, 'no-publish-btn', log);
-      throw new Error('FB: nút "Đăng" không khả dụng (ảnh chưa xử lý xong / không tìm thấy).');
+      throw new Error('FB: không tìm thấy nút "Đăng" sau các bước "Tiếp" (composer đổi layout?).');
     }
 
-    // 7) Verify commit + retry — a click can register without FB posting.
+    // Verify commit + retry — a click can register without FB posting.
     await page.waitForTimeout(6000);
     for (let commitTry = 0; commitTry < 3 && (await composerStillOpen(page, publishVerbs)); commitTry++) {
-      log('warn', `[fbphoto] composer still open — re-clicking "Đăng" (retry ${commitTry + 1}/3)`);
-      if (await clickPublish()) {
-        await page.locator("[__fbphoto_pub__='1']").click({ timeout: 5000 }).catch(() => {});
-        await page.evaluate(() => document.querySelectorAll('[__fbphoto_pub__]').forEach((e) => e.removeAttribute('__fbphoto_pub__'))).catch(() => {});
-      }
+      log('warn', `[fbphoto] composer still open — re-clicking publish (retry ${commitTry + 1}/3)`);
+      if (await tagCta(publishVerbs)) await clickTaggedCta();
       await page.waitForTimeout(6000);
     }
     if (await composerStillOpen(page, publishVerbs)) {