Merge branch 'trunk' into bidi-chromium

diemol · web-flow · commit 2de324bba287 · 2023-05-29T15:27:08.000+02:00
diff --git a/java/src/org/openqa/selenium/bidi/BiDiProvider.java b/java/src/org/openqa/selenium/bidi/BiDiProvider.java
@@ -55,8 +55,14 @@ public HasBiDi getImplementation(Capabilities caps, ExecuteMethod executeMethod)
   }
 
   private Optional<URI> getBiDiUrl(Capabilities caps) {
-    Optional<String> webSocketUrl =
-        Optional.ofNullable((String) caps.getCapability("webSocketUrl"));
+    Object bidiCapability;
+    if (caps.asMap().containsKey("se:bidi")) {
+      // Session is created remotely
+      bidiCapability = caps.getCapability("se:bidi");
+    } else {
+      bidiCapability = caps.getCapability("webSocketUrl");
+    }
+    Optional<String> webSocketUrl = Optional.ofNullable((String) bidiCapability);
 
     return webSocketUrl.map(
         uri -> {
diff --git a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/src/org/openqa/selenium/firefox/FirefoxDriver.java
@@ -348,6 +348,16 @@ public Optional<BiDi> maybeGetBiDi() {
     return biDi;
   }
 
+  @Override
+  public BiDi getBiDi() {
+    if (!biDiUri.isPresent()) {
+      throw new BiDiException("This version of Firefox or geckodriver does not support Bidi");
+    }
+
+    return maybeGetBiDi()
+        .orElseThrow(() -> new DevToolsException("Unable to initialize Bidi connection"));
+  }
+
   @Override
   public void quit() {
     super.quit();
diff --git a/java/src/org/openqa/selenium/grid/node/ProxyNodeWebsockets.java b/java/src/org/openqa/selenium/grid/node/ProxyNodeWebsockets.java
@@ -69,7 +69,7 @@ public Optional<Consumer<Message>> apply(String uri, Consumer<Message> downstrea
     UrlTemplate.Match bidiMatch = BIDI_TEMPLATE.match(uri);
     UrlTemplate.Match vncMatch = VNC_TEMPLATE.match(uri);
 
-    if (cdpMatch == null && vncMatch == null && fwdMatch == null) {
+    if (bidiMatch == null && cdpMatch == null && vncMatch == null && fwdMatch == null) {
       return Optional.empty();
     }
 
diff --git a/java/src/org/openqa/selenium/grid/node/local/LocalNode.java b/java/src/org/openqa/selenium/grid/node/local/LocalNode.java
@@ -495,7 +495,10 @@ public Either<WebDriverException, CreateSessionResponse> newSession(
                 desiredCapabilities);
 
         String sessionCreatedMessage = "Session created by the Node";
-        LOG.info(String.format("%s. Id: %s, Caps: %s", sessionCreatedMessage, sessionId, caps));
+        LOG.info(
+            String.format(
+                "%s. Id: %s, Caps: %s",
+                sessionCreatedMessage, sessionId, externalSession.getCapabilities()));
 
         return Either.right(
             new CreateSessionResponse(
@@ -533,6 +536,8 @@ private Capabilities setDownloadsDirectory(UUID uuid, Capabilities caps) {
               "download.prompt_for_download",
               false,
               "download.default_directory",
+              tempDir.getAbsolutePath(),
+              "savefile.default_directory",
               tempDir.getAbsolutePath());
       String optionsKey = Browser.CHROME.is(caps) ? "goog:chromeOptions" : "ms:edgeOptions";
       return appendPrefs(caps, optionsKey, map);

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public Optional<Consumer<Message>> apply(String uri, Consumer<Message> downstrea`
`69`	`69`	`UrlTemplate.Match bidiMatch = BIDI_TEMPLATE.match(uri);`
`70`	`70`	`UrlTemplate.Match vncMatch = VNC_TEMPLATE.match(uri);`
`71`	`71`
`72`		`- if (cdpMatch == null && vncMatch == null && fwdMatch == null) {`
	`72`	`+ if (bidiMatch == null && cdpMatch == null && vncMatch == null && fwdMatch == null) {`
`73`	`73`	`return Optional.empty();`
`74`	`74`	`}`
`75`	`75`