fix

Author: kblok

lib/CLAUDE.md

@@ -14,6 +14,12 @@ You are allowed to run git commands to update these repositories locally.
 - Original Puppeteer repository: ../../puppeteer/puppeteer. Every time "upstream" is mentioned we are referring to this code.
 - Bidi Driver: ../../webdriverbidi-net/webdriverbidi-net
 
+## Upstream code structure
+
+- Code in upstream puppeteer-core/src/api/* are our abstract class. For instance our public abstract class Frame.
+- Code in upstream puppeteer-core/src/bidi/* are our Bidi* classes.
+- Code in upstream puppeteer-core/src/cdp/* are our Cdp* classes.
+
 ## Project Structure
 
 ```
@@ -380,6 +386,7 @@ Test directory structure demonstrates comprehensive coverage:
 - Headless mode variations (headless, headful, headless-shell)
 - Local and upstream expectation merging
 - Tests should always match the code in upstream. Tests should never be changed to match the code local code.
+
 #### Test Server (`PuppeteerSharp.TestServer/`)
 - ASP.NET Core server for hosting test pages
 - wwwroot directory with test fixtures

lib/PuppeteerSharp.Tests/PageTests/AddScriptTagTests.cs

@@ -8,10 +8,6 @@ namespace PuppeteerSharp.Tests.PageTests
 {
     public class AddScriptTagTests : PuppeteerPageBaseTest
     {
-        public AddScriptTagTests() : base()
-        {
-        }
-
         [Test, PuppeteerTest("page.spec", "Page Page.addScriptTag", "should throw an error if no options are provided")]
         public void ShouldThrowAnErrorIfNoOptionsAreProvided()
         {

lib/PuppeteerSharp/Bidi/BidiRealm.cs

@@ -214,7 +214,7 @@ private async Task<EvaluateResultSuccess> EvaluateAsync(bool returnByValue, bool
         if (result.ResultType == EvaluateResultType.Exception)
         {
             // TODO: Improve text details
-            throw new EvaluateException(((EvaluateResultException)result).ExceptionDetails.Text);
+            throw new EvaluationFailedException(((EvaluateResultException)result).ExceptionDetails.Text);
         }
 
         return result as EvaluateResultSuccess;

lib/PuppeteerSharp/Frame.cs

@@ -3,6 +3,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using PuppeteerSharp.Helpers;
 using PuppeteerSharp.Input;
 using PuppeteerSharp.QueryHandlers;
 
@@ -196,7 +197,7 @@ public async Task<IElementHandle[]> XPathAsync(string expression)
         }
 
         /// <inheritdoc/>
-        public Task<DeviceRequestPrompt> WaitForDevicePromptAsync(WaitForOptions options = default)
+        public Task<DeviceRequestPrompt> WaitForDevicePromptAsync(WaitForOptions options = null)
             => GetDeviceRequestPromptManager().WaitForDevicePromptAsync(options);
 
         /// <inheritdoc/>
@@ -220,45 +221,50 @@ public async Task<IElementHandle> AddScriptTagAsync(AddTagOptions options)
 
             if (!string.IsNullOrEmpty(options.Path))
             {
-                content = await Helpers.AsyncFileHelper.ReadAllText(options.Path).ConfigureAwait(false);
+                content = await AsyncFileHelper.ReadAllText(options.Path).ConfigureAwait(false);
                 content += "//# sourceURL=" + options.Path.Replace("\n", string.Empty);
             }
 
-            var type = options.Type ?? "text/javascript";
-
             var handle = await IsolatedRealm.EvaluateFunctionHandleAsync(
-                @"async ({url, id, type, content}) => {
-                      return await new Promise((resolve, reject) => {
-                        const script = document.createElement('script');
-                        script.type = type;
-                        script.text = content;
+                @"async (puppeteerUtil, url, id, type, content) => {
+                      const createDeferredPromise = puppeteerUtil.createDeferredPromise;
+                      const promise = createDeferredPromise();
+                      const script = document.createElement('script');
+                      script.type = type;
+                      script.text = content;
+                      if (url) {
+                        script.src = url;
+                        script.addEventListener(
+                          'load',
+                          () => {
+                            return promise.resolve();
+                          },
+                          {once: true}
+                        );
                         script.addEventListener(
                           'error',
                           event => {
-                            reject(new Error(event.message ?? 'Could not load script'));
+                            promise.reject(
+                              new Error(event.message ?? 'Could not load script')
+                            );
                           },
                           {once: true}
                         );
-                        if (id) {
-                          script.id = id;
-                        }
-                        if (url) {
-                          script.src = url;
-                          script.addEventListener(
-                            'load',
-                            () => {
-                              resolve(script);
-                            },
-                            {once: true}
-                          );
-                          document.head.appendChild(script);
-                        } else {
-                          document.head.appendChild(script);
-                          resolve(script);
-                        }
-                      });
+                      } else {
+                        promise.resolve();
+                      }
+                      if (id) {
+                        script.id = id;
+                      }
+                      document.head.appendChild(script);
+                      await promise;
+                      return script;
                     }",
-                new { url = options.Url, id = options.Id, type, content }).ConfigureAwait(false);
+                new LazyArg(async context => await context.GetPuppeteerUtilAsync().ConfigureAwait(false)),
+                options.Url,
+                options.Id,
+                options.Type,
+                content).ConfigureAwait(false);
 
             return (await MainRealm.TransferHandleAsync(handle).ConfigureAwait(false)) as IElementHandle;
         }