Create Request class right away from payload (#653)

Author: kblok

lib/PuppeteerSharp/NetworkManager.cs

@@ -257,27 +257,32 @@ private async Task OnRequestInterceptedAsync(RequestInterceptedResponse e)
 
         private void OnRequest(RequestWillBeSentPayload e, string interceptionId)
         {
+            Request request;
             var redirectChain = new List<Request>();
             if (e.RedirectResponse != null)
             {
-                _requestIdToRequest.TryGetValue(e.RequestId, out var request);
+                _requestIdToRequest.TryGetValue(e.RequestId, out request);
                 // If we connect late to the target, we could have missed the requestWillBeSent event.
                 if (request != null)
                 {
                     HandleRequestRedirect(request, e.RedirectResponse);
                     redirectChain = request.RedirectChainList;
                 }
             }
-            var isNavigationRequest = e.RequestId == e.LoaderId && e.Type == ResourceType.Document;
-            HandleRequestStart(
-                e.RequestId,
+            var frame = !string.IsNullOrEmpty(e.FrameId) ? _frameManager.Frames[e.FrameId] : null;
+            request = new Request(
+                _client,
+                frame,
                 interceptionId,
-                e.Request.Url,
-                isNavigationRequest,
-                e.Type,
-                e.Request,
-                e.FrameId,
+                _userRequestInterceptionEnabled,
+                e,
                 redirectChain);
+
+            _requestIdToRequest.Add(e.RequestId, request);
+            Request(this, new RequestEventArgs
+            {
+                Request = request
+            });
         }
 
         private void OnRequestServedFromCache(RequestServedFromCacheResponse response)
@@ -288,43 +293,7 @@ private void OnRequestServedFromCache(RequestServedFromCacheResponse response)
             }
         }
 
-        private void HandleRequestStart(
-            string requestId,
-            string interceptionId,
-            string url,
-            bool isNavigationRequest,
-            ResourceType resourceType,
-            Payload requestPayload,
-            string frameId,
-            List<Request> redirectChain)
-        {
-            Frame frame = null;
-
-            if (!string.IsNullOrEmpty(frameId))
-            {
-                _frameManager.Frames.TryGetValue(frameId, out frame);
-            }
-
-            var request = new Request(
-                _client,
-                requestId,
-                interceptionId,
-                isNavigationRequest,
-                _userRequestInterceptionEnabled,
-                url,
-                resourceType,
-                requestPayload,
-                frame,
-                redirectChain);
-
-            _requestIdToRequest.Add(requestId, request);
-            Request(this, new RequestEventArgs
-            {
-                Request = request
-            });
-        }
-
-        private void HandleRequestRedirect(Request request, Messaging.ResponsePayload responseMessage)
+        private void HandleRequestRedirect(Request request, ResponsePayload responseMessage)
         {
             var response = new Response(
                 _client,

lib/PuppeteerSharp/Request.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using PuppeteerSharp.Messaging;
 using System;
 using System.Collections.Generic;
 using System.Net;
@@ -27,38 +28,31 @@ public class Request
         private bool _interceptionHandled;
         #endregion
 
-        internal Request()
-        {
-        }
         internal Request(
             CDPSession client,
-            string requestId,
+            Frame frame,
             string interceptionId,
-            bool isNavigationRequest,
             bool allowInterception,
-            string url,
-            ResourceType resourceType,
-            Payload payload,
-            Frame frame,
+            RequestWillBeSentPayload e,
             List<Request> redirectChain)
         {
             _client = client;
             _allowInterception = allowInterception;
             _interceptionHandled = false;
             _logger = _client.Connection.LoggerFactory.CreateLogger<Request>();
 
-            RequestId = requestId;
+            RequestId = e.RequestId;
             InterceptionId = interceptionId;
-            IsNavigationRequest = isNavigationRequest;
-            Url = url;
-            ResourceType = resourceType;
-            Method = payload.Method;
-            PostData = payload.PostData;
+            IsNavigationRequest = e.RequestId == e.LoaderId && e.Type == ResourceType.Document;
+            Url = e.Request.Url;
+            ResourceType = e.Type;
+            Method = e.Request.Method;
+            PostData = e.Request.PostData;
             Frame = frame;
             RedirectChainList = redirectChain;
 
             Headers = new Dictionary<string, string>();
-            foreach (var keyValue in payload.Headers)
+            foreach (var keyValue in e.Request.Headers)
             {
                 Headers[keyValue.Key] = keyValue.Value;
             }