Lightpanda: the headless browser designed for AI and automation
fix ordering, frameNavigated before the navigate error response
Karl Seguin4beed65e14c0
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zigindex 288c0340b..b114f004e 100644--- a/src/browser/Frame.zig+++ b/src/browser/Frame.zig@@ -1978,23 +1978,6 @@ fn frameErrorCallback(ctx: *anyopaque, err: anyerror) void {self._last_navigate_error = err;log.debug(.frame, "navigate failed", .{ .err = err, .type = self._type, .url = self.url });- // A navigation that fails before any response headers arrive never- // reaches the frame_navigated dispatch in frameHeaderCallback, so the- // Page.navigate command that initiated it would stay unanswered forever.- // Tell CDP so it can answer with an errorText (Chrome semantics).- // _http_status is set as soon as headers are processed; non-null means- // frameHeaderCallback already answered the command — don't answer twice.- if (self._http_status == null) {- self._session.notification.dispatch(.frame_navigate_failed, &.{- .frame_id = self._frame_id,- .loader_id = self._loader_id,- .timestamp = lp.datetime.timestamp(.boot),- .url = self.url,- .err = err,- .opts = self._navigated_options orelse .{},- });- }-// A pending root navigation that failed before commit. A cancelled one// (window.stop(), Fetch.failRequest) leaves the OLD active Page untouched.// Otherwise, like Chrome, commit an error document in its place: the OLD@@ -2002,20 +1985,26 @@ fn frameErrorCallback(ctx: *anyopaque, err: anyerror) void {// DOMContentLoaded or load.if (self.page.replaces != null) {if (err == error.TransferCanceled) {+ self.navigateFailed(err);self._session.discardPendingPage(self.page);return;}self._session.commitPendingPage(self.page) catch |e| {log.err(.frame, "commit error page", .{ .err = e, .type = self._type, .url = self.url });+ self.navigateFailed(err);if (self.page.replaces != null) {self._session.discardPendingPage(self.page);}return;};+ // Like Chrome, the error document's frameNavigated goes out before+ // the Page.navigate answer: a client that starts its next navigation+ // on that answer would otherwise take this document's events for it.self.errorPageNavigated() catch |e| {log.err(.frame, "error page navigated", .{ .err = e, .type = self._type, .url = self.url });};}+ self.navigateFailed(err);self._parse_state.deinit(self);self._parse_state = .{ .err = err };@@ -2028,6 +2017,26 @@ fn frameErrorCallback(ctx: *anyopaque, err: anyerror) void {};}+// A navigation that fails before any response headers arrive never+// reaches the frame_navigated dispatch in frameHeaderCallback, so the+// Page.navigate command that initiated it would stay unanswered forever.+// Tell CDP so it can answer with an errorText (Chrome semantics).+// _http_status is set as soon as headers are processed; non-null means+// frameHeaderCallback already answered the command — don't answer twice.+fn navigateFailed(self: *Frame, err: anyerror) void {+ if (self._http_status != null) {+ return;+ }+ self._session.notification.dispatch(.frame_navigate_failed, &.{+ .frame_id = self._frame_id,+ .loader_id = self._loader_id,+ .timestamp = lp.datetime.timestamp(.boot),+ .url = self.url,+ .err = err,+ .opts = self._navigated_options orelse .{},+ });+}+// The parts of frameHeaderDoneCallback an error document committed in place of// a pending root navigation needs. Like Chrome's error page, its origin is// opaque.diff --git a/src/server/cdp/domains/page.zig b/src/server/cdp/domains/page.zigindex 5c6a99cfd..c0fa2fb58 100644--- a/src/server/cdp/domains/page.zig+++ b/src/server/cdp/domains/page.zig@@ -2414,10 +2414,22 @@ test "cdp.frame: navigate answers with errorText when the navigation fails" {const frame = bc.mainFrame() orelse unreachable;try testing.expectEqualSlices(u8, "http://127.0.0.1:1/unreachable", frame.url);+ // The error document's frameNavigated precedes the answer: a client that+ // navigates again on the answer must not take it for its own navigation.var answers: usize = 0;+ var navigated = false;for (ctx.received.items) |msg| {+ if (msg.object.get("method")) |method| {+ if (method == .string and std.mem.eql(u8, method.string, "Page.frameNavigated")) {+ const loader_id = msg.object.get("params").?.object.get("frame").?.object.get("loaderId").?;+ if (std.mem.eql(u8, loader_id.string, "LID-0000000002")) navigated = true;+ }+ }const msg_id = msg.object.get("id") orelse continue;- if (msg_id == .integer and msg_id.integer == 52) answers += 1;+ if (msg_id == .integer and msg_id.integer == 52) {+ try testing.expect(navigated);+ answers += 1;+ }}try testing.expectEqual(1, answers);}