@web-auto/webauto 0.1.18 → 0.1.19

package/dist/modules/camo-runtime/src/utils/browser-service.mjs

@@ -8,6 +8,7 @@ import { fileURLToPath } from 'node:url';
 import { BROWSER_SERVICE_URL, loadConfig, setRepoRoot } from './config.mjs';
 const requireFromHere = createRequire(import.meta.url);
 const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
+const DEFAULT_API_TIMEOUT_MS = 30000;
 function resolveNodeBin() {
     const explicit = String(process.env.WEBAUTO_NODE_BIN || '').trim();
     if (explicit)
@@ -53,12 +54,43 @@ function runCamoCli(args = [], options = {}) {
         entry,
     };
 }
-export async function callAPI(action, payload = {}) {
-    const r = await fetch(`${BROWSER_SERVICE_URL}/command`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ action, args: payload }),
-    });
+function resolveApiTimeoutMs(options = {}) {
+    const optionValue = Number(options?.timeoutMs);
+    if (Number.isFinite(optionValue) && optionValue > 0) {
+        return Math.max(1000, Math.floor(optionValue));
+    }
+    const envValue = Number(process.env.CAMO_API_TIMEOUT_MS);
+    if (Number.isFinite(envValue) && envValue > 0) {
+        return Math.max(1000, Math.floor(envValue));
+    }
+    return DEFAULT_API_TIMEOUT_MS;
+}
+function isTimeoutError(error) {
+    const name = String(error?.name || '').toLowerCase();
+    const message = String(error?.message || '').toLowerCase();
+    return (name.includes('timeout')
+        || name.includes('abort')
+        || message.includes('timeout')
+        || message.includes('timed out')
+        || message.includes('aborted'));
+}
+export async function callAPI(action, payload = {}, options = {}) {
+    const timeoutMs = resolveApiTimeoutMs(options);
+    let r;
+    try {
+        r = await fetch(`${BROWSER_SERVICE_URL}/command`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ action, args: payload }),
+            signal: AbortSignal.timeout(timeoutMs),
+        });
+    }
+    catch (error) {
+        if (isTimeoutError(error)) {
+            throw new Error(`browser-service timeout after ${timeoutMs}ms: ${action}`);
+        }
+        throw error;
+    }
     let body;
     try {
         body = await r.json();

package/dist/modules/workflow/blocks/EnsureSession.js

@@ -160,8 +160,6 @@ export async function execute(input) {
             return 1;
         }
         async function clearCssZoom() {
-            if (!profileId.startsWith('xiaohongshu_'))
-                return;
             try {
                 await fetch(statusUrl, {
                     method: 'POST',
@@ -184,8 +182,6 @@ export async function execute(input) {
             }
         }
         async function applyZoom() {
-            if (!profileId.startsWith('xiaohongshu_'))
-                return;
             const metrics = await loadMetrics();
             const zoom = resolveZoom(metrics);
             if (zoom === null) {
@@ -239,8 +235,6 @@ export async function execute(input) {
             return null;
         }
         async function applyBrowserZoom() {
-            if (!profileId.startsWith('xiaohongshu_'))
-                return;
             const target = resolveBrowserZoomTarget();
             if (!target || Math.abs(target - 1) < 0.01)
                 return;
@@ -278,8 +272,6 @@ export async function execute(input) {
             console.log(`[EnsureSession] browser zoom applied target~${target} steps=${steps} key=${key} profile=${profileId}`);
         }
         async function resetBrowserZoom() {
-            if (!profileId.startsWith('xiaohongshu_'))
-                return;
             if (process.env.WEBAUTO_RESET_BROWSER_ZOOM === '0')
                 return;
             const key = os.platform() === 'darwin' ? 'Meta+0' : 'Control+0';

package/dist/modules/workflow/blocks/WeiboCollectFromLinksBlock.js

@@ -96,9 +96,11 @@ async function saveMarkdown(keywordDir, entry, content, comments, commentStats,
 }
 export async function execute(input) {
     const { sessionId, keyword, env = 'debug', targetCount, maxComments = 0, collectComments: enableComments = false, // 默认不采集评论，加快速度
-    serviceUrl = 'http://127.0.0.1:7704', } = input;
+    tabCount: requestedTabCount = 1, tabOpenDelayMs: requestedTabOpenDelayMs = 800, serviceUrl = 'http://127.0.0.1:7704', } = input;
     const profile = sessionId;
     const controllerUrl = `${serviceUrl}/command`;
+    const tabCount = Math.max(1, Math.min(8, Number(requestedTabCount || 1) || 1));
+    const tabOpenDelayMs = Math.max(0, Number(requestedTabOpenDelayMs || 0) || 0);
     const keywordDir = path.join(resolveDownloadRoot(), 'weibo', env, sanitizeFilenamePart(keyword));
     const linksPath = path.join(keywordDir, 'phase2-links.jsonl');
     const links = await readJsonl(linksPath);
@@ -109,7 +111,7 @@ export async function execute(input) {
             linksPath,
             processedCount: 0,
             persistedCount: 0,
-            stats: { postsProcessed: 0, totalComments: 0, errors: 0 },
+            stats: { postsProcessed: 0, totalComments: 0, errors: 0, tabsUsed: 0 },
             error: 'No links found in phase2-links.jsonl',
         };
     }
@@ -153,6 +155,67 @@ export async function execute(input) {
         await controllerAction('goto', { url });
         await new Promise(r => setTimeout(r, 500)); // 减少间隔  // 减少等待时间
     }
+    async function listPagesDetailed() {
+        const res = await controllerAction('browser:page:list', { profileId: profile });
+        const value = unwrapResult(res);
+        const pages = Array.isArray(value?.pages) ? value.pages : (Array.isArray(value) ? value : []);
+        return pages
+            .map((item) => ({
+            index: Number(item?.index),
+            url: String(item?.url || ''),
+            active: item?.active === true,
+        }))
+            .filter((item) => Number.isFinite(item.index));
+    }
+    async function switchToPage(index) {
+        await controllerAction('browser:page:switch', { profileId: profile, index });
+        await new Promise((r) => setTimeout(r, 260));
+    }
+    async function openNewTabAndResolveIndex(existingIndexes) {
+        await controllerAction('system:shortcut', { app: 'camoufox', shortcut: 'new-tab' });
+        if (tabOpenDelayMs > 0) {
+            await new Promise((r) => setTimeout(r, tabOpenDelayMs));
+        }
+        const after = await listPagesDetailed();
+        const active = after.find((item) => item.active);
+        if (active && !existingIndexes.has(active.index))
+            return active.index;
+        const added = after.find((item) => !existingIndexes.has(item.index));
+        if (added)
+            return added.index;
+        const fallback = after
+            .map((item) => item.index)
+            .filter((idx) => !existingIndexes.has(idx))
+            .sort((a, b) => a - b);
+        return fallback.length > 0 ? fallback[fallback.length - 1] : null;
+    }
+    async function ensureTabPool(count) {
+        const pages = await listPagesDetailed().catch(() => []);
+        const active = pages.find((item) => item.active);
+        const pool = [];
+        if (active && Number.isFinite(active.index)) {
+            pool.push(active.index);
+        }
+        else if (pages.length > 0) {
+            pool.push(pages[0].index);
+        }
+        else {
+            pool.push(0);
+        }
+        while (pool.length < count) {
+            const idx = await openNewTabAndResolveIndex(new Set(pool));
+            if (!Number.isFinite(Number(idx)))
+                break;
+            const next = Number(idx);
+            if (pool.includes(next))
+                break;
+            pool.push(next);
+        }
+        if (pool.length > 0) {
+            await switchToPage(pool[0]).catch(() => null);
+        }
+        return pool;
+    }
     async function extractPostContent() {
         const script = `
       (() => {
@@ -223,12 +286,20 @@ export async function execute(input) {
     let persistedCount = 0;
     let totalComments = 0;
     let errors = 0;
+    let tabsUsed = 1;
     try {
-        const targetLinks = links.slice(0, targetCount);
-        for (const link of targetLinks) {
+        const targetLinks = links.slice(0, Math.max(1, Number(targetCount || 0) || 1));
+        const tabPool = await ensureTabPool(tabCount).catch(() => [0]);
+        const roundRobinTabs = tabPool.length > 0 ? tabPool : [0];
+        tabsUsed = roundRobinTabs.length;
+        console.log(`[WeiboCollectFromLinks] tab pool ready: [${roundRobinTabs.join(', ')}]`);
+        for (let idx = 0; idx < targetLinks.length; idx += 1) {
+            const link = targetLinks[idx];
             processedCount++;
-            console.log(`[WeiboCollectFromLinks] Processing: ${link.statusId}`);
+            const tabIndex = roundRobinTabs[idx % roundRobinTabs.length];
+            console.log(`[WeiboCollectFromLinks] Processing: ${link.statusId} (tab=${tabIndex})`);
             try {
+                await switchToPage(tabIndex);
                 await gotoUrl(link.safeUrl);
                 let currentUrl = await getCurrentUrl();
                 if (!currentUrl) {
@@ -265,6 +336,7 @@ export async function execute(input) {
                 postsProcessed: processedCount,
                 totalComments,
                 errors,
+                tabsUsed,
             },
         };
     }
@@ -275,7 +347,7 @@ export async function execute(input) {
             linksPath,
             processedCount,
             persistedCount,
-            stats: { postsProcessed: processedCount, totalComments, errors },
+            stats: { postsProcessed: processedCount, totalComments, errors, tabsUsed },
             error: error.message,
         };
     }