fix workers

hardkoded · Nov 21, 2023 · 5e436c2 · 5e436c2
1 parent 9419592
commit 5e436c2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/lib/PuppeteerSharp/ChromeTargetManager.cs b/lib/PuppeteerSharp/ChromeTargetManager.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json.Linq;
 using PuppeteerSharp.Helpers;
 using PuppeteerSharp.Helpers.Json;
 using PuppeteerSharp.Messaging;

diff --git a/lib/PuppeteerSharp/Connection.cs b/lib/PuppeteerSharp/Connection.cs
@@ -227,8 +227,6 @@ internal void Close(string closeReason)
 
         internal CDPSession GetSession(string sessionId) => _sessions.GetValueOrDefault(sessionId);
 
-        internal Task<CDPSession> GetSessionAsync(string sessionId) => _sessions.GetItemAsync(sessionId);
-
         /// <summary>
         /// Releases all resource used by the <see cref="Connection"/> object.
         /// It will raise the <see cref="Disconnected"/> event and dispose <see cref="Transport"/>.
@@ -248,6 +246,8 @@ protected virtual void Dispose(bool disposing)
             _callbackQueue.Dispose();
         }
 
+        private Task<CDPSession> GetSessionAsync(string sessionId) => _sessions.GetItemAsync(sessionId);
+
         private async void Transport_MessageReceived(object sender, MessageReceivedEventArgs e)
         {
             try

diff --git a/lib/PuppeteerSharp/WebWorker.cs b/lib/PuppeteerSharp/WebWorker.cs
@@ -29,7 +29,6 @@ public class WebWorker : IEnvironment
         private readonly ILogger _logger;
         private readonly Func<ConsoleType, IJSHandle[], StackTrace, Task> _consoleAPICalled;
         private readonly Action<EvaluateExceptionResponseDetails> _exceptionThrown;
-        private readonly TaskCompletionSource<ExecutionContext> _executionContextCallback = new(TaskCreationOptions.RunContinuationsAsynchronously);
 
         internal WebWorker(
             CDPSession client,
@@ -82,8 +81,6 @@ internal WebWorker(
 
         internal IsolatedWorld World { get; }
 
-        internal Task<ExecutionContext> ExecutionContextTask => _executionContextCallback.Task;
-
         /// <summary>
         /// Executes a script in browser context.
         /// </summary>
@@ -95,7 +92,7 @@ internal WebWorker(
         /// <seealso cref="ExecutionContext.EvaluateExpressionAsync(string)"/>
         /// <returns>Task which resolves to script return value.</returns>
         public async Task<T> EvaluateExpressionAsync<T>(string script)
-            => await (await ExecutionContextTask.ConfigureAwait(false)).EvaluateExpressionAsync<T>(script).ConfigureAwait(false);
+            => await World.EvaluateExpressionAsync<T>(script).ConfigureAwait(false);
 
         /// <summary>
         /// Executes a function in browser context.
@@ -108,7 +105,7 @@ public async Task<T> EvaluateExpressionAsync<T>(string script)
         /// </remarks>
         /// <returns>Task which resolves to script return value.</returns>
         public async Task<JToken> EvaluateFunctionAsync(string script, params object[] args)
-            => await (await ExecutionContextTask.ConfigureAwait(false)).EvaluateFunctionAsync(script, args).ConfigureAwait(false);
+            => await World.EvaluateFunctionAsync(script, args).ConfigureAwait(false);
 
         /// <summary>
         /// Executes a function in the context.
@@ -122,7 +119,7 @@ public async Task<JToken> EvaluateFunctionAsync(string script, params object[] a
         /// </remarks>
         /// <returns>Task which resolves to script return value.</returns>
         public async Task<T> EvaluateFunctionAsync<T>(string script, params object[] args)
-            => await (await ExecutionContextTask.ConfigureAwait(false)).EvaluateFunctionAsync<T>(script, args).ConfigureAwait(false);
+            => await World.EvaluateFunctionAsync<T>(script, args).ConfigureAwait(false);
 
         /// <summary>
         /// Executes a script in browser context.
@@ -134,7 +131,7 @@ public async Task<T> EvaluateFunctionAsync<T>(string script, params object[] arg
         /// <returns>Task which resolves to script return value.</returns>
         /// <seealso cref="ExecutionContext.EvaluateExpressionHandleAsync(string)"/>
         public async Task<IJSHandle> EvaluateExpressionHandleAsync(string script)
-            => await (await ExecutionContextTask.ConfigureAwait(false)).EvaluateExpressionHandleAsync(script).ConfigureAwait(false);
+            => await World.EvaluateExpressionHandleAsync(script).ConfigureAwait(false);
 
         internal async void OnMessageReceived(object sender, MessageEventArgs e)
         {