opensource/mateclaw
2
0
Fork 0
mirror of https://gitee.com/mateos/mateclaw.git synced 2026-09-15 20:08:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(browser): fix idle watchdog leak on repeated start/stop cycles

Browse Source
This commit is contained in:
matevip 2026-04-06 12:01:09 +08:00
parent 6756577428
commit 4a99382004
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mateclaw-server/src/main/java/vip/mate/tool/builtin/BrowserUseTool.java
View File

@ -282,6 +282,12 @@ public class BrowserUseTool {
return ok("No browser running"); return ok("No browser running");
} }
// 取消空闲看门狗（避免 stop 后定时任务继续运行）
ScheduledFuture<?> watchdog = session.idleWatchdog;
if (watchdog != null && !watchdog.isDone()) {
watchdog.cancel(false);
}
String cdpUrl = session.cdpUrl; String cdpUrl = session.cdpUrl;
boolean wasCdp = session.connectedViaCdp; boolean wasCdp = session.connectedViaCdp;
session.close(); // Only closes Browser/Context, not the shared Playwright instance session.close(); // Only closes Browser/Context, not the shared Playwright instance
@ -624,15 +630,26 @@ public class BrowserUseTool {
} }
private void scheduleIdleCheck(String sessionKey) { private void scheduleIdleCheck(String sessionKey) {
scheduler.scheduleAtFixedRate(() -> { BrowserSession session = sessions.get(sessionKey);
BrowserSession session = sessions.get(sessionKey); if (session == null) return;
if (session == null) return;
long idleMinutes = (System.currentTimeMillis() - session.lastActivity) / 60_000; // 取消已有的看门狗（防止 start→stop→start 导致多个定时任务累积）
ScheduledFuture<?> existing = session.idleWatchdog;
if (existing != null && !existing.isDone()) {
existing.cancel(false);
}
ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(() -> {
BrowserSession s = sessions.get(sessionKey);
if (s == null) return;
long idleMinutes = (System.currentTimeMillis() - s.lastActivity) / 60_000;
if (idleMinutes >= IDLE_TIMEOUT_MINUTES) { if (idleMinutes >= IDLE_TIMEOUT_MINUTES) {
log.info("[BrowserUse] Idle timeout ({}min), stopping session: {}", idleMinutes, sessionKey); log.info("[BrowserUse] Idle timeout ({}min), stopping session: {}", idleMinutes, sessionKey);
doStop(sessionKey); doStop(sessionKey);
} }
}, IDLE_TIMEOUT_MINUTES, 5, TimeUnit.MINUTES); }, IDLE_TIMEOUT_MINUTES, 5, TimeUnit.MINUTES);
session.idleWatchdog = future;
} }
@PreDestroy @PreDestroy
@ -691,6 +708,8 @@ public class BrowserUseTool {
final boolean connectedViaCdp; final boolean connectedViaCdp;
final String cdpUrl; final String cdpUrl;
volatile long lastActivity; volatile long lastActivity;
/** 空闲看门狗定时任务（stop 时取消，避免泄漏） */
volatile ScheduledFuture<?> idleWatchdog;
BrowserSession(Browser browser, BrowserContext context, Page page, BrowserSession(Browser browser, BrowserContext context, Page page,
boolean headed, boolean connectedViaCdp, String cdpUrl) { boolean headed, boolean connectedViaCdp, String cdpUrl) {