channel-worker 2.5.36 → 2.5.38

package/package.json

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

package/scripts/upload_facebook.js

@@ -1550,7 +1550,33 @@ async function run({ page, payload, log }) {
         // new one is the publish mutation response.
         capturedReelIdsSnapshotLen = capturedReelIds.length;
         try {
-          await waitAndClick(pub.hit, { timeoutMs: 120_000, log, label: `Publish(${pub.verb})` });
+          // Retry the publish click. The button is FOUND + enabled, yet
+          // locator.click can still time out (transient overlay / React
+          // re-render detaching the node → "locator.click: Timeout 5000ms").
+          // Re-find + re-click up to 3×, and on the last try fall back to a raw
+          // JS dispatch (bypasses Playwright's obscured/stable guards).
+          let clickedPublish = false;
+          for (let attempt = 0; attempt < 3 && !clickedPublish; attempt++) {
+            const target = attempt === 0 ? pub : await findByVerbs(publishVerbs, { requireBottomHalf: true });
+            if (!target) { await page.waitForTimeout(1500); continue; }
+            try {
+              await target.hit.click({ timeout: 15000 });
+              clickedPublish = true;
+            } catch (ce) {
+              log('warn', `[fb-pw] publish click attempt ${attempt + 1}/3 failed: ${ce.message.slice(0, 90)}`);
+              if (attempt === 2) {
+                const js = await page.evaluate(() => {
+                  const el = document.querySelector("[__fbpw_target__='1']")
+                    || [...document.querySelectorAll("[role='button'],button")].find(b => ((b.getAttribute('aria-label') || b.innerText || '').trim() === 'Đăng'));
+                  if (!el) return false;
+                  el.scrollIntoView({ block: 'center' }); el.click(); return true;
+                }).catch(() => false);
+                if (js) { clickedPublish = true; log('info', '[fb-pw] publish via JS-dispatch fallback'); }
+              }
+              if (!clickedPublish) await page.waitForTimeout(2000);
+            }
+          }
+          if (!clickedPublish) throw new Error(`publish button not clickable after 3 attempts`);
 
           // FB shows a confirmation dialog ("Chia sẻ ai biết tin trên Facebook"
           // / "Are you sure you want to share?") after the primary publish

package/scripts/upload_facebook_photo.js

@@ -221,22 +221,34 @@ async function run({ page, payload, log }) {
 
     // 6) Click "Đăng".
     log('info', '[fbphoto] clicking publish…');
-    // Tag the first enabled button inside the composer matching `verbs`
-    // (bottom-half CTA preferred). Returns the matched verb, or null.
+    // 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 dlg = document.querySelector("[role='dialog']") || document;
-      const btns = [...dlg.querySelectorAll("div[role='button'], button, [role='button']")];
-      for (const v of vbs) {
-        for (const b of btns) {
-          const t = (b.innerText || '').trim();
-          const a = (b.getAttribute('aria-label') || '').trim();
-          if ((t === v || a === v) && b.getAttribute('aria-disabled') !== 'true') {
-            const r = b.getBoundingClientRect();
+      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;
-            b.setAttribute('__fbphoto_cta__', '1');
-            return v;
+            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 null;
     }, verbs).catch(() => null);
@@ -260,6 +272,21 @@ async function run({ page, payload, log }) {
       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);