@xiaohhhh1/canvas-agent 0.4.40 → 0.4.41

package/dist/integrations/fastmoss.d.ts

@@ -138,6 +138,7 @@ export declare class FastMossIntegration {
     private loadRows;
     private useLatestPage;
     private openProductRanking;
+    private waitForManualVerification;
     private openVideoLearningPage;
     private readVideoLearningItems;
     /**
@@ -154,6 +155,11 @@ export declare class FastMossIntegration {
     private clickVideoLearningNextPage;
     private waitForVideoLearningNavigation;
 }
+export declare function waitForFastMossVerificationClear(inspect: () => Promise<Pick<FastMossStatus, "verificationRequired" | "membershipExpired" | "authenticated">>, options?: {
+    timeoutMs?: number;
+    pollMs?: number;
+    sleep?: (milliseconds: number) => Promise<unknown>;
+}): Promise<void>;
 export declare function videoEvidenceTimestamps(durationMs: number): number[];
 export declare function fastMossSalesRankUrl(market?: string): string;
 export declare function fastMossRankingUrl(source: FastMossRankingSource, market?: string): string;

package/dist/integrations/fastmoss.js

@@ -6,6 +6,7 @@ import { chromium } from "playwright-core";
 import { CONFIG_DIR } from "../config.js";
 const FASTMOSS_HOME = "https://www.fastmoss.com/";
 const MEMBERSHIP_RECHECK_MS = 5 * 60_000;
+const MANUAL_VERIFICATION_TIMEOUT_MS = 10 * 60_000;
 const PRODUCT_TABLE_TIMEOUT_MS = 45_000;
 const PRODUCT_RANK_PAGE_SIZE = 10;
 const PRODUCT_RANK_MAX_PAGES = 50;
@@ -175,7 +176,7 @@ export class FastMossIntegration {
             await this.start();
         await this.inspect();
         if (this.verificationRequired)
-            throw new Error("请先在 FastMoss 浏览器中手动完成验证");
+            await this.waitForManualVerification();
         if (this.membershipExpired)
             throw new Error("FastMoss 会员已过期或当前账号没有榜单权限，请先更换账号");
         if (Date.now() - this.lastMembershipCheckAt > MEMBERSHIP_RECHECK_MS) {
@@ -192,7 +193,16 @@ export class FastMossIntegration {
             let previousSignature = "";
             for (let pageNumber = 1; pageNumber <= PRODUCT_RANK_MAX_PAGES; pageNumber += 1) {
                 const snapshot = await readVisibleTableSnapshot(this.page);
-                if (!snapshot.tables[0]?.rows.length || snapshot.signature === previousSignature)
+                if (!snapshot.tables[0]?.rows.length) {
+                    await this.inspect();
+                    if (this.verificationRequired) {
+                        await this.waitForManualVerification();
+                        pageNumber -= 1;
+                        continue;
+                    }
+                    break;
+                }
+                if (snapshot.signature === previousSignature)
                     break;
                 previousSignature = snapshot.signature;
                 pages.push(snapshot.url);
@@ -204,10 +214,12 @@ export class FastMossIntegration {
                     break;
                 await this.page.waitForTimeout(800);
                 await this.inspect();
-                if (this.verificationRequired || this.membershipExpired)
+                if (this.verificationRequired)
+                    await this.waitForManualVerification();
+                if (this.membershipExpired)
                     break;
             }
-            if (this.verificationRequired || this.membershipExpired)
+            if (this.membershipExpired)
                 break;
         }
         const records = [...collected.values()];
@@ -227,7 +239,7 @@ export class FastMossIntegration {
                 : `采集在${stage === "ranking" ? "榜单" : "商品详情互证"}阶段发现会员权限异常；已保留上次 ${previousProducts} 个商品结果`;
             return { ...this.status(), records: marketRecords, allRows: previousRows, trendProducts: previousProducts, detailFailures, interrupted: true };
         };
-        if (this.verificationRequired || this.membershipExpired)
+        if (this.membershipExpired)
             return retainPreviousOnInterruption("ranking");
         const detailCandidates = selectDetailCandidates(marketRecords, DETAIL_CANDIDATE_LIMIT);
         const capturePage = this.page;
@@ -242,11 +254,13 @@ export class FastMossIntegration {
             if ((offset / DETAIL_FETCH_CONCURRENCY) % 10 === 0) {
                 this.useLatestPage();
                 await this.inspect();
-                if (this.verificationRequired || this.membershipExpired)
+                if (this.verificationRequired)
+                    await this.waitForManualVerification();
+                if (this.membershipExpired)
                     break;
             }
         }
-        if (this.verificationRequired || this.membershipExpired)
+        if (this.membershipExpired)
             return retainPreviousOnInterruption("detail", trendRows, detailFailures);
         if (!trendRows.length && !this.verificationRequired)
             throw new Error("榜单读取成功，但未能读取商品详情的最近 7 天销量；请检查会员权限后重试");
@@ -257,9 +271,7 @@ export class FastMossIntegration {
         await writeFile(path.join(this.dataDir, "observations.json"), JSON.stringify(allRows, null, 2), "utf8");
         await writeFile(path.join(this.dataDir, `capture-${localDate()}.json`), JSON.stringify({ capturedAt: this.lastCapture, pages, records: marketRecords, detailCandidates: detailCandidates.map((record) => record.product_id), trendRows, detailFailures }, null, 2), "utf8");
         const trendProducts = new Set(trendRows.map((row) => String(row.product_id))).size;
-        this.message = this.verificationRequired
-            ? `已保存验证前的 ${trendProducts} 个商品趋势；请手动完成滑块后再次抓取`
-            : `四榜单去重后 ${marketRecords.length} 个商品，优先互证 ${detailCandidates.length} 个，其中 ${trendProducts} 个取得最近 ${DETAIL_TREND_DAYS} 天趋势`;
+        this.message = `四榜单去重后 ${marketRecords.length} 个商品，优先互证 ${detailCandidates.length} 个，其中 ${trendProducts} 个取得最近 ${DETAIL_TREND_DAYS} 天趋势`;
         return { ...this.status(), records: marketRecords, allRows, trendProducts, detailFailures };
     }
     /**
@@ -527,7 +539,7 @@ export class FastMossIntegration {
         const market = normalizeMarket(input.market);
         this.message = `正在自动进入 ${market} ${ranking.label}`;
         await this.page.goto(fastMossRankingUrl(ranking.source, market), { waitUntil: "domcontentloaded", timeout: 60_000 });
-        const deadline = Date.now() + PRODUCT_TABLE_TIMEOUT_MS;
+        let deadline = Date.now() + PRODUCT_TABLE_TIMEOUT_MS;
         while (Date.now() < deadline) {
             const snapshot = await readVisibleTableSnapshot(this.page);
             if (hasReadableProductRows(snapshot)) {
@@ -536,8 +548,11 @@ export class FastMossIntegration {
                 return;
             }
             await this.inspect();
-            if (this.verificationRequired)
-                throw new Error("检测到 FastMoss 滑块验证，请在专用窗口中手动完成后再次抓取");
+            if (this.verificationRequired) {
+                await this.waitForManualVerification();
+                deadline = Date.now() + PRODUCT_TABLE_TIMEOUT_MS;
+                continue;
+            }
             if (this.membershipExpired)
                 throw new Error("FastMoss 会员已过期或当前账号没有商品榜单权限，请先更换账号");
             if (!this.authenticated)
@@ -546,6 +561,28 @@ export class FastMossIntegration {
         }
         throw new Error("FastMoss 商品榜单自动加载超时；请检查网络或在窗口中完成人工验证后重试");
     }
+    async waitForManualVerification() {
+        if (!this.verificationRequired)
+            return;
+        this.phase = "verification_required";
+        this.message = "采集已暂停等待人工滑块；完成后会自动继续，无需刷新或重新点击";
+        await this.page?.bringToFront().catch(() => undefined);
+        await waitForFastMossVerificationClear(async () => {
+            const status = await this.inspect();
+            if (status.verificationRequired)
+                this.message = "采集已暂停等待人工滑块；完成后会自动继续，无需刷新或重新点击";
+            return status;
+        }, {
+            timeoutMs: MANUAL_VERIFICATION_TIMEOUT_MS,
+            sleep: (milliseconds) => this.page && !this.page.isClosed()
+                ? this.page.waitForTimeout(milliseconds)
+                : new Promise((resolve) => setTimeout(resolve, milliseconds)),
+        });
+        this.phase = "ready";
+        this.message = "人工验证已完成，正在自动继续采集";
+        await this.page?.waitForLoadState("domcontentloaded", { timeout: 10_000 }).catch(() => undefined);
+        await this.page?.waitForTimeout(1_000).catch(() => undefined);
+    }
     async openVideoLearningPage(url, label) {
         if (!this.page || this.page.isClosed())
             throw new Error("FastMoss 专用浏览器未打开");
@@ -722,6 +759,24 @@ export class FastMossIntegration {
         });
     }
 }
+export async function waitForFastMossVerificationClear(inspect, options = {}) {
+    const timeoutMs = Math.max(1, Number(options.timeoutMs || MANUAL_VERIFICATION_TIMEOUT_MS));
+    const pollMs = Math.max(1, Number(options.pollMs || 1_000));
+    const sleep = options.sleep || ((milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds)));
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        const status = await inspect();
+        if (status.membershipExpired)
+            throw new Error("FastMoss 会员已过期或当前账号没有商品榜单权限，请先更换账号");
+        if (!status.verificationRequired) {
+            if (!status.authenticated)
+                throw new Error("FastMoss 登录已失效，请在专用窗口中重新登录后再次抓取");
+            return;
+        }
+        await sleep(pollMs);
+    }
+    throw new Error("等待人工滑块超过 10 分钟，本次采集已停止；完成验证后可重新开始，已保存结果不会丢失");
+}
 export function videoEvidenceTimestamps(durationMs) {
     const maximumFrames = 24;
     const safeDuration = Math.max(1_000, Math.min(30 * 60_000, Math.round(Number(durationMs) || 0)));

package/package.json

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