@xbrowser/cli 1.14.0 → 1.16.0

package/dist/{chunk-PYQGDBAF.js → chunk-A5HJ6IRE.js}

@@ -26,7 +26,7 @@ var DEFAULT_STEALTH_CONFIG = {
   bezierCurvature: [0.35, 0.6],
   noiseAmplitude: 5.5,
   overshootRange: [6, 14],
-  aimPause: [150, 400],
+  aimPause: [80, 280],
   pressDuration: [60, 140],
   releaseDrift: [0.8, 2.5],
   landingOffsetSmall: [0.3, 2.5],
@@ -47,6 +47,9 @@ var DEFAULT_STEALTH_CONFIG = {
 function rand(min, max) {
   return min + Math.random() * (max - min);
 }
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function cosineEase(t) {
   return 0.5 - 0.5 * Math.cos(Math.PI * t);
 }
@@ -94,6 +97,18 @@ function landingOffset(width, height, config = DEFAULT_STEALTH_CONFIG) {
   const dy = rand(...range) * (Math.random() < 0.5 ? -1 : 1);
   return { dx, dy };
 }
+function typingDelay(config = DEFAULT_STEALTH_CONFIG) {
+  const roll = Math.random();
+  const r = config.typingRhythm;
+  if (roll < r.pauseProb) return rand(...r.pauseRange);
+  if (roll < r.pauseProb + r.fastProb) return rand(...r.fastRange);
+  return rand(...r.normalRange);
+}
+function wheelDelta(step, config = DEFAULT_STEALTH_CONFIG) {
+  return Math.round(
+    config.wheelPeak * Math.exp(-step * config.wheelDecayRate) * rand(0.85, 1.15)
+  );
+}
 var KEY_MAP = {};
 for (let i = 97; i <= 122; i++) {
   const ch = String.fromCharCode(i);
@@ -117,6 +132,7 @@ Object.assign(KEY_MAP, {
 function buildStealthInitScript() {
   return [
     "(function(){",
+    '  window.__xbStealthVer="57";',
     // 1. AEL event proxy
     "  var o=EventTarget.prototype.addEventListener;",
     "  var fc=new InputDeviceCapabilities({firesTouchEvents:false});",
@@ -279,6 +295,70 @@ function buildStealthInitScript() {
     '    var _pto=Object.getOwnPropertyDescriptor(Performance.prototype,"timeOrigin");',
     '    if(_pto&&_pto.get){Object.defineProperty(performance,"timeOrigin",{get:function(){return _pto.get.call(performance);},configurable:true});}',
     "  }catch(e){}",
+    // 3f. getCoalescedEvents 合成（d47）：真实鼠标 125Hz 采样被浏览器按帧合并，
+    //     快速移动时 pointermove.getCoalescedEvents() 返回 2~6 个事件（群内
+    //     ≈8ms）；CDP Input 逐事件派发不走合并管线，coalesced>1 恒为 0（结构性
+    //     暴露，间隔模拟救不了——实测 Chrome 帧对齐时 CDP 连发事件被直接丢弃
+    //     而非合并）。按 125Hz 物理插值合成 coalesced 群：期望样本数 = dt/8ms-1，
+    //     合成事件用真 PointerEvent 构造 + 实例级 isTrusted/timeStamp 遮蔽。
+    "  try{",
+    "    if(window.PointerEvent&&PointerEvent.prototype.getCoalescedEvents){",
+    "      var _gce=PointerEvent.prototype.getCoalescedEvents;",
+    "      var _lm=null;",
+    "      var _gceH=function(){",
+    "        var list=_gce.call(this);",
+    '        if(this.type!=="pointermove"||!this.isTrusted)return list;',
+    "        var cur={x:this.clientX,y:this.clientY,ts:this.timeStamp};",
+    "        var out=null;",
+    "        if((!list||list.length<2)&&_lm){",
+    "          var dt=cur.ts-_lm.ts,dx=cur.x-_lm.x,dy=cur.y-_lm.y;",
+    // dt 长（帧丢弃后）不代表群覆盖整个 dt —— 真实 coalesced 群只覆盖
+    // 最后一帧窗口（≤16.7ms，群内 ≈8ms=125Hz）。合成群从自身往回推 8ms
+    // 链，位移取末端占比（span/dt，dt 远大于 span 时位移趋零=丢弃后实况）。
+    "          var expN=Math.floor(dt/8)-1;",
+    // dt<12ms（不足一帧+采样周期）时真实浏览器不会产生合并群 ——
+    // 单采样帧 coalesced=1，强行合成会出现 ~2ms 的超物理群内间隔。
+    "          if(expN>0&&dt>=12&&Math.random()>0.15){",
+    "            var n=Math.min(4,expN+(Math.random()<0.3?1:0));",
+    "            var span=Math.min(dt,n*8.3);",
+    "            var frac=Math.min(1,span/Math.max(dt,1));",
+    "            out=[];",
+    "            for(var i=1;i<=n;i++){",
+    // k=距自身的步数（含自身共 n+1 个事件，相邻恒 ≈8.3ms=125Hz 周期）
+    "              var k=n+1-i;",
+    '              var ev=new PointerEvent("pointermove",{',
+    '                pointerId:this.pointerId,pointerType:"mouse",isPrimary:this.isPrimary,',
+    "                clientX:cur.x-dx*frac*(k/(n+1))+(Math.random()-0.5)*1.5,",
+    "                clientY:cur.y-dy*frac*(k/(n+1))+(Math.random()-0.5)*1.5,",
+    "                screenX:this.screenX,screenY:this.screenY,",
+    "                buttons:this.buttons,button:this.button,",
+    "                bubbles:true,cancelable:true,composed:true,",
+    "                width:this.width,height:this.height,pressure:this.pressure,",
+    "                tiltX:this.tiltX,tiltY:this.tiltY,twist:this.twist});",
+    "              var tsV=cur.ts-k*8.3-Math.random()*1.2;",
+    // isTrusted/timeStamp 是实例不可配置属性（defineProperty 抛
+    // "Cannot redefine"），改 Proxy 包装：getPrototypeOf/ownKeys 透传，
+    // instanceof 与属性枚举行为与真事件一致。IIFE 捕获本次循环的 tsV
+    // 快照 —— var 提升会让所有 Proxy 闭包共享最后一次赋值（实测四个
+    // 合成事件同时间戳、群内间隔塌到 ~2ms）。
+    "              out.push((function(e2,t2){return new Proxy(e2,{get:function(t,p){",
+    '                if(p==="isTrusted")return true;',
+    '                if(p==="timeStamp")return t2;',
+    '                var v=Reflect.get(t,p);return typeof v==="function"?v.bind(t):v;',
+    "              }});})(ev,tsV));",
+    "            }",
+    "            out.push(this);",
+    "          }",
+    "        }",
+    "        _lm=cur;",
+    "        return out||list;",
+    "      };",
+    "      PointerEvent.prototype.getCoalescedEvents=_gceH;",
+    // name 反查伪装：var _gceH=fn 的具名推断会暴露 hook（原生 name 是
+    // "getCoalescedEvents"）——toString 白名单管不到 name 属性。
+    '      try{Object.defineProperty(_gceH,"name",{value:"getCoalescedEvents"});}catch(e){}',
+    "    }",
+    "  }catch(e){}",
     // 3d. Chrome object depth (d24): automation fakes usually only set
     //     window.chrome = {}; deep checks hit app.run/runtime/csi/loadTimes.
     "  try{",
@@ -313,6 +393,7 @@ function buildStealthInitScript() {
     '    if(this===HTMLCanvasElement.prototype.toDataURL)return"function toDataURL() { [native code] }";',
     '    if(this===AnalyserNode.prototype.getFloatFrequencyData)return"function getFloatFrequencyData() { [native code] }";',
     '    if(this===AudioBuffer.prototype.getChannelData)return"function getChannelData() { [native code] }";',
+    '    if(this===_gceH)return"function getCoalescedEvents() { [native code] }";',
     "    return _ts.call(this);",
     "  };",
     // 4. onclick prototype hijack (dual-stream consistency)
@@ -373,26 +454,26 @@ var XBMouseImpl = class {
         await this.send("Input.dispatchMouseEvent", { type: "mouseMoved", x: p.x, y: p.y, button: this._button });
         this._x = p.x;
         this._y = p.y;
-        await sleep(p.delay);
+        await sleep2(p.delay);
       }
       this._x = tx;
       this._y = ty;
       if (_truncated) {
         await this.send("Input.dispatchMouseEvent", { type: "mouseMoved", x: tx, y: ty, button: this._button });
       }
-      await sleep(rand(...DEFAULT_STEALTH_CONFIG.aimPause));
+      await sleep2(rand(...DEFAULT_STEALTH_CONFIG.aimPause));
     } else {
       await this.move(tx, ty);
     }
     await this.down({ button });
-    await sleep(stealth ? rand(...DEFAULT_STEALTH_CONFIG.pressDuration) : opts.delay ?? 0);
+    await sleep2(stealth ? rand(...DEFAULT_STEALTH_CONFIG.pressDuration) : opts.delay ?? 0);
     const rx = stealth ? this._x + rand(...DEFAULT_STEALTH_CONFIG.releaseDrift) * (Math.random() < 0.5 ? -1 : 1) : this._x;
     const ry = stealth ? this._y + rand(...DEFAULT_STEALTH_CONFIG.releaseDrift) * (Math.random() < 0.5 ? -1 : 1) : this._y;
     this._x = rx;
     this._y = ry;
     await this.send("Input.dispatchMouseEvent", { type: "mouseReleased", x: rx, y: ry, button, clickCount: opts.clickCount ?? 1 });
     for (let i = 1; i < (opts.clickCount ?? 1); i++) {
-      if (opts.delay) await sleep(opts.delay);
+      if (opts.delay) await sleep2(opts.delay);
       await this.down({ button });
       await this.up({ button });
     }
@@ -423,12 +504,14 @@ var XBMouseImpl = class {
     });
   }
   async move(x, y, opts = {}) {
+    const stealth = opts.stealth ?? process.env.XBROWSER_STEALTH !== "off";
     const steps = Math.max(1, opts.steps ?? 1);
     const fromX = this._x;
     const fromY = this._y;
     const dx = x - fromX;
     const dy = y - fromY;
     for (let i = 1; i <= steps; i++) {
+      if (stealth) await sleep2(rand(16, 28));
       const t = i / steps;
       this._x = fromX + dx * t;
       this._y = fromY + dy * t;
@@ -455,7 +538,7 @@ var XBMouseImpl = class {
     await this.conn.send(method, params, this.sessionId);
   }
 };
-function sleep(ms) {
+function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
@@ -485,17 +568,17 @@ var XBKeyboardImpl = class {
     await this.dispatchKeyEvent(downParams);
     if (mapping.text) {
       if (process.env.XBROWSER_STEALTH !== "off") {
-        await sleep2(rand(...DEFAULT_STEALTH_CONFIG.keyPressDuration));
+        await sleep3(rand(...DEFAULT_STEALTH_CONFIG.keyPressDuration));
       }
       await this.dispatchKeyEvent({
         type: "char",
         text: mapping.text
       });
     }
-    if (delay > 0) await sleep2(delay);
+    if (delay > 0) await sleep3(delay);
     else {
       if (process.env.XBROWSER_STEALTH !== "off") {
-        await sleep2(rand(...DEFAULT_STEALTH_CONFIG.keyPressDuration));
+        await sleep3(rand(...DEFAULT_STEALTH_CONFIG.keyPressDuration));
       }
     }
     const upParams = {
@@ -541,45 +624,56 @@ var XBKeyboardImpl = class {
     const fixedDelay = opts.delay ?? 0;
     for (const char of text) {
       if (fixedDelay > 0) {
-        await sleep2(fixedDelay);
+        await sleep3(fixedDelay);
       } else if (stealth) {
-        const roll = Math.random();
-        const cfg = DEFAULT_STEALTH_CONFIG.typingRhythm;
-        if (roll < cfg.pauseProb) {
-          await sleep2(rand(cfg.pauseRange[0], cfg.pauseRange[1]));
-        } else if (roll < cfg.pauseProb + cfg.fastProb) {
-          await sleep2(rand(cfg.fastRange[0], cfg.fastRange[1]));
-        } else {
-          await sleep2(rand(cfg.normalRange[0], cfg.normalRange[1]));
-        }
-      }
-      const mapping = resolveKeyMapping(char);
-      const downParams = {
-        type: "rawKeyDown",
-        key: mapping.key,
-        code: mapping.code
-      };
-      if (mapping.text) {
-        downParams.text = mapping.text;
-        downParams.unmodifiedText = mapping.text;
-      }
-      if (mapping.keyCode) {
-        downParams.windowsVirtualKeyCode = mapping.keyCode;
+        await sleep3(typingDelay());
       }
-      await this.dispatchKeyEvent(downParams);
-      if (mapping.text) {
-        await this.dispatchKeyEvent({
-          type: "char",
-          text: mapping.text
-        });
+      if (stealth && char.length === 1 && Math.random() < DEFAULT_STEALTH_CONFIG.typoProbability) {
+        const wrong = NEIGHBOR_KEYS[char];
+        if (wrong && wrong !== char) {
+          await this.dispatchKeySequence(resolveKeyMapping(wrong), stealth);
+          await sleep3(rand(120, 420));
+          await this.dispatchKeySequence(KEY_MAP2.Backspace, stealth);
+        }
       }
-      await this.dispatchKeyEvent({
-        type: "keyUp",
-        key: mapping.key,
-        code: mapping.code,
-        ...mapping.keyCode ? { windowsVirtualKeyCode: mapping.keyCode } : {}
-      });
+      await this.dispatchKeySequence(resolveKeyMapping(char), stealth);
+    }
+  }
+  /**
+   * Single-key event sequence: rawKeyDown → (char) → keyUp.
+   * Shared by press() and type() — two separate implementations drifted
+   * apart once already (S60: type() lost the keyPressDuration that press()
+   * had; d50 caught it as 33/33 keys with down→up of 2ms).
+   */
+  async dispatchKeySequence(mapping, stealth) {
+    const downParams = {
+      type: "rawKeyDown",
+      key: mapping.key,
+      code: mapping.code
+    };
+    if (mapping.text) {
+      downParams.text = mapping.text;
+      downParams.unmodifiedText = mapping.text;
+    }
+    if (mapping.keyCode) {
+      downParams.windowsVirtualKeyCode = mapping.keyCode;
+    }
+    await this.dispatchKeyEvent(downParams);
+    if (mapping.text) {
+      await this.dispatchKeyEvent({ type: "char", text: mapping.text });
     }
+    if (stealth) {
+      await sleep3(rand(...DEFAULT_STEALTH_CONFIG.keyPressDuration));
+    }
+    const upParams = {
+      type: "keyUp",
+      key: mapping.key,
+      code: mapping.code
+    };
+    if (mapping.keyCode) {
+      upParams.windowsVirtualKeyCode = mapping.keyCode;
+    }
+    await this.dispatchKeyEvent(upParams);
   }
   async insertText(text) {
     await this.conn.send(
@@ -588,6 +682,55 @@ var XBKeyboardImpl = class {
       this.sessionId
     );
   }
+  /**
+   * Navigation key press using CDP type 'keyDown' (NOT rawKeyDown).
+   * rawKeyDown skips browser default actions — select option navigation,
+   * arrow-key scrolling etc. never fire under it (d53: ArrowDown on a
+   * focused <select> left the value unchanged). keyDown carries the
+   * default action.
+   */
+  async pressNav(key) {
+    const mapping = resolveKeyMapping(key);
+    const downParams = {
+      type: "keyDown",
+      key: mapping.key,
+      code: mapping.code
+    };
+    if (mapping.keyCode) {
+      downParams.windowsVirtualKeyCode = mapping.keyCode;
+      downParams.nativeVirtualKeyCode = mapping.keyCode;
+    }
+    await this.dispatchKeyEvent(downParams);
+    if (process.env.XBROWSER_STEALTH !== "off") {
+      await sleep3(rand(...DEFAULT_STEALTH_CONFIG.keyPressDuration));
+    }
+    await this.dispatchKeyEvent({
+      type: "keyUp",
+      key: mapping.key,
+      code: mapping.code,
+      ...mapping.keyCode ? { windowsVirtualKeyCode: mapping.keyCode } : {}
+    });
+  }
+  /**
+   * Shortcut combo press (modifier+key) with explicit per-event modifiers
+   * bitmask — plain down(mod)+press(key) inserts the raw character because
+   * CDP modifiers are per-event fields, not session state (d56: Meta,v
+   * typed a literal 'v'). keyDown type carries the default action so the
+   * browser's shortcut dispatcher sees the combo (e.g. native paste).
+   */
+  async pressCombo(key, modifier) {
+    const MODBIT = { Alt: 1, Control: 2, Meta: 4, Shift: 8 };
+    const m = resolveKeyMapping(modifier);
+    const k = resolveKeyMapping(key);
+    const bits = MODBIT[modifier] ?? 0;
+    await this.dispatchKeyEvent({ type: "rawKeyDown", key: m.key, code: m.code, ...m.keyCode ? { windowsVirtualKeyCode: m.keyCode } : {}, modifiers: bits });
+    await this.dispatchKeyEvent({ type: "keyDown", key: k.key, code: k.code, ...k.keyCode ? { windowsVirtualKeyCode: k.keyCode } : {}, modifiers: bits });
+    if (process.env.XBROWSER_STEALTH !== "off") {
+      await sleep3(rand(...DEFAULT_STEALTH_CONFIG.keyPressDuration));
+    }
+    await this.dispatchKeyEvent({ type: "keyUp", key: k.key, code: k.code, ...k.keyCode ? { windowsVirtualKeyCode: k.keyCode } : {}, modifiers: bits });
+    await this.dispatchKeyEvent({ type: "keyUp", key: m.key, code: m.code, ...m.keyCode ? { windowsVirtualKeyCode: m.keyCode } : {}, modifiers: 0 });
+  }
   async dispatchKeyEvent(params) {
     await this.conn.send("Input.dispatchKeyEvent", params, this.sessionId);
   }
@@ -642,7 +785,44 @@ var KEY_MAP2 = {
   F11: { key: "F11", code: "F11", keyCode: 122 },
   F12: { key: "F12", code: "F12", keyCode: 123 }
 };
-function sleep2(ms) {
+var NEIGHBOR_KEYS = {
+  a: "s",
+  b: "v",
+  c: "x",
+  d: "f",
+  e: "r",
+  f: "g",
+  g: "h",
+  h: "j",
+  i: "o",
+  j: "k",
+  k: "l",
+  l: "k",
+  m: "n",
+  n: "m",
+  o: "p",
+  p: "o",
+  q: "w",
+  r: "t",
+  s: "d",
+  t: "y",
+  u: "i",
+  v: "b",
+  w: "e",
+  x: "c",
+  y: "u",
+  z: "x",
+  "1": "2",
+  "2": "3",
+  "3": "4",
+  "4": "5",
+  "5": "6",
+  "6": "7",
+  "7": "8",
+  "8": "9",
+  "9": "0"
+};
+function sleep3(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
@@ -934,6 +1114,18 @@ var XBLocatorImpl = class _XBLocatorImpl {
     await waitForActionable(this.page, this.selector, opts);
     await scrollIntoView(this.page, this.selector);
     await this.click({ ...opts });
+    if (process.env.XBROWSER_STEALTH !== "off" && value.length >= 40 && process.env.XBROWSER_FILL_TYPE !== "type") {
+      try {
+        const { pasteViaClipboard, syntheticPaste } = await import("./clipboard-BOL2GP2E.js");
+        await pasteViaClipboard(this.page, value);
+        const got = await this.page.evaluate(
+          `(function(){ const el = ${this._q(this.selector)}; return el ? (el.value || '') : ''; })()`
+        );
+        if (got === value) return;
+        if (await syntheticPaste(this.page, this._q(this.selector), value)) return;
+      } catch {
+      }
+    }
     await this.page.keyboard.type(value, { stealth: true });
     return;
     await this.page.evaluate(`
@@ -959,23 +1151,13 @@ var XBLocatorImpl = class _XBLocatorImpl {
   async press(key, opts = {}) {
     await waitForActionable(this.page, this.selector, { timeout: opts.timeout });
     await scrollIntoView(this.page, this.selector);
-    await this.page.evaluate(`
-      (function() {
-        const el = ${this._q(this.selector)};
-        if (el) el.focus();
-      })()
-    `);
+    await this.click({ timeout: opts.timeout });
     await this.page.keyboard.press(key);
   }
   async pressSequentially(text, opts = {}) {
     await waitForActionable(this.page, this.selector, { timeout: opts.timeout });
     await scrollIntoView(this.page, this.selector);
-    await this.page.evaluate(`
-      (function() {
-        const el = ${this._q(this.selector)};
-        if (el) el.focus();
-      })()
-    `);
+    await this.click({ timeout: opts.timeout });
     await this.page.keyboard.type(text, { delay: opts.delay });
   }
   async hover(opts = {}) {
@@ -1030,11 +1212,36 @@ var XBLocatorImpl = class _XBLocatorImpl {
   async selectOption(value) {
     await waitForActionable(this.page, this.selector);
     const values = Array.isArray(value) ? value : [value];
-    const selected = await this.page.evaluate(`
+    const info = await this.page.evaluate(`
       (function() {
         const el = ${this._q(this.selector)};
         if (!el || el.tagName !== 'SELECT') throw new Error('Not a select element');
-
+        const values = ${JSON.stringify(values)};
+        let target = -1, targetValue = '';
+        outer:
+        for (let i = 0; i < el.options.length; i++) {
+          const opt = el.options[i];
+          for (const v of values) {
+            const hit = typeof v === 'object'
+              ? (v.label !== undefined ? opt.label === v.label
+                 : v.value !== undefined ? opt.value === v.value
+                 : opt.index === v.index)
+              : (opt.value === v || opt.label === v);
+            if (hit) { target = i; targetValue = opt.value; break outer; }
+          }
+        }
+        return { cur: el.selectedIndex, target: target, targetValue: targetValue, multiple: el.multiple };
+      })()
+    `);
+    if (info.target < 0) {
+      throw new Error(`Option not found: ${JSON.stringify(values)}`);
+    }
+    if (!info.multiple) {
+      await this.click({ timeout: 5e3 });
+    }
+    const selected = await this.page.evaluate(`
+      (function() {
+        const el = ${this._q(this.selector)};
         const values = ${JSON.stringify(values)};
         const selectedValues = [];
 
@@ -3727,6 +3934,9 @@ async function launch(options = {}) {
 }
 
 export {
+  rand,
+  sleep,
+  wheelDelta,
   XBMouseImpl,
   XBKeyboardImpl,
   waitForActionable,

package/dist/{chunk-ZD4OSYOX.js → chunk-GWQ5NTVE.js}

@@ -1,7 +1,7 @@
 import {
   createRuleEngine,
   launch
-} from "./chunk-UPAWITVM.js";
+} from "./chunk-LTBNQERK.js";
 import {
   errMsg
 } from "./chunk-GDKLH7ZY.js";
@@ -588,16 +588,14 @@ process.on("exit", () => {
 async function getCDPTargets(cdpEndpoint) {
   try {
     const ep = String(cdpEndpoint);
-    let host = "localhost";
-    let port = "9222";
+    let url = "http://localhost:9222/json/list";
     if (ep.startsWith("http://") || ep.startsWith("https://")) {
       const u = new URL(ep);
-      host = u.hostname;
-      port = u.port || "9222";
+      u.pathname = (u.pathname.replace(/\/+$/, "") || "") + "/json/list";
+      url = u.toString();
     } else if (/^\d+$/.test(ep)) {
-      port = ep;
+      url = `http://localhost:${ep}/json/list`;
     }
-    const url = `http://${host}:${port}/json/list`;
     const resp = await fetch(url);
     return await resp.json();
   } catch {
@@ -1082,6 +1080,10 @@ async function createSession(name, url, options) {
       }
     }
     page = targetPage;
+    if (isCDP) {
+      await Promise.resolve(targetPage.bringToFront?.()).catch(() => {
+      });
+    }
   } else {
     context = await b.newContext({ viewport: { width: 1920, height: 1080 } });
     page = await context.newPage();