Merge remote-tracking branch 'upstream/trunk' into dotnet-bidi-getdata

nvborisenko · nvborisenko · commit eeae5a82a511 · 2025-08-19T00:02:49.000+03:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -14,12 +14,10 @@ the defect. If the issue can't be reproduced it will be closed.
 Please provide [concise reproducible test cases](http://sscce.org/)
 and describe what results you are seeing and what results you expect.
 
-Issues shouldn't be used for support. Please address questions to the
-[`selenium-users@` mailing list](https://groups.google.com/forum/#!forum/selenium-users).
+Issues shouldn't be used for support. To raise a bug, please go to the
+[Issue tracker](https://github.com/SeleniumHQ/selenium/issues).
 Discussion of high level project ideas or non-technical topics should
-move to the
-[`selenium-developers@` mailing list](https://groups.google.com/forum/#!forum/selenium-developers)
-instead.
+move to the Selenium [Slack channel](https://inviter.co/seleniumhq).
 
 We also need help with triaging
 [issues that needs investigation](https://github.com/SeleniumHQ/selenium/labels/I-needs%20investigation).
@@ -34,7 +32,6 @@ with details describing what feature(s) you'd like added or changed.
 
 If you'd like a hand at trying to implement the feature yourself, please refer to the [Code Contributions](#code-contributions) section of the document.
 
-
 ## Documentation
 
 Selenium is a big software project and documentation is key to
diff --git a/common/repositories.bzl b/common/repositories.bzl
@@ -165,8 +165,8 @@ js_library(
 
     http_archive(
         name = "linux_edgedriver",
-        url = "https://msedgedriver.microsoft.com/139.0.3405.86/edgedriver_linux64.zip",
-        sha256 = "49ce29de50f9ac418a3a2416708a5563215b8412b27d3e505f3c859fc6ffba12",
+        url = "https://msedgedriver.microsoft.com/139.0.3405.102/edgedriver_linux64.zip",
+        sha256 = "e092178901c011ccfddc0556193742a01f206d71b5bb1a12cc1ba7a243262fc2",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
 
     http_archive(
         name = "mac_edgedriver",
-        url = "https://msedgedriver.microsoft.com/139.0.3405.86/edgedriver_mac64.zip",
-        sha256 = "b6c8244dfb7b8a223d3ac8fd569533f0a307eadaca2b8cbc884ce7f69294682e",
+        url = "https://msedgedriver.microsoft.com/139.0.3405.102/edgedriver_mac64.zip",
+        sha256 = "98aa637081061ea610c1f70be09fdea6b5f5b3a46c94a87ca291e2285bad1328",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
diff --git a/dotnet/src/webdriver/BiDi/BrowsingContext/CaptureScreenshotCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/CaptureScreenshotCommand.cs
@@ -18,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using System;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
@@ -56,9 +57,9 @@ public sealed record BoxClipRectangle(double X, double Y, double Width, double H
 
 public sealed record ElementClipRectangle(Script.ISharedReference Element) : ClipRectangle;
 
-public sealed record CaptureScreenshotResult(string Data) : EmptyResult
+public sealed record CaptureScreenshotResult(ReadOnlyMemory<byte> Data) : EmptyResult
 {
     public static implicit operator byte[](CaptureScreenshotResult captureScreenshotResult) => captureScreenshotResult.ToByteArray();
 
-    public byte[] ToByteArray() => System.Convert.FromBase64String(Data);
+    public byte[] ToByteArray() => Data.ToArray();
 }
diff --git a/dotnet/src/webdriver/BiDi/BrowsingContext/PrintCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/PrintCommand.cs
@@ -112,7 +112,7 @@ public static implicit operator PrintPageRange(Range range)
 #endif
 }
 
-public sealed record PrintResult(string Data) : EmptyResult
+public sealed record PrintResult(ReadOnlyMemory<byte> Data) : EmptyResult
 {
-    public byte[] ToByteArray() => Convert.FromBase64String(Data);
+    public byte[] ToByteArray() => Data.ToArray();
 }
diff --git a/dotnet/src/webdriver/BiDi/Communication/Broker.cs b/dotnet/src/webdriver/BiDi/Communication/Broker.cs
@@ -85,6 +85,7 @@ internal Broker(BiDi bidi, Uri url)
                 new RealmConverter(_bidi),
                 new RealmTypeConverter(),
                 new DateTimeOffsetConverter(),
+                new TimeSpanConverter(),
                 new PrintPageRangeConverter(),
                 new InputOriginConverter(),
                 new WebExtensionConverter(_bidi),
diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/DateTimeOffsetConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/DateTimeOffsetConverter.cs
@@ -27,16 +27,7 @@ internal class DateTimeOffsetConverter : JsonConverter<DateTimeOffset>
 {
     public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        // Workaround: it should be Int64, chrome uses double for `expiry` like "expiry":1737379944.308351
-
-        if (reader.TryGetInt64(out long unixTime) is false)
-        {
-            var doubleValue = reader.GetDouble();
-
-            unixTime = Convert.ToInt64(doubleValue);
-        }
-
-        return DateTimeOffset.FromUnixTimeMilliseconds(unixTime);
+        return DateTimeOffset.FromUnixTimeMilliseconds(reader.GetInt64());
     }
 
     public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/TimeSpanConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/TimeSpanConverter.cs
@@ -0,0 +1,44 @@
+// <copyright file="TimeSpanConverter.cs" company="Selenium Committers">
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+// </copyright>
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace OpenQA.Selenium.BiDi.Communication.Json.Converters;
+
+internal class TimeSpanConverter : JsonConverter<TimeSpan>
+{
+    public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TryGetInt64(out long milliseconds) is false)
+        {
+            var doubleValue = reader.GetDouble();
+
+            milliseconds = Convert.ToInt64(doubleValue);
+        }
+
+        return TimeSpan.FromMilliseconds(milliseconds);
+    }
+
+    public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options)
+    {
+        writer.WriteNumberValue(value.TotalMilliseconds);
+    }
+}
diff --git a/dotnet/src/webdriver/BiDi/Network/BytesValue.cs b/dotnet/src/webdriver/BiDi/Network/BytesValue.cs
@@ -28,19 +28,9 @@ namespace OpenQA.Selenium.BiDi.Network;
 public abstract record BytesValue
 {
     public static implicit operator BytesValue(string value) => new StringBytesValue(value);
-    public static implicit operator BytesValue(byte[] value) => new Base64BytesValue(Convert.ToBase64String(value));
-
-    public static explicit operator string(BytesValue value)
-    {
-        if (value is StringBytesValue stringBytesValue)
-        {
-            return stringBytesValue.Value;
-        }
-
-        throw new InvalidCastException($"Cannot cast '{value.GetType()}' to '{typeof(string)}'.");
-    }
+    public static implicit operator BytesValue(byte[] value) => new Base64BytesValue(value);
 }
 
 public sealed record StringBytesValue(string Value) : BytesValue;
 
-public sealed record Base64BytesValue(string Value) : BytesValue;
+public sealed record Base64BytesValue(ReadOnlyMemory<byte> Value) : BytesValue;
diff --git a/dotnet/src/webdriver/BiDi/Network/Cookie.cs b/dotnet/src/webdriver/BiDi/Network/Cookie.cs
@@ -18,15 +18,10 @@
 // </copyright>
 
 using System;
-using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Network;
 
-public sealed record Cookie(string Name, BytesValue Value, string Domain, string Path, long Size, bool HttpOnly, bool Secure, SameSite SameSite)
-{
-    [JsonInclude]
-    public DateTimeOffset? Expiry { get; internal set; }
-}
+public sealed record Cookie(string Name, BytesValue Value, string Domain, string Path, long Size, bool HttpOnly, bool Secure, SameSite SameSite, TimeSpan? Expiry);
 
 public enum SameSite
 {
diff --git a/dotnet/src/webdriver/BiDi/WebExtension/InstallCommand.cs b/dotnet/src/webdriver/BiDi/WebExtension/InstallCommand.cs
@@ -18,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using System;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.WebExtension;
@@ -35,7 +36,7 @@ public abstract record ExtensionData;
 
 public sealed record ExtensionArchivePath(string Path) : ExtensionData;
 
-public sealed record ExtensionBase64Encoded(string Value) : ExtensionData;
+public sealed record ExtensionBase64Encoded(ReadOnlyMemory<byte> Value) : ExtensionData;
 
 public sealed record ExtensionPath(string Path) : ExtensionData;
 
diff --git a/dotnet/src/webdriver/Safari/SafariDriverService.cs b/dotnet/src/webdriver/Safari/SafariDriverService.cs
@@ -20,10 +20,7 @@
 using OpenQA.Selenium.Internal;
 using System;
 using System.IO;
-using System.Net;
-using System.Net.Http;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Safari;
 
@@ -34,6 +31,13 @@ public sealed class SafariDriverService : DriverService
 {
     private const string DefaultSafariDriverServiceExecutableName = "safaridriver";
 
+    /// <summary>
+    /// Enable diagnose logging.
+    /// When set to <see langword="true"/>, the <b>SafariDriver</b> will be started with the <i>--diagnose</i> flag.
+    /// Logs will be written to <i>~/Library/Logs/com.apple.WebDriver/</i>.
+    /// </summary>
+    public bool? Diagnose { get; set; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="SafariDriverService"/> class.
     /// </summary>
@@ -59,6 +63,12 @@ protected override string CommandLineArguments
         get
         {
             StringBuilder argsBuilder = new StringBuilder(base.CommandLineArguments);
+
+            if (this.Diagnose is true)
+            {
+                argsBuilder.Append(" --diagnose");
+            }
+
             return argsBuilder.ToString();
         }
     }
diff --git a/dotnet/test/common/BiDi/BrowsingContext/BrowsingContextTest.cs b/dotnet/test/common/BiDi/BrowsingContext/BrowsingContextTest.cs
@@ -250,7 +250,7 @@ public async Task CanCaptureScreenshot()
         var screenshot = await context.CaptureScreenshotAsync();
 
         Assert.That(screenshot, Is.Not.Null);
-        Assert.That(screenshot.Data, Is.Not.Empty);
+        Assert.That(screenshot.Data.Length, Is.Not.Zero);
     }
 
     [Test]
@@ -263,7 +263,7 @@ public async Task CanCaptureScreenshotWithParameters()
         });
 
         Assert.That(screenshot, Is.Not.Null);
-        Assert.That(screenshot.Data, Is.Not.Empty);
+        Assert.That(screenshot.Data.Length, Is.Not.Zero);
     }
 
     [Test]
@@ -276,7 +276,7 @@ public async Task CanCaptureScreenshotOfViewport()
         });
 
         Assert.That(screenshot, Is.Not.Null);
-        Assert.That(screenshot.Data, Is.Not.Empty);
+        Assert.That(screenshot.Data.Length, Is.Not.Zero);
     }
 
     [Test]
@@ -292,7 +292,7 @@ public async Task CanCaptureScreenshotOfElement()
         });
 
         Assert.That(screenshot, Is.Not.Null);
-        Assert.That(screenshot.Data, Is.Not.Empty);
+        Assert.That(screenshot.Data.Length, Is.Not.Zero);
     }
 
     [Test]
@@ -313,6 +313,6 @@ public async Task CanPrintPage()
         var pdf = await context.PrintAsync();
 
         Assert.That(pdf, Is.Not.Null);
-        Assert.That(pdf.Data, Is.Not.Empty);
+        Assert.That(pdf.Data.Length, Is.Not.Zero);
     }
 }
diff --git a/dotnet/test/common/BiDi/WebExtension/WebExtensionTest.cs b/dotnet/test/common/BiDi/WebExtension/WebExtensionTest.cs
@@ -64,9 +64,9 @@ public async Task CanInstallBase64WebExtension()
     {
         var path = LocateRelativePath("common/extensions/webextensions-selenium-example.zip");
 
-        string base64 = Convert.ToBase64String(File.ReadAllBytes(path));
+        var bytes = File.ReadAllBytes(path);
 
-        var result = await bidi.WebExtension.InstallAsync(new ExtensionBase64Encoded(base64));
+        var result = await bidi.WebExtension.InstallAsync(new ExtensionBase64Encoded(bytes));
 
         Assert.That(result, Is.Not.Null);
         Assert.That(result.Extension, Is.Not.Null);
diff --git a/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java b/java/src/org/openqa/selenium/remote/HttpCommandExecutor.java
@@ -47,8 +47,8 @@ public class HttpCommandExecutor implements CommandExecutor, NeedsLocalLogs {
 
   private final URL remoteServer;
   public final HttpClient client;
-  private final HttpClient.Factory httpClientFactory;
-  private final Map<String, CommandInfo> additionalCommands;
+  protected final HttpClient.Factory httpClientFactory;
+  protected final Map<String, CommandInfo> additionalCommands;
   protected CommandCodec<HttpRequest> commandCodec;
   protected ResponseCodec<HttpResponse> responseCodec;
 
diff --git a/rb/lib/selenium/webdriver/bidi.rb b/rb/lib/selenium/webdriver/bidi.rb
@@ -23,6 +23,7 @@ class BiDi
       autoload :Session, 'selenium/webdriver/bidi/session'
       autoload :LogInspector, 'selenium/webdriver/bidi/log_inspector'
       autoload :LogHandler, 'selenium/webdriver/bidi/log_handler'
+      autoload :Browser, 'selenium/webdriver/bidi/browser'
       autoload :BrowsingContext, 'selenium/webdriver/bidi/browsing_context'
       autoload :Struct, 'selenium/webdriver/bidi/struct'
       autoload :Network, 'selenium/webdriver/bidi/network'
diff --git a/rb/lib/selenium/webdriver/bidi/browser.rb b/rb/lib/selenium/webdriver/bidi/browser.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Selenium
+  module WebDriver
+    class BiDi
+      class Browser
+        def initialize(bidi)
+          @bidi = bidi
+        end
+
+        def create_user_context
+          @bidi.send_cmd('browser.createUserContext')
+        end
+
+        def user_contexts
+          @bidi.send_cmd('browser.getUserContexts')
+        end
+
+        def remove_user_context(user_context)
+          @bidi.send_cmd('browser.removeUserContext', userContext: user_context)
+        end
+      end
+    end # BiDi
+  end # WebDriver
+end # Selenium
diff --git a/rb/lib/selenium/webdriver/common/manager.rb b/rb/lib/selenium/webdriver/common/manager.rb
@@ -79,6 +79,8 @@ def cookie_named(name)
       #
 
       def delete_cookie(name)
+        raise ArgumentError, 'Cookie name cannot be null or empty' if name.nil? || name.to_s.strip.empty?
+
         @bridge.delete_cookie name
       end
 
diff --git a/rb/sig/lib/selenium/webdriver/bidi/browser.rbs b/rb/sig/lib/selenium/webdriver/bidi/browser.rbs
@@ -0,0 +1,17 @@
+module Selenium
+  module WebDriver
+    class BiDi
+      class Browser
+        @bidi: BiDi
+
+        def initialize: (BiDi bidi) -> void
+
+        def create_user_context: () -> Hash[String, String]
+
+        def user_contexts: () -> Array[Hash[String, String]]
+
+        def remove_user_context: (String user_context) -> Hash[nil, nil]
+      end
+    end
+  end
+end
diff --git a/rb/spec/integration/selenium/webdriver/bidi/browser_spec.rb b/rb/spec/integration/selenium/webdriver/bidi/browser_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`// </copyright>`
`19`	`19`
`20`	`20`	`using OpenQA.Selenium.BiDi.Communication;`
	`21`	`+using System;`
`21`	`22`	`using System.Text.Json.Serialization;`
`22`	`23`
`23`	`24`	`namespace OpenQA.Selenium.BiDi.BrowsingContext;`
`@@ -56,9 +57,9 @@ public sealed record BoxClipRectangle(double X, double Y, double Width, double H`
`56`	`57`
`57`	`58`	`public sealed record ElementClipRectangle(Script.ISharedReference Element) : ClipRectangle;`
`58`	`59`
`59`		`-public sealed record CaptureScreenshotResult(string Data) : EmptyResult`
	`60`	`+public sealed record CaptureScreenshotResult(ReadOnlyMemory<byte> Data) : EmptyResult`
`60`	`61`	`{`
`61`	`62`	`public static implicit operator byte[](CaptureScreenshotResult captureScreenshotResult) => captureScreenshotResult.ToByteArray();`
`62`	`63`
`63`		`- public byte[] ToByteArray() => System.Convert.FromBase64String(Data);`
	`64`	`+ public byte[] ToByteArray() => Data.ToArray();`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public static implicit operator PrintPageRange(Range range)`
`112`	`112`	`#endif`
`113`	`113`	`}`
`114`	`114`
`115`		`-public sealed record PrintResult(string Data) : EmptyResult`
	`115`	`+public sealed record PrintResult(ReadOnlyMemory<byte> Data) : EmptyResult`
`116`	`116`	`{`
`117`		`- public byte[] ToByteArray() => Convert.FromBase64String(Data);`
	`117`	`+ public byte[] ToByteArray() => Data.ToArray();`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,16 +27,7 @@ internal class DateTimeOffsetConverter : JsonConverter<DateTimeOffset>`
`27`	`27`	`{`
`28`	`28`	`public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
`29`	`29`	`{`
`30`		- // Workaround: it should be Int64, chrome uses double for `expiry` like "expiry":1737379944.308351
`31`		`-`
`32`		`- if (reader.TryGetInt64(out long unixTime) is false)`
`33`		`- {`
`34`		`- var doubleValue = reader.GetDouble();`
`35`		`-`
`36`		`- unixTime = Convert.ToInt64(doubleValue);`
`37`		`- }`
`38`		`-`
`39`		`- return DateTimeOffset.FromUnixTimeMilliseconds(unixTime);`
	`30`	`+ return DateTimeOffset.FromUnixTimeMilliseconds(reader.GetInt64());`
`40`	`31`	`}`
`41`	`32`
`42`	`33`	`public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)`