Use new requestId for interception request matching (#1100)

* Use new requestId for interception request matching

* ops

Author: kblok

lib/PuppeteerSharp.Tests/NetworkTests/SetRequestInterceptionTests.cs

@@ -66,7 +66,7 @@ await Task.WhenAll(
             );
         }
 
-        [Fact(Skip = "see https://github.com/GoogleChrome/puppeteer/issues/3973")]
+        [Fact]
         public async Task ShouldWorkWhenHeaderManipulationHeadersWithRedirect()
         {
             Server.SetRedirect("/rredirect", "/empty.html");

lib/PuppeteerSharp/Messaging/RequestInterceptedResponse.cs

@@ -14,6 +14,7 @@ internal class RequestInterceptedResponse
         public HttpStatusCode ResponseStatusCode { get; set; }
         public string RedirectUrl { get; set; }
         public AuthChallengeData AuthChallenge { get; set; }
+        public string RequestId { get; set; }
 
         internal class AuthChallengeData
         {

lib/PuppeteerSharp/NetworkManager.cs

@@ -17,8 +17,7 @@ internal class NetworkManager
         private readonly ConcurrentDictionary<string, Request> _requestIdToRequest = new ConcurrentDictionary<string, Request>();
         private readonly ConcurrentDictionary<string, RequestWillBeSentPayload> _requestIdToRequestWillBeSentEvent =
             new ConcurrentDictionary<string, RequestWillBeSentPayload>();
-        private readonly MultiMap<string, string> _requestHashToRequestIds = new MultiMap<string, string>();
-        private readonly MultiMap<string, string> _requestHashToInterceptionIds = new MultiMap<string, string>();
+        private readonly ConcurrentDictionary<string, string> _requestIdToInterceptionId = new ConcurrentDictionary<string, string>();
         private readonly ILogger _logger;
         private Dictionary<string, string> _extraHTTPHeaders;
         private bool _offine;
@@ -245,19 +244,13 @@ private async Task OnRequestInterceptedAsync(RequestInterceptedResponse e)
                 }
             }
 
-            var requestHash = e.Request.Hash;
-            var requestId = _requestHashToRequestIds.FirstValue(requestHash);
-            if (requestId != null)
+            if (e.RequestId != null && _requestIdToRequestWillBeSentEvent.TryRemove(e.RequestId, out var requestWillBeSentEvent))
             {
-                if (_requestIdToRequestWillBeSentEvent.TryRemove(requestId, out var requestWillBeSentEvent))
-                {
-                    await OnRequestAsync(requestWillBeSentEvent, e.InterceptionId);
-                    _requestHashToRequestIds.Delete(requestHash, requestId);
-                }
+                await OnRequestAsync(requestWillBeSentEvent, e.InterceptionId);
             }
             else
             {
-                _requestHashToInterceptionIds.Add(requestHash, e.InterceptionId);
+                _requestIdToInterceptionId[e.RequestId] = e.InterceptionId;
             }
         }
 
@@ -343,16 +336,12 @@ private async Task OnRequestWillBeSentAsync(RequestWillBeSentPayload e)
             // Request interception doesn't happen for data URLs with Network Service.
             if (_protocolRequestInterceptionEnabled && !e.Request.Url.StartsWith("data:", StringComparison.InvariantCultureIgnoreCase))
             {
-                var requestHash = e.Request.Hash;
-                var interceptionId = _requestHashToInterceptionIds.FirstValue(requestHash);
-                if (interceptionId != null)
+                if (_requestIdToInterceptionId.TryRemove(e.RequestId, out var interceptionId))
                 {
                     await OnRequestAsync(e, interceptionId);
-                    _requestHashToInterceptionIds.Delete(requestHash, interceptionId);
                 }
                 else
                 {
-                    _requestHashToRequestIds.Add(requestHash, e.RequestId);
                     // Under load, we may get to this section more than once
                     _requestIdToRequestWillBeSentEvent.TryAdd(e.RequestId, e);
                 }

lib/PuppeteerSharp/Payload.cs

@@ -45,44 +45,5 @@ public class Payload
         /// </summary>
         /// <value>The URL.</value>
         public string Url { get; set; }
-
-        internal string Hash
-        {
-            get
-            {
-                var normalizedUrl = Url;
-
-                try
-                {
-                    // Decoding is necessary to normalize URLs.
-                    // The method will throw if the URL is malformed. In this case,
-                    // consider URL to be normalized as-is.
-                    normalizedUrl = HttpUtility.UrlDecode(Url);
-                }
-                catch
-                {
-                }
-
-                var hash = new Payload
-                {
-                    Url = Url,
-                    Method = Method,
-                    PostData = PostData
-                };
-
-                if (!normalizedUrl.StartsWith("data:", StringComparison.Ordinal))
-                {
-                    foreach (var item in Headers.OrderBy(kv => kv.Key))
-                    {
-                        if (IgnoredHeaders.Contains(item.Key))
-                        {
-                            continue;
-                        }
-                        hash.Headers[item.Key] = item.Value;
-                    }
-                }
-                return JsonConvert.SerializeObject(hash, JsonHelper.DefaultJsonSerializerSettings);
-            }
-        }
     }
 }