hyper-agent-browser 0.3.1 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyper-agent-browser",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Pure browser automation CLI for AI Agents - 纯浏览器自动化 CLI，专为 AI Agent 设计",
   "type": "module",
   "main": "src/cli.ts",

package/src/browser/manager.ts

@@ -149,14 +149,23 @@ export class BrowserManager {
       }
 
       // Use launchPersistentContext for UserData persistence
-      this.context = await chromium.launchPersistentContext(this.session.userDataDir, {
+      // 给启动加上超时保护（15秒）
+      const launchPromise = chromium.launchPersistentContext(this.session.userDataDir, {
         channel: this.options.channel,
         headless: !this.options.headed,
         args: launchArgs,
         ignoreDefaultArgs: ignoreArgs,
         viewport: { width: 1280, height: 720 },
+        timeout: 15000, // 15秒启动超时
       });
 
+      this.context = await Promise.race([
+        launchPromise,
+        new Promise<never>((_, reject) =>
+          setTimeout(() => reject(new Error("Browser launch timeout (15s)")), 15000),
+        ),
+      ]);
+
       // Extract browser from context
       // @ts-ignore - context has _browser property
       this.browser = this.context._browser;
@@ -334,6 +343,22 @@ export class BrowserManager {
       // 重新连接
       await this.connect();
     }
+
+    // 确保返回当前活动页面（可能有多个页面时需要获取最新的）
+    if (this.context) {
+      const pages = this.context.pages();
+      if (pages.length > 0) {
+        // 优先返回非 about:blank 的页面
+        const activePage = pages.find((p) => p.url() !== "about:blank") || pages[pages.length - 1];
+        if (activePage !== this.page) {
+          this.page = activePage;
+          if (this.options.timeout) {
+            this.page.setDefaultTimeout(this.options.timeout);
+          }
+        }
+      }
+    }
+
     return this.page!;
   }
 
@@ -353,7 +378,30 @@ export class BrowserManager {
 
   async close(): Promise<void> {
     if (this.browser) {
-      await this.browser.close();
+      // 获取 PID 以便超时后强制 kill
+      const pid = this.getPid();
+
+      try {
+        // 给 close 操作 5 秒超时
+        await Promise.race([
+          this.browser.close(),
+          new Promise((_, reject) =>
+            setTimeout(() => reject(new Error("Browser close timeout")), 5000),
+          ),
+        ]);
+      } catch (error) {
+        console.log("Browser close failed or timed out, forcing cleanup...");
+        // 强制 kill 进程
+        if (pid) {
+          try {
+            process.kill(pid, "SIGKILL");
+            console.log(`Force killed browser process (PID: ${pid})`);
+          } catch {
+            // 进程可能已经退出
+          }
+        }
+      }
+
       this.browser = null;
       this.context = null;
       this.page = null;

package/src/commands/actions.ts

@@ -43,7 +43,42 @@ async function getLocator(page: Page, selector: string): Promise<Locator> {
 
 export async function click(page: Page, selector: string): Promise<void> {
   const locator = await getLocator(page, selector);
-  await locator.click();
+
+  // 先尝试正常点击
+  try {
+    await locator.click({ timeout: 5000 });
+  } catch (error) {
+    // 如果被遮罩拦截，逐级降级
+    if (error instanceof Error && error.message.includes("intercepts pointer events")) {
+      console.log("Element intercepted, trying force click...");
+      try {
+        await locator.click({ force: true, timeout: 5000 });
+      } catch {
+        // force click 失败，使用完整鼠标事件序列（兼容 React 等框架）
+        console.log("Force click failed, using mouse event sequence...");
+        await locator.evaluate((el: HTMLElement) => {
+          const rect = el.getBoundingClientRect();
+          const x = rect.left + rect.width / 2;
+          const y = rect.top + rect.height / 2;
+
+          // 模拟完整鼠标事件序列
+          for (const type of ["mousedown", "mouseup", "click"]) {
+            el.dispatchEvent(
+              new MouseEvent(type, {
+                bubbles: true,
+                cancelable: true,
+                view: window,
+                clientX: x,
+                clientY: y,
+              }),
+            );
+          }
+        });
+      }
+    } else {
+      throw error;
+    }
+  }
 }
 
 export async function fill(page: Page, selector: string, value: string): Promise<void> {