Lightpanda: the headless browser designed for AI and automation
webapi: align AbortMessage error messages with Chrome
Karl Seguin50dc4e28723a
diff --git a/src/browser/tests/event/abort_controller.html b/src/browser/tests/event/abort_controller.htmlindex b3fb7eec7..10f65d3d8 100644--- a/src/browser/tests/event/abort_controller.html+++ b/src/browser/tests/event/abort_controller.html@@ -125,6 +125,8 @@testing.expectEqual(true, signal.aborted);testing.expectEqual(true, signal.reason instanceof DOMException);testing.expectEqual("AbortError", signal.reason.name);+ testing.expectEqual("signal is aborted without reason", signal.reason.message);+ testing.expectEqual(20, signal.reason.code);}</script>@@ -139,14 +141,9 @@controller.abort();// Should throw after abort- let didThrow = false;- try {+ testing.expectError('AbortError: signal is aborted without reason', () => {signal.throwIfAborted();- } catch (e) {- didThrow = true;- }-- testing.expectEqual(true, didThrow);+ });}</script>@@ -327,7 +324,9 @@testing.expectEqual(true, s3.aborted);testing.expectEqual(true, s3.reason instanceof DOMException);testing.expectEqual('TimeoutError', s3.reason.name);- testing.expectError('TimeoutError: The operation timed out', () => {+ testing.expectEqual('signal timed out', s3.reason.message);+ testing.expectEqual(23, s3.reason.code);+ testing.expectError('TimeoutError: signal timed out', () => {s3.throwIfAborted()});});diff --git a/src/browser/webapi/AbortSignal.zig b/src/browser/webapi/AbortSignal.zigindex ff3a0a31d..c00ccaeeb 100644--- a/src/browser/webapi/AbortSignal.zig+++ b/src/browser/webapi/AbortSignal.zig@@ -140,7 +140,7 @@ fn markAborted(self: *AbortSignal, reason_: ?Reason, exec: *const Execution) !vo// Allocate the DOMException so the reason keeps a single JS identity:// dependent signals must expose the very same DOMException instance.const dom = try exec.page_arena.create(DOMException);- dom.* = DOMException.fromError(error.AbortError).?;+ dom.* = defaultReason();self._reason = .{ .dom = dom };}@@ -256,13 +256,18 @@ fn throwIfAborted(self: *const AbortSignal, exec: *const Execution) !ThrowIfAbor.dom => |err| local.newException(err),.string => |str| local.newException(str),.js_val => |js_val| local.newException(js_val),- .undefined => local.newException(DOMException.fromError(error.AbortError).?),+ .undefined => local.newException(defaultReason()),};return .{ .exception = exception };}return .undefined;}+// The reason for an abort without one. The message matches Chrome's.+fn defaultReason() DOMException {+ return .init("signal is aborted without reason", "AbortError");+}+pub const Reason = union(enum) {js_val: js.Value.Global,dom: *DOMException,@@ -276,7 +281,7 @@ pub fn reasonJsValue(reason: Reason, local: *const js.Local) !js.Value {.dom => |dom| local.zigValueToJs(dom, .{}),.string => |str| local.zigValueToJs(str, .{}),.js_val => |global| local.toLocal(global),- .undefined => local.zigValueToJs(DOMException.fromError(error.AbortError).?, .{}),+ .undefined => local.zigValueToJs(defaultReason(), .{}),};}@@ -310,7 +315,7 @@ const TimeoutCallback = struct {}const dom = try self.exec.page_arena.create(DOMException);- dom.* = DOMException.fromError(error.TimeoutError).?;+ dom.* = DOMException.init("signal timed out", "TimeoutError");try self.signal.abort(.{ .dom = dom }, self.exec);}};