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

fix(tool): retry browser_use eval with async IIFE on top-level return

Browse Source
This commit is contained in:
matevip 2026-05-24 22:57:30 +08:00
parent c857d6dd45
commit 68effa3f90
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -646,6 +646,16 @@ public class BrowserUseTool {
/** Detects the {@code await} keyword as a whole word to decide whether eval code needs an async wrapper. */
private static final Pattern TOP_LEVEL_AWAIT = Pattern.compile("\\bawait\\b");
/**
* Playwright raises this exact message when a bare-expression eval contains a
* top-level {@code return}. Such snippets are safe to retry inside an async
* IIFE, where {@code return} surfaces the value.
*/
private static boolean isIllegalReturn(PlaywrightException ex) {
String m = ex.getMessage();
return m != null && m.contains("Illegal return statement");
}
private String doEval(String sessionKey, String code) {
if (code == null || code.isBlank()) {
return error("code is required for action=eval");
@ -660,12 +670,28 @@ public class BrowserUseTool {
Page page = session.page;
// Playwright evaluates the supplied string as a plain expression, which
// rejects top-level `await`. Wrap such snippets in an async IIFE so the
// agent can await promises; Playwright auto-resolves the returned one.
// rejects both top-level `await` and top-level `return` ("SyntaxError:
// Illegal return statement"). Snippets that use `await` are wrapped up
// front in an async IIFE (valid for `await` and `return` alike).
// A top-level `return` only fails at eval time, so we retry once wrapped
// rather than pre-wrapping on a naive `return` match — that would mangle
// bare expressions containing a nested return (e.g. arr.map(x => {
// return x; })) into an IIFE with no top-level return, yielding undefined.
String script = TOP_LEVEL_AWAIT.matcher(code).find()
? "(async () => {" + code + "})()"
: code;
Object evalResult = page.evaluate(script);
Object evalResult;
try {
evalResult = page.evaluate(script);
} catch (PlaywrightException ex) {
if (script.equals(code) && isIllegalReturn(ex)) {
log.debug("[BrowserUse] eval had a top-level return; retrying wrapped in async IIFE");
script = "(async () => {" + code + "})()";
evalResult = page.evaluate(script);
} else {
throw ex;
}
}
String resultStr = evalResult != null ? evalResult.toString() : "null";
if (resultStr.length() > 10_000) {