Separate target init from construction

hardkoded · Sep 20, 2023 · 94dc1b7 · 94dc1b7
1 parent 54ac49c
commit 94dc1b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/lib/PuppeteerSharp/ChromeTargetManager.cs b/lib/PuppeteerSharp/ChromeTargetManager.cs
@@ -199,6 +199,7 @@ private void OnTargetCreated(TargetCreatedResponse e)
                 }
 
                 var target = _targetFactoryFunc(e.TargetInfo, null);
+                target.Initialize();
                 _attachedTargetsByTargetId.AddItem(e.TargetInfo.TargetId, target);
             }
         }
@@ -288,6 +289,7 @@ await parent.SendAsync(
                 }
 
                 var workerTarget = _targetFactoryFunc(targetInfo, null);
+                workerTarget.Initialize();
                 _attachedTargetsByTargetId.AddItem(targetInfo.TargetId, workerTarget);
                 TargetAvailable?.Invoke(this, new TargetChangedArgs { Target = workerTarget });
                 return;
@@ -316,6 +318,8 @@ await parent.SendAsync(
             }
             else
             {
+                target.Initialize();
+
                 _attachedTargetsByTargetId.AddItem(targetInfo.TargetId, target);
                 _attachedTargetsBySessionId.TryAdd(session.Id, target);
             }

diff --git a/lib/PuppeteerSharp/FirefoxTargetManager.cs b/lib/PuppeteerSharp/FirefoxTargetManager.cs
@@ -117,6 +117,7 @@ private void OnTargetCreated(TargetCreatedResponse e)
             if (e.TargetInfo.Type == TargetType.Browser && e.TargetInfo.Attached)
             {
                 var browserTarget = _targetFactoryFunc(e.TargetInfo, null);
+                browserTarget.Initialize();
                 _availableTargetsByTargetId.AddItem(e.TargetInfo.TargetId, browserTarget);
                 FinishInitializationIfReady(e.TargetInfo.TargetId);
             }
@@ -129,6 +130,7 @@ private void OnTargetCreated(TargetCreatedResponse e)
                 return;
             }
 
+            target.Initialize();
             _availableTargetsByTargetId.AddItem(e.TargetInfo.TargetId, target);
             TargetAvailable?.Invoke(
                 this,

diff --git a/lib/PuppeteerSharp/Target.cs b/lib/PuppeteerSharp/Target.cs
@@ -85,7 +85,7 @@ internal void TargetInfoChanged(TargetInfo targetInfo)
         /// <summary>
         /// Initializes the target.
         /// </summary>
-        protected virtual void Initialize()
+        internal virtual void Initialize()
         {
             IsInitialized = true;
             InitializedTaskWrapper.TrySetResult(InitializationStatus.Success);