mirror/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2026-06-11 01:25:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

toRequestId2 -> toRequestId on CDP

Browse Source
This commit is contained in:
Muki Kiboigo
2026-04-28 06:24:13 -07:00
parent 85a5c0f927
commit 1057b9de8d
3 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cdp/domains/fetch.zig
View File

@@ -214,7 +214,7 @@ pub fn requestIntercept(bc: *CDP.BrowserContext, intercept: *const Notification.
.document => "Document",
.fetch => "Fetch",
},
.networkId = &id.toRequestId2(request), // matches the Network REQ-ID
.networkId = &id.toRequestId(request), // matches the Network REQ-ID
}, .{ .session_id = session_id });
log.debug(.cdp, "request intercept", .{
@@ -446,7 +446,7 @@ pub fn requestAuthRequired(bc: *CDP.BrowserContext, intercept: *const Notificati
.scheme = if (challenge.scheme) |s| (if (s == .digest) "digest" else "basic") else "",
.realm = challenge.realm orelse "",
},
.networkId = &id.toRequestId2(&request),
.networkId = &id.toRequestId(&request),
}, .{ .session_id = session_id });
log.debug(.cdp, "request auth required", .{

8
src/cdp/domains/network.zig
View File

@@ -262,7 +262,7 @@ pub fn httpRequestFail(bc: *CDP.BrowserContext, msg: *const Notification.Request
// We're missing a bunch of fields, but, for now, this seems like enough
try bc.cdp.sendEvent("Network.loadingFailed", .{
.requestId = &id.toRequestId2(msg.request),
.requestId = &id.toRequestId(msg.request),
// Seems to be what chrome answers with. I assume it depends on the type of error?
.type = "Ping",
.errorText = msg.err,
@@ -287,7 +287,7 @@ pub fn httpRequestStart(bc: *CDP.BrowserContext, msg: *const Notification.Reques
// We're missing a bunch of fields, but, for now, this eems like enough
try bc.cdp.sendEvent("Network.requestWillBeSent", .{
.frameId = &id.toFrameId(frame_id),
.requestId = &id.toRequestId2(req),
.requestId = &id.toRequestId(req),
.loaderId = &id.toLoaderId(req.params.loader_id),
.type = req.params.resource_type.string(),
.documentURL = frame.url,
@@ -310,7 +310,7 @@ pub fn httpResponseHeaderDone(arena: Allocator, bc: *CDP.BrowserContext, msg: *c
// We're missing a bunch of fields, but, for now, this seems like enough
try bc.cdp.sendEvent("Network.responseReceived", .{
.frameId = &id.toFrameId(req.params.frame_id),
.requestId = &id.toRequestId2(req),
.requestId = &id.toRequestId(req),
.loaderId = &id.toLoaderId(req.params.loader_id),
.response = ResponseWriter.init(arena, msg.response),
.hasExtraInfo = false, // TODO change after adding Network.responseReceivedExtraInfo
@@ -323,7 +323,7 @@ pub fn httpRequestDone(bc: *CDP.BrowserContext, msg: *const Notification.Request
const session_id = bc.session_id orelse return;
const req = msg.request;
try bc.cdp.sendEvent("Network.loadingFinished", .{
.requestId = &id.toRequestId2(req),
.requestId = &id.toRequestId(req),
.encodedDataLength = msg.content_length,
}, .{ .session_id = session_id });
}

14
src/cdp/id.zig
View File

@@ -40,20 +40,8 @@ pub fn toLoaderId(id: u32) [14]u8 {
// requestId has special requirements. If it's the main document navigation,
// then it should match the loader id.
const Transfer = @import("../browser/HttpClient.zig").Transfer;
pub fn toRequestId(transfer: *const Transfer) [14]u8 {
const req = transfer.req;
if (req.params.resource_type == .document) {
return toLoaderId(req.params.loader_id);
}
var buf: [14]u8 = undefined;
_ = std.fmt.bufPrint(&buf, "REQ-{d:0>10}", .{transfer.id}) catch unreachable;
return buf;
}
const Request = @import("../browser/HttpClient.zig").Request;
pub fn toRequestId2(req: *const Request) [14]u8 {
pub fn toRequestId(req: *const Request) [14]u8 {
if (req.params.resource_type == .document) {
return toLoaderId(req.params.loader_id);
}