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

fix request id mismatch on cdp

Browse Source
This commit is contained in:
Muki Kiboigo
2026-04-26 21:11:13 -07:00
parent 0d50f706db
commit dddd0dfb90
3 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/layer/CacheLayer.zig
View File

@@ -80,7 +80,6 @@ fn request(ptr: *anyopaque, client: *Client, req: Request) anyerror!void {
const wrapped = cache_ctx.forward.wrapRequest(
req,
cache_ctx,
client.incrReqId(),
.{
.start = CacheContext.startCallback,
.header = CacheContext.headerCallback,

2
src/network/layer/Forward.zig
View File

@@ -54,14 +54,12 @@ pub fn wrapRequest(
self: *Forward,
req: Request,
new_ctx: anytype,
new_id: u32,
overrides: Overrides,
) Request {
const T = @TypeOf(new_ctx.*);
const PassthroughT = makePassthrough(T, "forward");
var wrapped = req;
wrapped.ctx = new_ctx;
wrapped.params.request_id = new_id;
wrapped.start_callback = overrides.start orelse if (self.start != null) PassthroughT.start else null;
wrapped.header_callback = overrides.header orelse PassthroughT.header;
wrapped.data_callback = overrides.data orelse PassthroughT.data;

65
src/network/layer/InterceptionLayer.zig
View File

@@ -67,7 +67,6 @@ fn request(ptr: *anyopaque, client: *Client, in_req: Request) anyerror!void {
var req = intercept_ctx.forward.wrapRequest(
pre_wrap_req,
intercept_ctx,
client.incrReqId(),
.{
.start = InterceptContext.startCallback,
.header = InterceptContext.headerCallback,
@@ -86,6 +85,12 @@ fn request(ptr: *anyopaque, client: *Client, in_req: Request) anyerror!void {
.wait_for_interception = &wait_for_interception,
});
log.debug(.http, "interception check", .{
.wait_for_interception = wait_for_interception,
.intercepted = self.intercepted,
.url = req.params.url,
});
if (!wait_for_interception) {
return self.next.request(client, req);
}
@@ -121,35 +126,35 @@ pub const InterceptContext = struct {
self.content_length = response.contentLength() orelse 0;
switch (response.inner) {
.transfer => |t| {
const status = t.response_header.?.status;
if (status == 401 or status == 407) {
self.auth_challenge = Transfer.detectAuthChallenge(t._conn.?);
// switch (response.inner) {
// .transfer => |t| {
// const status = t.response_header.?.status;
// if (status == 401 or status == 407) {
// self.auth_challenge = Transfer.detectAuthChallenge(t._conn.?);
if (self.auth_challenge != null and self.tries < 10) {
var wait_for_interception = false;
// if (self.auth_challenge != null and self.tries < 10) {
// var wait_for_interception = false;
self.request.params.notification.dispatch(.http_request_auth_required, &.{
.request = &self.request,
.intercept_ctx = self,
.wait_for_interception = &wait_for_interception,
});
// self.request.params.notification.dispatch(.http_request_auth_required, &.{
// .request = &self.request,
// .intercept_ctx = self,
// .wait_for_interception = &wait_for_interception,
// });
if (wait_for_interception) {
log.debug(.http, "intercept auth required", .{
.url = self.request.params.url,
.status = status,
.intercepted = self.layer.intercepted,
});
self.layer.intercepted += 1;
return false;
}
}
}
},
else => {},
}
// if (wait_for_interception) {
// log.debug(.http, "intercept auth required", .{
// .url = self.request.params.url,
// .status = status,
// .intercepted = self.layer.intercepted,
// });
// self.layer.intercepted += 1;
// return false;
// }
// }
// }
// },
// else => {},
// }
self.request.params.notification.dispatch(.http_response_header_done, &.{
.request = &self.request,
@@ -202,6 +207,10 @@ pub const InterceptContext = struct {
fn shutdownCallback(ctx: *anyopaque) void {
const self: *InterceptContext = @ptrCast(@alignCast(ctx));
log.debug(.http, "intercept shutdown", .{ .url = self.request.params.url });
self.request.params.notification.dispatch(.http_request_fail, &.{
.request = &self.request,
.err = error.Shutdown,
});
self.forward.forwardShutdown();
}
};
@@ -269,7 +278,7 @@ pub fn fulfillRequest(
body: ?[]const u8,
) !void {
if (comptime IS_DEBUG) {
log.debug(.http, "filfull transfer", .{ .intercepted = self.intercepted });
log.debug(.http, "fulfill transfer", .{ .intercepted = self.intercepted });
}
self.intercepted -= 1;