Merge branch 'trunk' into network

Author: shbenzer

MODULE.bazel

@@ -15,7 +15,7 @@ bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "protobuf", version = "29.2", dev_dependency = True, repo_name = "com_google_protobuf")
 
 # Required for rules_rust to import the crates properly
-bazel_dep(name = "rules_cc", version = "0.1.0", dev_dependency = True)
+bazel_dep(name = "rules_cc", version = "0.1.1", dev_dependency = True)
 
 bazel_dep(name = "rules_dotnet", version = "0.17.5")
 bazel_dep(name = "rules_java", version = "8.7.1")

dotnet/src/webdriver/BiDi/WebDriver.Extensions.cs

@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 using System;
 using System.Threading.Tasks;
 
@@ -44,13 +43,4 @@ public static async Task<BiDi> AsBiDiAsync(this IWebDriver webDriver)
 
         return bidi;
     }
-
-    public static async Task<BrowsingContext> AsBiDiContextAsync(this IWebDriver webDriver)
-    {
-        var bidi = await webDriver.AsBiDiAsync();
-
-        var currentBrowsingContext = new BrowsingContext(bidi, webDriver.CurrentWindowHandle);
-
-        return currentBrowsingContext;
-    }
 }

dotnet/src/webdriver/Remote/HttpCommandExecutor.cs

@@ -221,19 +221,39 @@ protected virtual void OnSendingRemoteHttpRequest(SendingRemoteHttpRequestEventA
             this.SendingRemoteHttpRequest?.Invoke(this, eventArgs);
         }
 
-        private HttpClient CreateHttpClient()
+        /// <summary>
+        /// Creates an instance of <see cref="HttpClientHandler"/> as underlying handler,
+        /// used by <see cref="CreateHttpClient"/>. Invoked only once when required.
+        /// </summary>
+        /// <returns>An instance of <see cref="HttpClientHandler"/>.</returns>
+        protected virtual HttpClientHandler CreateHttpClientHandler()
         {
-            HttpClientHandler httpClientHandler = new HttpClientHandler();
+            HttpClientHandler httpClientHandler = new();
+
             string userInfo = this.remoteServerUri.UserInfo;
-            if (!string.IsNullOrEmpty(userInfo) && userInfo.Contains(":"))
+
+            if (!string.IsNullOrEmpty(userInfo) && userInfo.Contains(':'))
             {
-                string[] userInfoComponents = this.remoteServerUri.UserInfo.Split(new char[] { ':' }, 2);
+                string[] userInfoComponents = this.remoteServerUri.UserInfo.Split([':'], 2);
                 httpClientHandler.Credentials = new NetworkCredential(userInfoComponents[0], userInfoComponents[1]);
                 httpClientHandler.PreAuthenticate = true;
             }
 
             httpClientHandler.Proxy = this.Proxy;
 
+            return httpClientHandler;
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="HttpClient"/> used by making all HTTP calls to remote end.
+        /// Invoked only once when required.
+        /// </summary>
+        /// <returns>An instance of <see cref="HttpClient"/>.</returns>
+        protected virtual HttpClient CreateHttpClient()
+        {
+            var httpClientHandler = CreateHttpClientHandler()
+                ?? throw new InvalidOperationException($"{nameof(CreateHttpClientHandler)} method returned null");
+
             HttpMessageHandler handler = httpClientHandler;
 
             if (_logger.IsEnabled(LogEventLevel.Trace))
@@ -242,15 +262,18 @@ private HttpClient CreateHttpClient()
             }
 
             var client = new HttpClient(handler);
+
             client.DefaultRequestHeaders.UserAgent.ParseAdd(this.UserAgent);
             client.DefaultRequestHeaders.Accept.ParseAdd(RequestAcceptHeader);
             client.DefaultRequestHeaders.ExpectContinue = false;
+
             if (!this.IsKeepAliveEnabled)
             {
                 client.DefaultRequestHeaders.Connection.ParseAdd("close");
             }
 
             client.Timeout = this.serverResponseTimeout;
+
             return client;
         }
 

dotnet/test/common/BiDi/BiDiFixture.cs

@@ -44,8 +44,9 @@ public async Task BiDiSetUp()
 
         driver = EnvironmentManager.Instance.CreateDriverInstance(options);
 
-        context = await driver.AsBiDiContextAsync();
-        bidi = context.BiDi;
+        bidi = await driver.AsBiDiAsync();
+
+        context = (await bidi.BrowsingContext.GetTreeAsync())[0].Context;
     }
 
     [TearDown]

java/spotbugs-excludes.xml

@@ -139,12 +139,7 @@
     <Class name="org.openqa.selenium.json.JsonInputIterator"/>
     <Bug pattern="IT_NO_SUCH_ELEMENT"/>
   </Match>
-
-  <Match>
-    <Class name="org.openqa.selenium.mobile.NetworkConnection$ConnectionType"/>
-    <Bug pattern="IM_BAD_CHECK_FOR_ODD"/>
-  </Match>
-
+  
   <Match>
     <Class name="org.openqa.selenium.net.NetworkUtils"/>
     <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>

java/src/org/openqa/selenium/BUILD.bazel

@@ -17,7 +17,6 @@ java_export(
         "internal/*.java",
         "interactions/**/*.java",
         "logging/**/*.java",
-        "mobile/*.java",
         "net/*.java",
         "virtualauthenticator/*.java",
         "print/*.java",

java/src/org/openqa/selenium/chromium/ChromiumDriver.java

@@ -61,7 +61,6 @@
 import org.openqa.selenium.json.TypeToken;
 import org.openqa.selenium.logging.EventType;
 import org.openqa.selenium.logging.HasLogEvents;
-import org.openqa.selenium.mobile.NetworkConnection;
 import org.openqa.selenium.remote.CommandExecutor;
 import org.openqa.selenium.remote.FileDetector;
 import org.openqa.selenium.remote.RemoteWebDriver;
@@ -70,7 +69,6 @@
 import org.openqa.selenium.remote.http.ClientConfig;
 import org.openqa.selenium.remote.http.ConnectionFailedException;
 import org.openqa.selenium.remote.http.HttpClient;
-import org.openqa.selenium.remote.mobile.RemoteNetworkConnection;
 
 /**
  * A {@link WebDriver} implementation that controls a Chromium browser running on the local machine.
@@ -87,7 +85,6 @@ public class ChromiumDriver extends RemoteWebDriver
         HasNetworkConditions,
         HasPermissions,
         LocationContext,
-        NetworkConnection,
         WebStorage {
 
   public static final Predicate<String> IS_CHROMIUM_BROWSER =
@@ -97,7 +94,6 @@ public class ChromiumDriver extends RemoteWebDriver
   private final Capabilities capabilities;
   private final RemoteLocationContext locationContext;
   private final RemoteWebStorage webStorage;
-  private final RemoteNetworkConnection networkConnection;
   private final HasNetworkConditions networkConditions;
   private final HasPermissions permissions;
   private final HasLaunchApp launch;
@@ -115,7 +111,6 @@ protected ChromiumDriver(
     locationContext = new RemoteLocationContext(getExecuteMethod());
     webStorage = new RemoteWebStorage(getExecuteMethod());
     permissions = new AddHasPermissions().getImplementation(getCapabilities(), getExecuteMethod());
-    networkConnection = new RemoteNetworkConnection(getExecuteMethod());
     networkConditions =
         new AddHasNetworkConditions().getImplementation(getCapabilities(), getExecuteMethod());
     launch = new AddHasLaunchApp().getImplementation(getCapabilities(), getExecuteMethod());
@@ -317,19 +312,6 @@ public void setLocation(Location location) {
     locationContext.setLocation(location);
   }
 
-  @Override
-  @Deprecated
-  public ConnectionType getNetworkConnection() {
-    return networkConnection.getNetworkConnection();
-  }
-
-  @Override
-  @Deprecated
-  public ConnectionType setNetworkConnection(ConnectionType type) {
-    Require.nonNull("Network Connection Type", type);
-    return networkConnection.setNetworkConnection(type);
-  }
-
   @Override
   public void launchApp(String id) {
     Require.nonNull("Launch App ID", id);

java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java

@@ -89,14 +89,6 @@ public static Optional<URI> getReportedUri(Capabilities caps) {
       case "msedge":
         key = "ms:edgeOptions";
         break;
-      case "firefox":
-        key = "moz:debuggerAddress";
-        if (!caps.is("webSocketUrl")) {
-          LOG.warning(
-              "CDP support for Firefox is deprecated and will be removed in future versions. "
-                  + "Please switch to WebDriver BiDi.");
-        }
-        break;
       default:
         return Optional.empty();
     }

java/src/org/openqa/selenium/firefox/BUILD.bazel

@@ -13,7 +13,6 @@ java_export(
     deps = [
         "//java:auto-service",
         "//java/src/org/openqa/selenium/bidi",
-        "//java/src/org/openqa/selenium/devtools/v85",
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/manager",
         "//java/src/org/openqa/selenium/remote",