Skip to content

Lightpanda: the headless browser designed for AI and automation

tree, nodeDetails: report the iframe's current URL

Adrià Arrufat78f9c13e6297
diff --git a/src/SemanticTree.zig b/src/SemanticTree.zig
index 6becd162f..47b49a301 100644
--- a/src/SemanticTree.zig
+++ b/src/SemanticTree.zig
@@ -234,7 +234,7 @@ fn visitNode(
options = try extractSelectOptions(el.asNode(), self.frame, self.arena);
} else if (el.is(Element.Html.IFrame)) |iframe| {
// The tree doesn't enter frames; the URL lets the agent open one.
- value = try iframe.getSrc(self.frame);
+ value = try iframe.currentURL(self.frame);
}
if (el.is(Element.Html)) |html_el| {
@@ -738,6 +738,8 @@ pub fn nodeDetails(self: Self) !NodeDetails {
} else if (el.is(Element.Html.Select)) |select| {
value = select.getValue(frame);
options = try extractSelectOptions(el.asNode(), frame, arena);
+ } else if (el.is(Element.Html.IFrame)) |iframe| {
+ value = try iframe.currentURL(frame);
}
if (el.is(Element.Html)) |html_el| {
diff --git a/src/browser/tools.zig b/src/browser/tools.zig
index 8650c1f99..0c7f39f8e 100644
--- a/src/browser/tools.zig
+++ b/src/browser/tools.zig
@@ -2779,7 +2779,7 @@ test "tree and nodeDetails read the node's own frame" {
try std.testing.expect(std.mem.find(u8, details.text, "child-label") != null);
}
-test "tree lists iframes with their URL" {
+test "tree and nodeDetails list iframes with their URL" {
var registry: NodeRegistry = .init(std.testing.allocator);
defer registry.deinit();
@@ -2788,12 +2788,17 @@ test "tree lists iframes with their URL" {
const aa = testing.arena_allocator;
_ = try call(aa, page.session, &registry, "evaluate", try std.json.parseFromSliceLeaky(std.json.Value, aa,
- \\{"script":"const f = document.createElement('iframe'); f.setAttribute('src', 'semantic_tree_iframe_child.html?scripted'); document.body.appendChild(f)"}
+ \\{"script":"document.querySelector('iframe').contentWindow.history.replaceState(null, '', '?moved'); const f = document.createElement('iframe'); f.setAttribute('src', 'semantic_tree_iframe_child.html?scripted'); document.body.appendChild(f)"}
, .{}), .{});
const tree = try call(aa, page.session, &registry, "tree", null, .{});
- try std.testing.expect(std.mem.find(u8, tree.text, "Iframe value='http://127.0.0.1:9582/src/browser/tests/cdp/semantic_tree_iframe_child.html'") != null);
+ try std.testing.expect(std.mem.find(u8, tree.text, "Iframe value='http://127.0.0.1:9582/src/browser/tests/cdp/semantic_tree_iframe_child.html?moved'") != null);
try std.testing.expect(std.mem.find(u8, tree.text, "Iframe value='http://127.0.0.1:9582/src/browser/tests/cdp/semantic_tree_iframe_child.html?scripted'") != null);
+
+ const iframe = (try page.frame().?.document.querySelector(.wrap("iframe"), page.frame().?)).?.asNode();
+ const details_args = try std.json.parseFromSliceLeaky(std.json.Value, aa, try aa.print("{{\"backendNodeId\":{d}}}", .{(try registry.register(iframe)).id}), .{});
+ const details = try call(aa, page.session, &registry, "nodeDetails", details_args, .{});
+ try std.testing.expect(std.mem.find(u8, details.text, "\"value\":\"http://127.0.0.1:9582/src/browser/tests/cdp/semantic_tree_iframe_child.html?moved\"") != null);
}
test "goto: a navigation stuck waiting for a connection is an error" {
diff --git a/src/browser/webapi/element/html/IFrame.zig b/src/browser/webapi/element/html/IFrame.zig
index 10f53e26e..57f525d86 100644
--- a/src/browser/webapi/element/html/IFrame.zig
+++ b/src/browser/webapi/element/html/IFrame.zig
@@ -72,6 +72,13 @@ pub fn getSrc(self: *IFrame, frame: *Frame) ![]const u8 {
return self.asNode().resolveURLReflect(src, frame, .{});
}
+/// The URL the iframe's document is on, which can differ from `src` after
+/// in-frame navigation or redirects; `src` until a document exists.
+pub fn currentURL(self: *IFrame, frame: *Frame) ![]const u8 {
+ if (self._window) |window| return window._frame.url;
+ return self.getSrc(frame);
+}
+
fn setSrc(self: *IFrame, src: []const u8, frame: *Frame) !void {
try self.asElement().setAttributeSafe(comptime .wrap("src"), .wrap(src), frame);
}