@web-auto/camo 0.1.26 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web-auto/camo",
-  "version": "0.1.26",
+  "version": "0.2.0",
   "description": "Camoufox Browser CLI - Cross-platform browser automation",
   "type": "module",
   "bin": {

package/src/commands/browser.mjs

@@ -496,7 +496,6 @@ export async function handleStartCommand(args) {
   const alias = validateAlias(readFlagValue(args, ['--alias']));
   const idleTimeoutRaw = readFlagValue(args, ['--idle-timeout']);
   const parsedIdleTimeoutMs = parseDurationMs(idleTimeoutRaw, DEFAULT_HEADLESS_IDLE_TIMEOUT_MS);
-  const maxTabs = Math.max(1, Math.floor(Number(readFlagValue(args, ['--max-tabs']) || 1) || 1));
   const wantsDevtools = args.includes('--devtools');
   const wantsRecord = args.includes('--record');
   const recordName = readFlagValue(args, ['--record-name']);
@@ -507,7 +506,7 @@ export async function handleStartCommand(args) {
       ? true
       : null;
   if (hasExplicitWidth !== hasExplicitHeight) {
-    throw new Error('Usage: camo start [profileId] [--url <url>] [--no-headless|--visible] [--devtools] [--record] [--record-name <name>] [--record-output <path>] [--record-overlay|--no-record-overlay] [--alias <name>] [--idle-timeout <duration>] [--width <w> --height <h> --max-tabs <n>]');
+    throw new Error('Usage: camo start [profileId] [--url <url>] [--no-headless|--visible] [--devtools] [--record] [--record-name <name>] [--record-output <path>] [--record-overlay|--no-record-overlay] [--alias <name>] [--idle-timeout <duration>] [--width <w> --height <h>]');
   }
   if ((hasExplicitWidth && explicitWidth < START_WINDOW_MIN_WIDTH) || (hasExplicitHeight && explicitHeight < START_WINDOW_MIN_HEIGHT)) {
     throw new Error(`Window size too small. Minimum is ${START_WINDOW_MIN_WIDTH}x${START_WINDOW_MIN_HEIGHT}`);
@@ -528,7 +527,7 @@ export async function handleStartCommand(args) {
     const arg = args[i];
     if (arg === '--url') { i++; continue; }
     if (arg === '--width' || arg === '--height') { i++; continue; }
-    if (arg === '--alias' || arg === '--idle-timeout' || arg === '--record-name' || arg === '--record-output' || arg === '--max-tabs') { i++; continue; }
+    if (arg === '--alias' || arg === '--idle-timeout' || arg === '--record-name' || arg === '--record-output') { i++; continue; }
     if (arg === '--headless' || arg === '--no-headless' || arg === '--visible') continue;
     if (arg === '--record' || arg === '--record-overlay' || arg === '--no-record-overlay') continue;
     if (arg.startsWith('--')) continue;
@@ -628,7 +627,6 @@ export async function handleStartCommand(args) {
     headless,
     devtools: wantsDevtools,
     ...(wantsRecord ? { record: true } : {}),
-    ...(Number.isFinite(maxTabs) ? { maxTabs } : {}),
     ...(recordName ? { recordName } : {}),
     ...(recordOutput ? { recordOutput } : {}),
     ...(recordOverlay !== null ? { recordOverlay } : {}),

package/src/container/runtime-core/validation.mjs

@@ -26,21 +26,13 @@ async function validatePage(profileId, spec = {}, platform = 'generic') {
     errors.push(`url host mismatch, expected one of: ${hostIncludes.join(',')}`);
   }
 
-  // 锚点驱动的 checkpoint 检查
   const checkpoints = normalizeArray(spec.checkpointIn || []);
   let checkpoint = null;
   if (checkpoints.length > 0) {
-    // 使用锚点轮询，而非 evaluate
-    const checkpointSelectors = getCheckpointSelectors(checkpoints, platform);
-    const anchorResult = await validateAnchors(profileId, checkpointSelectors, {
-      timeoutMs: 15000,  // 15秒最大等待
-      intervalMs: 500,
-    });
-    
-    if (anchorResult.found) {
-      checkpoint = checkpoints[0];  // 锚点存在，使用第一个 checkpoint
-    } else {
-      errors.push(`anchor not found within ${anchorResult.elapsed}ms, expected one of: ${checkpoints.join(',')}`);
+    const detected = await detectCheckpoint({ profileId, platform });
+    checkpoint = detected?.data?.checkpoint || null;
+    if (!checkpoints.includes(checkpoint)) {
+      errors.push(`checkpoint mismatch: got ${checkpoint}, expect one of ${checkpoints.join(',')}`);
     }
   }
 
@@ -50,29 +42,8 @@ async function validatePage(profileId, spec = {}, platform = 'generic') {
     checkpoint,
     errors,
   };
-};
-
-// 添加 getCheckpointSelectors 辅助函数
-function getCheckpointSelectors(checkpoints, platform = 'generic') {
-  const XHS_CHECKPOINTS = {
-    search_ready: ['#search-input', 'input.search-input', '.search-result-list'],
-    home_ready: ['.note-item', '.note-item a', 'a[href*="/explore/"]', '[class*="note-item"]'],
-    detail_ready: ['.note-scroller', '.note-content', '.interaction-container'],
-    comments_ready: ['.comments-container', '.comment-item'],
-    login_guard: ['.login-container', '.login-dialog', '#login-container'],
-    risk_control: ['.qrcode-box', '.captcha-container', '[class*="captcha"]'],
-  };
-
-  const selectors = [];
-  for (const cp of checkpoints) {
-    if (platform === 'xiaohongshu' && XHS_CHECKPOINTS[cp]) {
-      selectors.push(...XHS_CHECKPOINTS[cp]);
-    }
-  }
-  return selectors.length > 0 ? selectors : checkpoints;
 }
 
-
 async function validateContainer(profileId, spec = {}) {
   const snapshot = await getDomSnapshotByProfile(profileId);
   const selector = maybeSelector({
@@ -154,31 +125,3 @@ export async function validateOperation({
     return asErrorPayload('VALIDATION_FAILED', err?.message || String(err), { phase, context });
   }
 }
-
-// 锚点驱动的验证：轮询容器 selector，而非 evaluate
-async function validateAnchors(profileId, selectors = [], options = {}) {
-  const maxMs = Math.max(1000, Number(options.timeoutMs || 30000));
-  const intervalMs = Math.max(200, Number(options.intervalMs || 500));
-  const startTime = Date.now();
-  
-  while (Date.now() - startTime < maxMs) {
-    try {
-      const snapshot = await getDomSnapshotByProfile(profileId, { maxDepth: 5, maxChildren: 50 });
-      for (const selector of selectors) {
-        const matched = buildSelectorCheck(snapshot, selector);
-        if (matched.length > 0) {
-          return { ok: true, found: true, selector, count: matched.length, elapsed: Date.now() - startTime };
-        }
-      }
-    } catch (err) {
-      // 忽略 snapshot 错误，继续轮询
-    }
-    
-    // 等待下次检查
-    await new Promise((resolve) => setTimeout(resolve, intervalMs));
-  }
-  
-  return { ok: false, found: false, elapsed: maxMs };
-}
-
-export { validateAnchors };

package/src/services/browser-service/index.js

@@ -305,19 +305,16 @@ async function handleCommand(payload, manager, wsServer, options = {}) {
     switch (action) {
         case 'start': {
             const startViewport = resolveStartViewport(args);
-      const opts = {
-        profileId: args.profileId || 'default',
-        sessionName: args.profileId || 'default',
-        headless: !!args.headless,
-        initialUrl: args.url,
-        engine: args.engine || 'camoufox',
-        fingerprintPlatform: args.fingerprintPlatform || null,
-        ...(startViewport ? { viewport: startViewport } : {}),
-        ...(args.ownerPid ? { ownerPid: args.ownerPid } : {}),
-      };
-      if (Number.isFinite(args.maxTabs) && args.maxTabs >= 1) {
-        opts.maxTabs = Math.floor(args.maxTabs);
-      }
+            const opts = {
+                profileId: args.profileId || 'default',
+                sessionName: args.profileId || 'default',
+                headless: !!args.headless,
+                initialUrl: args.url,
+                engine: args.engine || 'camoufox',
+                fingerprintPlatform: args.fingerprintPlatform || null,
+                ...(startViewport ? { viewport: startViewport } : {}),
+                ...(args.ownerPid ? { ownerPid: args.ownerPid } : {}),
+            };
             const res = await manager.createSession(opts);
             const session = manager.getSession(opts.profileId);
             if (!session) {
@@ -495,8 +492,8 @@ async function handleCommand(payload, manager, wsServer, options = {}) {
             const activeIndex = pages.find((p) => p.active)?.index ?? 0;
             return { ok: true, body: { ok: true, pages, activeIndex } };
         }
-        case 'newTab':
         case 'page:new':
+        case 'newTab':
         case 'newPage': {
             const profileId = args.profileId || 'default';
             const session = manager.getSession(profileId);

package/src/services/browser-service/internal/BrowserSession.js

@@ -37,7 +37,6 @@ export class BrowserSession {
     exitNotified = false;
     constructor(options) {
         this.options = options;
-        this.maxTabs = Math.max(5, Math.floor(Number(options.maxTabs ?? 5) || 5));
         const profileId = options.profileId || 'default';
         const root = resolveProfilesRoot();
         this.profileDir = path.join(root, profileId);
@@ -70,7 +69,6 @@ export class BrowserSession {
             recordLastKnownUrl: (url) => { if (url)
                 this.lastKnownUrl = url; },
             isHeadless: () => this.options.headless === true,
-            getMaxTabs: () => this.maxTabs,
         });
         this.navigation = new BrowserSessionNavigation({
             ensurePrimaryPage: () => this.pageManager.ensurePrimaryPage(),
@@ -149,10 +147,7 @@ export class BrowserSession {
         const existing = this.context.pages();
         this.page = existing.length ? existing[0] : await this.context.newPage();
         this.setupPageHooks(this.page);
-        this.context.on('page', (p) => {
-            this.setupPageHooks(p);
-            this.enforceMaxTabs();
-        });
+        this.context.on('page', (p) => this.setupPageHooks(p));
         if (this.viewportManager.isFollowingWindow()) {
             await this.viewportManager.refreshFromWindow(this.page).catch(() => { });
         }
@@ -163,33 +158,6 @@ export class BrowserSession {
     setupPageHooks(page) {
         this.pageHooks.setupPageHooks(page);
     }
-
-    async enforceMaxTabs() {
-        try {
-            const ctx = this.context;
-            if (!ctx) return;
-            const pages = ctx.pages().filter((p) => !p.isClosed());
-            if (pages.length <= this.maxTabs) return;
-            const activePage = this.getActivePage();
-            const excess = pages.length - this.maxTabs;
-            const closable = pages
-                .filter((p) => p !== activePage)
-                .sort((a, b) => {
-                    const aUrl = a.url() || '';
-                    const bUrl = b.url() || '';
-                    const aScore = (aUrl.includes('captcha') || aUrl === 'about:blank') ? 1 : 0;
-                    const bScore = (bUrl.includes('captcha') || bUrl === 'about:blank') ? 1 : 0;
-                    if (aScore !== bScore) return bScore - aScore;
-                    return 0;
-                });
-            const toClose = closable.slice(0, Math.min(excess, closable.length));
-            for (const page of toClose) {
-                try {
-                    await page.close({ runBeforeUnload: false });
-                } catch { /* ignore */ }
-            }
-        } catch { /* ignore enforcement errors */ }
-    }
     addRuntimeEventObserver(observer) {
         return this.runtimeEvents.addObserver(observer);
     }
@@ -333,4 +301,4 @@ export class BrowserSession {
         this.onExit?.(this.options.profileId);
     }
 }
-//# sourceMappingURL=BrowserSession.js.map
+//# sourceMappingURL=BrowserSession.js.map

package/src/services/browser-service/internal/browser-session/input-ops.js

@@ -120,25 +120,28 @@ export class BrowserSessionInputOps {
                 await clickPage.mouse.move(nudgeX, nudgeY, { steps: 3 }).catch(() => { });
                 await clickPage.waitForTimeout(40).catch(() => { });
             };
+            const performClick = async (clickPage, label) => {
+                await this.runInputAction(page, label, async (activePage) => {
+                    if (nudgeBefore)
+                        await nudgePointer(activePage);
+                    await moveToTarget(activePage);
+                    await activePage.mouse.down({ button });
+                    const pause = Math.max(0, Number(delay) || 0);
+                    if (pause > 0)
+                        await activePage.waitForTimeout(pause).catch(() => { });
+                    await activePage.mouse.up({ button });
+                });
+            };
             for (let i = 0; i < clicks; i++) {
                 if (i > 0)
                     await new Promise(r => setTimeout(r, 100 + Math.random() * 100));
                 try {
-                    await this.runInputAction(page, 'mouse:click(direct)', async (clickPage) => {
-                        if (nudgeBefore)
-                            await nudgePointer(clickPage);
-                        await moveToTarget(clickPage);
-                        await clickPage.mouse.click(x, y, { button, clickCount: 1, delay: Math.max(0, Number(delay) || 0) });
-                    });
+                    await performClick(page, 'mouse:click(direct)');
                 }
                 catch (error) {
                     if (!isTimeoutLikeError(error))
                         throw error;
-                    await this.runInputAction(page, 'mouse:click(retry)', async (clickPage) => {
-                        await nudgePointer(clickPage);
-                        await moveToTarget(clickPage);
-                        await clickPage.mouse.click(x, y, { button, clickCount: 1, delay: Math.max(0, Number(delay) || 0) });
-                    });
+                    await performClick(page, 'mouse:click(retry)');
                 }
             }
         });

package/src/services/browser-service/internal/browser-session/page-management.js

@@ -1,6 +1,6 @@
 import { spawnSync } from 'node:child_process';
 import { ensurePageRuntime } from '../pageRuntime.js';
-import { resolveNavigationWaitUntil, normalizeUrl, shouldSkipBringToFront } from './utils.js';
+import { resolveNavigationWaitUntil, normalizeUrl } from './utils.js';
 export class BrowserSessionPageManagement {
     deps;
     trackedPages = [];
@@ -182,24 +182,14 @@ export class BrowserSessionPageManagement {
             active: active === p,
         }));
     }
-  async newPage(url, options = {}) {
-    const ctx = this.deps.ensureContext();
-    const maxTabs = typeof this.deps.getMaxTabs === 'function' ? this.deps.getMaxTabs() : null;
-    if (Number.isFinite(maxTabs) && maxTabs >= 1) {
-      const pages = this.collectPages(ctx);
-      if (pages.length >= maxTabs) {
-        throw new Error(`max_tabs_exceeded:${maxTabs}`);
-      }
-    }
-    const isMac = process.platform === 'darwin';
+    async newPage(url, options = {}) {
+        const ctx = this.deps.ensureContext();
+        const isMac = process.platform === 'darwin';
         const shortcut = isMac ? 'Meta+t' : 'Control+t';
         let page = null;
         const opener = this.deps.getActivePage() || ctx.pages()[0];
         if (!opener)
             throw new Error('no_opener_page');
-        if (!shouldSkipBringToFront()) {
-            await opener.bringToFront().catch(() => null);
-        }
         const before = this.collectPages(ctx).length;
         if (!options?.strictShortcut) {
             page = await this.openPageViaContext(ctx, before);
@@ -252,14 +242,6 @@ export class BrowserSessionPageManagement {
         catch {
             /* ignore */
         }
-        if (!shouldSkipBringToFront()) {
-            try {
-                await page.bringToFront();
-            }
-            catch {
-                /* ignore */
-            }
-        }
         if (url) {
             await page.goto(url, { waitUntil: resolveNavigationWaitUntil() });
             await ensurePageRuntime(page);
@@ -283,14 +265,6 @@ export class BrowserSessionPageManagement {
         catch {
             /* ignore */
         }
-        if (!shouldSkipBringToFront()) {
-            try {
-                await page.bringToFront();
-            }
-            catch {
-                /* ignore */
-            }
-        }
         await ensurePageRuntime(page, true).catch(() => { });
         this.deps.recordLastKnownUrl(page.url());
         return { index: idx, url: page.url() };
@@ -316,14 +290,6 @@ export class BrowserSessionPageManagement {
         if (nextIndex >= 0) {
             const nextPage = remaining[nextIndex];
             this.deps.setActivePage(nextPage);
-            if (!shouldSkipBringToFront()) {
-                try {
-                    await nextPage.bringToFront();
-                }
-                catch {
-                    /* ignore */
-                }
-            }
             await ensurePageRuntime(nextPage, true).catch(() => { });
             this.deps.recordLastKnownUrl(nextPage.url());
         }

package/src/utils/help.mjs

@@ -26,7 +26,7 @@ CONFIG:
 
 BROWSER CONTROL:
   init                                      Ensure camoufox + ensure browser-service daemon
-  start [profileId] [--url <url>] [--no-headless|--visible] [--devtools] [--record] [--record-name <name>] [--record-output <path>] [--record-overlay|--no-record-overlay] [--alias <name>] [--idle-timeout <duration>] [--width <w> --height <h> --max-tabs <n>]
+  start [profileId] [--url <url>] [--no-headless|--visible] [--devtools] [--record] [--record-name <name>] [--record-output <path>] [--record-overlay|--no-record-overlay] [--alias <name>] [--idle-timeout <duration>] [--width <w> --height <h>]
   stop [profileId]
   stop --id <instanceId>                    Stop by instance id
   stop --alias <alias>                      Stop by alias