Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/browser/events/event.zig
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pub const Event = struct {
.custom_event => .{ .CustomEvent = @as(*CustomEvent, @ptrCast(evt)).* },
.progress_event => .{ .ProgressEvent = @as(*ProgressEvent, @ptrCast(evt)).* },
.mouse_event => .{ .MouseEvent = @as(*parser.MouseEvent, @ptrCast(evt)) },
.error_event => .{ .ErrorEvent = @as(*ErrorEvent, @ptrCast(evt)).* },
.error_event => .{ .ErrorEvent = (@as(*ErrorEvent, @fieldParentPtr("proto", evt))).* },
.message_event => .{ .MessageEvent = @as(*MessageEvent, @ptrCast(evt)).* },
.keyboard_event => .{ .KeyboardEvent = @as(*parser.KeyboardEvent, @ptrCast(evt)) },
.pop_state => .{ .PopStateEvent = @as(*PopStateEvent, @ptrCast(evt)).* },
Expand Down
2 changes: 1 addition & 1 deletion src/browser/html/error_event.zig
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub const ErrorEvent = struct {
const event = try parser.eventCreate();
defer parser.eventDestroy(event);
try parser.eventInit(event, event_type, .{});
parser.eventSetInternalType(event, .event);
parser.eventSetInternalType(event, .error_event);

const o = opts orelse ErrorEventInit{};

Expand Down
20 changes: 20 additions & 0 deletions src/browser/html/window.zig
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const Request = @import("../fetch/Request.zig");
const fetchFn = @import("../fetch/fetch.zig").fetch;

const storage = @import("../storage/storage.zig");
const ErrorEvent = @import("error_event.zig").ErrorEvent;

// https://dom.spec.whatwg.org/#interface-window-extensions
// https://html.spec.whatwg.org/multipage/nav-history-apis.html#window
Expand Down Expand Up @@ -281,6 +282,25 @@ pub const Window = struct {
return out;
}

pub fn _reportError(self: *Window, err: js.Object, page: *Page) !void {
var error_event = try ErrorEvent.constructor("error", .{
.@"error" = err,
});
_ = try parser.eventTargetDispatchEvent(
parser.toEventTarget(Window, self),
@as(*parser.Event, &error_event.proto),
);

if (parser.eventDefaultPrevented(&error_event.proto) == false) {
const err_string = err.toString() catch "Unknown error";
log.info(.user_script, "error", .{
.err = err_string,
.stack = page.stackTrace() catch "???",
.source = "window.reportError",
});
}
}

const CreateTimeoutOpts = struct {
name: []const u8,
args: []js.Object = &.{},
Expand Down
16 changes: 16 additions & 0 deletions src/tests/window/window.html
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,19 @@

testing.eventually(() => testing.expectEqual(true, isWindowTarget));
</script>

<script id=reportError>
let errorEventFired = false;
let capturedError = null;

window.addEventListener('error', (e) => {
errorEventFired = true;
capturedError = e.error;
});

const testError = new Error('Test error message');
window.reportError(testError);

testing.expectEqual(true, errorEventFired);
testing.expectEqual(testError, capturedError);
</script>