Move target updates to the target manager (#2316)

hardkoded · Sep 15, 2023 · c359dd2 · c359dd2
1 parent dfac7b3
commit c359dd2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/lib/PuppeteerSharp/Browser.cs b/lib/PuppeteerSharp/Browser.cs
@@ -341,20 +341,14 @@ protected virtual void Dispose(bool disposing) => _ = CloseAsync()
         private void TargetManager_TargetDiscovered(object sender, TargetChangedArgs e)
             => TargetDiscovered?.Invoke(this, e);
 
-        private void TargetManager_TargetChanged(object sender, TargetChangedArgs e)
+        private void OnTargetChanged(object sender, TargetChangedArgs e)
         {
-            var previousURL = e.Target.Url;
-            var wasInitialized = e.Target.IsInitialized;
-            e.Target.TargetInfoChanged(e.TargetInfo);
-            if (wasInitialized && previousURL != e.Target.Url)
-            {
-                var args = new TargetChangedArgs { Target = e.Target };
-                TargetChanged?.Invoke(this, args);
-                e.Target.BrowserContext.OnTargetChanged(this, args);
-            }
+            var args = new TargetChangedArgs { Target = e.Target };
+            TargetChanged?.Invoke(this, args);
+            e.Target.BrowserContext.OnTargetChanged(this, args);
         }
 
-        private async void TargetManager_TargetGone(object sender, TargetChangedArgs e)
+        private async void OnDetachedFromTargetAsync(object sender, TargetChangedArgs e)
         {
             try
             {
@@ -376,7 +370,7 @@ private async void TargetManager_TargetGone(object sender, TargetChangedArgs e)
             }
         }
 
-        private async void TargetManager_TargetAvailable(object sender, TargetChangedArgs e)
+        private async void OnAttachedToTargetAsync(object sender, TargetChangedArgs e)
         {
             try
             {
@@ -454,19 +448,19 @@ private async void Connection_Disconnected(object sender, EventArgs e)
         private Task AttachAsync()
         {
             Connection.Disconnected += Connection_Disconnected;
-            TargetManager.TargetAvailable += TargetManager_TargetAvailable;
-            TargetManager.TargetGone += TargetManager_TargetGone;
-            TargetManager.TargetChanged += TargetManager_TargetChanged;
+            TargetManager.TargetAvailable += OnAttachedToTargetAsync;
+            TargetManager.TargetGone += OnDetachedFromTargetAsync;
+            TargetManager.TargetChanged += OnTargetChanged;
             TargetManager.TargetDiscovered += TargetManager_TargetDiscovered;
             return TargetManager.InitializeAsync();
         }
 
         private void Detach()
         {
             Connection.Disconnected -= Connection_Disconnected;
-            TargetManager.TargetAvailable -= TargetManager_TargetAvailable;
-            TargetManager.TargetGone -= TargetManager_TargetGone;
-            TargetManager.TargetChanged -= TargetManager_TargetChanged;
+            TargetManager.TargetAvailable -= OnAttachedToTargetAsync;
+            TargetManager.TargetGone -= OnDetachedFromTargetAsync;
+            TargetManager.TargetChanged -= OnTargetChanged;
             TargetManager.TargetDiscovered -= TargetManager_TargetDiscovered;
         }
 

diff --git a/lib/PuppeteerSharp/ChromeTargetManager.cs b/lib/PuppeteerSharp/ChromeTargetManager.cs
@@ -226,7 +226,18 @@ private void OnTargetInfoChanged(TargetCreatedResponse e)
                 return;
             }
 
-            TargetChanged?.Invoke(this, new TargetChangedArgs { Target = target, TargetInfo = e.TargetInfo });
+            var previousURL = target.Url;
+            var wasInitialized = target.IsInitialized;
+            target.TargetInfoChanged(e.TargetInfo);
+
+            if (wasInitialized && previousURL != target.Url)
+            {
+                TargetChanged?.Invoke(this, new TargetChangedArgs
+                {
+                    Target = target,
+                    TargetInfo = e.TargetInfo,
+                });
+            }
         }
 
         private async Task OnAttachedToTargetAsync(object sender, TargetAttachedToTargetResponse e)
@@ -339,7 +350,7 @@ await Task.WhenAll(
             }
             catch (Exception ex)
             {
-                _logger.LogError("Failed to call setautoAttach and runIfWaitingForDebugger", ex);
+                _logger.LogError("Failed to call setAutoAttach and runIfWaitingForDebugger", ex);
             }
         }