channel-worker 2.5.118 → 2.5.120

package/lib/command-poller.js

@@ -370,7 +370,26 @@ class CommandPoller {
         return;
       }
 
+      const clickResult = await report.fetchClickReport(conn.context, {
+        days: payload.days || 90,
+        log: (message) => console.log(message),
+      });
+      if (clickResult.status === 'needs_verify') {
+        await this.api.updateCommand(command._id, {
+          status: 'done',
+          result: { needs_verify: true, reason: clickResult.reason, count: result.rows.length, click_count: clickResult.rows?.length || 0 },
+        });
+        return;
+      }
+      if (clickResult.status !== 'ok') {
+        await this.api.updateCommand(command._id, {
+          status: 'failed', error: String(clickResult.reason || 'Không đọc được báo cáo click Shopee').slice(0, 500),
+        });
+        return;
+      }
+
       const saved = await this.api.affiliateReportResult(result.rows, {
+        clicks: clickResult.rows,
         last_report_date: result.last_report_date,
         last_update_time: result.last_update_time,
         from: result.from,
@@ -383,10 +402,14 @@ class CommandPoller {
           saved: saved?.saved || 0,
           matched: saved?.matched || 0,
           unmatched: saved?.unmatched || 0,
+          click_count: clickResult.rows.length,
+          click_saved: saved?.click_saved || 0,
+          click_matched: saved?.click_matched || 0,
+          click_unmatched: saved?.click_unmatched || 0,
           last_report_date: result.last_report_date,
         },
       });
-      console.log(`[shopee-report] đã lưu ${saved?.saved || 0}/${result.rows.length} dòng; khớp kênh ${saved?.matched || 0}`);
+      console.log(`[shopee-report] đã lưu ${saved?.saved || 0}/${result.rows.length} đơn, ${saved?.click_saved || 0}/${clickResult.rows.length} click`);
     } catch (err) {
       console.error(`[shopee-report] đồng bộ thất bại: ${err.message}`);
       await this.api.updateCommand(command._id, { status: 'failed', error: String(err.message || err).slice(0, 500) });

package/lib/shopee-report.js

@@ -104,4 +104,83 @@ async function fetchConversionReport(ctx, {
   }
 }
 
-module.exports = { fetchConversionReport, reportWindow };
+async function fetchClickReport(ctx, {
+  days = 90,
+  pageSize = 100,
+  maxPages = 200,
+  delayMs = 250,
+  timeoutMs = 60000,
+  log = null,
+} = {}) {
+  let page = findAffiliatePage(ctx.pages());
+  let opened = false;
+  if (!page) {
+    page = await ctx.newPage();
+    opened = true;
+  }
+
+  try {
+    if (!page.url().includes('affiliate.shopee.vn/')) {
+      await page.goto('https://affiliate.shopee.vn/report/click_report', {
+        waitUntil: 'domcontentloaded', timeout: timeoutMs,
+      }).catch(() => {});
+      await sleep(1500);
+    }
+    if (isBlockedState(page.url(), null)) {
+      return { status: 'needs_verify', rows: [], reason: 'session at captcha/login — re-verify via VNC' };
+    }
+
+    const window = reportWindow(days);
+    const rows = [];
+    let total = null;
+
+    for (let pageNum = 1; pageNum <= maxPages; pageNum++) {
+      const result = await page.evaluate(async (q) => {
+        const url = `/api/v1/click_report/list?page_size=${q.pageSize}&page_num=${q.pageNum}`
+          + `&click_time_s=${q.start}&click_time_e=${q.end}`;
+        try {
+          const r = await fetch(url, { credentials: 'include' });
+          return { status: r.status, json: await r.json().catch(() => null) };
+        } catch (e) {
+          return { status: 0, error: String(e?.message || e) };
+        }
+      }, { pageSize, pageNum, start: window.start, end: window.end });
+
+      if (isBlockedState(page.url(), result) || result.json?.code === 90309999) {
+        return { status: 'needs_verify', rows, reason: `blocked while reading click report (http ${result.status}, code ${result.json?.code})` };
+      }
+      if (result.status !== 200 || result.json?.code !== 0) {
+        return { status: 'failed', rows, reason: result.json?.msg || result.error || `click report HTTP ${result.status}` };
+      }
+
+      const data = result.json?.data || {};
+      const batch = Array.isArray(data.list) ? data.list : [];
+      total = Number(data.total_count || 0);
+      rows.push(...batch.map((row) => ({
+        click_id: row.click_id,
+        click_time: row.click_time,
+        sub_id: row.sub_id,
+        click_region: row.click_region,
+        referrer: row.referrer,
+        direct_source: row.direct_source,
+      })));
+      if (log) log(`[shopee-report] click trang ${pageNum}: ${batch.length} dòng (${rows.length}/${total})`);
+      if (!batch.length || rows.length >= total || batch.length < pageSize) break;
+      await sleep(delayMs);
+    }
+
+    if (total != null && rows.length < total) {
+      return { status: 'failed', rows, reason: `click pagination stopped at ${rows.length}/${total} rows` };
+    }
+
+    return {
+      status: 'ok', rows, total: total ?? rows.length,
+      from: new Date(window.start * 1000).toISOString(),
+      to: new Date(window.end * 1000).toISOString(),
+    };
+  } finally {
+    if (opened) await page.close().catch(() => {});
+  }
+}
+
+module.exports = { fetchConversionReport, fetchClickReport, reportWindow };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "channel-worker",
-  "version": "2.5.118",
+  "version": "2.5.120",
   "description": "Channel Manager worker daemon — runs on remote machines to execute video pipeline jobs",
   "main": "lib/daemon.js",
   "bin": {
-    "channel-worker": "./bin/cli.js"
+    "channel-worker": "bin/cli.js"
   },
   "files": [
     "bin/",