Improve TargetClosedException (#804)

* Improve TargetClosedException

* Register events after TaskCompletionSource were created

* Release notes

Author: kblok

lib/PuppeteerSharp.Tests/BrowserTests/Events/DisconnectedTests.cs

@@ -67,7 +67,7 @@ public async Task ShouldRejectNavigationWhenBrowserCloses()
                 await Server.WaitForRequest("/one-style.css");
                 remote.Disconnect();
                 var exception = await Assert.ThrowsAsync<NavigationException>(() => navigationTask);
-                Assert.Equal("Navigation failed because browser has disconnected!", exception.Message);
+                Assert.Contains("Navigation failed because browser has disconnected!", exception.Message);
             }
         }
 

lib/PuppeteerSharp/FrameManager.cs

@@ -11,10 +11,10 @@
 namespace PuppeteerSharp
 {
     internal class FrameManager
-    {        
+    {
         private Dictionary<int, ExecutionContext> _contextIdToContext;
         private bool _ensureNewDocumentNavigation;
-        private readonly ILogger _logger;        
+        private readonly ILogger _logger;
         private readonly ConcurrentDictionary<string, Frame> _frames;
         private readonly MultiMap<string, TaskCompletionSource<Frame>> _pendingFrameRequests;
         private const int WaitForRequestDelay = 1000;
@@ -136,17 +136,7 @@ public async Task<Response> WaitForFrameNavigationAsync(Frame frame, NavigationO
                     watcher.TimeoutOrTerminationTask
                 ).ConfigureAwait(false);
 
-                var exception = raceTask.Exception;
-                if (exception == null &&
-                    watcher.TimeoutOrTerminationTask.IsCompleted &&
-                    watcher.TimeoutOrTerminationTask.Result.IsFaulted)
-                {
-                    exception = watcher.TimeoutOrTerminationTask.Result.Exception;
-                }
-                if (exception != null)
-                {
-                    throw new NavigationException(exception.Message, exception);
-                }
+                await raceTask;
 
                 return watcher.NavigationResponse;
             }

lib/PuppeteerSharp/LifecycleWatcher.cs

@@ -61,17 +61,17 @@ public LifecycleWatcher(
             _timeout = timeout;
             _hasSameDocumentNavigation = false;
 
-            frameManager.LifecycleEvent += CheckLifecycleComplete;
-            frameManager.FrameNavigatedWithinDocument += NavigatedWithinDocument;
-            frameManager.FrameDetached += OnFrameDetached;
-            frameManager.NetworkManager.Request += OnRequest;
-            frameManager.Client.Disconnected += OnClientDisconnected;
-
             _sameDocumentNavigationTaskWrapper = new TaskCompletionSource<bool>();
             _newDocumentNavigationTaskWrapper = new TaskCompletionSource<bool>();
             _lifecycleTaskWrapper = new TaskCompletionSource<bool>();
             _terminationTaskWrapper = new TaskCompletionSource<bool>();
             _timeoutTask = TaskHelper.CreateTimeoutTask(timeout);
+
+            frameManager.LifecycleEvent += CheckLifecycleComplete;
+            frameManager.FrameNavigatedWithinDocument += NavigatedWithinDocument;
+            frameManager.FrameDetached += OnFrameDetached;
+            frameManager.NetworkManager.Request += OnRequest;
+            frameManager.Client.Disconnected += OnClientDisconnected;
         }
 
         #region Properties

lib/PuppeteerSharp/PuppeteerSharp.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackOnBuild>true</PackOnBuild>
-    <PackageVersion>1.11.0</PackageVersion>
+    <PackageVersion>1.11.1</PackageVersion>
     <Authors>Darío Kondratiuk</Authors>
     <Owners>Darío Kondratiuk</Owners>
     <PackageProjectUrl>https://github.com/kblok/puppeteer-sharp</PackageProjectUrl>
@@ -31,8 +31,10 @@
  * Fixed event handler leak.
  * Removed a couple of common allocations.
  * New target types.
+ * LifeCycleWatcher fixes
+ * ScrollIntoViewIfNeededAsync improvements
  ]]></PackageReleaseNotes>
-    <ReleaseVersion>1.11.0</ReleaseVersion>
+    <ReleaseVersion>1.11.1</ReleaseVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
   </PropertyGroup>
   <PropertyGroup>

lib/PuppeteerSharp/TargetClosedException.cs

@@ -16,6 +16,7 @@ public class TargetClosedException : PuppeteerException
         /// </summary>
         /// <param name="message">Message.</param>
         /// <param name="closeReason">Close reason.</param>
-        public TargetClosedException(string message, string closeReason) : base(message) => CloseReason = closeReason;
+        public TargetClosedException(string message, string closeReason) : base($"{message} ({closeReason})")
+            => CloseReason = closeReason;
     }
 }