public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2026-03-22 04:34:44 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #1706 from lightpanda-io/cdp-attach-to-browser

Browse Source 
cdp: fix send CDP raw command with Playwright
This commit is contained in:
Karl Seguin
2026-03-04 07:40:05 +08:00
committed by GitHub
parent 1c07d786a0 9ca5188e12
commit 01fab5c92a
1 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/cdp/domains/target.zig
View File

@@ -31,6 +31,7 @@ pub fn processMessage(cmd: anytype) !void {
const action = std.meta.stringToEnum(enum { const action = std.meta.stringToEnum(enum {
getTargets, getTargets,
attachToTarget, attachToTarget,
attachToBrowserTarget,
closeTarget, closeTarget,
createBrowserContext, createBrowserContext,
createTarget, createTarget,
@@ -47,6 +48,7 @@ pub fn processMessage(cmd: anytype) !void {
switch (action) { switch (action) {
.getTargets => return getTargets(cmd), .getTargets => return getTargets(cmd),
.attachToTarget => return attachToTarget(cmd), .attachToTarget => return attachToTarget(cmd),
.attachToBrowserTarget => return attachToBrowserTarget(cmd),
.closeTarget => return closeTarget(cmd), .closeTarget => return closeTarget(cmd),
.createBrowserContext => return createBrowserContext(cmd), .createBrowserContext => return createBrowserContext(cmd),
.createTarget => return createTarget(cmd), .createTarget => return createTarget(cmd),
@@ -79,7 +81,7 @@ fn getTargets(cmd: anytype) !void {
.targetInfos = [_]TargetInfo{.{ .targetInfos = [_]TargetInfo{.{
.targetId = target_id, .targetId = target_id,
.type = "page", .type = "page",
.title = bc.getTitle() orelse "about:blank", .title = bc.getTitle() orelse "",
.url = bc.getURL() orelse "about:blank", .url = bc.getURL() orelse "about:blank",
.attached = true, .attached = true,
.canAccessOpener = false, .canAccessOpener = false,
@@ -207,7 +209,7 @@ fn createTarget(cmd: anytype) !void {
.targetInfo = TargetInfo{ .targetInfo = TargetInfo{
.attached = false, .attached = false,
.targetId = target_id, .targetId = target_id,
.title = "about:blank", .title = "",
.browserContextId = bc.id, .browserContextId = bc.id,
.url = "about:blank", .url = "about:blank",
}, },
@@ -243,14 +245,31 @@ fn attachToTarget(cmd: anytype) !void {
return error.UnknownTargetId; return error.UnknownTargetId;
} }
if (bc.session_id == null) {
try doAttachtoTarget(cmd, target_id); try doAttachtoTarget(cmd, target_id);
}
return cmd.sendResult( return cmd.sendResult(.{ .sessionId = bc.session_id }, .{});
.{ .sessionId = bc.session_id }, }
.{ .include_session_id = false },
); fn attachToBrowserTarget(cmd: anytype) !void {
const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
const session_id = bc.session_id orelse cmd.cdp.session_id_gen.next();
try cmd.sendEvent("Target.attachedToTarget", AttachToTarget{
.sessionId = session_id,
.targetInfo = TargetInfo{
.targetId = bc.id, // We use the browser context is as browser's target id.
.title = "",
.url = "",
.type = "browser",
// Chrome doesn't send a browserContextId in this case.
.browserContextId = null,
},
}, .{});
bc.session_id = session_id;
return cmd.sendResult(.{ .sessionId = bc.session_id }, .{});
} }
fn closeTarget(cmd: anytype) !void { fn closeTarget(cmd: anytype) !void {
@@ -311,7 +330,7 @@ fn getTargetInfo(cmd: anytype) !void {
.targetInfo = TargetInfo{ .targetInfo = TargetInfo{
.targetId = target_id, .targetId = target_id,
.type = "page", .type = "page",
.title = bc.getTitle() orelse "about:blank", .title = bc.getTitle() orelse "",
.url = bc.getURL() orelse "about:blank", .url = bc.getURL() orelse "about:blank",
.attached = true, .attached = true,
.canAccessOpener = false, .canAccessOpener = false,
@@ -323,7 +342,7 @@ fn getTargetInfo(cmd: anytype) !void {
.targetInfo = TargetInfo{ .targetInfo = TargetInfo{
.targetId = "TID-STARTUP-B", .targetId = "TID-STARTUP-B",
.type = "browser", .type = "browser",
.title = "about:blank", .title = "",
.url = "about:blank", .url = "about:blank",
.attached = true, .attached = true,
.canAccessOpener = false, .canAccessOpener = false,
@@ -442,8 +461,8 @@ fn setAutoAttach(cmd: anytype) !void {
.targetInfo = TargetInfo{ .targetInfo = TargetInfo{
.type = "page", .type = "page",
.targetId = "TID-STARTUP-P", .targetId = "TID-STARTUP-P",
.title = "New Private Tab", .title = "",
.url = "chrome://newtab/", .url = "about:blank",
.browserContextId = "BID-STARTUP", .browserContextId = "BID-STARTUP",
}, },
}, .{}); }, .{});
@@ -451,22 +470,23 @@ fn setAutoAttach(cmd: anytype) !void {
fn doAttachtoTarget(cmd: anytype, target_id: []const u8) !void { fn doAttachtoTarget(cmd: anytype, target_id: []const u8) !void {
const bc = cmd.browser_context.?; const bc = cmd.browser_context.?;
lp.assert(bc.session_id == null, "CDP.target.doAttachtoTarget not null session_id", .{}); const session_id = bc.session_id orelse cmd.cdp.session_id_gen.next();
const session_id = cmd.cdp.session_id_gen.next();
if (bc.session_id == null) {
// extra_headers should not be kept on a new page or tab, // extra_headers should not be kept on a new page or tab,
// currently we have only 1 page, we clear it just in case // currently we have only 1 page, we clear it just in case
bc.extra_headers.clearRetainingCapacity(); bc.extra_headers.clearRetainingCapacity();
}
try cmd.sendEvent("Target.attachedToTarget", AttachToTarget{ try cmd.sendEvent("Target.attachedToTarget", AttachToTarget{
.sessionId = session_id, .sessionId = session_id,
.targetInfo = TargetInfo{ .targetInfo = TargetInfo{
.targetId = target_id, .targetId = target_id,
.title = "about:blank", .title = bc.getTitle() orelse "",
.url = "chrome://newtab/", .url = bc.getURL() orelse "about:blank",
.browserContextId = bc.id, .browserContextId = bc.id,
}, },
}, .{}); }, .{ .session_id = bc.session_id });
bc.session_id = session_id; bc.session_id = session_id;
} }
@@ -568,7 +588,7 @@ test "cdp.target: createTarget" {
// should create a browser context // should create a browser context
const bc = ctx.cdp().browser_context.?; const bc = ctx.cdp().browser_context.?;
try ctx.expectSentEvent("Target.targetCreated", .{ .targetInfo = .{ .url = "about:blank", .title = "about:blank", .attached = false, .type = "page", .canAccessOpener = false, .browserContextId = bc.id, .targetId = bc.target_id.? } }, .{}); try ctx.expectSentEvent("Target.targetCreated", .{ .targetInfo = .{ .url = "about:blank", .title = "", .attached = false, .type = "page", .canAccessOpener = false, .browserContextId = bc.id, .targetId = bc.target_id.? } }, .{});
} }
{ {
@@ -580,8 +600,8 @@ test "cdp.target: createTarget" {
// should create a browser context // should create a browser context
const bc = ctx.cdp().browser_context.?; const bc = ctx.cdp().browser_context.?;
try ctx.expectSentEvent("Target.targetCreated", .{ .targetInfo = .{ .url = "about:blank", .title = "about:blank", .attached = false, .type = "page", .canAccessOpener = false, .browserContextId = bc.id, .targetId = bc.target_id.? } }, .{}); try ctx.expectSentEvent("Target.targetCreated", .{ .targetInfo = .{ .url = "about:blank", .title = "", .attached = false, .type = "page", .canAccessOpener = false, .browserContextId = bc.id, .targetId = bc.target_id.? } }, .{});
try ctx.expectSentEvent("Target.attachedToTarget", .{ .sessionId = bc.session_id.?, .targetInfo = .{ .url = "chrome://newtab/", .title = "about:blank", .attached = true, .type = "page", .canAccessOpener = false, .browserContextId = bc.id, .targetId = bc.target_id.? } }, .{}); try ctx.expectSentEvent("Target.attachedToTarget", .{ .sessionId = bc.session_id.?, .targetInfo = .{ .url = "about:blank", .title = "", .attached = true, .type = "page", .canAccessOpener = false, .browserContextId = bc.id, .targetId = bc.target_id.? } }, .{});
} }
var ctx = testing.context(); var ctx = testing.context();
@@ -596,7 +616,7 @@ test "cdp.target: createTarget" {
try ctx.processMessage(.{ .id = 10, .method = "Target.createTarget", .params = .{ .browserContextId = "BID-9" } }); try ctx.processMessage(.{ .id = 10, .method = "Target.createTarget", .params = .{ .browserContextId = "BID-9" } });
try testing.expectEqual(true, bc.target_id != null); try testing.expectEqual(true, bc.target_id != null);
try ctx.expectSentResult(.{ .targetId = bc.target_id.? }, .{ .id = 10 }); try ctx.expectSentResult(.{ .targetId = bc.target_id.? }, .{ .id = 10 });
try ctx.expectSentEvent("Target.targetCreated", .{ .targetInfo = .{ .url = "about:blank", .title = "about:blank", .attached = false, .type = "page", .canAccessOpener = false, .browserContextId = "BID-9", .targetId = bc.target_id.? } }, .{}); try ctx.expectSentEvent("Target.targetCreated", .{ .targetInfo = .{ .url = "about:blank", .title = "", .attached = false, .type = "page", .canAccessOpener = false, .browserContextId = "BID-9", .targetId = bc.target_id.? } }, .{});
} }
} }
@@ -658,7 +678,7 @@ test "cdp.target: attachToTarget" {
try ctx.processMessage(.{ .id = 11, .method = "Target.attachToTarget", .params = .{ .targetId = "TID-000000000B" } }); try ctx.processMessage(.{ .id = 11, .method = "Target.attachToTarget", .params = .{ .targetId = "TID-000000000B" } });
const session_id = bc.session_id.?; const session_id = bc.session_id.?;
try ctx.expectSentResult(.{ .sessionId = session_id }, .{ .id = 11 }); try ctx.expectSentResult(.{ .sessionId = session_id }, .{ .id = 11 });
try ctx.expectSentEvent("Target.attachedToTarget", .{ .sessionId = session_id, .targetInfo = .{ .url = "chrome://newtab/", .title = "about:blank", .attached = true, .type = "page", .canAccessOpener = false, .browserContextId = "BID-9", .targetId = bc.target_id.? } }, .{}); try ctx.expectSentEvent("Target.attachedToTarget", .{ .sessionId = session_id, .targetInfo = .{ .url = "about:blank", .title = "", .attached = true, .type = "page", .canAccessOpener = false, .browserContextId = "BID-9", .targetId = bc.target_id.? } }, .{});
} }
} }
@@ -671,7 +691,7 @@ test "cdp.target: getTargetInfo" {
try ctx.expectSentResult(.{ try ctx.expectSentResult(.{
.targetInfo = .{ .targetInfo = .{
.type = "browser", .type = "browser",
.title = "about:blank", .title = "",
.url = "about:blank", .url = "about:blank",
.attached = true, .attached = true,
.canAccessOpener = false, .canAccessOpener = false,