Skip to content

Lightpanda: the headless browser designed for AI and automation

webapi: On script error, trigger window.reportError

Karl Seguin6c5bde28df38
diff --git a/src/browser/ScriptManagerBase.zig b/src/browser/ScriptManagerBase.zig
index fbce4ea2c..bcd5c1178 100644
--- a/src/browser/ScriptManagerBase.zig
+++ b/src/browser/ScriptManagerBase.zig
@@ -980,6 +980,12 @@ pub const Script = struct {
.cacheable = cacheable,
});
+ if (try_catch.exceptionValue()) |exc| {
+ frame.window.reportError(exc, frame) catch |err| {
+ log.warn(.js, "eval script report error", .{ .url = url, .err = err });
+ };
+ }
+
self.executeCallback(comptime .wrap("error"));
}
diff --git a/src/browser/webapi/Window.zig b/src/browser/webapi/Window.zig
index c44648e4e..4e2f872f1 100644
--- a/src/browser/webapi/Window.zig
+++ b/src/browser/webapi/Window.zig
@@ -578,6 +578,17 @@ pub fn reportError(self: *Window, err: js.Value, frame: *Frame) !void {
if (self._reporting_error) {
return;
}
+
+ const target = self.asEventTarget();
+ if (!frame._event_manager.hasDirectListeners(target, "error", self._on_error)) {
+ if (comptime builtin.is_test == false) {
+ log.warn(.js, "window.reportError", .{
+ .message = err.toStringSlice() catch "Unknown error",
+ });
+ }
+ return;
+ }
+
self._reporting_error = true;
defer self._reporting_error = false;
@@ -616,7 +627,7 @@ pub fn reportError(self: *Window, err: js.Value, frame: *Frame) !void {
event._prevent_default = prevent_default;
// Pass null as handler: onerror was already called above with 5 args.
// We still dispatch so that addEventListener('error', ...) listeners fire.
- try frame._event_manager.dispatchDirect(self.asEventTarget(), event, null, .{
+ try frame._event_manager.dispatchDirect(target, event, null, .{
.context = "window.reportError",
});