@xiaohhhh1/canvas-agent 0.4.19 → 0.4.21

package/dist/integrations/fastmoss.d.ts

@@ -39,6 +39,8 @@ export declare class FastMossIntegration {
     capture(input?: CaptureContext): Promise<{
         records: Record<string, unknown>[];
         allRows: Record<string, unknown>[];
+        trendProducts: number;
+        detailFailures: number;
         phase: FastMossPhase;
         browserOpen: boolean;
         authenticated: boolean;
@@ -59,4 +61,15 @@ export declare class FastMossIntegration {
     private openProductRanking;
 }
 export declare function fastMossSalesRankUrl(market?: string): string;
+export declare function productIdFromUrl(value: string): string;
+export declare function detailTrendRows(record: Record<string, unknown>, payload: unknown, days?: number): {
+    date: string;
+    source: string;
+    units_sold: number;
+    gmv: number;
+    creators: number;
+    price: number;
+    currency: string;
+    period_days: number;
+}[];
 export {};

package/dist/integrations/fastmoss.js

@@ -10,6 +10,8 @@ const MEMBERSHIP_RECHECK_MS = 5 * 60_000;
 const PRODUCT_TABLE_TIMEOUT_MS = 45_000;
 const PRODUCT_RANK_PAGE_SIZE = 10;
 const PRODUCT_RANK_MAX_PAGES = 50;
+const DETAIL_TREND_DAYS = 7;
+const DETAIL_FETCH_CONCURRENCY = 3;
 export class FastMossIntegration {
     context = null;
     page = null;
@@ -193,17 +195,35 @@ export class FastMossIntegration {
         const records = [...collected.values()];
         if (!records.length)
             throw new Error("已自动进入 FastMoss 商品榜单，但没有读取到商品数据；请检查会员权限或页面是否仍在加载");
+        const requestedMarket = normalizeMarket(input.market);
+        const marketRecords = records.filter((record) => !record.market || normalizeExtractedMarket(record.market) === requestedMarket);
+        const trendRows = [];
+        let detailFailures = 0;
+        for (let offset = 0; offset < marketRecords.length; offset += DETAIL_FETCH_CONCURRENCY) {
+            const chunk = marketRecords.slice(offset, offset + DETAIL_FETCH_CONCURRENCY);
+            const results = await Promise.all(chunk.map((record) => fetchDetailTrend(this.page, record, DETAIL_TREND_DAYS)));
+            results.forEach((rows) => rows.length ? trendRows.push(...rows) : detailFailures += 1);
+            this.message = `正在读取商品最近 ${DETAIL_TREND_DAYS} 天趋势：${Math.min(offset + chunk.length, marketRecords.length)}/${marketRecords.length}`;
+            await this.page.waitForTimeout(150);
+            if ((offset / DETAIL_FETCH_CONCURRENCY) % 10 === 0) {
+                await this.inspect();
+                if (this.verificationRequired || this.membershipExpired)
+                    break;
+            }
+        }
+        if (!trendRows.length && !this.verificationRequired)
+            throw new Error("榜单读取成功，但未能读取商品详情的最近 7 天销量；请检查会员权限后重试");
         await mkdir(this.dataDir, { recursive: true });
-        const stored = await this.loadRows();
-        const indexed = new Map(stored.map((row) => [`${row.date}:${row.product_id || row.title}`, row]));
-        records.forEach((row) => indexed.set(`${row.date}:${row.product_id || row.title}`, row));
-        const allRows = [...indexed.values()];
+        const allRows = trendRows;
         this.lastCapture = new Date().toISOString();
-        this.captured = records.length;
+        this.captured = marketRecords.length;
         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 }, null, 2), "utf8");
-        this.message = this.verificationRequired ? `已保存验证前的 ${records.length} 条数据；请手动完成滑块后再次抓取，程序会接着合并` : `已读取 ${pages.length} 个可见分页，共 ${records.length} 条商品数据`;
-        return { ...this.status(), records, allRows };
+        await writeFile(path.join(this.dataDir, `capture-${localDate()}.json`), JSON.stringify({ capturedAt: this.lastCapture, pages, records: marketRecords, trendRows, detailFailures }, null, 2), "utf8");
+        const trendProducts = new Set(trendRows.map((row) => String(row.product_id))).size;
+        this.message = this.verificationRequired
+            ? `已保存验证前的 ${trendProducts} 个商品趋势；请手动完成滑块后再次抓取`
+            : `已读取榜单 ${marketRecords.length} 个商品，其中 ${trendProducts} 个取得最近 ${DETAIL_TREND_DAYS} 天趋势`;
+        return { ...this.status(), records: marketRecords, allRows, trendProducts, detailFailures };
     }
     async close() {
         const context = this.context;
@@ -222,7 +242,7 @@ export class FastMossIntegration {
         return this.status();
     }
     async observations() {
-        const rows = await this.loadRows();
+        const rows = (await this.loadRows()).filter((row) => row.source === "fastmoss-agent-detail-trend");
         return { rows };
     }
     async switchAccount() {
@@ -379,7 +399,7 @@ function extractRows(tables, context, pageUrl) {
             const productCell = String(pick(/^商品$|商品名|商品标题|product|title/i) || row.cells.find((cell) => cell.length > 5) || "");
             const title = productCell.replace(/\s*(?:售价|价格|price)\s*[：:].*$/is, "").trim();
             const productUrl = row.links.find((link) => /product|goods|item|detail/i.test(link)) || row.links[0] || pageUrl;
-            const productId = String(pick(/商品\s*id|product\s*id/i) || productUrl.match(/(?:detail|product|goods|item)[/=_-]([\w-]+)/i)?.[1] || stableId(`${title}:${productUrl}`));
+            const productId = String(pick(/商品\s*id|product\s*id/i) || productIdFromUrl(productUrl) || stableId(`${title}:${productUrl}`));
             const images = row.images.filter((image) => !image.isQr).map((image) => image.src);
             const qr = row.images.find((image) => image.isQr);
             const priceText = String(pick(/^价格$|^售价$|price/i) || productCell.match(/(?:售价|价格|price)\s*[：:]\s*([^\s]+)/i)?.[1] || "");
@@ -393,7 +413,7 @@ function extractRows(tables, context, pageUrl) {
                 product_url: productUrl,
                 store_name: storeName,
                 category: String(pick(/类目|分类|category/i) || context.category || context.categories?.[0] || ""),
-                market: String(pick(/国家|市场|market|country/i) || context.market || ""),
+                market: normalizeExtractedMarket(String(pick(/国家|市场|market|country/i) || context.market || "")),
                 shop_type: String(pick(/店铺类型|shop.*type|seller.*type/i) || context.shopType || ""),
                 period_days: context.periodDays || 7,
                 price: numberValue(priceText),
@@ -412,6 +432,72 @@ function extractRows(tables, context, pageUrl) {
     }
     return output.filter((row) => row.title);
 }
+export function productIdFromUrl(value) {
+    try {
+        const url = new URL(value);
+        const queryId = url.searchParams.get("product_id") || url.searchParams.get("productId");
+        if (queryId && /^\d+$/.test(queryId))
+            return queryId;
+        return url.pathname.match(/\/(?:detail|product|goods|item)\/(\d+)(?:\/|$)/i)?.[1] || "";
+    }
+    catch {
+        return String(value).match(/(?:detail|product|goods|item)[/=_-](\d+)/i)?.[1] || "";
+    }
+}
+export function detailTrendRows(record, payload, days = DETAIL_TREND_DAYS) {
+    const envelope = payload && typeof payload === "object" ? payload : {};
+    const data = envelope.data && typeof envelope.data === "object" ? envelope.data : {};
+    const points = Array.isArray(data.chart_list) ? data.chart_list : [];
+    return points.slice(-days).flatMap((point) => {
+        const date = String(point.dt || "").slice(0, 10);
+        if (!/^\d{4}-\d{2}-\d{2}$/.test(date))
+            return [];
+        return [{
+                ...record,
+                date,
+                source: "fastmoss-agent-detail-trend",
+                units_sold: Number(point.inc_real_sold_count ?? point.inc_sold_count ?? 0),
+                gmv: Number(point.inc_real_sale_amount ?? point.inc_sale_amount ?? 0),
+                creators: Number(point.inc_author_count ?? record.creators ?? 0),
+                price: Number(point.price ?? record.price ?? 0),
+                currency: String(point.currency || ""),
+                period_days: days,
+            }];
+    });
+}
+async function fetchDetailTrend(page, record, days) {
+    const productId = String(record.product_id || productIdFromUrl(String(record.product_url || "")));
+    if (!/^\d+$/.test(productId))
+        return [];
+    const payload = await page.evaluate(async ({ productId, days }) => {
+        const url = new URL("/api/goods/v3/overview", location.origin);
+        url.searchParams.set("product_id", productId);
+        url.searchParams.set("d_type", String(days));
+        url.searchParams.set("_time", String(Math.floor(Date.now() / 1000)));
+        url.searchParams.set("cnonce", String(Math.floor(10_000_000 + Math.random() * 90_000_000)));
+        const response = await fetch(url, { credentials: "include" });
+        if (!response.ok)
+            return null;
+        return response.json().catch(() => null);
+    }, { productId, days }).catch(() => null);
+    return detailTrendRows({ ...record, product_id: productId, platform_product_id: productId }, payload, days);
+}
+function normalizeExtractedMarket(value) {
+    const key = String(value || "").trim().toLowerCase();
+    const aliases = {
+        mx: "MX", mexico: "MX", "méxico": "MX", "墨西哥": "MX",
+        vn: "VN", vietnam: "VN", "越南": "VN",
+        us: "US", usa: "US", "美国": "US",
+        gb: "GB", uk: "GB", "英国": "GB",
+        id: "ID", indonesia: "ID", "印度尼西亚": "ID", "印尼": "ID",
+        th: "TH", thailand: "TH", "泰国": "TH",
+        my: "MY", malaysia: "MY", "马来西亚": "MY",
+        ph: "PH", philippines: "PH", "菲律宾": "PH",
+        es: "ES", spain: "ES", "西班牙": "ES",
+        br: "BR", brazil: "BR", "巴西": "BR",
+    };
+    return aliases[key] || String(value || "").trim().toUpperCase();
+}
 function numberValue(value) {
     const raw = String(value || "").replace(/,/g, "");
     const match = raw.match(/-?\d+(?:\.\d+)?/);

package/dist/relay-bridge.d.ts

@@ -1,7 +1,20 @@
 import type { CanvasAgentConfig } from "./config.js";
+export type RelayBridgeStatus = {
+    ready: boolean;
+    lastReadyAt?: string;
+    lastDisconnectAt?: string;
+};
+export type RelayBridgeOptions = {
+    relayUrl?: string;
+    reconnectDelayMs?: number;
+    heartbeatIntervalMs?: number;
+    readyTimeoutMs?: number;
+    livenessTimeoutMs?: number;
+    onStatus?: (status: RelayBridgeStatus) => void;
+};
 /**
  * Keeps an outbound, encrypted connection to the production relay.  The canvas
  * browser can then use same-origin requests instead of directly reaching a
  * loopback HTTP address, which Chromium clients can block before CORS runs.
  */
-export declare function startRelayBridge(config: CanvasAgentConfig): () => void;
+export declare function startRelayBridge(config: CanvasAgentConfig, options?: RelayBridgeOptions): () => void;

package/dist/relay-bridge.js

@@ -9,8 +9,12 @@ const LIVENESS_TIMEOUT_MS = 45_000;
  * browser can then use same-origin requests instead of directly reaching a
  * loopback HTTP address, which Chromium clients can block before CORS runs.
  */
-export function startRelayBridge(config) {
-    const relayUrl = process.env.CANVAS_AGENT_RELAY_URL || DEFAULT_RELAY_URL;
+export function startRelayBridge(config, options = {}) {
+    const relayUrl = options.relayUrl || process.env.CANVAS_AGENT_RELAY_URL || DEFAULT_RELAY_URL;
+    const reconnectDelayMs = options.reconnectDelayMs ?? RECONNECT_DELAY_MS;
+    const heartbeatIntervalMs = options.heartbeatIntervalMs ?? HEARTBEAT_INTERVAL_MS;
+    const readyTimeoutMs = options.readyTimeoutMs ?? READY_TIMEOUT_MS;
+    const livenessTimeoutMs = options.livenessTimeoutMs ?? LIVENESS_TIMEOUT_MS;
     const subscriptions = new Map();
     let socket = null;
     let stopped = false;
@@ -19,6 +23,9 @@ export function startRelayBridge(config) {
     let reconnectTimer = null;
     let heartbeatTimer = null;
     let readyTimer = null;
+    let lastReadyAt;
+    let lastDisconnectAt;
+    const publishStatus = () => options.onStatus?.({ ready: relayReady, lastReadyAt, lastDisconnectAt });
     const send = (message) => {
         const current = socket;
         if (!relayReady || current?.readyState !== WebSocket.OPEN)
@@ -52,7 +59,13 @@ export function startRelayBridge(config) {
         stopSubscription(clientId);
         const controller = new AbortController();
         subscriptions.set(clientId, controller);
-        void pipeEvents(clientId, config, controller.signal, send).finally(() => {
+        void pipeEvents(clientId, config, controller.signal, send)
+            .catch(() => {
+            // A browser may disappear while the relay subscription is being
+            // established. That is a recoverable client disconnect, not a
+            // process-fatal unhandled rejection.
+        })
+            .finally(() => {
             if (subscriptions.get(clientId) === controller)
                 subscriptions.delete(clientId);
         });
@@ -99,7 +112,7 @@ export function startRelayBridge(config) {
         reconnectTimer = setTimeout(() => {
             reconnectTimer = null;
             connect();
-        }, RECONNECT_DELAY_MS);
+        }, reconnectDelayMs);
     };
     const connect = () => {
         if (stopped || socket)
@@ -107,6 +120,10 @@ export function startRelayBridge(config) {
         try {
             const current = new WebSocket(relayUrl);
             socket = current;
+            // Cover DNS/TCP/TLS/WebSocket handshakes as well as the relay hello.
+            // Starting this timer only after `open` leaves a CONNECTING socket
+            // able to stall forever and prevents every future reconnect.
+            readyTimer = setTimeout(() => current.terminate(), readyTimeoutMs);
             let disconnected = false;
             const disconnect = () => {
                 if (disconnected)
@@ -115,6 +132,8 @@ export function startRelayBridge(config) {
                 if (socket === current)
                     socket = null;
                 relayReady = false;
+                lastDisconnectAt = new Date().toISOString();
+                publishStatus();
                 clearConnectionTimers();
                 abortSubscriptions();
                 scheduleReconnect();
@@ -127,13 +146,14 @@ export function startRelayBridge(config) {
                     current.terminate();
                     return;
                 }
-                readyTimer = setTimeout(() => current.terminate(), READY_TIMEOUT_MS);
             });
             current.on("message", (raw) => {
                 try {
                     const message = JSON.parse(raw.toString());
                     if (message.type === "ready") {
                         relayReady = true;
+                        lastReadyAt = new Date().toISOString();
+                        publishStatus();
                         lastHeartbeatAck = Date.now();
                         if (readyTimer)
                             clearTimeout(readyTimer);
@@ -141,12 +161,12 @@ export function startRelayBridge(config) {
                         if (heartbeatTimer)
                             clearInterval(heartbeatTimer);
                         heartbeatTimer = setInterval(() => {
-                            if (Date.now() - lastHeartbeatAck > LIVENESS_TIMEOUT_MS) {
+                            if (Date.now() - lastHeartbeatAck > livenessTimeoutMs) {
                                 current.terminate();
                                 return;
                             }
                             send({ type: "heartbeat", time: Date.now() });
-                        }, HEARTBEAT_INTERVAL_MS);
+                        }, heartbeatIntervalMs);
                         heartbeatTimer.unref();
                         return;
                     }
@@ -168,6 +188,8 @@ export function startRelayBridge(config) {
         catch {
             socket = null;
             relayReady = false;
+            lastDisconnectAt = new Date().toISOString();
+            publishStatus();
             clearConnectionTimers();
             scheduleReconnect();
         }

package/dist/server/http.js

@@ -33,6 +33,7 @@ export function startHttpServer() {
     };
     const workflows = new WorkflowManager(config, emit);
     const fastmoss = new FastMossIntegration();
+    let relayStatus = { ready: false };
     const app = express();
     app.disable("x-powered-by");
     app.use(express.json({ limit: "30mb" }));
@@ -56,7 +57,7 @@ export function startHttpServer() {
             return void res.json({});
         next();
     });
-    app.get("/health", (_req, res) => res.json({ ...session.health(), version: VERSION }));
+    app.get("/health", (_req, res) => res.json({ ...session.health(), version: VERSION, relayReady: relayStatus.ready, relayLastReadyAt: relayStatus.lastReadyAt, relayLastDisconnectAt: relayStatus.lastDisconnectAt }));
     app.get("/config", (_req, res) => res.json({ ok: true, url: config.url, hasToken: true }));
     app.use((req, res, next) => {
         if (validToken(req, requestUrl(req, config), config.token))
@@ -285,7 +286,7 @@ export function startHttpServer() {
         console.log("Codex MCP is not installed by this command.");
         console.log("Optional MCP add: codex mcp add infinite-canvas -- npx -y @xiaohhhh1/canvas-agent mcp");
         console.log("Remove manually added MCP: codex mcp remove infinite-canvas");
-        startRelayBridge(config);
+        startRelayBridge(config, { onStatus: (status) => { relayStatus = status; } });
         if (logger.enabled)
             console.log(`Debug log: ${logger.filePath}`);
         logger.info("Canvas Agent started", { url: config.url, workspace: ensureSiteWorkspace(config).workspacePath, debugLog: logger.filePath });

package/package.json

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