Revert "Fix request interception with complex PostData"

This reverts commit 0112e13.

Author: kblok

lib/PuppeteerSharp/BrowserData/JsonUtils.cs

@@ -5,7 +5,7 @@
 
 namespace PuppeteerSharp.BrowserData
 {
-    internal static class JsonUtils
+    internal class JsonUtils
     {
         public static async Task<T> GetAsync<T>(string url)
         {

lib/PuppeteerSharp/CDPSession.cs

@@ -30,9 +30,6 @@ public abstract class CDPSession : ICDPSession
         /// <inheritdoc/>
         public string Id { get; init; }
 
-        /// <inheritdoc/>
-        public string CloseReason { get; protected set; }
-
         /// <inheritdoc/>
         public ILoggerFactory LoggerFactory => Connection.LoggerFactory;
 

lib/PuppeteerSharp/Cdp/CdpCDPSession.cs

@@ -40,6 +40,7 @@ public class CdpCDPSession : CDPSession
     private readonly ConcurrentDictionary<int, MessageTask> _callbacks = new();
     private readonly string _parentSessionId;
     private readonly TargetType _targetType;
+    private string _closeReason;
     private int _lastId;
 
     internal CdpCDPSession(Connection connection, TargetType targetType, string sessionId, string parentSessionId)
@@ -78,8 +79,8 @@ public override Task DetachAsync()
             throw new TargetClosedException(
                 $"Protocol error ({method}): Session closed. " +
                 $"Most likely the {_targetType} has been closed." +
-                $"Close reason: {CloseReason}",
-                CloseReason);
+                $"Close reason: {_closeReason}",
+                _closeReason);
         }
 
         var id = GetMessageId();
@@ -146,7 +147,7 @@ internal override void Close(string closeReason)
             return;
         }
 
-        CloseReason = closeReason;
+        _closeReason = closeReason;
         IsClosed = true;
 
         foreach (var callback in _callbacks.Values.ToArray())

lib/PuppeteerSharp/Cdp/CdpHttpRequest.cs

@@ -29,7 +29,7 @@ internal CdpHttpRequest(
         IFrame frame,
         string interceptionId,
         bool allowInterception,
-        RequestWillBeSentResponse data,
+        RequestWillBeSentPayload data,
         List<IRequest> redirectChain,
         ILoggerFactory loggerFactory)
     {

lib/PuppeteerSharp/Cdp/LifecycleWatcher.cs

@@ -110,14 +110,7 @@ private void OnFrameDetached(object sender, EventArgs e)
             var frame = sender as Frame;
             if (_frame == frame)
             {
-                var message = "Navigating frame was detached";
-
-                if (!string.IsNullOrEmpty(frame?.Client?.CloseReason))
-                {
-                    message += $": {frame.Client.CloseReason}";
-                }
-
-                Terminate(new PuppeteerException(message));
+                Terminate(new PuppeteerException("Navigating frame was detached"));
                 return;
             }
 

lib/PuppeteerSharp/Cdp/Messaging/FetchRequestPausedResponse.cs

@@ -1,6 +1,6 @@
 namespace PuppeteerSharp.Cdp.Messaging
 {
-    internal class FetchRequestPausedResponse : RequestWillBeSentResponse
+    internal class FetchRequestPausedResponse : RequestWillBeSentPayload
     {
         public ResourceType? ResourceType { get; set; }
     }

lib/PuppeteerSharp/Cdp/Messaging/Request.cs

@@ -1,12 +1,12 @@
 namespace PuppeteerSharp.Cdp.Messaging
 {
-    internal class RequestWillBeSentResponse
+    internal class RequestWillBeSentPayload
     {
         public string RequestId { get; set; }
 
         public string LoaderId { get; set; }
 
-        public Request Request { get; set; }
+        public Payload Request { get; set; }
 
         public ResponsePayload RedirectResponse { get; set; }
 

lib/PuppeteerSharp/Cdp/Messaging/RequestWillBeSentResponse.cs renamed to lib/PuppeteerSharp/Cdp/Messaging/RequestWillBeSentPayload.cs

@@ -7,7 +7,7 @@ namespace PuppeteerSharp.Cdp
 {
     internal class NetworkEventManager
     {
-        private readonly ConcurrentDictionary<string, RequestWillBeSentResponse> _requestWillBeSentMap = new();
+        private readonly ConcurrentDictionary<string, RequestWillBeSentPayload> _requestWillBeSentMap = new();
         private readonly ConcurrentDictionary<string, FetchRequestPausedResponse> _requestPausedMap = new();
         private readonly ConcurrentDictionary<string, CdpHttpRequest> _httpRequestsMap = new();
         private readonly ConcurrentDictionary<string, QueuedEventGroup> _queuedEventGroupMap = new();
@@ -59,10 +59,10 @@ internal ResponseReceivedExtraInfoResponse ShiftResponseExtraInfo(string network
             return result;
         }
 
-        internal void StoreRequestWillBeSent(string networkRequestId, RequestWillBeSentResponse e)
+        internal void StoreRequestWillBeSent(string networkRequestId, RequestWillBeSentPayload e)
             => _requestWillBeSentMap.AddOrUpdate(networkRequestId, e, (_, _) => e);
 
-        internal RequestWillBeSentResponse GetRequestWillBeSent(string networkRequestId)
+        internal RequestWillBeSentPayload GetRequestWillBeSent(string networkRequestId)
         {
             _requestWillBeSentMap.TryGetValue(networkRequestId, out var result);
             return result;

lib/PuppeteerSharp/Cdp/NetworkEventManager.cs

@@ -173,7 +173,7 @@ private async void Client_MessageReceived(object sender, MessageEventArgs e)
                         await OnAuthRequiredAsync(client, e.MessageData.ToObject<FetchAuthRequiredResponse>()).ConfigureAwait(false);
                         break;
                     case "Network.requestWillBeSent":
-                        await OnRequestWillBeSentAsync(client, e.MessageData.ToObject<RequestWillBeSentResponse>()).ConfigureAwait(false);
+                        await OnRequestWillBeSentAsync(client, e.MessageData.ToObject<RequestWillBeSentPayload>()).ConfigureAwait(false);
                         break;
                     case "Network.requestServedFromCache":
                         OnRequestServedFromCache(e.MessageData.ToObject<RequestServedFromCacheResponse>());
@@ -462,7 +462,7 @@ private async void OnRequestWithoutNetworkInstrumentationAsync(CDPSession client
             _ = request.FinalizeInterceptionsAsync();
         }
 
-        private async Task OnRequestAsync(CDPSession client, RequestWillBeSentResponse e, string fetchRequestId)
+        private async Task OnRequestAsync(CDPSession client, RequestWillBeSentPayload e, string fetchRequestId)
         {
             CdpHttpRequest request;
             var redirectChain = new List<IRequest>();
@@ -549,7 +549,7 @@ private void HandleRequestRedirect(CDPSession client, CdpHttpRequest request, Re
             RequestFinished?.Invoke(this, new RequestEventArgs(request));
         }
 
-        private async Task OnRequestWillBeSentAsync(CDPSession client, RequestWillBeSentResponse e)
+        private async Task OnRequestWillBeSentAsync(CDPSession client, RequestWillBeSentPayload e)
         {
             // Request interception doesn't happen for data URLs with Network Service.
             if (_userRequestInterceptionEnabled && !e.Request.Url.StartsWith("data:", StringComparison.InvariantCultureIgnoreCase))
@@ -571,7 +571,7 @@ private async Task OnRequestWillBeSentAsync(CDPSession client, RequestWillBeSent
             await OnRequestAsync(client, e, null).ConfigureAwait(false);
         }
 
-        private void PatchRequestEventHeaders(RequestWillBeSentResponse requestWillBeSentEvent, FetchRequestPausedResponse requestPausedEvent)
+        private void PatchRequestEventHeaders(RequestWillBeSentPayload requestWillBeSentEvent, FetchRequestPausedResponse requestPausedEvent)
         {
             foreach (var kv in requestPausedEvent.Request.Headers)
             {