Wait for the page to close in the browser in page.close (#369)

Author: kblok

lib/PuppeteerSharp.Tests/PageTests/CloseTests.cs

@@ -22,5 +22,14 @@ public async Task ShouldRejectAllPromisesWhenPageIsClosed()
 
             Assert.Contains("Protocol error", exception.Message);
         }
+
+        [Fact]
+        public async Task ShouldNotBeVisibleInBrowserPages()
+        {
+            var newPage = await Browser.NewPageAsync();
+            Assert.Contains(newPage, await Browser.PagesAsync());
+            await newPage.CloseAsync();
+            Assert.DoesNotContain(newPage, await Browser.PagesAsync());
+        }
     }
-}
+}

lib/PuppeteerSharp/Browser.cs

@@ -136,9 +136,10 @@ public Browser(Connection connection, IBrowserOptions options, Process process,
         /// <returns>Task which resolves to a new <see cref="Page"/> object</returns>
         public async Task<Page> NewPageAsync()
         {
-            string targetId = (await Connection.SendAsync("Target.createTarget", new Dictionary<string, object>(){
+            string targetId = (await Connection.SendAsync("Target.createTarget", new Dictionary<string, object>
+            {
                 {"url", "about:blank"}
-              })).targetId.ToString();
+            })).targetId.ToString();
 
             var target = _targets[targetId];
             await target.InitializedTask;
@@ -231,11 +232,11 @@ private async void Connect_MessageReceived(object sender, MessageEventArgs e)
             switch (e.MessageID)
             {
                 case "Target.targetCreated":
-                    await CreateTarget(e.MessageData.ToObject<TargetCreatedResponse>());
+                    await CreateTargetAsync(e.MessageData.ToObject<TargetCreatedResponse>());
                     return;
 
                 case "Target.targetDestroyed":
-                    DestroyTarget(e.MessageData.ToObject<TargetDestroyedResponse>());
+                    await DestroyTargetAsync(e.MessageData.ToObject<TargetDestroyedResponse>());
                     return;
 
                 case "Target.targetInfoChanged":
@@ -250,32 +251,35 @@ private void ChangeTargetInfo(TargetCreatedResponse e)
             {
                 throw new InvalidTargetException("Target should exists before ChangeTargetInfo");
             }
-            
+
             var target = _targets[e.TargetInfo.TargetId];
             target.TargetInfoChanged(e.TargetInfo);
         }
 
-        private void DestroyTarget(TargetDestroyedResponse e)
+        private async Task DestroyTargetAsync(TargetDestroyedResponse e)
         {
             if (!_targets.ContainsKey(e.TargetId))
             {
                 throw new InvalidTargetException("Target should exists before DestroyTarget");
             }
 
             var target = _targets[e.TargetId];
-            if (!target.InitilizedTaskWrapper.Task.IsCompleted)
-            {
-                target.InitilizedTaskWrapper.SetResult(false);
-            }
             _targets.Remove(e.TargetId);
 
-            TargetDestroyed?.Invoke(this, new TargetChangedArgs()
+            if (!target.CloseTaskWrapper.Task.IsCompleted)
             {
-                Target = target
-            });
+                target.CloseTaskWrapper.SetResult(true);
+            }
+            if (await target.InitializedTask)
+            {
+                TargetDestroyed?.Invoke(this, new TargetChangedArgs()
+                {
+                    Target = target
+                });
+            }
         }
 
-        private async Task CreateTarget(TargetCreatedResponse e)
+        private async Task CreateTargetAsync(TargetCreatedResponse e)
         {
             var target = new Target(this, e.TargetInfo);
             _targets[e.TargetInfo.TargetId] = target;
@@ -290,7 +294,10 @@ private async Task CreateTarget(TargetCreatedResponse e)
         }
 
         internal static async Task<Browser> CreateAsync(
-            Connection connection, IBrowserOptions options, Process process, Func<Task> closeCallBack)
+            Connection connection,
+            IBrowserOptions options,
+            Process process,
+            Func<Task> closeCallBack)
         {
             var browser = new Browser(connection, options, process, closeCallBack);
             await connection.SendAsync("Target.setDiscoverTargets", new
@@ -311,4 +318,4 @@ public void Dispose()
         }
         #endregion
     }
-}
+}

lib/PuppeteerSharp/Page.cs

@@ -981,17 +981,17 @@ public async Task<byte[]> ScreenshotDataAsync(ScreenshotOptions options)
         /// Closes the page.
         /// </summary>
         /// <returns>Task.</returns>
-        public Task CloseAsync()
+        public async Task CloseAsync()
         {
             if (!(Client?.Connection?.IsClosed ?? true))
             {
-                return Client.Connection.SendAsync("Target.closeTarget", new
+                await Client.Connection.SendAsync("Target.closeTarget", new
                 {
                     targetId = Target.TargetId
                 });
-            }
 
-            return Task.CompletedTask;
+                await Target.CloseTask;
+            }
         }
 
         /// <summary>
@@ -1525,7 +1525,7 @@ private decimal ConvertPrintParameterToInches(object parameter)
                     valueText = text;
                 }
 
-                if (Decimal.TryParse(valueText, NumberStyles.Any, CultureInfo.InvariantCulture.NumberFormat, out var number))
+                if (decimal.TryParse(valueText, NumberStyles.Any, CultureInfo.InvariantCulture.NumberFormat, out var number))
                 {
                     pixels = number * _unitToPixels[unit];
                 }
@@ -1750,8 +1750,7 @@ private static string EvaluationString(string fun, params object[] args)
 
             string SerializeArgument(object arg)
             {
-                if (arg == null) return "undefined";
-                return JsonConvert.SerializeObject(arg);
+                return arg == null ? "undefined" : JsonConvert.SerializeObject(arg);
             }
         }
         #endregion

lib/PuppeteerSharp/Target.cs

@@ -23,6 +23,7 @@ internal Target(Browser browser, TargetInfo targetInfo)
             _targetInfo = targetInfo;
 
             InitilizedTaskWrapper = new TaskCompletionSource<bool>();
+            CloseTaskWrapper = new TaskCompletionSource<bool>();
             IsInitialized = _targetInfo.Type != "page" || _targetInfo.Url != string.Empty;
 
             if (IsInitialized)
@@ -49,6 +50,8 @@ internal Target(Browser browser, TargetInfo targetInfo)
         public string TargetId => _targetInfo.TargetId;
         internal Task<bool> InitializedTask => InitilizedTaskWrapper.Task;
         internal TaskCompletionSource<bool> InitilizedTaskWrapper { get; }
+        internal Task<bool> CloseTask => CloseTaskWrapper.Task;
+        internal TaskCompletionSource<bool> CloseTaskWrapper { get; }
         #endregion
 
         /// <summary>
@@ -91,4 +94,4 @@ internal void TargetInfoChanged(TargetInfo targetInfo)
         /// <returns>A task that returns a <see cref="CDPSession"/></returns>
         public Task<CDPSession> CreateCDPSessionAsync() => _browser.Connection.CreateSessionAsync(TargetId);
     }
-}
+}