channel-worker 2.5.7 → 2.5.9

package/package.json

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

package/scripts/upload_facebook.js

@@ -321,21 +321,49 @@ async function run({ page, payload, log }) {
     // 3) Dismiss any onboarding/tutorial dialog.
     await dismissBsOnboarding(page, log);
 
-    // 3) Click "Thêm video" — opens the native OS file picker. Catch the
-    //    filechooser event and inject the video file path. Multiple aria/text
-    //    candidates so we survive minor i18n drift.
-    log('info', '[fb-pw] click "Thêm video" + filechooser…');
+    // 3) Click "Thêm video" / "Tải lên" INSIDE the Reels modal — opens the
+    //    native OS file picker. Catch the filechooser event and inject the
+    //    video file path.
+    //
+    //    CRITICAL: scope every candidate to the Reels modal ([role='dialog']
+    //    titled "Tạo thước phim"). The page-wall background still has a
+    //    "Thêm video" / "Ảnh-video" button in the "Tạo bài viết" widget —
+    //    without scoping, the locator can match that instead, which opens
+    //    the regular "Tạo bài viết" composer ON TOP of the Reels modal and
+    //    the rest of the script lands in the wrong composer.
+    log('info', '[fb-pw] click "Thêm video" / "Tải lên" inside Reels modal + filechooser…');
+    // Locate the Reels modal first. Two title variants (vi + en).
+    const reelsDialog = page
+      .locator("[role='dialog']")
+      .filter({ has: page.locator(":scope :text-matches('^Tạo thước phim$|^Create reel$|^Create a reel$', 'i')") })
+      .first();
+    if (!(await reelsDialog.isVisible({ timeout: 6000 }).catch(() => false))) {
+      await dumpInventory(page, log, 'no-reels-modal');
+      await dumpFailure(page, 'no-reels-modal', log);
+      throw new Error('FB Reels modal "Tạo thước phim" did not open after clicking Thước phim entry');
+    }
+    // Candidates inside the modal only:
+    //   - "Tải lên" — the explicit blue upload button at the bottom (preferred)
+    //   - "Thêm video" — the drop-zone label (clickable on some variants)
+    //   - English equivalents
     const addVideoCandidates = [
-      "div[role='button']:has-text('Thêm video')",
-      "div[role='button']:has-text('Add video')",
-      "[aria-label='Thêm video']",
-      "[aria-label='Add video']",
+      reelsDialog.locator("div[role='button']:has-text('Tải lên')"),
+      reelsDialog.locator("button:has-text('Tải lên')"),
+      reelsDialog.locator("[aria-label='Tải lên']"),
+      reelsDialog.locator("div[role='button']:has-text('Upload')"),
+      reelsDialog.locator("[aria-label='Upload']"),
+      reelsDialog.locator("div[role='button']:has-text('Thêm video')"),
+      reelsDialog.locator("div[role='button']:has-text('Add video')"),
+      reelsDialog.locator("[aria-label='Thêm video']"),
+      reelsDialog.locator("[aria-label='Add video']"),
     ];
     let videoSet = false;
-    for (const sel of addVideoCandidates) {
+    for (const loc of addVideoCandidates) {
       if (videoSet) break;
-      const btn = await firstVisible(page.locator(sel), 3);
-      if (!btn) continue;
+      const count = await loc.count().catch(() => 0);
+      if (count === 0) continue;
+      const btn = loc.first();
+      if (!(await btn.isVisible().catch(() => false))) continue;
       try {
         const [chooser] = await Promise.all([
           page.waitForEvent('filechooser', { timeout: 8000 }),
@@ -343,27 +371,27 @@ async function run({ page, payload, log }) {
         ]);
         await chooser.setFiles(videoPath);
         videoSet = true;
-        log('info', `[fb-pw] video file set via "${sel}"`);
+        log('info', `[fb-pw] video file set via modal-scoped "${(await btn.innerText().catch(() => '')).slice(0, 30)}" button`);
       } catch (e) {
-        log('info', `[fb-pw] "Thêm video" via "${sel}" did not open picker: ${e.message.slice(0, 80)}`);
+        log('info', `[fb-pw] modal upload candidate did not open picker: ${e.message.slice(0, 80)}`);
       }
     }
     if (!videoSet) {
-      // Fallback — some BS variants expose the hidden input directly. Try
-      // setInputFiles on input[type='file'] anywhere on the page that accepts video.
-      const fi = page.locator("input[type='file']").last();
+      // Fallback — find an input[type='file'] that lives INSIDE the Reels
+      // modal (not the page-wall composer's hidden input).
+      const fi = reelsDialog.locator("input[type='file']").last();
       if (await fi.count().catch(() => 0) > 0) {
         try {
           await fi.setInputFiles(videoPath);
           videoSet = true;
-          log('info', `[fb-pw] video file set via fallback input[type='file']`);
-        } catch (e) { log('info', `[fb-pw] fallback input setInputFiles failed: ${e.message.slice(0, 80)}`); }
+          log('info', '[fb-pw] video file set via modal-scoped fallback input[type=file]');
+        } catch (e) { log('info', `[fb-pw] modal fallback input setInputFiles failed: ${e.message.slice(0, 80)}`); }
       }
     }
     if (!videoSet) {
       await dumpInventory(page, log, 'no-add-video');
       await dumpFailure(page, 'no-add-video', log);
-      throw new Error('FB "Thêm video" trigger not found — could not start video upload');
+      throw new Error('FB Reels modal: "Thêm video"/"Tải lên" trigger not found — could not start video upload');
     }
 
     // 4) Wait for the video to finish processing on FB's side before we can
@@ -1271,6 +1299,17 @@ async function run({ page, payload, log }) {
           throw new Error(`FB publish: thumbnail_url provided but the "Chỉnh sửa hình thu nhỏ" overlay was never detected before publish (step ${step + 1}). Refusing to ship without custom thumb. Inspect dump screenshots in Temp\\cm-worker-pw\\.`);
         }
         log('info', `[fb-pw] click publish "${pub.verb}" via "${pub.sel}" (step ${step + 1})`);
+        // DRY-RUN MODE (temporary, for QA): skip the actual publish click so
+        // we can verify the upstream flow (modal scoping, video upload, thumb
+        // step, metadata fill) without spawning real Reels every iteration.
+        // Throws a recognisable error so the daemon marks the cmd failed
+        // without retrying. REMOVE this block once the page-wall composer
+        // fix is verified end-to-end.
+        if (process.env.FB_PW_DRY_RUN === '1' || payload._dry_run === true) {
+          await dumpInventory(page, log, `dry-run-at-publish-${step + 1}`);
+          await dumpFailure(page, `dry-run-at-publish-${step + 1}`, log);
+          throw new Error(`[fb-pw] DRY-RUN: reached publish step ${step + 1} successfully. Pub button found via "${pub.sel}" verb="${pub.verb}". Thumb=${customThumbDone ? 'uploaded' : 'NOT uploaded'}. NOT clicking. Inspect dump screenshots in Temp\\cm-worker-pw\\.`);
+        }
         // Snapshot the captured-IDs list RIGHT BEFORE the publish click. The
         // network listener captures from EVERY graph response, including the
         // pre-publish page wall feed (~100+ IDs). Only IDs captured AFTER