Code cleanup

Author: kblok

lib/PuppeteerSharp/FrameManager.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using PuppeteerSharp.Input;
+using Newtonsoft.Json.Linq;
 
 namespace PuppeteerSharp
 {
@@ -47,7 +48,7 @@ void _client_MessageReceived(object sender, PuppeteerSharp.MessageEventArgs e)
                     break;
 
                 case "Page.frameNavigated":
-                    OnFrameNavigated(e.MessageData.frame);
+                    OnFrameNavigated(((JObject)e.MessageData.frame).ToObject<FramePayload>());
                     break;
 
                 case "Page.frameDetached":
@@ -156,7 +157,10 @@ private void OnFrameNavigated(FramePayload framePayload)
                 if (frame != null)
                 {
                     // Update frame id to retain frame identity on cross-process navigation.
-                    Frames.Remove(frame.Id);
+                    if (frame.Id != null)
+                    {
+                        Frames.Remove(frame.Id);
+                    }
                     frame.Id = framePayload.Id;
                 }
                 else

lib/PuppeteerSharp/FramePayload.cs

@@ -1,10 +1,16 @@
-namespace PuppeteerSharp
+using Newtonsoft.Json;
+
+namespace PuppeteerSharp
 {
     public class FramePayload
     {
+        [JsonProperty("id")]
         public string Id { get; internal set; }
+        [JsonProperty("parentId")]
         public string ParentId { get; internal set; }
+        [JsonProperty("name")]
         public string Name { get; internal set; }
+        [JsonProperty("url")]
         public string Url { get; internal set; }
     }
 }

lib/PuppeteerSharp/Helpers/DynamicHelpers.cs

@@ -131,9 +131,9 @@ private void OnLoadingFailed(MessageEventArgs e)
         {
             // For certain requestIds we never receive requestWillBeSent event.
             // @see https://crbug.com/750469
-            if (_requestIdToRequest.ContainsKey(e.MessageData.requestId))
+            if (_requestIdToRequest.ContainsKey(e.MessageData.requestId.ToString()))
             {
-                var request = _requestIdToRequest[e.MessageData.requestId];
+                var request = _requestIdToRequest[e.MessageData.requestId.ToString()];
 
                 request.Failure = e.MessageData.errorText;
                 request.CompleteTaskWrapper.SetResult(true);
@@ -157,11 +157,15 @@ private void OnLoadingFinished(MessageEventArgs e)
                 var request = _requestIdToRequest[e.MessageData.requestId.ToString()];
 
                 request.CompleteTaskWrapper.SetResult(true);
-                _requestIdToRequest.Remove(request.requestId);
-                _interceptionIdToRequest.Remove(request.interceptionId);
-                _attemptedAuthentications.Remove(request.interceptionId);
+                _requestIdToRequest.Remove(request.RequestId);
+
+                if (request.InterceptionId != null)
+                {
+                    _interceptionIdToRequest.Remove(request.InterceptionId);
+                    _attemptedAuthentications.Remove(request.InterceptionId);
+                }
 
-                RequestFinished(this, new RequestEventArgs()
+                RequestFinished?.Invoke(this, new RequestEventArgs()
                 {
                     Request = request
                 });
@@ -178,11 +182,11 @@ private void OnResponseReceived(MessageEventArgs e)
                     _client,
                     request,
                     (HttpStatusCode)e.MessageData.response.status,
-                    (Dictionary<string, object>)e.MessageData.response.headers);
+                    ((JObject)e.MessageData.response.headers).ToObject<Dictionary<string, object>>());
 
                 request.Response = response;
 
-                ResponseReceivedFinished(this, new ResponseReceivedArgs()
+                ResponseReceivedFinished?.Invoke(this, new ResponseReceivedArgs()
                 {
                     Response = response
                 });
@@ -347,7 +351,7 @@ private void OnRequestWillBeSent(MessageEventArgs e)
                 null,
                 e.MessageData.request.url?.ToString(),
                 e.MessageData.type?.ToString(),
-                ((JObject)e.MessageData.request).ToStatic<Payload>());
+                ((JObject)e.MessageData.request).ToObject<Payload>());
         }
 
 

lib/PuppeteerSharp/NetworkManager.cs

@@ -47,7 +47,7 @@ private Page(Session client, FrameTree frameTree, bool ignoreHTTPSErrors, TaskQu
             _networkManager.ResponseCreated += (sender, e) => ResponseCreated?.Invoke(this, e);
             _networkManager.RequestFinished += (sender, e) => RequestFinished?.Invoke(this, e);
 
-            _client.MessageReceived += _client_MessageReceived;
+            _client.MessageReceived += client_MessageReceived;
         }
 
         #region Public Properties
@@ -288,12 +288,12 @@ await Task.WhenAll(
 
         #region Private Method
 
-        private async void _client_MessageReceived(object sender, MessageEventArgs e)
+        private async void client_MessageReceived(object sender, MessageEventArgs e)
         {
             switch (e.MessageID)
             {
                 case "Page.loadEventFired":
-                    Load(this, new EventArgs());
+                    Load?.Invoke(this, new EventArgs());
                     break;
                 case "Runtime.consoleAPICalled":
                     OnConsoleAPI(e);