@xbrowser/cli 1.9.9 → 1.11.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   detectAntiBot,
   formatDetectionMessage
-} from "./chunk-INTQPBYF.js";
+} from "./chunk-JKVUFP3G.js";
 import {
   forwardCommandLog,
   forwardNetworkAnalyze,
@@ -25,7 +25,7 @@ import {
   forwardSessionList,
   forwardViewerCheckSelector,
   version
-} from "./chunk-YMUSHPU4.js";
+} from "./chunk-WHPBNUKB.js";
 import {
   buildViewerUrl
 } from "./chunk-3OD76SUE.js";
@@ -66,7 +66,7 @@ import {
 } from "./chunk-ANVL2ID2.js";
 import {
   SessionRecorder
-} from "./chunk-4452SPFI.js";
+} from "./chunk-NODRQGOK.js";
 import {
   addKnownIssue,
   getKnowledgePath,
@@ -91,8 +91,8 @@ import {
   resolveLaunchOpts,
   saveSessionDiskMeta,
   setActivePage
-} from "./chunk-RZM5CNIY.js";
-import "./chunk-RRBXV7KE.js";
+} from "./chunk-XKQVUFUS.js";
+import "./chunk-7OFM755Z.js";
 import "./chunk-TNEN6VQ2.js";
 import {
   errMsg
@@ -491,14 +491,23 @@ var CAPTCHA_SELECTORS = {
   generic: '#captcha, .captcha-container, [class*="captcha"]'
 };
 async function detectCaptcha(page) {
-  for (const [type, selector] of Object.entries(CAPTCHA_SELECTORS)) {
-    const el = await page.$(selector);
-    if (el) {
-      const iframeUrl = await el.getAttribute("src").catch(() => void 0);
-      return { type, selector, iframeUrl: iframeUrl || void 0 };
-    }
-  }
-  return null;
+  const hit = await page.evaluate(`
+    (function() {
+      var S = ${JSON.stringify(CAPTCHA_SELECTORS)};
+      for (var type in S) {
+        var sel = S[type];
+        var el;
+        try { el = document.querySelector(sel); } catch (e) { continue; }
+        if (el) {
+          var url = el.getAttribute && el.getAttribute('src');
+          return { type: type, selector: sel, iframeUrl: url || undefined };
+        }
+      }
+      return null;
+    })()
+  `).catch(() => null);
+  if (!hit) return null;
+  return { type: hit.type, selector: hit.selector, iframeUrl: hit.iframeUrl || void 0 };
 }
 async function waitForCaptchaSolved(page, captchaInfo, timeoutMs = 18e4) {
   const startTime = Date.now();
@@ -549,12 +558,24 @@ var clickCommand = registerCommand({
     let detectedNewPage;
     let cleanup;
     if (ctx.browserContext?.on) {
+      const targetIdOf = (p2) => p2._targetId;
+      let targetIdsBefore;
+      try {
+        targetIdsBefore = new Set(ctx.browserContext.pages().map(targetIdOf));
+      } catch {
+        targetIdsBefore = /* @__PURE__ */ new Set();
+      }
       const pagePromise = new Promise((resolve10) => {
         const timer = setTimeout(() => {
           ctx.browserContext.off("page", handler);
           resolve10(void 0);
         }, 3e3);
         const handler = (page2) => {
+          if (targetIdsBefore.has(targetIdOf(page2))) return;
+          try {
+            if ((page2.url?.() ?? "") === "about:blank") return;
+          } catch {
+          }
           clearTimeout(timer);
           ctx.browserContext.off("page", handler);
           resolve10(page2);
@@ -955,9 +976,11 @@ var mouseCommand = registerCommand({
         await ctx.page.mouse.move(p.x, p.y, { steps: p.steps || 1 });
         break;
       case "down":
+        await ctx.page.mouse.move(p.x, p.y);
         await ctx.page.mouse.down({ button });
         break;
       case "up":
+        await ctx.page.mouse.move(p.x, p.y);
         await ctx.page.mouse.up({ button });
         break;
       case "click":
@@ -976,10 +999,11 @@ import { z as z7 } from "zod";
 import { ok as ok7, normalizeTips as normalizeTips2 } from "@dyyz1993/xcli-core";
 var evaluateCommand = registerCommand({
   name: "eval",
-  description: "Evaluate JavaScript expression in the browser",
+  description: "Evaluate JavaScript expression in the browser (--frame <url-substring> \u53EF\u5B9A\u5411\u5230 iframe \u4E0A\u4E0B\u6587\uFF0C\u8DE8\u57DF iframe \u4EA6\u53EF)",
   scope: "page",
   parameters: z7.object({
-    expression: z7.string()
+    expression: z7.string(),
+    frame: z7.string().optional().describe("\u5728 URL \u542B\u6B64\u5B50\u4E32\u7684 iframe \u91CC\u6267\u884C\uFF08\u540C\u8FDB\u7A0B\u7528 contextId\uFF0C\u8DE8\u57DF OOPIF \u7528 Target auto-attach\uFF09")
   }),
   handler: async (p, ctx) => {
     const engine = createRuleEngine();
@@ -991,7 +1015,7 @@ var evaluateCommand = registerCommand({
       direction: "client\u2192browser"
     });
     engine.stop();
-    const result = await ctx.page.evaluate(p.expression);
+    const result = p.frame ? await ctx.page.evaluateInFrame(p.frame, p.expression) : await ctx.page.evaluate(p.expression);
     const response = ok7({ result });
     if (decision && decision.severity === "danger") {
       response.tips = normalizeTips2([`${decision.suggestion}`]);
@@ -5756,6 +5780,11 @@ async function handleSwitch(p, pages, ctx) {
   const targetPage = pages[p.index];
   await targetPage.bringToFront().catch(() => {
   });
+  for (let i = 0; i < 5; i++) {
+    const okProbe = await targetPage.evaluate("1").then(() => true, () => false);
+    if (okProbe) break;
+    await new Promise((r) => setTimeout(r, 300));
+  }
   const session = ctx.sessionId ? getSessionById(ctx.sessionId) : void 0;
   if (session) {
     setActivePage(session, targetPage);
@@ -6210,7 +6239,7 @@ function attachWaitForHuman(ctx, getOrCreateWSServer) {
 }
 function attachDetectAntiBot(ctx) {
   ctx.detectAntiBot = async (page, config) => {
-    const { detectAntiBot: detectAntiBot2 } = await import("./anti-bot-DR56Y63V.js");
+    const { detectAntiBot: detectAntiBot2 } = await import("./anti-bot-GTTYNEFB.js");
     return detectAntiBot2(page, config);
   };
 }
@@ -7399,7 +7428,7 @@ async function executeCommand(commandName, params, sessionName = "default", extr
   }
   let targetPageOverride = null;
   if (_target && extraOpts?.cdpEndpoint) {
-    const { findTargetPage } = await import("./browser-YCO4GJMZ.js");
+    const { findTargetPage } = await import("./browser-V3JIWSTR.js");
     targetPageOverride = await findTargetPage(extraOpts.cdpEndpoint, _target);
     if (!targetPageOverride) {
       return errorResult(`Target "${_target}" not found. Use 'xbrowser targets --cdp ${extraOpts.cdpEndpoint}' to list available pages.`);
@@ -7416,7 +7445,7 @@ async function executeCommand(commandName, params, sessionName = "default", extr
     params = result.data;
   }
   if (command.scope !== "cli" && !process.env.XBROWSER_DAEMON_WORKER) {
-    const { forwardExec } = await import("./daemon-client-O6BYVRXV.js");
+    const { forwardExec } = await import("./daemon-client-Y2YSZCGK.js");
     const result = await forwardExec(commandName, params, sessionName, extraOpts?.cdpEndpoint);
     if (result) return result;
   }
@@ -10065,10 +10094,12 @@ var HTML_TAGS = /* @__PURE__ */ new Set([
   "map",
   "area"
 ]);
+var SELECTOR_DSL_PREFIXES = /^(text=|popup-text=|xpath=|role=|css=|chain=)/;
 function normalizeSelector(input) {
   if (!input) return input;
   if (/^[#\.\[\:\/]/.test(input)) return input;
   if (input === "*") return input;
+  if (SELECTOR_DSL_PREFIXES.test(input)) return input;
   if (/[>\s+,~]/.test(input)) return input;
   const tagName = input.match(/^[a-zA-Z][a-zA-Z0-9]*/)?.[0];
   if (tagName && HTML_TAGS.has(tagName.toLowerCase())) return input;
@@ -10243,11 +10274,23 @@ async function handleBrowserCommand(command, args, options, sessionName, mode, c
           output: options.output || options.o || args[0]
         };
         break;
-      case "eval":
+      case "eval": {
         cmdName = "eval";
-        params = { expression: args.join(" ") || options.expression || "" };
-        if (!params.expression) outputError("Usage: xbrowser eval <expression>");
+        const frameVal = options.frame || void 0;
+        const exprParts = [];
+        for (let i = 0; i < args.length; i++) {
+          if (args[i] === "--frame") {
+            i++;
+            continue;
+          }
+          if (args[i].startsWith("--frame=")) continue;
+          exprParts.push(args[i]);
+        }
+        params = { expression: exprParts.join(" ") || options.expression || "" };
+        if (frameVal) params.frame = frameVal;
+        if (!params.expression) outputError("Usage: xbrowser eval <expression> [--frame <url-substring>]");
         break;
+      }
       case "scroll": {
         let direction = "down";
         let distance;
@@ -10950,7 +10993,7 @@ async function handlePlugin(args, options, mode) {
       } catch {
       }
       try {
-        const { daemonPing } = await import("./daemon-client-O6BYVRXV.js");
+        const { daemonPing } = await import("./daemon-client-Y2YSZCGK.js");
         if (await daemonPing()) {
           await fetch("http://localhost:9224/rpc", {
             method: "POST",
@@ -11516,7 +11559,7 @@ async function handleFilter(args, _mode, options) {
   }
 }
 async function handleGeneratePlugin(sessionName, pluginName, outputDir) {
-  const { SessionRecorder: SessionRecorder2 } = await import("./session-recorder-QRZMKFVL.js");
+  const { SessionRecorder: SessionRecorder2 } = await import("./session-recorder-SLDBENVF.js");
   const { readSiteKnowledge: readSiteKnowledge2, toMarkdown } = await import("./site-knowledge-SYC6VCDB.js");
   const { mkdirSync: mkdirSync11, writeFileSync: writeFileSync13 } = await import("fs");
   const { join: join14 } = await import("path");
@@ -12822,6 +12865,9 @@ var HTTPServer = class {
         this.server = null;
         reject(err);
       });
+      server.headersTimeout = 20 * 6e4;
+      server.requestTimeout = 20 * 6e4;
+      server.keepAliveTimeout = 20 * 6e4;
       server.listen(this.port, this.host, () => {
         const addr = server.address();
         if (addr && typeof addr === "object") {
@@ -13084,12 +13130,16 @@ async function routeCommand(argvIn, stdinCommands) {
     }
     const globalFlags = /* @__PURE__ */ new Set(["--session", "--cdp", "--json", "--yaml", "--output", "--timeout", "--help", "-h", "--version"]);
     let chainArgIdx = -1;
+    let seenCommandWord = false;
     for (let i = 0; i < argv.length; i++) {
       if (globalFlags.has(argv[i])) continue;
       if (globalFlags.has(argv[i]) || i > 0 && globalFlags.has(argv[i - 1]) && !argv[i].startsWith("-")) continue;
-      if (argv[i].includes(" ") && /^[a-zA-Z]/.test(argv[i])) {
-        chainArgIdx = i;
-        break;
+      if (!seenCommandWord) {
+        if (argv[i].includes(" ") && /^[a-zA-Z]/.test(argv[i])) {
+          chainArgIdx = i;
+          break;
+        }
+        seenCommandWord = true;
       }
     }
     if (chainArgIdx >= 0) {
@@ -13453,7 +13503,7 @@ Run "xbrowser ${command} ${subCommand} --help" to see available parameters.`
           }
           const needsBrowser = cmdEntry.scope === "page" || cmdEntry.scope === "browser";
           if (needsBrowser && !process.env.XBROWSER_DAEMON_WORKER) {
-            const { forwardPluginExec } = await import("./daemon-client-O6BYVRXV.js");
+            const { forwardPluginExec } = await import("./daemon-client-Y2YSZCGK.js");
             const userTimeout = typeof params.timeout === "number" && params.timeout > 0 ? params.timeout * 1e3 + 3e4 : void 0;
             const result = await forwardPluginExec(`${command}.${subCommand}`, params, sessionName, cdpEndpoint, userTimeout);
             const resultData = result && typeof result === "object" && "data" in result ? result.data : void 0;
@@ -13493,7 +13543,7 @@ Run "xbrowser ${command} ${subCommand} --help" to see available parameters.`
               const targetPage = pages[cmdTabIndex];
               await targetPage.bringToFront().catch(() => {
               });
-              const { setActivePage: setActivePage2 } = await import("./browser-YCO4GJMZ.js");
+              const { setActivePage: setActivePage2 } = await import("./browser-V3JIWSTR.js");
               setActivePage2(session, targetPage);
             }
           }
@@ -14096,7 +14146,19 @@ var PlaybackEngine = class _PlaybackEngine {
 import { EventEmitter as EventEmitter2 } from "events";
 
 // src/stream/frame-processor.ts
-import sharp from "sharp";
+var _sharp = null;
+async function loadSharp() {
+  if (!_sharp) {
+    try {
+      _sharp = (await import("sharp")).default;
+    } catch (err) {
+      throw new Error(
+        "\u76F4\u64AD\u6D41\u5E27\u5904\u7406\u9700\u8981 sharp \u539F\u751F\u6A21\u5757\uFF0C\u5F53\u524D\u73AF\u5883\u52A0\u8F7D\u5931\u8D25\uFF1A" + (err instanceof Error ? err.message : String(err)) + "\u3002\u4E0D\u7528\u76F4\u64AD\u6D41\u529F\u80FD\u53EF\u5FFD\u7565\uFF1B\u9700\u8981\u76F4\u64AD\u8BF7\u5728\u517C\u5BB9\u73AF\u5883\u8FD0\u884C\u6216\u5B89\u88C5\u5BF9\u5E94\u5E73\u53F0\u4F9D\u8D56\u3002"
+      );
+    }
+  }
+  return _sharp;
+}
 var STATE_CONFIGS = {
   // Full-screen: aggressive compression for speed
   // user_interacting: low quality + downscale — prioritize FPS over clarity
@@ -14248,6 +14310,7 @@ var FrameProcessor = class {
     if (!needsResize && !needsCrop && !needsReencode) {
       return buffer;
     }
+    const sharp = await loadSharp();
     let processed = sharp(buffer);
     if (cropConfig) {
       const meta = await processed.metadata();
@@ -16653,7 +16716,7 @@ var DataCollector = class {
     return results;
   }
   async createBrowserContext() {
-    const { launch } = await import("./cdp-driver-J3YQ4LJV.js");
+    const { launch } = await import("./cdp-driver-GD6YBBGE.js");
     const { browser } = await launch({
       headless: true,
       args: ["--no-sandbox", "--disable-setuid-sandbox"]

package/dist/{session-recorder-H3KEYU26.js → session-recorder-3BEVWHOK.js}

@@ -1,6 +1,6 @@
 import {
   SessionRecorder
-} from "./chunk-5UGR6MUK.js";
+} from "./chunk-HBHOKZPN.js";
 import "./chunk-KFQGP6VL.js";
 export {
   SessionRecorder

package/dist/{session-recorder-QRZMKFVL.js → session-recorder-SLDBENVF.js}

@@ -1,6 +1,6 @@
 import {
   SessionRecorder
-} from "./chunk-4452SPFI.js";
+} from "./chunk-NODRQGOK.js";
 import "./chunk-OZKD3W4X.js";
 import "./chunk-KFQGP6VL.js";
 export {

package/dist/{session-replayer-LJUC4TI7.js → session-replayer-WIUYVN5J.js}

@@ -1,3 +1,6 @@
+import {
+  queryJS
+} from "./chunk-3FWLW7FS.js";
 import "./chunk-KFQGP6VL.js";
 
 // src/recorder/session-replayer.ts
@@ -31,7 +34,7 @@ var SessionReplayer = class {
     if (this.opts.page) {
       this.page = this.opts.page;
     } else if (this.opts.cdpUrl) {
-      const { launch } = await import("./cdp-driver-J3YQ4LJV.js");
+      const { launch } = await import("./cdp-driver-VEK6BNN6.js");
       const { browser } = await launch({ cdpEndpoint: this.opts.cdpUrl });
       let contexts = browser.contexts();
       for (let i = 0; i < 10 && contexts.length === 0; i++) {
@@ -44,13 +47,14 @@ var SessionReplayer = class {
       this.page = pages[0];
     }
     if (!this.page) throw new Error("No page available. Provide cdpUrl or page.");
-    const actions = this.recording.actions;
+    const actions = this.dedupAdjacentActions(this.recording.actions);
     let success = 0;
     let failed = 0;
     let skipped = 0;
     for (let i = 0; i < actions.length; i++) {
       const action = actions[i];
       this.opts.onStep?.(action, i, actions.length);
+      const pagesBefore = this.listContextPages();
       try {
         if (action.trajectory) {
           await this.replayTrajectory(action.trajectory);
@@ -63,6 +67,15 @@ var SessionReplayer = class {
           }
         }
         success++;
+        if (action.type === "click" || action.type === "cdp-click") {
+          const pagesAfter = this.listContextPages();
+          if (pagesAfter && pagesBefore && pagesAfter.length > pagesBefore.length) {
+            const newest = pagesAfter[pagesAfter.length - 1];
+            await newest.bringToFront().catch(() => {
+            });
+            this.page = newest;
+          }
+        }
       } catch (e) {
         const err = e instanceof Error ? e : new Error(String(e));
         this.opts.onError?.(action, err, i);
@@ -75,6 +88,47 @@ var SessionReplayer = class {
     return { success, failed, skipped };
   }
   /** Replay a single action */
+  /** Pages of the replayer page's context (best-effort; null if unavailable). */
+  listContextPages() {
+    try {
+      const ctx = this.page.context?.();
+      const pages = ctx?.pages?.();
+      return Array.isArray(pages) ? pages : null;
+    } catch {
+      return null;
+    }
+  }
+  /**
+   * Replay-time adjacent dedup (rec-duel d02/d03/d05).
+   *
+   * The recorder can emit both the real action signal AND the injected cdp
+   * command action for a single interaction when the signal flush lags behind
+   * the recorder-side dedup window (heavy snapshot capture slows polling).
+   * Replaying both executes the interaction twice. Filter here: an action is
+   * skipped when a nearby (≤15s apart) earlier action matches on
+   * type-normalized key (selector + text) AND coordinates agree — either side
+   * lacks coords (cdp actions carry none) or both are within 30px. Two real
+   * clicks on the same element at different spots (canvas buttons) survive.
+   */
+  dedupAdjacentActions(actions) {
+    const normType = (t) => t === "cdp-click" ? "click" : t === "cdp-fill" ? "input" : t;
+    const generic = (a) => (a.type === "click" || a.type === "dblclick" || a.type === "contextmenu") && (a.element?.selector === "html" || a.element?.selector === "body");
+    const keyOf = (a) => `${normType(a.type)}|${a.element?.selector || ""}|${a.element?.text || ""}`;
+    const coordsOf = (a) => typeof a.x === "number" && typeof a.y === "number" ? { x: a.x, y: a.y } : null;
+    const near = (p, q) => Math.abs(p.x - q.x) <= 30 && Math.abs(p.y - q.y) <= 30;
+    const lastKept = /* @__PURE__ */ new Map();
+    return actions.filter((a) => {
+      if (generic(a)) return false;
+      const key = keyOf(a);
+      const c = coordsOf(a);
+      const recent = lastKept.get(key) || [];
+      const dup = recent.some((e) => Math.abs(a.timestamp - e.ts) <= 15e3 && (!c || !e.c || near(c, e.c)));
+      if (dup) return false;
+      recent.push({ ts: a.timestamp, c });
+      lastKept.set(key, recent);
+      return true;
+    });
+  }
   async replayAction(action) {
     const page = this.page;
     const timeout = this.opts.stepTimeout;
@@ -93,9 +147,43 @@ var SessionReplayer = class {
       case "click":
       case "cdp-click": {
         const selector = await this.resolveAndWait(action);
+        if (typeof action.x === "number" && typeof action.y === "number") {
+          const hit = await page.evaluate(`
+            (function() {
+              const el = ${queryJS(selector)};
+              if (!el) return false;
+              const r = el.getBoundingClientRect();
+              return ${action.x} >= r.x - 2 && ${action.x} <= r.x + r.width + 2
+                  && ${action.y} >= r.y - 2 && ${action.y} <= r.y + r.height + 2;
+            })()
+          `).catch(() => false);
+          if (hit) {
+            await page.mouse.click(action.x, action.y, { stealth: true });
+            break;
+          }
+        }
         await page.click(selector, { timeout });
         break;
       }
+      case "scroll": {
+        const [dir, distStr] = (action.value || "down:300").split(":");
+        const dist = Number(distStr) || 300;
+        const sign = dir === "up" ? -1 : dir === "left" ? 0 : 1;
+        const selector = await this.resolveAndWait(action).catch(() => void 0);
+        if (selector) {
+          await page.evaluate(`
+            (function() {
+              const el = ${queryJS(selector)};
+              if (el) el.scrollTop += ${sign * dist};
+            })()
+          `).catch(() => {
+          });
+        } else {
+          await page.evaluate(`window.scrollBy(0, ${sign * dist})`).catch(() => {
+          });
+        }
+        break;
+      }
       case "input": {
         const selector = await this.resolveAndWait(action);
         await page.fill(selector, action.value ?? "", { timeout });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xbrowser/cli",
-  "version": "1.9.9",
+  "version": "1.11.0",
   "description": "Browser automation CLI for web scraping, headless browsing, SEO analysis, and AI agent workflows. A command-line alternative to Playwright, Puppeteer, and Selenium.",
   "type": "module",
   "bin": {