Bring more changes

Author: kblok

lib/PuppeteerSharp/Browser.cs

@@ -22,7 +22,6 @@ public class Browser : IBrowser
         private readonly ConcurrentDictionary<string, BrowserContext> _contexts;
         private readonly ILogger<Browser> _logger;
         private readonly Func<TargetInfo, bool> _targetFilterCallback;
-        private readonly Func<TargetInfo, bool> _isPageTargetFunc;
         private readonly BrowserContext _defaultContext;
         private readonly CustomQueriesManager _customQueriesManager = new();
         private Task _closeTask;
@@ -43,7 +42,7 @@ internal Browser(
             Connection = connection;
             _targetFilterCallback = targetFilter ?? ((TargetInfo _) => true);
             _logger = Connection.LoggerFactory.CreateLogger<Browser>();
-            _isPageTargetFunc =
+            IsPageTargetFunc =
                 isPageTargetFunc ??
                 new Func<TargetInfo, bool>((TargetInfo target) =>
                 {
@@ -140,6 +139,8 @@ public bool IsClosed
 
         internal ITargetManager TargetManager { get; }
 
+        internal Func<TargetInfo, bool> IsPageTargetFunc { get; set; }
+
         /// <inheritdoc/>
         public Task<IPage> NewPageAsync() => _defaultContext.NewPageAsync();
 
@@ -478,7 +479,7 @@ private Target CreateTarget(TargetInfo targetInfo, CDPSession session)
                 context = _defaultContext;
             }
 
-            if (_isPageTargetFunc(targetInfo))
+            if (IsPageTargetFunc(targetInfo))
             {
                 return new PageTarget(
                     targetInfo,

lib/PuppeteerSharp/BrowserContext.cs

@@ -49,7 +49,11 @@ public Task<ITarget> WaitForTargetAsync(Func<ITarget, bool> predicate, WaitForOp
         /// <inheritdoc/>
         public async Task<IPage[]> PagesAsync()
         => (await Task.WhenAll(
-            Targets().Where(t => t.Type == TargetType.Page).Select(t => t.PageAsync())).ConfigureAwait(false))
+            Targets()
+                .Where(t =>
+                    t.Type == TargetType.Page ||
+                    (t.Type == TargetType.Other && Browser.IsPageTargetFunc((t as Target).TargetInfo)))
+                .Select(t => t.PageAsync())).ConfigureAwait(false))
             .Where(p => p != null).ToArray();
 
         /// <inheritdoc/>

lib/PuppeteerSharp/PageTarget.cs

@@ -19,7 +19,7 @@ public PageTarget(TargetInfo targetInfo, CDPSession session, BrowserContext cont
             PageTask = null;
         }
 
-        internal Task<IPage> PageTask { get; set; }
+        internal Task<Page> PageTask { get; set; }
 
         /// <inheritdoc/>
         public override async Task<IPage> PageAsync()
@@ -28,12 +28,12 @@ public override async Task<IPage> PageAsync()
             {
                 var session = Session ?? await SessionFactory(true).ConfigureAwait(false);
 
-                return await Page.CreateAsync(
+                PageTask = Page.CreateAsync(
                     session,
                     this,
                     _ignoreHTTPSErrors,
                     _defaultViewport,
-                    _screenshotTaskQueue).ConfigureAwait(false);
+                    _screenshotTaskQueue);
             }
 
             return await PageTask.ConfigureAwait(false);