From dddd0dfb90db95274f37def99dcafa7e686c631c Mon Sep 17 00:00:00 2001
From: Muki Kiboigo <muki@muki.gg>
Date: Sun, 26 Apr 2026 21:11:13 -0700
Subject: [PATCH] fix request id mismatch on cdp

---
 src/network/layer/CacheLayer.zig        |  1 -
 src/network/layer/Forward.zig           |  2 -
 src/network/layer/InterceptionLayer.zig | 65 ++++++++++++++-----------
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/src/network/layer/CacheLayer.zig b/src/network/layer/CacheLayer.zig
index 6c5c72c6..317457b5 100644
--- a/src/network/layer/CacheLayer.zig
+++ b/src/network/layer/CacheLayer.zig
@@ -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,
diff --git a/src/network/layer/Forward.zig b/src/network/layer/Forward.zig
index 2a81ec14..b11ff23f 100644
--- a/src/network/layer/Forward.zig
+++ b/src/network/layer/Forward.zig
@@ -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;
diff --git a/src/network/layer/InterceptionLayer.zig b/src/network/layer/InterceptionLayer.zig
index f5bc6aaa..21225815 100644
--- a/src/network/layer/InterceptionLayer.zig
+++ b/src/network/layer/InterceptionLayer.zig
@@ -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;