Implement NavigationWatcher

Author: kblok

lib/PuppeteerSharp/Frame.cs

@@ -15,7 +15,7 @@ public class Frame
         private object _context = null;
         private string _url = string.Empty;
         private List<WaitTask> _waitTasks;
-        private List<string> _lifecycleEvents;
+        private bool _detached;
 
         public Frame(Session client, Page page, Frame parentFrame, string frameId)
         {
@@ -32,7 +32,7 @@ public Frame(Session client, Page page, Frame parentFrame, string frameId)
             SetDefaultContext(null);
 
             _waitTasks = new List<WaitTask>();
-            _lifecycleEvents = new List<string>();
+            LifecycleEvents = new List<string>();
         }
 
         #region Properties
@@ -43,6 +43,7 @@ public Frame(Session client, Page page, Frame parentFrame, string frameId)
         public string Id { get; internal set; }
         public string LoaderId { get; set; }
         public TaskCompletionSource<ExecutionContext> ContextResolveTaskWrapper { get; internal set; }
+        public List<string> LifecycleEvents { get; internal set; }
 
         #endregion
 
@@ -93,7 +94,12 @@ internal Task<ElementHandle> AddScriptTag(dynamic options)
 
         internal void OnLifecycleEvent(string loaderId, string name)
         {
-            throw new NotImplementedException();
+            if (name == "init")
+            {
+                LoaderId = loaderId;
+                LifecycleEvents.Clear();
+            }
+            LifecycleEvents.Add(name);
         }
 
         internal void Navigated(FramePayload framePayload)
@@ -122,8 +128,17 @@ internal void SetDefaultContext(ExecutionContext context)
 
         internal void Detach()
         {
-            throw new NotImplementedException();
+            foreach (var waitTask in _waitTasks)
+            {
+                waitTask.Termiante(new Exception("waitForSelector failed: frame got detached."));
+            }
+            _detached = true;
+            if (_parentFrame != null)
+            {
+                _parentFrame.ChildFrames.Remove(this);
+            }
+            _parentFrame = null;
+            #endregion
         }
-        #endregion
     }
-}
+}

lib/PuppeteerSharp/NavigationWatcher.cs

@@ -11,7 +11,7 @@ namespace PuppeteerSharp
     internal class NavigationWatcher
     {
         private FrameManager _frameManager;
-        private Frame _mainFrame;
+        private Frame _frame;
         private dynamic _options;
         private static readonly Dictionary<string, string> _puppeteerToProtocolLifecycle = new Dictionary<string, string>()
         {
@@ -24,16 +24,17 @@ internal class NavigationWatcher
         private int _timeout;
         private string _initialLoaderId;
         private Task _navigationPromise;
+        private Timer _timer = null;
 
         public NavigationWatcher(FrameManager frameManager, Frame mainFrame, int timeout, dynamic options)
         {
             var waitUntil = new[] { "load" };
 
-            if (options.waitUntil is Array)
+            if (options != null && options.waitUntil is Array)
             {
                 waitUntil = options.waitUntil;
             }
-            else if (options.waitUntil is string)
+            else if (options != null && options.waitUntil is string)
             {
                 waitUntil = new string[] { options.waitUntil.ToString() };
             }
@@ -46,7 +47,7 @@ public NavigationWatcher(FrameManager frameManager, Frame mainFrame, int timeout
             });
 
             _frameManager = frameManager;
-            _mainFrame = mainFrame;
+            _frame = mainFrame;
             _options = options;
             _initialLoaderId = mainFrame.LoaderId;
             _timeout = timeout;
@@ -75,40 +76,72 @@ public NavigationWatcher(FrameManager frameManager, Frame mainFrame, int timeout
         #region Public methods
         public void Cancel()
         {
-            throw new NotImplementedException();
+            CleanUp();
         }
         #endregion
-        #region Private methods
-        void FrameManager_LifecycleEvent(object sender, PuppeteerSharp.FrameEventArgs e)
-        {
+        #region Private methods
 
-        }
-
-        private void CleanUp()
-        {
-            throw new NotImplementedException();
-        }
-
-        private Task CreateTimeoutTask()
-        {
-            var wrapper = new TaskCompletionSource<bool>();
-
-            if (_timeout == 0)
+        void FrameManager_LifecycleEvent(object sender, FrameEventArgs e)
+        {
+            // We expect navigation to commit.
+            if (_frame.LoaderId == _initialLoaderId)
             {
-                wrapper.SetResult(true);
+                return;
             }
-            else
+            if (!CheckLifecycle(_frame, _expectedLifecycle))
             {
-                Timer timer = null;
-                timer = new Timer((state) =>
-                {
-                    wrapper.SetException(
-                        new ChromeProcessException($"Navigation Timeout Exceeded: '{_timeout}'ms exceeded"));
-                    timer.Dispose();
-                }, null, _timeout, 0);
+                return;
             }
 
-            return wrapper.Task;
+            LifeCycleCompleteTaskWrapper.SetResult(true);
+        }
+
+        private bool CheckLifecycle(Frame frame, IEnumerable<string> expectedLifecycle)
+        {
+            foreach (var item in expectedLifecycle)
+            {
+                if (!frame.LifecycleEvents.Contains(item))
+                {
+                    return false;
+                }
+            }
+            foreach (var child in frame.ChildFrames)
+            {
+                if (!CheckLifecycle(child, expectedLifecycle))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private void CleanUp()
+        {
+            _frameManager.LifecycleEvent -= FrameManager_LifecycleEvent;
+            _frameManager.FrameDetached -= FrameManager_LifecycleEvent;
+            _timer?.Dispose();
+        }
+
+        private Task CreateTimeoutTask()
+        {
+            var wrapper = new TaskCompletionSource<bool>();
+
+            if (_timeout == 0)
+            {
+                wrapper.SetResult(true);
+            }
+            else
+            {
+                _timer = new Timer((state) =>
+                {
+                    wrapper.SetException(
+                        new ChromeProcessException($"Navigation Timeout Exceeded: '{_timeout}'ms exceeded"));
+                    _timer.Dispose();
+                    _timer = null;
+                }, null, _timeout, 0);
+            }
+
+            return wrapper.Task;
         }
         #endregion
     }

lib/PuppeteerSharp/Page.cs

@@ -18,7 +18,7 @@ public class Page
         private ViewPortOptions _viewport;
         private Mouse _mouse;
         private Dictionary<string, Func<object>> _pageBindings;
-
+        private const int DefaultNavigationTimeout = 30000;
 
         private Page(Session client, FrameTree frameTree, bool ignoreHTTPSErrors, TaskQueue screenshotTaskQueue)
         {
@@ -252,7 +252,11 @@ public async Task<dynamic> GoToAsync(string url, Dictionary<string, string> opti
             _networkManager.RequestCreated += createRequestEventListener;
 
             var mainFrame = _frameManager.MainFrame;
-            var watcher = new NavigationWatcher(_frameManager, mainFrame, options);
+            var timeout = options != null && options.ContainsKey("timeout") ?
+                Convert.ToInt32(options["timeout"]) :
+                DefaultNavigationTimeout;
+
+            var watcher = new NavigationWatcher(_frameManager, mainFrame, timeout, options);
 
             var navigateTask = Navigate(_client, url, referrer);
 

lib/PuppeteerSharp/WaitTask.cs

@@ -8,5 +8,10 @@ internal void Rerun()
         {
             throw new NotImplementedException();
         }
+
+        internal void Termiante(Exception exception)
+        {
+            throw new NotImplementedException();
+        }
     }
 }