Merge branch 'trunk' into feat-14045/nodejs-env-var-driver-location

Author: diemol

common/repositories.bzl

@@ -165,8 +165,8 @@ js_library(
 
     http_archive(
         name = "linux_edgedriver",
-        url = "https://msedgedriver.azureedge.net/137.0.3296.83/edgedriver_linux64.zip",
-        sha256 = "141cd4cd42b7642dec1f215e0b1a0c1dae05f573218cb8ef18b876efa14f152a",
+        url = "https://msedgedriver.azureedge.net/137.0.3296.93/edgedriver_linux64.zip",
+        sha256 = "417bdfafbe8358e2b040b86b0e255344e0d200bd7087a9d85171abc9fc0c29c3",
         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.azureedge.net/137.0.3296.83/edgedriver_mac64.zip",
-        sha256 = "e361cfea041e649944a60a41ec40076be35fda8608e9011fad638ec0491a1f79",
+        url = "https://msedgedriver.azureedge.net/137.0.3296.93/edgedriver_mac64.zip",
+        sha256 = "d55e0f377ba45c1d754625b88f16493bded924b41bd624210241493b77e4fdb9",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

java/src/org/openqa/selenium/Keys.java

@@ -23,13 +23,26 @@
 
 /**
  * Representations of pressable keys that aren't text. These are stored in the Unicode PUA (Private
- * Use Area) code points, 0xE000-0xF8FF.
+ * Use Area) code points, 0xE000–0xF8FF. These values are used internally by WebDriver to simulate
+ * keyboard input where standard Unicode characters are insufficient, such as modifier and control
+ * keys.
  *
- * @see <a
- *     href="http://www.google.com.au/search?&amp;q=unicode+pua&amp;btnK=Search">http://www.google.com.au/search?&amp;q=unicode+pua&amp;btnK=Search</a>
+ * <p>The codes follow conventions partially established by the W3C WebDriver specification and the
+ * Selenium project. Some values (e.g., RIGHT_SHIFT, RIGHT_COMMAND) are used in ChromeDriver but are
+ * not currently part of the W3C spec. Others (e.g., OPTION, FN) are symbolic and reserved for
+ * possible future mapping.
+ *
+ * <p>For consistency across platforms and drivers, values should be verified before assuming native
+ * support.
+ *
+ * @see <a href="https://www.w3.org/TR/webdriver/#keyboard-actions">W3C WebDriver Keyboard
+ *     Actions</a>
+ * @see <a href="http://www.google.com.au/search?&q=unicode+pua&btnK=Search">Unicode PUA
+ *     Overview</a>
  */
 @NullMarked
 public enum Keys implements CharSequence {
+  // Basic control characters
   NULL('\uE000'),
   CANCEL('\uE001'), // ^break
   HELP('\uE002'),
@@ -99,6 +112,16 @@ public enum Keys implements CharSequence {
   META('\uE03D'),
   COMMAND(Keys.META),
 
+  // Extended macOS/ChromeDriver keys (based on observed Chrome usage)
+  RIGHT_SHIFT('\uE050'), // aligns with ChromeDriver usage
+  RIGHT_CONTROL('\uE051'),
+  RIGHT_ALT('\uE052'),
+  RIGHT_COMMAND('\uE053'),
+
+  // Symbolic macOS keys not yet standardized
+  OPTION('\uE050'), // TODO: verify Unicode value with WebDriver spec
+  FN('\uE051'), // TODO: symbolic only; confirm or remove in future
+
   ZENKAKU_HANKAKU('\uE040');
 
   private final char keyCode;
@@ -122,7 +145,6 @@ public char charAt(int index) {
     if (index == 0) {
       return keyCode;
     }
-
     return 0;
   }
 
@@ -136,7 +158,6 @@ public CharSequence subSequence(int start, int end) {
     if (start == 0 && end == 1) {
       return String.valueOf(keyCode);
     }
-
     throw new IndexOutOfBoundsException();
   }
 
@@ -147,11 +168,9 @@ public String toString() {
 
   /**
    * Simulate pressing many keys at once in a "chord". Takes a sequence of Keys.XXXX or strings;
-   * appends each of the values to a string, and adds the chord termination key (Keys.NULL) and
-   * returns the resultant string.
+   * appends each to a string, adds the chord termination key (Keys.NULL), and returns it.
    *
-   * <p>Note: When the low-level webdriver key handlers see Keys.NULL, active modifier keys
-   * (CTRL/ALT/SHIFT/etc) release via a keyup event.
+   * <p>Note: Keys.NULL signals release of modifier keys like CTRL/ALT/SHIFT via keyup events.
    *
    * @param value characters to send
    * @return String representation of the char sequence
@@ -161,35 +180,32 @@ public static String chord(CharSequence... value) {
   }
 
   /**
-   * @see #chord(CharSequence...)
+   * Overload of {@link #chord(CharSequence...)} that accepts an iterable.
+   *
    * @param value characters to send
    * @return String representation of the char sequence
    */
   public static String chord(Iterable<CharSequence> value) {
     StringBuilder builder = new StringBuilder();
-
     for (CharSequence seq : value) {
       builder.append(seq);
     }
-
     builder.append(Keys.NULL);
     return builder.toString();
   }
 
   /**
-   * Get the special key representation, {@link Keys}, of the supplied character if there is one. If
-   * there is no special key tied to this character, null will be returned.
+   * Retrieves the {@link Keys} enum constant corresponding to the given Unicode character.
    *
    * @param key unicode character code
-   * @return special key linked to the character code, or null if character is not a special key
+   * @return special key linked to the character code, or null if not found
    */
   public static @Nullable Keys getKeyFromUnicode(char key) {
     for (Keys unicodeKey : values()) {
       if (unicodeKey.charAt(0) == key) {
         return unicodeKey;
       }
     }
-
     return null;
   }
 }

java/src/org/openqa/selenium/bidi/browsingcontext/HistoryUpdated.java

@@ -0,0 +1,92 @@
+// 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.
+
+package org.openqa.selenium.bidi.browsingcontext;
+
+import static java.util.Collections.unmodifiableMap;
+
+import java.util.Map;
+import java.util.TreeMap;
+import org.openqa.selenium.json.JsonInput;
+
+public class HistoryUpdated {
+
+  private final String browsingContextId;
+
+  private final int timestamp;
+
+  private final String url;
+
+  private HistoryUpdated(String browsingContextId, int timestamp, String url) {
+    this.browsingContextId = browsingContextId;
+    this.timestamp = timestamp;
+    this.url = url;
+  }
+
+  public static HistoryUpdated fromJson(JsonInput input) {
+    String browsingContextId = null;
+    int timestamp = 0;
+    String url = null;
+
+    input.beginObject();
+    while (input.hasNext()) {
+      switch (input.nextName()) {
+        case "context":
+          browsingContextId = input.read(String.class);
+          break;
+
+        case "timestamp":
+          timestamp = input.read(int.class);
+          break;
+
+        case "url":
+          url = input.read(String.class);
+          break;
+
+        default:
+          input.skipValue();
+          break;
+      }
+    }
+
+    input.endObject();
+
+    return new HistoryUpdated(browsingContextId, timestamp, url);
+  }
+
+  public String getBrowsingContextId() {
+    return browsingContextId;
+  }
+
+  public int getTimestamp() {
+    return timestamp;
+  }
+
+  public String getUrl() {
+    return url;
+  }
+
+  private Map<String, Object> toJson() {
+    Map<String, Object> toReturn = new TreeMap<>();
+
+    toReturn.put("browsingContextId", this.getBrowsingContextId());
+    toReturn.put("timestamp", this.getTimestamp());
+    toReturn.put("url", this.getUrl());
+
+    return unmodifiableMap(toReturn);
+  }
+}

java/src/org/openqa/selenium/bidi/module/BrowsingContextInspector.java

@@ -29,6 +29,7 @@
 import org.openqa.selenium.bidi.Event;
 import org.openqa.selenium.bidi.HasBiDi;
 import org.openqa.selenium.bidi.browsingcontext.BrowsingContextInfo;
+import org.openqa.selenium.bidi.browsingcontext.HistoryUpdated;
 import org.openqa.selenium.bidi.browsingcontext.NavigationInfo;
 import org.openqa.selenium.bidi.browsingcontext.UserPromptClosed;
 import org.openqa.selenium.bidi.browsingcontext.UserPromptOpened;
@@ -88,6 +89,16 @@ public class BrowsingContextInspector implements AutoCloseable {
             }
           });
 
+  private final Event<HistoryUpdated> historyUpdated =
+      new Event<>(
+          "browsingContext.historyUpdated",
+          params -> {
+            try (StringReader reader = new StringReader(JSON.toJson(params));
+                JsonInput input = JSON.newInput(reader)) {
+              return input.read(HistoryUpdated.class);
+            }
+          });
+
   public BrowsingContextInspector(WebDriver driver) {
     this(new HashSet<>(), driver);
   }
@@ -172,6 +183,14 @@ public void onUserPromptOpened(Consumer<UserPromptOpened> consumer) {
     }
   }
 
+  public void onHistoryUpdated(Consumer<HistoryUpdated> consumer) {
+    if (browsingContextIds.isEmpty()) {
+      this.bidi.addListener(historyUpdated, consumer);
+    } else {
+      this.bidi.addListener(browsingContextIds, historyUpdated, consumer);
+    }
+  }
+
   private void addNavigationEventListener(String name, Consumer<NavigationInfo> consumer) {
     Event<NavigationInfo> navigationEvent = new Event<>(name, navigationInfoMapper);
 
@@ -190,6 +209,7 @@ public void close() {
     this.bidi.clearListener(browsingContextDestroyed);
     this.bidi.clearListener(userPromptOpened);
     this.bidi.clearListener(userPromptClosed);
+    this.bidi.clearListener(historyUpdated);
 
     navigationEventSet.forEach(this.bidi::clearListener);
   }

java/src/org/openqa/selenium/remote/CommandPayload.java

@@ -25,7 +25,6 @@ public class CommandPayload {
   private final Map<String, ?> parameters;
 
   public CommandPayload(String name, Map<String, ?> parameters) {
-
     this.name = name;
     this.parameters = parameters;
   }

rb/lib/selenium/webdriver/common/proxy.rb

@@ -77,6 +77,7 @@ def ==(other)
       alias eql? ==
 
       def ftp=(value)
+        WebDriver.logger.deprecate('FTP proxy support', nil, id: :ftp_proxy)
         self.type = :manual
         @ftp = value
       end