@xiaohhhh1/canvas-agent 0.4.23 → 0.4.24

package/dist/integrations/fastmoss.d.ts

@@ -112,11 +112,17 @@ export declare class FastMossIntegration {
     private useLatestPage;
     private openProductRanking;
     private openVideoLearningPage;
+    private readVideoLearningItems;
+    private clickVideoLearningTab;
+    private clickVideoLearningNextPage;
+    private waitForVideoLearningNavigation;
 }
 export declare function fastMossSalesRankUrl(market?: string): string;
 export declare function fastMossRankingUrl(source: FastMossRankingSource, market?: string): string;
+export declare function fastMossVideoLearningRankUrl(market?: string): string;
 export declare function mergeRankingRecord(target: Map<string, Record<string, unknown>>, row: Record<string, unknown>, source: FastMossRankingSource, position: number): void;
 export declare function selectDetailCandidates(records: Array<Record<string, unknown>>, limit?: number): Record<string, unknown>[];
+export declare function isTransientFastMossNavigation(error: unknown): boolean;
 export declare function isAnalyzableVideoUrl(value: string): boolean;
 export declare function videoLearningSourcesFromItems(items: VisibleVideoItem[], context: {
     market: string;

package/dist/integrations/fastmoss.js

@@ -273,7 +273,9 @@ export class FastMossIntegration {
             throw new Error("FastMoss 会员已过期或当前账号没有视频榜单权限，请先更换账号");
         if (!this.authenticated || !this.page || this.page.isClosed())
             throw new Error("FastMoss 尚未登录；请在恢复的窗口中完成登录后重试");
-        const market = normalizeMarket(input.market || "US");
+        // 视频学习只研究可迁移的创意机制，不应被某一个运营市场限制。
+        // FastMoss 使用空 region 表示“全部国家/地区”。
+        const market = normalizeLearningMarket(input.market);
         const requestedTarget = Math.max(1, Math.min(VIDEO_LEARNING_TARGET, Number(input.target || VIDEO_LEARNING_TARGET)));
         const sources = [];
         const rejected = [];
@@ -283,7 +285,7 @@ export class FastMossIntegration {
                 return;
             let previousSignature = "";
             for (let pageNumber = 1; pageNumber <= 5 && sources.filter((item) => item.rankingDimension === dimension).length < limit; pageNumber += 1) {
-                const snapshot = await readVisibleVideoLearningItems(this.page);
+                const snapshot = await this.readVideoLearningItems();
                 const signature = JSON.stringify(snapshot.map((item) => [item.text, item.media, item.links]).slice(0, 20));
                 if (!snapshot.length || (pageNumber > 1 && signature === previousSignature))
                     break;
@@ -309,9 +311,9 @@ export class FastMossIntegration {
                 this.message = `正在读取视频学习样本：${dimension} ${sources.filter((item) => item.rankingDimension === dimension).length}/${limit}，合计 ${sources.length}/${requestedTarget}`;
                 if (sources.filter((item) => item.rankingDimension === dimension).length >= limit)
                     break;
-                if (!await clickVisibleNextPage(this.page))
+                if (!await this.clickVideoLearningNextPage())
                     break;
-                await this.page.waitForTimeout(900);
+                await this.waitForVideoLearningNavigation();
                 await this.inspect();
                 if (this.verificationRequired)
                     throw new Error("采集视频榜单时出现滑块验证；请手动完成后重新采集，未完成样本不会计数");
@@ -319,7 +321,7 @@ export class FastMossIntegration {
                     throw new Error("当前 FastMoss 账号没有继续查看视频榜单的权限");
             }
         };
-        await this.openVideoLearningPage(fastMossRankingUrl("video", market), `${market} 视频商品榜`);
+        await this.openVideoLearningPage(fastMossVideoLearningRankUrl(market), market === "GLOBAL" ? "全球视频商品榜" : `${market} 视频商品榜`);
         await collect("commerce-video", Math.min(VIDEO_COMMERCE_TARGET, requestedTarget));
         const aiDimensions = [
             { dimension: "high-sales", labels: ["高销量榜单", "High Sales"] },
@@ -329,17 +331,17 @@ export class FastMossIntegration {
         ];
         if (sources.length < requestedTarget) {
             const aiUrl = new URL(VIDEO_AI_RANKING_PATH, FASTMOSS_HOME);
-            aiUrl.searchParams.set("region", market);
-            await this.openVideoLearningPage(aiUrl.toString(), `${market} AI 带货视频榜`);
+            aiUrl.searchParams.set("region", market === "GLOBAL" ? "" : market);
+            await this.openVideoLearningPage(aiUrl.toString(), market === "GLOBAL" ? "全球 AI 带货视频榜" : `${market} AI 带货视频榜`);
             for (const entry of aiDimensions) {
                 if (sources.length >= requestedTarget)
                     break;
-                const clicked = await clickVisibleText(this.page, entry.labels);
+                const clicked = await this.clickVideoLearningTab(entry.labels);
                 if (!clicked) {
                     rejected.push({ dimension: entry.dimension, reason: `没有找到${entry.labels[0]}标签` });
                     continue;
                 }
-                await this.page.waitForTimeout(900);
+                await this.waitForVideoLearningNavigation();
                 await this.inspect();
                 if (this.verificationRequired)
                     throw new Error("采集 AI 视频榜时出现滑块验证；请手动完成后重新采集");
@@ -437,10 +439,18 @@ export class FastMossIntegration {
         if (!this.page || this.page.isClosed())
             throw new Error("FastMoss 专用浏览器未打开");
         this.message = `正在自动进入 ${label}`;
-        await this.page.goto(url, { waitUntil: "domcontentloaded", timeout: 60_000 });
+        try {
+            await this.page.goto(url, { waitUntil: "domcontentloaded", timeout: 60_000 });
+        }
+        catch (error) {
+            // FastMoss 会在进入 AI 榜时自行二次跳转。此时 Playwright 报 ERR_ABORTED，
+            // 但浏览器实际仍在加载目标页；继续等待可见榜单，而不是把正常跳转当成失败。
+            if (!isTransientFastMossNavigation(error))
+                throw error;
+        }
         const deadline = Date.now() + PRODUCT_TABLE_TIMEOUT_MS;
         while (Date.now() < deadline) {
-            const items = await readVisibleVideoLearningItems(this.page);
+            const items = await this.readVideoLearningItems();
             if (items.length)
                 return;
             await this.inspect();
@@ -450,10 +460,74 @@ export class FastMossIntegration {
                 throw new Error("当前 FastMoss 账号没有该视频榜单权限");
             if (!this.authenticated)
                 throw new Error("FastMoss 登录已失效，请重新登录后再次采集");
-            await this.page.waitForTimeout(750);
+            await this.waitForVideoLearningNavigation(750);
         }
         throw new Error(`${label}加载超时；请检查网络或在专用窗口中确认页面可见`);
     }
+    async readVideoLearningItems() {
+        let lastError;
+        for (let attempt = 0; attempt < 4; attempt += 1) {
+            this.useLatestPage();
+            if (!this.page || this.page.isClosed())
+                throw new Error("FastMoss 专用浏览器未打开");
+            try {
+                return await readVisibleVideoLearningItems(this.page);
+            }
+            catch (error) {
+                lastError = error;
+                if (!isTransientFastMossNavigation(error))
+                    throw error;
+                await this.waitForVideoLearningNavigation();
+            }
+        }
+        throw lastError instanceof Error ? lastError : new Error("FastMoss 视频榜页面跳转后没有恢复");
+    }
+    async clickVideoLearningTab(labels) {
+        let lastError;
+        for (let attempt = 0; attempt < 3; attempt += 1) {
+            this.useLatestPage();
+            if (!this.page || this.page.isClosed())
+                throw new Error("FastMoss 专用浏览器未打开");
+            try {
+                return await clickVisibleText(this.page, labels);
+            }
+            catch (error) {
+                lastError = error;
+                if (!isTransientFastMossNavigation(error))
+                    throw error;
+                await this.waitForVideoLearningNavigation();
+            }
+        }
+        throw lastError instanceof Error ? lastError : new Error("FastMoss 视频榜标签切换失败");
+    }
+    async clickVideoLearningNextPage() {
+        let lastError;
+        for (let attempt = 0; attempt < 3; attempt += 1) {
+            this.useLatestPage();
+            if (!this.page || this.page.isClosed())
+                throw new Error("FastMoss 专用浏览器未打开");
+            try {
+                return await clickVisibleNextPage(this.page);
+            }
+            catch (error) {
+                lastError = error;
+                if (!isTransientFastMossNavigation(error))
+                    throw error;
+                await this.waitForVideoLearningNavigation();
+            }
+        }
+        throw lastError instanceof Error ? lastError : new Error("FastMoss 视频榜翻页失败");
+    }
+    async waitForVideoLearningNavigation(delay = 900) {
+        await new Promise((resolve) => setTimeout(resolve, delay));
+        this.useLatestPage();
+        if (!this.page || this.page.isClosed())
+            return;
+        await this.page.waitForLoadState("domcontentloaded", { timeout: 10_000 }).catch((error) => {
+            if (!isTransientFastMossNavigation(error))
+                throw error;
+        });
+    }
 }
 export function fastMossSalesRankUrl(market) {
     return fastMossRankingUrl("sales", market);
@@ -461,11 +535,14 @@ export function fastMossSalesRankUrl(market) {
 export function fastMossRankingUrl(source, market) {
     const definition = RANKING_DEFINITIONS.find((item) => item.source === source) || RANKING_DEFINITIONS[0];
     const url = new URL(definition.pathname, FASTMOSS_HOME);
-    url.searchParams.set("region", normalizeMarket(market));
+    url.searchParams.set("region", market === "GLOBAL" ? "" : normalizeMarket(market));
     url.searchParams.set("page", "1");
     url.searchParams.set("pagesize", String(PRODUCT_RANK_PAGE_SIZE));
     return url.toString();
 }
+export function fastMossVideoLearningRankUrl(market) {
+    return fastMossRankingUrl("video", normalizeLearningMarket(market));
+}
 export function mergeRankingRecord(target, row, source, position) {
     const key = String(row.product_id || row.title);
     const existing = target.get(key) || {};
@@ -493,6 +570,14 @@ function normalizeMarket(value) {
     const market = String(value || "MX").trim().toUpperCase();
     return /^[A-Z]{2}$/.test(market) ? market : "MX";
 }
+function normalizeLearningMarket(value) {
+    const market = String(value || "GLOBAL").trim().toUpperCase();
+    return market === "GLOBAL" || market === "ALL" || market === "全球" || market === "全部" ? "GLOBAL" : normalizeMarket(market);
+}
+export function isTransientFastMossNavigation(error) {
+    const message = error instanceof Error ? error.message : String(error || "");
+    return /ERR_ABORTED|Execution context was destroyed|navigation interrupted|frame was detached/i.test(message);
+}
 function hasReadableProductRows(snapshot) {
     return snapshot.tables.some((table) => table.rows.some((row) => row.cells.filter(Boolean).length >= 3));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaohhhh1/canvas-agent",
-  "version": "0.4.23",
+  "version": "0.4.24",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",