chore(connection): add close reason to connection closed exception (#…

…1032) * chore(connection): add close reason to connection closed exception * Don't overwrite the reason * Change to connection disposed * Check for null * Check connection closed * should be not * swallow
microsoft · Dec 3, 2020 · e45ef99 · e45ef99
1 parent ececc05
commit e45ef99
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/PlaywrightSharp/Selectors.cs b/src/PlaywrightSharp/Selectors.cs
@@ -48,7 +48,14 @@ public async Task RegisterAsync(string name, string script = null, string path =
                 tasks.Add(channel.RegisterAsync(registerParam));
             }
 
-            await Task.WhenAll(tasks).ConfigureAwait(false);
+            try
+            {
+                await Task.WhenAll(tasks).ConfigureAwait(false);
+            }
+            catch (Exception ex) when (ex.Message.Contains("Connection closed"))
+            {
+                // Ignore connection closed exceptions.
+            }
 
             _registrations.Add(registerParam);
         }
@@ -66,8 +73,9 @@ internal async Task AddChannelAsync(SelectorsOwner channel)
             {
                 await Task.WhenAll(tasks).ConfigureAwait(false);
             }
-            catch
+            catch (Exception ex) when (ex.Message.Contains("Connection closed"))
             {
+                // Ignore connection closed exceptions.
             }
         }
     }

diff --git a/src/PlaywrightSharp/Transport/Connection.cs b/src/PlaywrightSharp/Transport/Connection.cs
@@ -112,7 +112,7 @@ internal static async Task InstallAsync(string driverPath = null, string browser
         {
             if (IsClosed)
             {
-                throw new PlaywrightSharpException("Connection closed");
+                throw new PlaywrightSharpException($"Connection closed ({_reason})");
             }
 
             int id = Interlocked.Increment(ref _lastId);
@@ -439,7 +439,7 @@ private void CreateRemoteObject(string parentGuid, ChannelOwnerType type, string
 
         private void Close(string reason)
         {
-            _reason = reason;
+            _reason = string.IsNullOrEmpty(_reason) ? reason : _reason;
             if (!IsClosed)
             {
                 foreach (var callback in _callbacks)
@@ -518,7 +518,7 @@ private void Dispose(bool disposing)
             }
 
             _queue.Dispose();
-            _transport.Close("Connection closed");
+            _transport.Close("Connection disposed");
 
             try
             {