public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2026-03-21 20:24:42 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Session: fix page pointer handling in wait loop

Browse Source 
- Refactor `wait` and `_wait` to handle `page` as `*Page` instead of `**Page`, preventing stale references during navigations.
- Update `networkidle` wait condition to use `_notified_network_idle == .done`.
- Document `--wait_ms` and `--wait_until` options in `Config.zig` help text.
This commit is contained in:
shaewe180
2026-03-19 09:36:42 +08:00
parent 09327c3897
commit c15afa23ca
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Config.zig
View File

@@ -398,6 +398,13 @@ pub fn printUsageAndExit(self: *const Config, success: bool) void {
\\ \\
\\--with_frames Includes the contents of iframes. Defaults to false. \\--with_frames Includes the contents of iframes. Defaults to false.
\\ \\
\\--wait_ms Wait time in milliseconds.
\\ Defaults to 5000.
\\
\\--wait_until Wait until the specified event.
\\ Supported events: load, domcontentloaded, networkidle, fixed.
\\ Defaults to 'load'.
\\
++ common_options ++ ++ common_options ++
\\ \\
\\serve command \\serve command

30
src/browser/Session.zig
View File

@@ -320,14 +320,15 @@ fn findPageBy(page: *Page, comptime field: []const u8, id: u32) ?*Page {
} }
pub fn wait(self: *Session, wait_ms: u32, wait_until: lp.Config.WaitUntil) WaitResult { pub fn wait(self: *Session, wait_ms: u32, wait_until: lp.Config.WaitUntil) WaitResult {
var page = &(self.page orelse return .no_page);
while (true) { while (true) {
const wait_result = self._wait(&page, wait_ms, wait_until) catch |err| { if (self.page == null) return .no_page;
const page = &self.page.?;
const wait_result = self._wait(page, wait_ms, wait_until) catch |err| {
switch (err) { switch (err) {
error.JsError => {}, // already logged (with hopefully more context) error.JsError => {}, // already logged (with hopefully more context)
else => log.err(.browser, "session wait", .{ else => log.err(.browser, "session wait", .{
.err = err, .err = err,
.url = page.*.url, .url = page.url,
}), }),
} }
return .done; return .done;
@@ -339,14 +340,13 @@ pub fn wait(self: *Session, wait_ms: u32, wait_until: lp.Config.WaitUntil) WaitR
return .done; return .done;
} }
self.processQueuedNavigation() catch return .done; self.processQueuedNavigation() catch return .done;
page = &self.page.?; // might have changed
}, },
else => |result| return result, else => |result| return result,
} }
} }
} }
fn _wait(self: *Session, page: **Page, wait_ms: u32, wait_until: lp.Config.WaitUntil) !WaitResult { fn _wait(self: *Session, page: *Page, wait_ms: u32, wait_until: lp.Config.WaitUntil) !WaitResult {
var timer = try std.time.Timer.start(); var timer = try std.time.Timer.start();
var ms_remaining = wait_ms; var ms_remaining = wait_ms;
@@ -366,7 +366,7 @@ fn _wait(self: *Session, page: **Page, wait_ms: u32, wait_until: lp.Config.WaitU
const exit_when_done = http_client.cdp_client == null; const exit_when_done = http_client.cdp_client == null;
while (true) { while (true) {
switch (page.*._parse_state) { switch (page._parse_state) {
.pre, .raw, .text, .image => { .pre, .raw, .text, .image => {
// The main page hasn't started/finished navigating. // The main page hasn't started/finished navigating.
// There's no JS to run, and no reason to run the scheduler. // There's no JS to run, and no reason to run the scheduler.
@@ -406,15 +406,15 @@ fn _wait(self: *Session, page: **Page, wait_ms: u32, wait_until: lp.Config.WaitU
try browser.runMacrotasks(); try browser.runMacrotasks();
// Each call to this runs scheduled load events. // Each call to this runs scheduled load events.
try page.*.dispatchLoad(); try page.dispatchLoad();
const http_active = http_client.active; const http_active = http_client.active;
const total_network_activity = http_active + http_client.intercepted; const total_network_activity = http_active + http_client.intercepted;
if (page.*._notified_network_almost_idle.check(total_network_activity <= 2)) { if (page._notified_network_almost_idle.check(total_network_activity <= 2)) {
page.*.notifyNetworkAlmostIdle(); page.notifyNetworkAlmostIdle();
} }
if (page.*._notified_network_idle.check(total_network_activity == 0)) { if (page._notified_network_idle.check(total_network_activity == 0)) {
page.*.notifyNetworkIdle(); page.notifyNetworkIdle();
} }
if (http_active == 0 and exit_when_done) { if (http_active == 0 and exit_when_done) {
@@ -427,9 +427,9 @@ fn _wait(self: *Session, page: **Page, wait_ms: u32, wait_until: lp.Config.WaitU
const is_event_done = switch (wait_until) { const is_event_done = switch (wait_until) {
.fixed => false, .fixed => false,
.domcontentloaded => (page.*._load_state == .load or page.*._load_state == .complete), .domcontentloaded => (page._load_state == .load or page._load_state == .complete),
.load => (page.*._load_state == .complete), .load => (page._load_state == .complete),
.networkidle => (page.*._load_state == .complete and http_active == 0), .networkidle => (page._notified_network_idle == .done),
}; };
var ms = blk: { var ms = blk: {
@@ -491,7 +491,7 @@ fn _wait(self: *Session, page: **Page, wait_ms: u32, wait_until: lp.Config.WaitU
} }
}, },
.err => |err| { .err => |err| {
page.*._parse_state = .{ .raw_done = @errorName(err) }; page._parse_state = .{ .raw_done = @errorName(err) };
return err; return err;
}, },
.raw_done => { .raw_done => {