Script

Author: nvborisenko

dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs

@@ -166,12 +166,15 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(Script.AddPreloadScriptCommand))]
 [JsonSerializable(typeof(Script.AddPreloadScriptResult))]
 [JsonSerializable(typeof(Script.DisownCommand))]
+[JsonSerializable(typeof(Script.DisownResult))]
 [JsonSerializable(typeof(Script.CallFunctionCommand))]
+[JsonSerializable(typeof(Script.CallFunctionResult))]
 [JsonSerializable(typeof(Script.EvaluateCommand))]
 [JsonSerializable(typeof(Script.EvaluateResult))]
 [JsonSerializable(typeof(Script.GetRealmsCommand))]
 [JsonSerializable(typeof(Script.GetRealmsResult))]
 [JsonSerializable(typeof(Script.RemovePreloadScriptCommand))]
+[JsonSerializable(typeof(Script.RemovePreloadScriptResult))]
 
 [JsonSerializable(typeof(Script.MessageEventArgs))]
 [JsonSerializable(typeof(Script.RealmDestroyedEventArgs))]

dotnet/src/webdriver/BiDi/Script/CallFunctionCommand.cs

@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Script;
 
 internal sealed class CallFunctionCommand(CallFunctionParameters @params)
-    : Command<CallFunctionParameters, EvaluateResult>(@params, "script.callFunction");
+    : Command<CallFunctionParameters, CallFunctionResult>(@params, "script.callFunction");
 
 internal sealed record CallFunctionParameters(string FunctionDeclaration, bool AwaitPromise, Target Target, IEnumerable<LocalValue>? Arguments, ResultOwnership? ResultOwnership, SerializationOptions? SerializationOptions, LocalValue? This, bool? UserActivation) : Parameters;
 
@@ -39,3 +39,5 @@ public sealed class CallFunctionOptions : CommandOptions
 
     public bool? UserActivation { get; set; }
 }
+
+public sealed record CallFunctionResult : EvaluateResult;

dotnet/src/webdriver/BiDi/Script/DisownCommand.cs

@@ -23,6 +23,10 @@
 namespace OpenQA.Selenium.BiDi.Script;
 
 internal sealed class DisownCommand(DisownParameters @params)
-    : Command<DisownParameters, EmptyResult>(@params, "script.disown");
+    : Command<DisownParameters, DisownResult>(@params, "script.disown");
 
 internal sealed record DisownParameters(IEnumerable<Handle> Handles, Target Target) : Parameters;
+
+public sealed class DisownOptions : CommandOptions;
+
+public sealed record DisownResult : EmptyResult;

dotnet/src/webdriver/BiDi/Script/RemovePreloadScriptCommand.cs

@@ -22,8 +22,10 @@
 namespace OpenQA.Selenium.BiDi.Script;
 
 internal sealed class RemovePreloadScriptCommand(RemovePreloadScriptParameters @params)
-    : Command<RemovePreloadScriptParameters, EmptyResult>(@params, "script.removePreloadScript");
+    : Command<RemovePreloadScriptParameters, RemovePreloadScriptResult>(@params, "script.removePreloadScript");
 
 internal sealed record RemovePreloadScriptParameters(PreloadScript Script) : Parameters;
 
 public sealed class RemovePreloadScriptOptions : CommandOptions;
+
+public sealed record RemovePreloadScriptResult : EmptyResult;

dotnet/src/webdriver/BiDi/Script/ScriptModule.cs

@@ -19,6 +19,7 @@
 
 using OpenQA.Selenium.BiDi.Communication;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.BiDi.Script;
@@ -39,11 +40,11 @@ public async Task<EvaluateResult> EvaluateAsync(string expression, bool awaitPro
         return result.AsSuccessResult().ConvertTo<TResult>();
     }
 
-    public async Task<EvaluateResult> CallFunctionAsync(string functionDeclaration, bool awaitPromise, Target target, CallFunctionOptions? options = null)
+    public async Task<CallFunctionResult> CallFunctionAsync(string functionDeclaration, bool awaitPromise, Target target, CallFunctionOptions? options = null)
     {
         var @params = new CallFunctionParameters(functionDeclaration, awaitPromise, target, options?.Arguments, options?.ResultOwnership, options?.SerializationOptions, options?.This, options?.UserActivation);
 
-        return await Broker.ExecuteCommandAsync(new CallFunctionCommand(@params), options, JsonContext.CallFunctionCommand, JsonContext.EvaluateResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new CallFunctionCommand(@params), options, JsonContext.CallFunctionCommand, JsonContext.CallFunctionResult).ConfigureAwait(false);
     }
 
     public async Task<TResult?> CallFunctionAsync<TResult>(string functionDeclaration, bool awaitPromise, Target target, CallFunctionOptions? options = null)
@@ -53,6 +54,13 @@ public async Task<EvaluateResult> CallFunctionAsync(string functionDeclaration,
         return result.AsSuccessResult().ConvertTo<TResult>();
     }
 
+    public async Task<DisownResult> DisownAsync(IEnumerable<Handle> handles, Target target, DisownOptions? options = null)
+    {
+        var @params = new DisownParameters(handles, target);
+
+        return await Broker.ExecuteCommandAsync(new DisownCommand(@params), options, JsonContext.DisownCommand, JsonContext.DisownResult).ConfigureAwait(false);
+    }
+
     public async Task<GetRealmsResult> GetRealmsAsync(GetRealmsOptions? options = null)
     {
         var @params = new GetRealmsParameters(options?.Context, options?.Type);
@@ -69,11 +77,11 @@ public async Task<PreloadScript> AddPreloadScriptAsync(string functionDeclaratio
         return result.Script;
     }
 
-    public async Task<EmptyResult> RemovePreloadScriptAsync(PreloadScript script, RemovePreloadScriptOptions? options = null)
+    public async Task<RemovePreloadScriptResult> RemovePreloadScriptAsync(PreloadScript script, RemovePreloadScriptOptions? options = null)
     {
         var @params = new RemovePreloadScriptParameters(script);
 
-        return await Broker.ExecuteCommandAsync(new RemovePreloadScriptCommand(@params), options, JsonContext.RemovePreloadScriptCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new RemovePreloadScriptCommand(@params), options, JsonContext.RemovePreloadScriptCommand, JsonContext.RemovePreloadScriptResult).ConfigureAwait(false);
     }
 
     public async Task<Subscription> OnMessageAsync(Func<MessageEventArgs, Task> handler, SubscriptionOptions? options = null)