[cdp] Handle the case when the first window closes

This means that we need to make the remote webdriver aware of the CDP
protocol, and that makes me very sad indeed.

Author: shs96c

Rakefile

@@ -106,7 +106,6 @@ JAVA_RELEASE_TARGETS = %w[
   //java/src/org/openqa/selenium/devtools/v85:v85.publish
   //java/src/org/openqa/selenium/devtools/v93:v93.publish
   //java/src/org/openqa/selenium/devtools/v94:v94.publish
-  //java/src/org/openqa/selenium/devtools:devtools.publish
   //java/src/org/openqa/selenium/edge:edge.publish
   //java/src/org/openqa/selenium/firefox/xpi:xpi.publish
   //java/src/org/openqa/selenium/firefox:firefox.publish

java/CHANGELOG

@@ -14,6 +14,7 @@ v4.0.0-rc-2
 * Add strongly-typed methods for setting timeouts and other w3c
   capabilities on the base options class.
 * Enable live view for Dynamic Grid
+* Merged devtools maven artifact into the main remote driver
 
 v4.0.0-rc-1
 ===========

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

@@ -15,10 +15,8 @@ java_export(
         "//java:auto-service",
         "//java/src/org/openqa/selenium:core",
         "//java/src/org/openqa/selenium/chromium",
-        "//java/src/org/openqa/selenium/devtools",
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/remote",
-        "//java/src/org/openqa/selenium/remote/http",
         artifact("com.google.guava:guava"),
     ],
 )

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

@@ -11,11 +11,10 @@ java_export(
         "//visibility:public",
     ],
     exports = [
-        "//java/src/org/openqa/selenium/devtools",
+        "//java/src/org/openqa/selenium/remote",
     ],
     deps = [
         "//java:auto-service",
-        "//java/src/org/openqa/selenium/devtools",
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/remote",
         artifact("com.google.guava:guava"),

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

@@ -217,8 +217,8 @@ public Map<String, Object> executeCdpCommand(String commandName, Map<String, Obj
   }
 
   @Override
-  public DevTools getDevTools() {
-    return devTools.orElseThrow(() -> new WebDriverException("Unable to create DevTools connection"));
+  public Optional<DevTools> maybeGetDevTools() {
+    return devTools;
   }
 
   public String getCastSinks() {

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

@@ -1,7 +1,6 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
 load("//common:defs.bzl", "copy_file")
-load("//java:defs.bzl", "java_binary", "java_export", "java_library")
-load("//java:version.bzl", "SE_VERSION")
+load("//java:defs.bzl", "java_binary", "java_library")
 
 GENERATOR_SOURCES = [
     "CdpClientGenerator.java",
@@ -33,7 +32,25 @@ copy_file(
     out = "mutation-listener.js",
 )
 
-java_export(
+AUGMENTER_SRCS = [
+    "DevToolsProvider.java",
+]
+
+java_library(
+    name = "augmenter",
+    srcs = AUGMENTER_SRCS,
+    visibility = [
+        "//java/src/org/openqa/selenium/remote:__pkg__",
+    ],
+    deps = [
+        ":devtools",
+        "//java:auto-service",
+        "//java/src/org/openqa/selenium:core",
+        "//java/src/org/openqa/selenium/remote:api",
+    ],
+)
+
+java_library(
     name = "devtools",
     srcs = glob(
         [
@@ -42,18 +59,13 @@ java_export(
             "idealized/**/*.java",
             "noop/*.java",
         ],
-        exclude = PROTOTYPE_SOURCES + GENERATOR_SOURCES,
+        exclude = AUGMENTER_SRCS + GENERATOR_SOURCES + PROTOTYPE_SOURCES,
     ),
-    maven_coordinates = "org.seleniumhq.selenium:selenium-devtools:%s" % SE_VERSION,
-    opens_to = [
-        "org.openqa.selenium.json",
-    ],
-    pom_template = "//java/src/org/openqa/selenium:template-pom",
     resources = [
         ":mutation-listener",
     ],
     visibility = [
-        "//visibility:public",
+        "//java/src/org/openqa/selenium/remote:__pkg__",
     ],
     exports = [
         ":devtools-prototypes",
@@ -63,7 +75,7 @@ java_export(
         "//java:auto-service",
         "//java/src/org/openqa/selenium:core",
         "//java/src/org/openqa/selenium/json",
-        "//java/src/org/openqa/selenium/remote",
+        "//java/src/org/openqa/selenium/remote/http",
         artifact("com.google.guava:guava"),
     ],
 )

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

@@ -53,6 +53,10 @@ public Domains getDomains() {
 
   @Override
   public void close() {
+    disconnectSession();
+  }
+
+  public void disconnectSession() {
     if (cdpSession != null) {
       SessionID id = cdpSession;
       cdpSession = null;

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

@@ -47,7 +47,7 @@ public HasDevTools getImplementation(Capabilities caps, ExecuteMethod executeMet
     CdpInfo info = new CdpVersionFinder().match(version).orElseGet(NoOpCdpInfo::new);
     Optional<DevTools> devTools = SeleniumCdpConnection.create(caps).map(conn -> new DevTools(info::getDomains, conn));
 
-    return () -> devTools.orElseThrow(() -> new IllegalStateException("Unable to create connection to " + caps));
+    return () -> devTools;
   }
 
   private String getCdpUrl(Capabilities caps) {

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

@@ -17,8 +17,14 @@
 
 package org.openqa.selenium.devtools;
 
+import java.util.Optional;
+
 public interface HasDevTools {
 
-  DevTools getDevTools();
+  default DevTools getDevTools() {
+    return maybeGetDevTools().orElseThrow(() -> new DevToolsException("Unable to create DevTools connection"));
+  }
+
+  Optional<DevTools> maybeGetDevTools();
 
 }

java/src/org/openqa/selenium/devtools/idealized/target/Target.java

@@ -18,6 +18,7 @@
 package org.openqa.selenium.devtools.idealized.target;
 
 import org.openqa.selenium.devtools.Command;
+import org.openqa.selenium.devtools.Event;
 import org.openqa.selenium.devtools.idealized.target.model.SessionID;
 import org.openqa.selenium.devtools.idealized.target.model.TargetID;
 import org.openqa.selenium.devtools.idealized.target.model.TargetInfo;
@@ -37,4 +38,6 @@ public interface Target {
   Command<SessionID> attachToTarget(TargetID targetId);
 
   Command<Void> setAutoAttach();
+
+  Event<TargetID> detached();
 }