Introduce an internal PageTarget subclass

Author: kblok

lib/PuppeteerSharp/Browser.cs

@@ -478,16 +478,25 @@ private Target CreateTarget(TargetInfo targetInfo, CDPSession session)
                 context = _defaultContext;
             }
 
+            if (_isPageTargetFunc(targetInfo))
+            {
+                return new PageTarget(
+                    targetInfo,
+                    session,
+                    context,
+                    TargetManager,
+                    (bool isAutoAttachEmulated) => Connection.CreateSessionAsync(targetInfo, isAutoAttachEmulated),
+                    IgnoreHTTPSErrors,
+                    DefaultViewport,
+                    ScreenshotTaskQueue);
+            }
+
             return new Target(
                 targetInfo,
                 session,
                 context,
                 TargetManager,
-                (bool isAutoAttachEmulated) => Connection.CreateSessionAsync(targetInfo, isAutoAttachEmulated),
-                IgnoreHTTPSErrors,
-                DefaultViewport,
-                ScreenshotTaskQueue,
-                _isPageTargetFunc);
+                (bool isAutoAttachEmulated) => Connection.CreateSessionAsync(targetInfo, isAutoAttachEmulated));
         }
     }
 }

lib/PuppeteerSharp/ITarget.cs

@@ -51,7 +51,7 @@ public interface ITarget
         Task<ICDPSession> CreateCDPSessionAsync();
 
         /// <summary>
-        /// Returns the <see cref="IPage"/> associated with the target. If the target is not <c>"page"</c> or <c>"background_page"</c> returns <c>null</c>.
+        /// Returns the <see cref="IPage"/> associated with the target. If the target is not <c>"page"</c>, <c>"webview"</c> or <c>"background_page"</c> returns <c>null</c>.
         /// </summary>
         /// <returns>a task that returns a <see cref="IPage"/>.</returns>
         Task<IPage> PageAsync();

lib/PuppeteerSharp/PageTarget.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Threading.Tasks;
+using PuppeteerSharp.Helpers;
+
+namespace PuppeteerSharp
+{
+    internal class PageTarget : Target
+    {
+        private readonly bool _ignoreHTTPSErrors;
+        private readonly ViewPortOptions _defaultViewport;
+        private readonly TaskQueue _screenshotTaskQueue;
+
+        public PageTarget(TargetInfo targetInfo, CDPSession session, BrowserContext context, ITargetManager targetManager, Func<bool, Task<CDPSession>> sessionFactory, bool ignoreHTTPSErrors, ViewPortOptions defaultViewport, TaskQueue screenshotTaskQueue)
+            : base(targetInfo, session, context, targetManager, sessionFactory)
+        {
+            _ignoreHTTPSErrors = ignoreHTTPSErrors;
+            _defaultViewport = defaultViewport;
+            _screenshotTaskQueue = screenshotTaskQueue;
+            PageTask = null;
+        }
+
+        internal Task<IPage> PageTask { get; set; }
+
+        /// <inheritdoc/>
+        public override async Task<IPage> PageAsync()
+        {
+            if (PageTask == null)
+            {
+                var session = Session ?? await SessionFactory(true).ConfigureAwait(false);
+
+                return await Page.CreateAsync(
+                    session,
+                    this,
+                    _ignoreHTTPSErrors,
+                    _defaultViewport,
+                    _screenshotTaskQueue).ConfigureAwait(false);
+            }
+
+            return await PageTask.ConfigureAwait(false);
+        }
+
+        protected override void Initialize()
+        {
+            _ = InitializedTaskWrapper.Task.ContinueWith(
+                async initializedTask =>
+                {
+                    var success = initializedTask.Result;
+                    if (!success)
+                    {
+                        return;
+                    }
+
+                    var opener = Opener as PageTarget;
+
+                    var openerPageTask = opener?.PageTask;
+                    if (openerPageTask == null || Type != TargetType.Page)
+                    {
+                        return;
+                    }
+
+                    var openerPage = (Page)await openerPageTask.ConfigureAwait(false);
+                    if (!openerPage.HasPopupEventListeners)
+                    {
+                        return;
+                    }
+
+                    var popupPage = await PageAsync().ConfigureAwait(false);
+                    openerPage.OnPopup(popupPage);
+                },
+                TaskScheduler.Default);
+        }
+
+        protected override void CheckIfInitialized()
+        {
+            if (!IsInitialized && (TargetInfo.Type != TargetType.Page || !string.IsNullOrEmpty(TargetInfo.Url)))
+            {
+                IsInitialized = true;
+                InitializedTaskWrapper.TrySetResult(true);
+            }
+        }
+    }
+}