Introduce Target initialization status (#2318)

hardkoded · Sep 20, 2023 · 4218fd4 · 4218fd4
1 parent 79dc944
commit 4218fd4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/docfx_project/examples/index.md b/docfx_project/examples/index.md
@@ -32,7 +32,7 @@ await page.SetViewportAsync(new ViewPortOptions
 
 ```cs
 using var browserFetcher = new BrowserFetcher();
-await browserFetcher.DownloadAsync(BrowserFetcher.DefaultChromiumRevision);
+await browserFetcher.DownloadAsync();
 var browser = await Puppeteer.LaunchAsync(new LaunchOptions
 {
     Headless = true

diff --git a/lib/PuppeteerSharp/Browser.cs b/lib/PuppeteerSharp/Browser.cs
@@ -352,10 +352,10 @@ private async void OnDetachedFromTargetAsync(object sender, TargetChangedArgs e)
         {
             try
             {
-                e.Target.InitializedTaskWrapper.TrySetResult(false);
+                e.Target.InitializedTaskWrapper.TrySetResult(InitializationStatus.Aborted);
                 e.Target.CloseTaskWrapper.TrySetResult(true);
 
-                if (await e.Target.InitializedTask.ConfigureAwait(false))
+                if ((await e.Target.InitializedTask.ConfigureAwait(false)) == InitializationStatus.Success)
                 {
                     var args = new TargetChangedArgs { Target = e.Target };
                     TargetDestroyed?.Invoke(this, args);
@@ -374,7 +374,7 @@ private async void OnAttachedToTargetAsync(object sender, TargetChangedArgs e)
         {
             try
             {
-                if (await e.Target.InitializedTask.ConfigureAwait(false))
+                if ((await e.Target.InitializedTask.ConfigureAwait(false)) == InitializationStatus.Success)
                 {
                     var args = new TargetChangedArgs { Target = e.Target };
                     TargetCreated?.Invoke(this, args);

diff --git a/lib/PuppeteerSharp/InitializationStatus.cs b/lib/PuppeteerSharp/InitializationStatus.cs
@@ -0,0 +1,8 @@
+namespace PuppeteerSharp
+{
+    internal enum InitializationStatus
+    {
+        Aborted,
+        Success,
+    }
+}
diff --git a/lib/PuppeteerSharp/PageTarget.cs b/lib/PuppeteerSharp/PageTarget.cs
@@ -45,7 +45,7 @@ protected override void Initialize()
                 async initializedTask =>
                 {
                     var success = initializedTask.Result;
-                    if (!success)
+                    if (success != InitializationStatus.Success)
                     {
                         return;
                     }
@@ -81,7 +81,7 @@ protected override void CheckIfInitialized()
             IsInitialized = !string.IsNullOrEmpty(TargetInfo.Url);
             if (IsInitialized)
             {
-                InitializedTaskWrapper.TrySetResult(true);
+                InitializedTaskWrapper.TrySetResult(InitializationStatus.Success);
             }
         }
     }

diff --git a/lib/PuppeteerSharp/Target.cs b/lib/PuppeteerSharp/Target.cs
@@ -49,9 +49,9 @@ internal Target(
 
         internal BrowserContext BrowserContext { get; }
 
-        internal Task<bool> InitializedTask => InitializedTaskWrapper.Task;
+        internal Task<InitializationStatus> InitializedTask => InitializedTaskWrapper.Task;
 
-        internal TaskCompletionSource<bool> InitializedTaskWrapper { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
+        internal TaskCompletionSource<InitializationStatus> InitializedTaskWrapper { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
 
         internal Task CloseTask => CloseTaskWrapper.Task;
 
@@ -88,7 +88,7 @@ internal void TargetInfoChanged(TargetInfo targetInfo)
         protected virtual void Initialize()
         {
             IsInitialized = true;
-            InitializedTaskWrapper.TrySetResult(true);
+            InitializedTaskWrapper.TrySetResult(InitializationStatus.Success);
         }
 
         /// <summary>
@@ -97,7 +97,7 @@ protected virtual void Initialize()
         protected virtual void CheckIfInitialized()
         {
             IsInitialized = true;
-            InitializedTaskWrapper.TrySetResult(true);
+            InitializedTaskWrapper.TrySetResult(InitializationStatus.Success);
         }
     }
 }