More fixes

hardkoded · Nov 16, 2023 · 07345b3 · 07345b3
1 parent fd0beb0
commit 07345b3
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/lib/PuppeteerSharp/ElementHandle.cs b/lib/PuppeteerSharp/ElementHandle.cs
@@ -284,33 +284,32 @@ public Task<IElementHandle[]> QuerySelectorAllAsync(string selector)
             });
 
         /// <inheritdoc/>
-        public Task<IJSHandle> QuerySelectorAllHandleAsync(string selector)
-            => BindIsolatedHandleAsync(async handle =>
+        public async Task<IJSHandle> QuerySelectorAllHandleAsync(string selector)
+        {
+            if (string.IsNullOrEmpty(selector))
             {
-                if (string.IsNullOrEmpty(selector))
-                {
-                    throw new ArgumentNullException(nameof(selector));
-                }
+                throw new ArgumentNullException(nameof(selector));
+            }
 
-                var handles = await handle.QuerySelectorAllAsync(selector).ConfigureAwait(false);
+            var handles = await QuerySelectorAllAsync(selector).ConfigureAwait(false);
 
-                var elements = await handle.EvaluateFunctionHandleAsync(
-                    @"(_, ...elements) => {
+            var elements = await EvaluateFunctionHandleAsync(
+                @"(_, ...elements) => {
                         return elements;
                     }",
-                    handles).ConfigureAwait(false) as JSHandle;
+                handles).ConfigureAwait(false) as JSHandle;
 
-                elements.DisposeAction = async () =>
+            elements.DisposeAction = async () =>
+            {
+                // We can't use Task.WhenAll with ValueTask :(
+                foreach (var item in handles)
                 {
-                    // We can't use Task.WhenAll with ValueTask :(
-                    foreach (var item in handles)
-                    {
-                        await item.DisposeAsync().ConfigureAwait(false);
-                    }
-                };
+                    await item.DisposeAsync().ConfigureAwait(false);
+                }
+            };
 
-                return (IJSHandle)elements;
-            });
+            return elements;
+        }
 
         /// <inheritdoc/>
         public Task<IElementHandle[]> XPathAsync(string expression)

diff --git a/lib/PuppeteerSharp/Frame.cs b/lib/PuppeteerSharp/Frame.cs
@@ -436,12 +436,14 @@ internal void UpdateClient(CDPSession client)
             MainRealm = new IsolatedWorld(
               this,
               null,
-              FrameManager.TimeoutSettings);
+              FrameManager.TimeoutSettings,
+              true);
 
             IsolatedRealm = new IsolatedWorld(
               this,
               null,
-              FrameManager.TimeoutSettings);
+              FrameManager.TimeoutSettings,
+              false);
         }
 
         private Task<ElementHandle> GetDocumentAsync()

diff --git a/lib/PuppeteerSharp/IsolatedWorld.cs b/lib/PuppeteerSharp/IsolatedWorld.cs
@@ -29,16 +29,23 @@ internal class IsolatedWorld : Realm, IDisposable, IAsyncDisposable
         public IsolatedWorld(
             Frame frame,
             WebWorker worker,
-            TimeoutSettings timeoutSettings) : base(timeoutSettings)
+            TimeoutSettings timeoutSettings,
+            bool isMainWorld) : base(timeoutSettings)
         {
             Frame = frame;
             Worker = worker;
+            IsMainWorld = isMainWorld;
             _logger = Client.Connection.LoggerFactory.CreateLogger<IsolatedWorld>();
 
             _detached = false;
             Client.MessageReceived += Client_MessageReceived;
         }
 
+        /// <summary>
+        /// This property is not upstream. It's helpful for debugging.
+        /// </summary>
+        internal bool IsMainWorld { get; }
+
         internal Frame Frame { get; }
 
         internal CDPSession Client => Frame?.Client ?? Worker?.Client;

diff --git a/lib/PuppeteerSharp/WebWorker.cs b/lib/PuppeteerSharp/WebWorker.cs
@@ -39,7 +39,7 @@ internal WebWorker(
         {
             _logger = client.Connection.LoggerFactory.CreateLogger<WebWorker>();
             Client = client;
-            World = new IsolatedWorld(null, this, new TimeoutSettings());
+            World = new IsolatedWorld(null, this, new TimeoutSettings(), true);
             Url = url;
             _consoleAPICalled = consoleAPICalled;
             _exceptionThrown = exceptionThrown;