@xbrowser/cli 1.18.1 → 1.19.0

package/dist/{browser-W3Z4HPJN.js → browser-6LH6KJSW.js}

@@ -20,7 +20,7 @@ import {
   saveSessionDiskMeta,
   setActivePage,
   touchSession
-} from "./chunk-OU335JBI.js";
+} from "./chunk-KLXLNQI5.js";
 import "./chunk-3KZ34AUC.js";
 import "./chunk-GDKLH7ZY.js";
 import "./chunk-KFQGP6VL.js";

package/dist/{browser-SYE57VHU.js → browser-TUD2KA5G.js}

@@ -20,8 +20,8 @@ import {
   saveSessionDiskMeta,
   setActivePage,
   touchSession
-} from "./chunk-EI2XZIDF.js";
-import "./chunk-LL37GYPP.js";
+} from "./chunk-2BPZ25RE.js";
+import "./chunk-LKJZYVIX.js";
 import "./chunk-3KZ34AUC.js";
 import "./chunk-GDKLH7ZY.js";
 import "./chunk-A6LPGFAL.js";

package/dist/{browser-UPKOT3V6.js → browser-Y5SIE6LY.js}

@@ -20,8 +20,8 @@ import {
   saveSessionDiskMeta,
   setActivePage,
   touchSession
-} from "./chunk-MMZCBUD3.js";
-import "./chunk-DVKIL7H6.js";
+} from "./chunk-C6PW3CPA.js";
+import "./chunk-GKYSCHT4.js";
 import "./chunk-3FWLW7FS.js";
 import "./chunk-3KZ34AUC.js";
 import "./chunk-GDKLH7ZY.js";

package/dist/{cdp-driver-KT6HL33W.js → cdp-driver-2EECZW4X.js}

@@ -14,7 +14,7 @@ import {
   scrollIntoView,
   waitForActionable,
   waitForNetworkIdle
-} from "./chunk-LL37GYPP.js";
+} from "./chunk-LKJZYVIX.js";
 import {
   connectToCDP,
   findChrome,

package/dist/{cdp-driver-4UAV56SQ.js → cdp-driver-7HO5SRNN.js}

@@ -14,7 +14,7 @@ import {
   scrollIntoView,
   waitForActionable,
   waitForNetworkIdle
-} from "./chunk-DVKIL7H6.js";
+} from "./chunk-GKYSCHT4.js";
 import "./chunk-3FWLW7FS.js";
 import {
   connectToCDP,

package/dist/{cdp-driver-NNBPNFF2.js → cdp-driver-E7G3VHIB.js}

@@ -133,8 +133,17 @@ function buildStealthInitScript() {
     "      if(!e)return f.call(this,e);",
     "      return f.call(this,new Proxy(e,{get:function(k,p){",
     '        if(p==="sourceCapabilities")return fc;',
-    '        if(p==="isTrusted")return Reflect.get(k,"isTrusted");',
-    '        if((p==="clientX"||p==="clientY")&&k.type==="click"&&Number.isInteger(k[p])&&k.isTrusted===true){',
+    // S124 修正（d67 攻防）：恒 true 是"过度伪装"——站点自己的合成事件
+    // 也变 true → 直接判定浏览器被篡改（比检测自动化更严重的指纹暴露）。
+    // 正确策略：透传原始值（CDP Input 事件本来就是 true，JS 合成本来是 false）
+    // + paste 定向伪装（合成的 paste 在真实场景都是 trusted 的键盘操作产物）
+    '        if(p==="isTrusted"){',
+    '          var orig=Reflect.get(k,"isTrusted");',
+    "          if(orig===true)return true;",
+    '          if(k.type==="paste")return true;',
+    "          return orig;",
+    "        }",
+    '        if((p==="clientX"||p==="clientY")&&k.type==="click"&&Number.isInteger(k[p])){',
     "          var _f=((k.timeStamp||Date.now())%89)/89*0.7+0.15;",
     "          return k[p]+_f;",
     "        }",
@@ -144,6 +153,30 @@ function buildStealthInitScript() {
     "    return o.call(this,t,w,op);",
     "  };",
     "  EventTarget.prototype.addEventListener=_ael;",
+    // window.event isTrusted 伪装（S123）：AEL 参数包装收不到 window.event
+    // （它是原始 Event 对象的隐式引用）。定义 getter 拦截读取。
+    "  try{",
+    '    var _weDesc=Object.getOwnPropertyDescriptor(Window.prototype,"event");',
+    "    if(_weDesc&&_weDesc.get){",
+    "      var _origWeGet=_weDesc.get;",
+    '      Object.defineProperty(Window.prototype,"event",{',
+    "        configurable:true,",
+    "        get:function(){",
+    "          var ev=_origWeGet.call(this);",
+    "          if(!ev)return ev;",
+    "          return new Proxy(ev,{get:function(k,p){",
+    '            if(p==="isTrusted"){',
+    '              var orig=Reflect.get(k,"isTrusted");',
+    "              if(orig===true)return true;",
+    '              if(k.type==="paste")return true;',
+    "              return orig;",
+    "            }",
+    '            var v=Reflect.get(k,p);return typeof v==="function"?v.bind(k):v;',
+    "          }});",
+    "        }",
+    "      });",
+    "    }",
+    "  }catch(e){}",
     // 2. Screen override (prototype-level, not instance-level)
     "  var _gw=function(){return 1728};",
     "  var _gh=function(){return 1117};",
@@ -401,7 +434,12 @@ function buildStealthInitScript() {
     "  };",
     // 4. onclick prototype hijack (dual-stream consistency)
     "  var _ba=function(k,p){",
-    '    if(p==="isTrusted")return Reflect.get(k,"isTrusted");',
+    '    if(p==="isTrusted"){',
+    '      var orig=Reflect.get(k,"isTrusted");',
+    "      if(orig===true)return true;",
+    '      if(k.type==="paste")return true;',
+    "      return orig;",
+    "    }",
     '    if((p==="clientX"||p==="clientY")&&k.type==="click"&&Number.isInteger(k[p])&&k.isTrusted===true){',
     "      var _f=((k.timeStamp||Date.now())%89)/89*0.7+0.15;return k[p]+_f;",
     "    }",

package/dist/{chunk-EI2XZIDF.js → chunk-2BPZ25RE.js}

@@ -1,6 +1,6 @@
 import {
   launch
-} from "./chunk-LL37GYPP.js";
+} from "./chunk-LKJZYVIX.js";
 import {
   errMsg
 } from "./chunk-GDKLH7ZY.js";
@@ -68,7 +68,9 @@ async function resolveCDPEndpoint(raw) {
   }
   if (raw.startsWith("http://") || raw.startsWith("https://")) {
     try {
-      const httpResp = await fetchNoProxy(`${raw}/json/version`);
+      const u = new URL(raw);
+      u.pathname = (u.pathname.replace(/\/+$/, "") || "") + "/json/version";
+      const httpResp = await fetchNoProxy(u.toString());
       const data = await httpResp.json();
       if (!data.webSocketDebuggerUrl) {
         throw new Error(`Could not discover CDP endpoint from ${raw}`);
@@ -206,9 +208,17 @@ function discoverChromiumPath() {
   }
   return void 0;
 }
+var _browserPool = /* @__PURE__ */ new Map();
 async function createBrowser(options) {
   if (options?.cdpEndpoint) {
     const realEndpoint = await resolveCDPEndpoint(options.cdpEndpoint);
+    if (!options.intercept) {
+      const pooled = _browserPool.get(realEndpoint);
+      if (pooled && !pooled.disconnected) {
+        return pooled;
+      }
+      if (pooled) _browserPool.delete(realEndpoint);
+    }
     if (options.intercept) {
       const config = typeof options.intercept === "object" ? { ...options.intercept, cdpEndpoint: realEndpoint } : { cdpEndpoint: realEndpoint };
       _sharedCdpProxy = new CDPInterceptorProxy(config);
@@ -221,6 +231,7 @@ async function createBrowser(options) {
     await browser2.discoverContexts().catch((err) => {
       console.error(`[browser] discoverContexts failed: ${errMsg(err)}`);
     });
+    if (!options.intercept) _browserPool.set(realEndpoint, browser2);
     return browser2;
   }
   const executablePath = options?.executablePath || process.env.XBROWSER_CHROMIUM_PATH || discoverChromiumPath();
@@ -607,11 +618,37 @@ async function createSession(name, url, options) {
     }
     context = contexts[0] || await b.newContext();
     let targetPage = null;
-    if (targetHostname) {
+    const ownedUrls = /* @__PURE__ */ new Set();
+    for (const ssn of sessions.list()) {
+      try {
+        const u = ssn.page?.url();
+        if (u && u !== "about:blank") ownedUrls.add(u);
+      } catch {
+      }
+    }
+    if (url) {
+      for (const ctx of contexts) {
+        for (const p of ctx.pages()) {
+          try {
+            const pUrl = await resolvePageUrl(p);
+            if (ownedUrls.has(pUrl)) continue;
+            if (pUrl === url) {
+              targetPage = p;
+              break;
+            }
+          } catch {
+          }
+        }
+        if (targetPage) break;
+      }
+    }
+    if (!targetPage && targetHostname) {
       for (const ctx of contexts) {
         const pages = ctx.pages();
         for (const p of pages) {
-          const pUrl = await resolvePageUrl(p);
+          const pUrl0 = await resolvePageUrl(p);
+          if (ownedUrls.has(pUrl0)) continue;
+          const pUrl = pUrl0;
           if (isRealPageUrl(pUrl) && pUrl.includes(targetHostname)) {
             targetPage = p;
             break;
@@ -624,7 +661,9 @@ async function createSession(name, url, options) {
       for (const ctx of contexts) {
         const pages = ctx.pages();
         for (const p of pages) {
-          const pUrl = await resolvePageUrl(p);
+          const pUrl0 = await resolvePageUrl(p);
+          if (ownedUrls.has(pUrl0)) continue;
+          const pUrl = pUrl0;
           if (isRealPageUrl(pUrl)) {
             targetPage = p;
             break;
@@ -635,13 +674,36 @@ async function createSession(name, url, options) {
     }
     if (!targetPage && options?.cdpEndpoint) {
       const targets = await getCDPTargets(options.cdpEndpoint);
+      const ownedUrlsT = /* @__PURE__ */ new Set();
+      for (const ssn of sessions.list()) {
+        try {
+          const u = ssn.page?.url();
+          if (u && u !== "about:blank") ownedUrlsT.add(u);
+        } catch {
+        }
+      }
       const matchTarget = targets.find(
-        (t) => t.url && t.url !== "about:blank" && !t.url.startsWith("chrome://") && !t.url.startsWith("chrome-untrusted://") && !t.url.startsWith("chrome-error://") && (url ? t.url.includes(new URL(url).hostname) : true)
+        (t) => t.url && t.url !== "about:blank" && !t.url.startsWith("chrome://") && !t.url.startsWith("chrome-untrusted://") && !t.url.startsWith("chrome-error://") && !ownedUrlsT.has(t.url) && (url ? t.url === url || t.url.includes(new URL(url).hostname) : true)
       );
       if (matchTarget && matchTarget.url) {
+        const ownedUrls2 = /* @__PURE__ */ new Set();
+        for (const ssn of sessions.list()) {
+          try {
+            const u = ssn.page?.url();
+            if (u && u !== "about:blank") ownedUrls2.add(u);
+          } catch {
+          }
+        }
+        const isOwned = (p) => {
+          try {
+            return ownedUrls2.has(p.url());
+          } catch {
+            return false;
+          }
+        };
         const existing2 = context.pages().find((p) => {
           try {
-            return p.url() === matchTarget.url;
+            return p.url() === matchTarget.url && !isOwned(p);
           } catch {
             return false;
           }
@@ -659,7 +721,10 @@ async function createSession(name, url, options) {
       const pages = context.pages();
       if (pages.length > 1) {
         try {
+          const owned = /* @__PURE__ */ new Set();
+          for (const ssn of sessions.list()) owned.add(ssn.page);
           for (const p of pages) {
+            if (owned.has(p)) continue;
             const vis = await p.evaluate("document.visibilityState").catch(() => "hidden");
             if (vis === "visible") {
               targetPage = p;

package/dist/{chunk-MMZCBUD3.js → chunk-C6PW3CPA.js}

@@ -1,7 +1,7 @@
 import {
   createRuleEngine,
   launch
-} from "./chunk-DVKIL7H6.js";
+} from "./chunk-GKYSCHT4.js";
 import {
   errMsg
 } from "./chunk-GDKLH7ZY.js";
@@ -495,7 +495,9 @@ async function resolveCDPEndpoint(raw) {
   }
   if (raw.startsWith("http://") || raw.startsWith("https://")) {
     try {
-      const httpResp = await fetchNoProxy(`${raw}/json/version`);
+      const u = new URL(raw);
+      u.pathname = (u.pathname.replace(/\/+$/, "") || "") + "/json/version";
+      const httpResp = await fetchNoProxy(u.toString());
       const data = await httpResp.json();
       if (!data.webSocketDebuggerUrl) {
         throw new Error(`Could not discover CDP endpoint from ${raw}`);
@@ -633,9 +635,17 @@ function discoverChromiumPath() {
   }
   return void 0;
 }
+var _browserPool = /* @__PURE__ */ new Map();
 async function createBrowser(options) {
   if (options?.cdpEndpoint) {
     const realEndpoint = await resolveCDPEndpoint(options.cdpEndpoint);
+    if (!options.intercept) {
+      const pooled = _browserPool.get(realEndpoint);
+      if (pooled && !pooled.disconnected) {
+        return pooled;
+      }
+      if (pooled) _browserPool.delete(realEndpoint);
+    }
     if (options.intercept) {
       const config = typeof options.intercept === "object" ? { ...options.intercept, cdpEndpoint: realEndpoint } : { cdpEndpoint: realEndpoint };
       _sharedCdpProxy = new CDPInterceptorProxy(config);
@@ -648,6 +658,7 @@ async function createBrowser(options) {
     await browser2.discoverContexts().catch((err) => {
       console.error(`[browser] discoverContexts failed: ${errMsg(err)}`);
     });
+    if (!options.intercept) _browserPool.set(realEndpoint, browser2);
     return browser2;
   }
   const executablePath = options?.executablePath || process.env.XBROWSER_CHROMIUM_PATH || discoverChromiumPath();
@@ -1034,11 +1045,37 @@ async function createSession(name, url, options) {
     }
     context = contexts[0] || await b.newContext();
     let targetPage = null;
-    if (targetHostname) {
+    const ownedUrls = /* @__PURE__ */ new Set();
+    for (const ssn of sessions.list()) {
+      try {
+        const u = ssn.page?.url();
+        if (u && u !== "about:blank") ownedUrls.add(u);
+      } catch {
+      }
+    }
+    if (url) {
+      for (const ctx of contexts) {
+        for (const p of ctx.pages()) {
+          try {
+            const pUrl = await resolvePageUrl(p);
+            if (ownedUrls.has(pUrl)) continue;
+            if (pUrl === url) {
+              targetPage = p;
+              break;
+            }
+          } catch {
+          }
+        }
+        if (targetPage) break;
+      }
+    }
+    if (!targetPage && targetHostname) {
       for (const ctx of contexts) {
         const pages = ctx.pages();
         for (const p of pages) {
-          const pUrl = await resolvePageUrl(p);
+          const pUrl0 = await resolvePageUrl(p);
+          if (ownedUrls.has(pUrl0)) continue;
+          const pUrl = pUrl0;
           if (isRealPageUrl(pUrl) && pUrl.includes(targetHostname)) {
             targetPage = p;
             break;
@@ -1051,7 +1088,9 @@ async function createSession(name, url, options) {
       for (const ctx of contexts) {
         const pages = ctx.pages();
         for (const p of pages) {
-          const pUrl = await resolvePageUrl(p);
+          const pUrl0 = await resolvePageUrl(p);
+          if (ownedUrls.has(pUrl0)) continue;
+          const pUrl = pUrl0;
           if (isRealPageUrl(pUrl)) {
             targetPage = p;
             break;
@@ -1062,13 +1101,36 @@ async function createSession(name, url, options) {
     }
     if (!targetPage && options?.cdpEndpoint) {
       const targets = await getCDPTargets(options.cdpEndpoint);
+      const ownedUrlsT = /* @__PURE__ */ new Set();
+      for (const ssn of sessions.list()) {
+        try {
+          const u = ssn.page?.url();
+          if (u && u !== "about:blank") ownedUrlsT.add(u);
+        } catch {
+        }
+      }
       const matchTarget = targets.find(
-        (t) => t.url && t.url !== "about:blank" && !t.url.startsWith("chrome://") && !t.url.startsWith("chrome-untrusted://") && !t.url.startsWith("chrome-error://") && (url ? t.url.includes(new URL(url).hostname) : true)
+        (t) => t.url && t.url !== "about:blank" && !t.url.startsWith("chrome://") && !t.url.startsWith("chrome-untrusted://") && !t.url.startsWith("chrome-error://") && !ownedUrlsT.has(t.url) && (url ? t.url === url || t.url.includes(new URL(url).hostname) : true)
       );
       if (matchTarget && matchTarget.url) {
+        const ownedUrls2 = /* @__PURE__ */ new Set();
+        for (const ssn of sessions.list()) {
+          try {
+            const u = ssn.page?.url();
+            if (u && u !== "about:blank") ownedUrls2.add(u);
+          } catch {
+          }
+        }
+        const isOwned = (p) => {
+          try {
+            return ownedUrls2.has(p.url());
+          } catch {
+            return false;
+          }
+        };
         const existing2 = context.pages().find((p) => {
           try {
-            return p.url() === matchTarget.url;
+            return p.url() === matchTarget.url && !isOwned(p);
           } catch {
             return false;
           }
@@ -1086,7 +1148,10 @@ async function createSession(name, url, options) {
       const pages = context.pages();
       if (pages.length > 1) {
         try {
+          const owned = /* @__PURE__ */ new Set();
+          for (const ssn of sessions.list()) owned.add(ssn.page);
           for (const p of pages) {
+            if (owned.has(p)) continue;
             const vis = await p.evaluate("document.visibilityState").catch(() => "hidden");
             if (vis === "visible") {
               targetPage = p;

package/dist/{chunk-DVKIL7H6.js → chunk-GKYSCHT4.js}

@@ -144,8 +144,17 @@ function buildStealthInitScript() {
     "      if(!e)return f.call(this,e);",
     "      return f.call(this,new Proxy(e,{get:function(k,p){",
     '        if(p==="sourceCapabilities")return fc;',
-    '        if(p==="isTrusted")return Reflect.get(k,"isTrusted");',
-    '        if((p==="clientX"||p==="clientY")&&k.type==="click"&&Number.isInteger(k[p])&&k.isTrusted===true){',
+    // S124 修正（d67 攻防）：恒 true 是"过度伪装"——站点自己的合成事件
+    // 也变 true → 直接判定浏览器被篡改（比检测自动化更严重的指纹暴露）。
+    // 正确策略：透传原始值（CDP Input 事件本来就是 true，JS 合成本来是 false）
+    // + paste 定向伪装（合成的 paste 在真实场景都是 trusted 的键盘操作产物）
+    '        if(p==="isTrusted"){',
+    '          var orig=Reflect.get(k,"isTrusted");',
+    "          if(orig===true)return true;",
+    '          if(k.type==="paste")return true;',
+    "          return orig;",
+    "        }",
+    '        if((p==="clientX"||p==="clientY")&&k.type==="click"&&Number.isInteger(k[p])){',
     "          var _f=((k.timeStamp||Date.now())%89)/89*0.7+0.15;",
     "          return k[p]+_f;",
     "        }",
@@ -155,6 +164,30 @@ function buildStealthInitScript() {
     "    return o.call(this,t,w,op);",
     "  };",
     "  EventTarget.prototype.addEventListener=_ael;",
+    // window.event isTrusted 伪装（S123）：AEL 参数包装收不到 window.event
+    // （它是原始 Event 对象的隐式引用）。定义 getter 拦截读取。
+    "  try{",
+    '    var _weDesc=Object.getOwnPropertyDescriptor(Window.prototype,"event");',
+    "    if(_weDesc&&_weDesc.get){",
+    "      var _origWeGet=_weDesc.get;",
+    '      Object.defineProperty(Window.prototype,"event",{',
+    "        configurable:true,",
+    "        get:function(){",
+    "          var ev=_origWeGet.call(this);",
+    "          if(!ev)return ev;",
+    "          return new Proxy(ev,{get:function(k,p){",
+    '            if(p==="isTrusted"){',
+    '              var orig=Reflect.get(k,"isTrusted");',
+    "              if(orig===true)return true;",
+    '              if(k.type==="paste")return true;',
+    "              return orig;",
+    "            }",
+    '            var v=Reflect.get(k,p);return typeof v==="function"?v.bind(k):v;',
+    "          }});",
+    "        }",
+    "      });",
+    "    }",
+    "  }catch(e){}",
     // 2. Screen override (prototype-level, not instance-level)
     "  var _gw=function(){return 1728};",
     "  var _gh=function(){return 1117};",
@@ -412,7 +445,12 @@ function buildStealthInitScript() {
     "  };",
     // 4. onclick prototype hijack (dual-stream consistency)
     "  var _ba=function(k,p){",
-    '    if(p==="isTrusted")return Reflect.get(k,"isTrusted");',
+    '    if(p==="isTrusted"){',
+    '      var orig=Reflect.get(k,"isTrusted");',
+    "      if(orig===true)return true;",
+    '      if(k.type==="paste")return true;',
+    "      return orig;",
+    "    }",
     '    if((p==="clientX"||p==="clientY")&&k.type==="click"&&Number.isInteger(k[p])&&k.isTrusted===true){',
     "      var _f=((k.timeStamp||Date.now())%89)/89*0.7+0.15;return k[p]+_f;",
     "    }",