Improve NavigationWatcher

Author: kblok

lib/PuppeteerSharp/Helpers/DynamicHelpers.cs

@@ -0,0 +1,14 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace PuppeteerSharp.Helpers
+{
+    public static class DynamicHelpers
+    {
+        public static T ToStatic<T>(this JObject obj)
+        {
+            return JsonConvert.DeserializeObject<T>(obj.ToString());
+        }
+    }
+}

lib/PuppeteerSharp/NavigationWatcher.cs

@@ -23,7 +23,6 @@ internal class NavigationWatcher
         private IEnumerable<string> _expectedLifecycle;
         private int _timeout;
         private string _initialLoaderId;
-        private Task _navigationPromise;
         private Timer _timer = null;
 
         public NavigationWatcher(FrameManager frameManager, Frame mainFrame, int timeout, dynamic options)
@@ -56,7 +55,7 @@ public NavigationWatcher(FrameManager frameManager, Frame mainFrame, int timeout
             frameManager.FrameDetached += FrameManager_LifecycleEvent;
             LifeCycleCompleteTaskWrapper = new TaskCompletionSource<bool>();
 
-            _navigationPromise = Task.WhenAny(new[]
+            NavigationTask = Task.WhenAny(new[]
             {
                 CreateTimeoutTask(),
                 LifeCycleCompleteTask,
@@ -67,7 +66,7 @@ public NavigationWatcher(FrameManager frameManager, Frame mainFrame, int timeout
         }
 
         #region Properties
-        public Task<string> NavigationTask { get; internal set; }
+        public Task NavigationTask { get; internal set; }
         public Task<bool> LifeCycleCompleteTask => LifeCycleCompleteTaskWrapper.Task;
         public TaskCompletionSource<bool> LifeCycleCompleteTaskWrapper { get; }
 

lib/PuppeteerSharp/NetworkManager.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
 using PuppeteerSharp.Helpers;
 
 namespace PuppeteerSharp
@@ -337,11 +338,11 @@ private void OnRequestWillBeSent(MessageEventArgs e)
             }
 
             HandleRequestStart(
-                e.MessageData.requestId,
+                e.MessageData.requestId?.ToString(),
                 null,
-                e.MessageData.request.url,
-                e.MessageData.type,
-                e.MessageData.request);
+                e.MessageData.request.url?.ToString(),
+                e.MessageData.type?.ToString(),
+                ((JObject)e.MessageData.request).ToStatic<Payload>());
         }
 
 

lib/PuppeteerSharp/Page.cs

@@ -257,22 +257,21 @@ public async Task<dynamic> GoToAsync(string url, Dictionary<string, string> opti
                 DefaultNavigationTimeout;
 
             var watcher = new NavigationWatcher(_frameManager, mainFrame, timeout, options);
-
             var navigateTask = Navigate(_client, url, referrer);
 
             await Task.WhenAll(
                 navigateTask,
                 watcher.NavigationTask
             );
 
-            var error = !string.IsNullOrEmpty(navigateTask.Result) ? navigateTask.Result : watcher.NavigationTask.Result;
+            var exception = navigateTask.Exception ?? watcher.NavigationTask.Exception;
 
             watcher.Cancel();
             _networkManager.RequestCreated -= createRequestEventListener;
 
-            if (!string.IsNullOrEmpty(error))
+            if (exception != null)
             {
-                throw new NavigationException(error);
+                throw new NavigationException(exception.Message, exception);
             }
 
             Request request = null;
@@ -377,21 +376,18 @@ private Task Reload()
         }
 
 
-        private async Task<string> Navigate(Session client, string url, string referrer)
+        private async Task Navigate(Session client, string url, string referrer)
         {
-            try
+
+            dynamic response = await client.SendAsync("Page.navigate", new
             {
-                dynamic response = await client.SendAsync("Page.navigate", new Dictionary<string, object>
-                {
-                    { "url", url},
-                    {"referrer", referrer}
-                });
+                url,
+                referrer = referrer ?? string.Empty
+            });
 
-                return response.ErrorText;
-            }
-            catch (Exception ex)
+            if (response.errorText != null)
             {
-                return ex.Message;
+                throw new NavigationException(response.errorText);
             }
         }
 

lib/PuppeteerSharp/Payload.cs

@@ -8,6 +8,7 @@ namespace PuppeteerSharp
 {
     public class Payload
     {
+
         public string Method { get; internal set; }
         public object PostData { get; internal set; }
         public Dictionary<string, object> Headers { get; internal set; }