@xbrowser/cli 1.9.2 → 1.9.4

package/dist/index.js

@@ -1,3 +1,21 @@
+import {
+  detectAntiBot,
+  formatDetectionMessage
+} from "./chunk-DPJNCMLC.js";
+import {
+  CaptchaDetector,
+  HumanInteractionManager,
+  NPM_REGISTRY_URL,
+  NPM_SCOPE,
+  ScreencastCapturer,
+  WebhookNotifier,
+  getCaptchaConfig,
+  getConfigValue,
+  getMarketplaceUrl,
+  loadConfig,
+  resolveNpmPackageWithFallback,
+  setConfigValue
+} from "./chunk-ZJHQPMCY.js";
 import {
   forwardCommandLog,
   forwardNetworkAnalyze,
@@ -27,20 +45,6 @@ import {
   stopDaemonProcess,
   version
 } from "./chunk-53LRNYPG.js";
-import {
-  CaptchaDetector,
-  HumanInteractionManager,
-  NPM_REGISTRY_URL,
-  NPM_SCOPE,
-  ScreencastCapturer,
-  WebhookNotifier,
-  getCaptchaConfig,
-  getConfigValue,
-  getMarketplaceUrl,
-  loadConfig,
-  resolveNpmPackageWithFallback,
-  setConfigValue
-} from "./chunk-ZJHQPMCY.js";
 import {
   generateBashScript,
   generateJSScript,
@@ -6167,246 +6171,49 @@ function describeSelector(strategy, value, name) {
   }
 }
 
-// src/anti-bot-detection.ts
-var CAPTCHA_PATTERNS = [
-  { name: "reCAPTCHA", pattern: /recaptcha/i },
-  { name: "hCaptcha", pattern: /hcaptcha/i },
-  { name: "Turnstile", pattern: /turnstile/i },
-  { name: "Cloudflare", pattern: /cloudflare/i },
-  { name: "FunCaptcha", pattern: /funcaptcha/i },
-  { name: "AWS WAF", pattern: /aws.*challenge/i }
-];
-var WARNING_TEXTS = [
-  { text: "detected as bot", severity: "high" },
-  { text: "suspicious activity", severity: "high" },
-  { text: "unusual traffic", severity: "high" },
-  { text: "please verify you are human", severity: "medium" },
-  { text: "access denied", severity: "high" },
-  { text: "blocked", severity: "high" },
-  { text: "rate limit", severity: "medium" },
-  { text: "too many requests", severity: "medium" },
-  { text: "\u9A8C\u8BC1", severity: "low" },
-  { text: "\u9A8C\u8BC1\u7801", severity: "low" }
-];
-var BLOCKED_URL_PATTERNS = [
-  { name: "Cloudflare Challenge", pattern: /challenge-platform/i },
-  { name: "Cloudflare Captcha", pattern: /cf-challenge/i },
-  { name: "AWS WAF", pattern: /aws-waf/i },
-  { name: "Generic Captcha", pattern: /captcha/i }
-];
-async function detectAntiBot(page, config = {}) {
-  const {
-    checkCaptcha = true,
-    checkWarning = true,
-    checkBlocked = true,
-    checkLogin = false,
-    checkWebdriver = true
-  } = config;
-  const result = {
-    detected: false
-  };
-  if (checkCaptcha) {
-    const captchaResult = await detectCaptcha2(page);
-    if (captchaResult.detected) {
-      return captchaResult;
-    }
-  }
-  if (checkWarning) {
-    const warningResult = await detectWarningText(page);
-    if (warningResult.detected) {
-      return warningResult;
-    }
-  }
-  if (checkBlocked) {
-    const blockedResult = await detectBlockedPage(page);
-    if (blockedResult.detected) {
-      return blockedResult;
-    }
-  }
-  if (checkWebdriver) {
-    const webdriverResult = await detectWebdriverExposure(page);
-    if (webdriverResult.detected) {
-      return webdriverResult;
-    }
-  }
-  if (checkLogin) {
-    const loginResult = await detectLoginRequired(page);
-    if (loginResult.detected) {
-      return loginResult;
-    }
-  }
-  return result;
-}
-async function detectCaptcha2(page) {
-  try {
-    const iframes = await page.frames();
-    for (const iframe of iframes) {
-      const src = iframe.url();
-      for (const pattern of CAPTCHA_PATTERNS) {
-        if (pattern.pattern.test(src)) {
-          return {
-            detected: true,
-            type: "captcha",
-            severity: "high",
-            message: `Detected ${pattern.name} CAPTCHA (iframe: ${src})`,
-            selector: `iframe[src*="${pattern.name.toLowerCase()}"]`,
-            actionRequired: "manual"
-          };
-        }
-      }
-    }
-    const captchaSelectors = [
-      ".g-recaptcha",
-      "#captcha",
-      '[class*="captcha"]',
-      '[id*="captcha"]',
-      'iframe[src*="recaptcha"]',
-      'iframe[src*="hcaptcha"]',
-      'iframe[src*="turnstile"]'
-    ];
-    for (const selector of captchaSelectors) {
-      const element = await page.$(selector).catch(() => null);
-      if (element) {
-        return {
-          detected: true,
-          type: "captcha",
-          severity: "high",
-          message: `CAPTCHA element found: ${selector}`,
-          selector,
-          actionRequired: "manual"
-        };
-      }
-    }
-    return { detected: false };
-  } catch {
-    return { detected: false };
+// src/context.ts
+function checkBrowserScope(scope, ctx) {
+  switch (scope) {
+    case "project":
+      return null;
+    case "browser":
+      return ctx.browser ? null : "\u9700\u8981\u6D4F\u89C8\u5668\u5B9E\u4F8B\uFF0C\u8BF7\u4F7F\u7528 --session \u9009\u9879";
+    case "page":
+      return ctx.page ? null : "\u9700\u8981\u6D3B\u8DC3\u7684\u9875\u9762\uFF0C\u8BF7\u4F7F\u7528 --session \u9009\u9879";
+    case "element":
+      return ctx.page ? null : "\u9700\u8981\u6D3B\u8DC3\u7684\u9875\u9762\uFF0C\u8BF7\u4F7F\u7528 --session \u9009\u9879";
+    default:
+      return null;
   }
 }
-async function detectWarningText(page) {
-  try {
-    const pageText = await page.textContent("body").catch(() => "") || "";
-    const lowerText = pageText.toLowerCase();
-    for (const { text, severity } of WARNING_TEXTS) {
-      if (lowerText.includes(text.toLowerCase())) {
-        return {
-          detected: true,
-          type: "warning",
-          severity,
-          message: `Anti-bot warning text found: "${text}"`,
-          actionRequired: severity === "high" ? "manual" : "retry"
-        };
-      }
-    }
-    return { detected: false };
-  } catch {
-    return { detected: false };
+function assertPageScope(ctx) {
+  if (!ctx.page) {
+    throw new Error("\u9700\u8981\u6D3B\u8DC3\u7684\u9875\u9762\uFF0C\u8BF7\u4F7F\u7528 --session \u9009\u9879");
   }
 }
-async function detectBlockedPage(page) {
-  try {
-    const url = page.url();
-    for (const { name, pattern } of BLOCKED_URL_PATTERNS) {
-      if (pattern.test(url)) {
-        return {
-          detected: true,
-          type: "blocked",
-          severity: "high",
-          message: `Blocked page detected: ${name} (${url})`,
-          actionRequired: "manual"
-        };
-      }
+var wsServerCache = /* @__PURE__ */ new WeakMap();
+function attachWaitForHuman(ctx, getOrCreateWSServer) {
+  ctx.waitForHuman = async (options) => {
+    if (!ctx.page) {
+      throw new Error("waitForHuman requires an active page");
     }
-    return { detected: false };
-  } catch {
-    return { detected: false };
-  }
+    const { HumanInteractionManager: HumanInteractionManager2 } = await import("./human-interaction-2DZK4MW7.js");
+    const wsServer2 = await getOrCreateWSServer(ctx.browserContext);
+    const manager = new HumanInteractionManager2(wsServer2, ctx.page);
+    return manager.waitForHuman(options);
+  };
 }
-async function detectWebdriverExposure(page) {
-  try {
-    const webdriver = await page.evaluate(() => {
-      return {
-        webdriver: navigator.webdriver,
-        webdriverScriptFn: !!window.__webdriver_script_fn,
-        webdriverEvaluate: !!window.__webdriver_evaluate,
-        chrome: !!window.chrome,
-        permissions: navigator.permissions
-      };
-    }).catch(() => null);
-    if (!webdriver) {
-      return { detected: false };
-    }
-    const issues = [];
-    if (webdriver.webdriver === true) {
-      issues.push("navigator.webdriver === true");
-    }
-    if (webdriver.webdriverScriptFn) {
-      issues.push("__webdriver_script_fn present");
-    }
-    if (webdriver.webdriverEvaluate) {
-      issues.push("__webdriver_evaluate present");
-    }
-    if (!webdriver.chrome) {
-      issues.push("window.chrome missing");
-    }
-    if (!webdriver.permissions) {
-      issues.push("navigator.permissions missing");
-    }
-    if (issues.length > 0) {
-      return {
-        detected: true,
-        type: "warning",
-        severity: "high",
-        message: `Automation markers exposed: ${issues.join(", ")}`,
-        actionRequired: "manual"
-      };
-    }
-    return { detected: false };
-  } catch {
-    return { detected: false };
-  }
+function attachDetectAntiBot(ctx) {
+  ctx.detectAntiBot = async (page, config) => {
+    const { detectAntiBot: detectAntiBot2 } = await import("./anti-bot-MCVM6IFB.js");
+    return detectAntiBot2(page, config);
+  };
 }
-async function detectLoginRequired(page) {
-  try {
-    const loginSelectors = [
-      'a[href*="login"]',
-      'a[href*="signin"]',
-      'a[href*="sign-in"]',
-      'button:has-text("Log in")',
-      'button:has-text("Sign in")',
-      'button:has-text("Login")',
-      'button:has-text("\u767B\u5F55")'
-    ];
-    for (const selector of loginSelectors) {
-      const element = await page.$(selector).catch(() => null);
-      if (element) {
-        const rect = await element.boundingBox().catch(() => null);
-        if (rect && rect.y < 200) {
-          return {
-            detected: true,
-            type: "login",
-            severity: "medium",
-            message: "Login button detected in page header",
-            selector,
-            actionRequired: "manual"
-          };
-        }
-      }
-    }
-    return { detected: false };
-  } catch {
-    return { detected: false };
-  }
+function getWSServerFromCache(browserContext) {
+  return wsServerCache.get(browserContext);
 }
-function formatDetectionMessage(result) {
-  if (!result.detected) {
-    return "\u2705 No anti-bot detection detected.";
-  }
-  const emoji = result.severity === "high" ? "\u{1F6A8}" : result.severity === "medium" ? "\u26A0\uFE0F" : "\u2139\uFE0F";
-  const action = result.actionRequired === "manual" ? "Please handle manually" : result.actionRequired === "retry" ? "Consider retrying with delay" : "Consider switching to a different session";
-  return `${emoji} Detection: ${result.message}
-  Type: ${result.type}
-  Severity: ${result.severity}
-  Action: ${action}`;
+function setWSServerCache(browserContext, server) {
+  wsServerCache.set(browserContext, server);
 }
 
 // src/plugin/loader.ts
@@ -6868,7 +6675,7 @@ async function checkPluginLoginRequired(options) {
   const { site, command, commandName, ctx, page, sessionName } = options;
   if (commandName === "login" || commandName === "logout") return { ok: true };
   const loginConfig = site.config?.loginConfig;
-  const requiresLogin = command.requiresLogin === true || site.config?.requiresLogin === true || loginConfig?.requiresLogin === true;
+  const requiresLogin = command.requiresLogin === true || site.config?.requiresLogin === true || loginConfig?.requiresLogin === true || command.loginRequired === "required";
   if (!requiresLogin) return { ok: true };
   const pluginName = site.name || "plugin";
   if (typeof site.isLoggedIn === "function") {
@@ -7655,6 +7462,7 @@ async function executeCommand(commandName, params, sessionName = "default", extr
     cliName: "xbrowser",
     tips: new TipCollector2()
   };
+  attachDetectAntiBot(ctx);
   if (_tabIndex !== void 0 && session?.context) {
     const pages = session.context.pages();
     if (_tabIndex >= 0 && _tabIndex < pages.length) {
@@ -8074,45 +7882,6 @@ function isChainInput(input) {
   return /\s&&\s|\|\|\s|\s;\s|;\s|\s,\s|\s\+\s|\s->\s/.test(input);
 }
 
-// src/context.ts
-function checkBrowserScope(scope, ctx) {
-  switch (scope) {
-    case "project":
-      return null;
-    case "browser":
-      return ctx.browser ? null : "\u9700\u8981\u6D4F\u89C8\u5668\u5B9E\u4F8B\uFF0C\u8BF7\u4F7F\u7528 --session \u9009\u9879";
-    case "page":
-      return ctx.page ? null : "\u9700\u8981\u6D3B\u8DC3\u7684\u9875\u9762\uFF0C\u8BF7\u4F7F\u7528 --session \u9009\u9879";
-    case "element":
-      return ctx.page ? null : "\u9700\u8981\u6D3B\u8DC3\u7684\u9875\u9762\uFF0C\u8BF7\u4F7F\u7528 --session \u9009\u9879";
-    default:
-      return null;
-  }
-}
-function assertPageScope(ctx) {
-  if (!ctx.page) {
-    throw new Error("\u9700\u8981\u6D3B\u8DC3\u7684\u9875\u9762\uFF0C\u8BF7\u4F7F\u7528 --session \u9009\u9879");
-  }
-}
-var wsServerCache = /* @__PURE__ */ new WeakMap();
-function attachWaitForHuman(ctx, getOrCreateWSServer) {
-  ctx.waitForHuman = async (options) => {
-    if (!ctx.page) {
-      throw new Error("waitForHuman requires an active page");
-    }
-    const { HumanInteractionManager: HumanInteractionManager2 } = await import("./human-interaction-2DZK4MW7.js");
-    const wsServer2 = await getOrCreateWSServer(ctx.browserContext);
-    const manager = new HumanInteractionManager2(wsServer2, ctx.page);
-    return manager.waitForHuman(options);
-  };
-}
-function getWSServerFromCache(browserContext) {
-  return wsServerCache.get(browserContext);
-}
-function setWSServerCache(browserContext, server) {
-  wsServerCache.set(browserContext, server);
-}
-
 // src/scope.ts
 var BROWSER_SCOPE = {
   name: "browser",
@@ -13657,6 +13426,7 @@ Run "xbrowser ${command} ${subCommand} --help" to see available parameters.`
             },
             tips: new TipCollector3()
           };
+          attachDetectAntiBot(ctx);
           try {
             const cmdStart = Date.now();
             const loginGuard = await checkPluginLoginRequired({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xbrowser/cli",
-  "version": "1.9.2",
+  "version": "1.9.4",
   "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": {