channel-worker 2.5.52 → 2.5.53

package/package.json

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

package/scripts/upload_facebook.js

@@ -1255,24 +1255,58 @@ async function runOnce({ page, payload, log }) {
             await page.locator(editBtn.selector).click({ timeout: 5000 });
             await page.waitForTimeout(2500);
 
-            // Wait for the thumb-edit modal to mount. Header text =
-            // "Chỉnh sửa hình thu nhỏ".
+            // Wait for the thumb editor to mount. FB serves (A/B, seen
+            // 2026-08-19) TWO variants and any given account can get either:
+            //   modal  — a separate [role='dialog'] titled "Chỉnh sửa hình
+            //            thu nhỏ" (the original form).
+            //   nested — the editor renders INSIDE the reel-composer dialog
+            //            ("Cài đặt thước phim"): no own dialog, and the
+            //            header sits too deep in innerText for a 300-char
+            //            signature check. Recognize it by its upload button
+            //            (aria "Tải hình thu nhỏ tùy chỉnh lên…"), which only
+            //            exists while the editor is open, and tag the nearest
+            //            container that also holds Lưu + Hủy so the scoped
+            //            selectors below keep working for both variants.
+            // Check modal FIRST so old-UI accounts behave exactly as before.
             await page.evaluate(() => document.querySelectorAll("[__fbpw_thumb_edit__]").forEach((el) => el.removeAttribute('__fbpw_thumb_edit__'))).catch(() => {});
-            const thumbDialogReady = await page.evaluate(() => {
+            const detectThumbEditor = () => page.evaluate(() => {
               document.querySelectorAll('[__fbpw_thumb_dialog__]').forEach((el) => el.removeAttribute('__fbpw_thumb_dialog__'));
+              const vis = (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';
+              };
               for (const dlg of document.querySelectorAll("[role='dialog']")) {
-                const r = dlg.getBoundingClientRect();
-                if (r.width < 8 || r.height < 8) continue;
-                const cs = getComputedStyle(dlg);
-                if (cs.visibility === 'hidden' || cs.display === 'none' || cs.opacity === '0') continue;
+                if (!vis(dlg)) continue;
                 const sig = `${dlg.getAttribute('aria-label') || ''}\n${(dlg.innerText || '').slice(0, 300)}`;
                 if (!/Chỉnh sửa hình thu nhỏ|Edit thumbnail/i.test(sig)) continue;
                 dlg.setAttribute('__fbpw_thumb_dialog__', '1');
-                return true;
+                return 'modal';
               }
-              return false;
-            }).catch(() => false);
-            if (!thumbDialogReady) throw new Error('thumbnail editor dialog did not mount');
+              const uploadBtn = [...document.querySelectorAll('[aria-label]')].find((el) => {
+                const al = el.getAttribute('aria-label') || '';
+                return /Tải hình thu nhỏ|thumbnail/i.test(al) && /Tải|upload/i.test(al) && vis(el);
+              });
+              if (uploadBtn) {
+                const hasBtn = (root, re) => [...root.querySelectorAll("[role='button'], button")]
+                  .some((b) => re.test((b.innerText || '').trim()) && vis(b));
+                let box = uploadBtn.parentElement;
+                while (box && box !== document.body && !(hasBtn(box, /^(Lưu|Save)$/) && hasBtn(box, /^(Hủy|Cancel)$/))) box = box.parentElement;
+                if (box === document.body) box = null;
+                (box || uploadBtn.closest("[role='dialog']") || document.body).setAttribute('__fbpw_thumb_dialog__', '1');
+                return 'nested';
+              }
+              return null;
+            }).catch(() => null);
+            let thumbEditorVia = await detectThumbEditor();
+            const mountDeadline = Date.now() + 12_000;
+            while (!thumbEditorVia && Date.now() < mountDeadline) {
+              await page.waitForTimeout(2000);
+              thumbEditorVia = await detectThumbEditor();
+            }
+            if (!thumbEditorVia) throw new Error('thumbnail editor dialog did not mount');
+            log('info', `[fb-pw] page-wall thumb — editor mounted (variant=${thumbEditorVia})`);
 
             // Click "Tải lên" button — opens OS file picker. Use filechooser
             // race to inject the file path directly. Scope every action to the
@@ -1355,6 +1389,11 @@ async function runOnce({ page, payload, log }) {
                 const RETRY_AFTER_MS = 12_000;
                 let lastRetryAt = Date.now();
                 while (Date.now() < closeDeadline) {
+                  // "Editor still open" must cover both variants: the modal
+                  // form (dialog whose text leads with the header) and the
+                  // 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) {
@@ -1364,6 +1403,15 @@ async function runOnce({ page, payload, log }) {
                         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; }