Skip to content

Lightpanda: the headless browser designed for AI and automation

CDP: evict only replaced page nodes on re-goto

Adrià Arrufat3a011147455a
diff --git a/src/browser/tools.zig b/src/browser/tools.zig
index 928f5771d..b6587a3e4 100644
--- a/src/browser/tools.zig
+++ b/src/browser/tools.zig
@@ -1846,7 +1846,9 @@ fn openPage(session: *lp.Session, url: [:0]const u8) ToolError!lp.Session.PageHa
/// Start a navigation without waiting for it to load, so the agent script Runtime
/// can drive several gotos concurrently. `receiver_frame_id`, when set, is the
-/// page a re-goto on the same `Page` object replaces — only that one is closed.
+/// page a re-goto on the same `Page` object replaces — only that page is closed,
+/// and only its nodes are evicted from the registry; sibling pages' node IDs stay
+/// valid.
pub fn startGoto(
arena: std.mem.Allocator,
session: *lp.Session,
@@ -1856,8 +1858,8 @@ pub fn startGoto(
) ToolError!StartedGoto {
const args = try parseArgs(GotoParams, arena, arguments);
if (receiver_frame_id) |fid| {
- if (session.livePage(fid) != null) {
- registry.reset();
+ if (session.livePage(fid)) |page| {
+ registry.resetFrame(arena, &page.frame);
session.closePage(fid);
}
}
diff --git a/src/cdp/Node.zig b/src/cdp/Node.zig
index 9822a4b68..b5ccbe6ff 100644
--- a/src/cdp/Node.zig
+++ b/src/cdp/Node.zig
@@ -69,6 +69,26 @@ pub const Registry = struct {
_ = self.node_pool.reset(.{ .retain_with_limit = 1024 });
}
+ /// Evict only the nodes owned by `frame`'s page, leaving sibling pages' node
+ /// IDs valid. Must run before the page's arena is freed — attribution walks
+ /// each node's live parent chain.
+ pub fn resetFrame(self: *Registry, arena: Allocator, frame: *Frame) void {
+ const page = frame._page;
+ var doomed: std.ArrayListUnmanaged(*Node) = .empty;
+ var it = self.lookup_by_id.valueIterator();
+ while (it.next()) |node_ptr| {
+ const node = node_ptr.*;
+ if (node.dom.ownerFrame(frame)._page == page) {
+ doomed.append(arena, node) catch return;
+ }
+ }
+ for (doomed.items) |node| {
+ _ = self.lookup_by_id.remove(node.id);
+ _ = self.lookup_by_node.remove(node.dom);
+ self.node_pool.destroy(node);
+ }
+ }
+
pub fn register(self: *Registry, dom_node: *DOMNode) !*Node {
const node_lookup_gop = try self.lookup_by_node.getOrPut(self.allocator, dom_node);
if (node_lookup_gop.found_existing) {
@@ -376,6 +396,36 @@ test "cdp Node: Registry register" {
}
}
+test "cdp Node: Registry resetFrame" {
+ var registry = Registry.init(testing.allocator);
+ defer registry.deinit();
+
+ var arena = std.heap.ArenaAllocator.init(testing.allocator);
+ defer arena.deinit();
+
+ var page_a = try testing.pageTest("cdp/registry1.html", .{});
+ defer page_a.close();
+ var page_b = try testing.pageTest("cdp/registry2.html", .{});
+ defer page_b.close();
+
+ const frame_a = page_a.frame().?;
+ const frame_b = page_b.frame().?;
+
+ const a_node = (try frame_a.window._document.querySelector(.wrap("#a1"), frame_a)).?.asNode();
+ const b_node = (try frame_b.window._document.querySelector(.wrap("a"), frame_b)).?.asNode();
+ const ra = try registry.register(a_node);
+ const rb = try registry.register(b_node);
+ try testing.expectEqual(2, registry.lookup_by_id.count());
+
+ registry.resetFrame(arena.allocator(), frame_a);
+
+ try testing.expectEqual(null, registry.lookup_by_id.get(ra.id));
+ try testing.expectEqual(null, registry.lookup_by_node.get(a_node));
+ try testing.expectEqual(1, registry.lookup_by_id.count());
+ try testing.expectEqual(rb, registry.lookup_by_id.get(rb.id).?);
+ try testing.expectEqual(b_node, registry.lookup_by_node.get(b_node).?.dom);
+}
+
test "cdp Node: search list" {
var registry = Registry.init(testing.allocator);
defer registry.deinit();