Fix get property

hardkoded · Nov 14, 2023 · 589fb05 · 589fb05
1 parent e03f130
commit 589fb05
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 36 deletions.
diff --git a/lib/PuppeteerSharp/Binding.cs b/lib/PuppeteerSharp/Binding.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json.Linq;
-using PuppeteerSharp.PageCoverage;
 
 namespace PuppeteerSharp
 {
@@ -85,7 +82,7 @@ internal async Task RunAsync(
                     if (taskResult.GetType().IsGenericType)
                     {
                         // the task is already awaited and therefore the call to property Result will not deadlock
-                        result = taskResult.GetType().GetProperty(taskResultPropertyName).GetValue(taskResult);
+                        result = taskResult.GetType().GetProperty(taskResultPropertyName)?.GetValue(taskResult);
                     }
                 }
 

diff --git a/lib/PuppeteerSharp/IsolatedWorld.cs b/lib/PuppeteerSharp/IsolatedWorld.cs
@@ -3,12 +3,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Xml.Linq;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
 using PuppeteerSharp.Helpers;
 using PuppeteerSharp.Helpers.Json;
-using PuppeteerSharp.Input;
 using PuppeteerSharp.Messaging;
 
 namespace PuppeteerSharp
@@ -43,8 +41,6 @@ public IsolatedWorld(
 
         internal Frame Frame { get; }
 
-        internal WebWorker Worker { get; }
-
         internal CDPSession Client => Frame?.Client ?? Worker?.Client;
 
         internal bool HasContext => _contextResolveTaskWrapper?.Task.IsCompleted == true;
@@ -53,6 +49,8 @@ public IsolatedWorld(
 
         internal override IEnvironment Environment => (IEnvironment)Frame ?? Worker;
 
+        private WebWorker Worker { get; }
+
         public void Dispose() => _bindingQueue.Dispose();
 
         public ValueTask DisposeAsync() => _bindingQueue.DisposeAsync();
@@ -91,11 +89,8 @@ await context.Client.SendAsync(
                     {
                         return;
                     }
-                    else
-                    {
-                        _logger.LogError(ex.ToString());
-                        return;
-                    }
+
+                    _logger.LogError(ex.ToString());
                 }
             }).ConfigureAwait(false);
         }
@@ -114,7 +109,7 @@ internal override async Task<IElementHandle> AdoptBackendNodeAsync(object backen
 
         internal override async Task<IJSHandle> TransferHandleAsync(IJSHandle handle)
         {
-            if ((handle as JSHandle).Realm == this)
+            if ((handle as JSHandle)?.Realm == this)
             {
                 return handle;
             }
@@ -133,9 +128,7 @@ internal override async Task<IJSHandle> TransferHandleAsync(IJSHandle handle)
 
         internal override async Task<IJSHandle> AdoptHandleAsync(IJSHandle handle)
         {
-            var executionContext = await GetExecutionContextAsync().ConfigureAwait(false);
-
-            if ((handle as JSHandle).Realm == this)
+            if ((handle as JSHandle)?.Realm == this)
             {
                 return handle;
             }

diff --git a/lib/PuppeteerSharp/JSHandle.cs b/lib/PuppeteerSharp/JSHandle.cs
@@ -18,9 +18,9 @@ public class JSHandle : IJSHandle
     {
         internal JSHandle(IsolatedWorld world, RemoteObject remoteObject)
         {
-            Logger = Client.Connection.LoggerFactory.CreateLogger(GetType());
             Realm = world;
             RemoteObject = remoteObject;
+            Logger = Client.Connection.LoggerFactory.CreateLogger(GetType());
         }
 
         /// <inheritdoc/>
@@ -29,7 +29,7 @@ internal JSHandle(IsolatedWorld world, RemoteObject remoteObject)
         /// <inheritdoc/>
         public RemoteObject RemoteObject { get; }
 
-        internal CDPSession Client { get; }
+        internal CDPSession Client => Realm.Environment.Client;
 
         internal Func<Task> DisposeAction { get; set; }
 
@@ -46,20 +46,11 @@ internal JSHandle(IsolatedWorld world, RemoteObject remoteObject)
 
         /// <inheritdoc/>
         public Task<IJSHandle> GetPropertyAsync(string propertyName)
-            => BindIsolatedHandleAsync(async handle =>
-            {
-                var objectHandle = await handle.EvaluateFunctionHandleAsync(
-                    @"(object, propertyName) => {
-                        const result = { __proto__: null};
-                        result[propertyName] = object[propertyName];
-                        return result;
-                    }",
-                    propertyName).ConfigureAwait(false);
-                var properties = await objectHandle.GetPropertiesAsync().ConfigureAwait(false);
-                properties.TryGetValue(propertyName, out var result);
-                await objectHandle.DisposeAsync().ConfigureAwait(false);
-                return result;
-            });
+            => EvaluateFunctionHandleAsync(
+                @"(object, propertyName) => {
+                    return object[propertyName];
+                }",
+                propertyName);
 
         /// <inheritdoc/>
         public Task<Dictionary<string, IJSHandle>> GetPropertiesAsync()

diff --git a/lib/PuppeteerSharp/QueryHandlers/CustomQuerySelectorRegistry.cs b/lib/PuppeteerSharp/QueryHandlers/CustomQuerySelectorRegistry.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using PuppeteerSharp.QueryHandlers;
 
 namespace PuppeteerSharp.QueryHandlers
 {
@@ -15,8 +14,6 @@ internal class CustomQuerySelectorRegistry
         private readonly Regex _customQueryHandlerNameRegex = new("[a-zA-Z]+$", RegexOptions.Compiled);
         private readonly QueryHandler _defaultHandler = new CssQueryHandler();
 
-        public Browser Browser { get; private set; }
-
         internal Dictionary<string, QueryHandler> InternalQueryHandlers => new()
         {
             ["aria"] = new AriaQueryHandler(),