Merge remote-tracking branch 'upstream/trunk' into dotnet-logging-issue

Author: nvborisenko

.bazelrc

@@ -1,6 +1,5 @@
-import .bazelrc.remote
-try-import .bazelrc.local
-try-import .bazelrc.windows.local
+try-import %workspace%/.bazelrc.local
+try-import %workspace%/.bazelrc.windows.local
 
 # Enable bzlmod but without lockfile for a moment.
 # Lockfile is a problem to check in at the moment
@@ -103,3 +102,6 @@ test:ruby_debug --test_output=streamed --test_env=RUBY_DEBUG_FORK_MODE=parent --
 build:release --config=remote
 build:release --stamp
 build:release --remote_download_outputs=toplevel
+
+# RBE
+import %workspace%/.bazelrc.remote

.github/workflows/bazel.yml

@@ -46,6 +46,11 @@ on:
         required: false
         type: string
         default: ''
+      node-version:
+        description: Custom Node version to install
+        required: false
+        type: string
+        default: ''
       ruby-version:
         description: Custom Ruby version to use
         required: false
@@ -72,6 +77,7 @@ jobs:
       SEL_M2_PASS: ${{ secrets.SEL_M2_PASS }}
       TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
       TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
+      NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       SE_AVOID_STATS: true
     steps:
       - name: Checkout source tree
@@ -103,6 +109,11 @@ jobs:
         with:
           java-version: ${{ inputs.java-version }}
           distribution: 'temurin'
+      - name: Setup Node
+        if: inputs.node-version != ''
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ inputs.node-version }}
       - name: Setup Bazel with caching
         if: inputs.caching
         uses: bazel-contrib/[email protected]

.github/workflows/ci-javascript.yml

@@ -12,9 +12,19 @@ jobs:
       name: Build
       cache-key: javascript-build
       run: bazel build //javascript/node/selenium-webdriver:selenium-webdriver
+
+  small-tests:
+    name: Small Tests
+    needs: build
+    uses: ./.github/workflows/bazel.yml
+    with:
+      name: Small Tests
+      cache-key: javascript-small-tests
+      run: bazel test //javascript/node/selenium-webdriver:small-tests
+
   browser-tests:
     name: Browser Tests
-    needs: build
+    needs: small-tests
     uses: ./.github/workflows/bazel.yml
     strategy:
       fail-fast: false
@@ -25,7 +35,8 @@ jobs:
     with:
       name: Browser Tests  (${{ matrix.browser }})
       browser: ${{ matrix.browser }}
-      cache-key: node
-      run: |
-        export SELENIUM_BROWSER=${{ matrix.browser }}
-        bazel test --flaky_test_attempts 3 //javascript/node/selenium-webdriver:${{matrix.browser}}-browser-tests
+      cache-key: javascript-${{matrix.browser}}-browser-tests
+      run: >
+        bazel test
+        --flaky_test_attempts 3
+        //javascript/node/selenium-webdriver:${{ matrix.browser }}-browser-tests

.github/workflows/nightly.yml

@@ -20,6 +20,7 @@ on:
           - python
           - grid
           - dotnet
+          - javascript
 
 jobs:
   ruby:
@@ -89,3 +90,21 @@ jobs:
         echo build --stamp >>.bazelrc.local
         ./go java-release-zip
       nightly-release-files: build/dist/*.*
+
+  javascript:
+    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'javascript' || github.event_name == 'schedule')
+    name: DotNet
+    uses: ./.github/workflows/bazel.yml
+    with:
+      name: Nightly JavaScript Release
+      cache-key: javascript-nightly
+      node-version: '18.x'
+      run: |
+        sed -i 's|https://registry.npmjs.org/|https://npm.pkg.github.com|g' javascript/node/selenium-webdriver/package.json
+        sed -i 's|"name": "selenium-webdriver"|"name": "@seleniumhq/selenium-webdriver"|g' javascript/node/selenium-webdriver/package.json
+        echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> .npmrc
+        echo "@seleniumhq:registry=https://npm.pkg.github.com" >> .npmrc
+        echo "always-auth=true" >> .npmrc
+        ./go "node:version[nightly]"
+        ./go node:release
+    secrets: inherit

MODULE.bazel

@@ -255,6 +255,7 @@ ruby.bundle_fetch(
         "diff-lcs-1.5.1": "273223dfb40685548436d32b4733aa67351769c7dea621da7d9dd4813e63ddfe",
         "drb-2.2.1": "e9d472bf785f558b96b25358bae115646da0dbfd45107ad858b0bc0d935cb340",
         "ffi-1.16.3": "6d3242ff10c87271b0675c58d68d3f10148fabc2ad6da52a18123f06078871fb",
+        "ffi-1.16.3-java": "6f107fcd7c96f9c96f7e57db749b99502cc2f65665f7b2241d087a8f8c01d42c",
         "ffi-1.16.3-x64-mingw32": "6ec709011e3955e97033fa77907a8ab89a9150137d4c45c82c77399b909c9259",
         "fileutils-1.7.2": "36a0fb324218263e52b486ad7408e9a295378fe8edc9fd343709e523c0980631",
         "git-1.19.1": "b0a422d9f6517353c48a330d6114de4db9e0c82dbe7202964a1d9f1fbc827d70",
@@ -263,6 +264,7 @@ ruby.bundle_fetch(
         "io-console-0.7.2": "f0dccff252f877a4f60d04a4dc6b442b185ebffb4b320ab69212a92b48a7a221",
         "io-console-0.7.2-java": "73aa382f8832b116613ceaf57b8ff5bf73dfedcaf39f0aa5420e10f63a4543ed",
         "irb-1.12.0": "07634937fbb7d28d07e46da50d0aa43b4d2f7258174d08de4e32dfb57c10539d",
+        "jar-dependencies-0.4.1": "b2df2f1ecbff15334ce20ea7fdd5b8d8161faab67761ff72c7647d728e40d387",
         "json-2.7.1": "187ea312fb58420ff0c40f40af1862651d4295c8675267c6a1c353f1a0ac3265",
         "json-2.7.1-java": "bfd628c0f8357058c2cf848febfa6f140f70f94ec492693a31a0a1933038a61b",
         "language_server-protocol-3.17.0.3": "3d5c58c02f44a20d972957a9febe386d7e7468ab3900ce6bd2b563dd910c6b3f",

Rakefile

@@ -496,7 +496,7 @@ namespace :node do
   end
 
   task :'dry-run' do
-    Bazel.execute('run', ['--stamp'], '//javascript/node/selenium-webdriver:selenium-webdriver.pack')
+    Bazel.execute('run', ['--stamp'], '//javascript/node/selenium-webdriver:selenium-webdriver.publish  -- --dry-run=true')
   end
 
   desc 'Release Node npm package'
@@ -520,16 +520,43 @@ namespace :node do
 
   desc 'Update Node version'
   task :version, [:version] do |_task, arguments|
+    bump_nightly = arguments[:version] === 'nightly'
     old_version = node_version
-    new_version = updated_version(old_version, arguments[:version])
+    new_version = nil
+
+    # There are three cases we want to deal with:
+    # 1. Switching from a release build to a nightly one
+    # 2. Updating a nightly build for the next nightly build
+    # 3. Switching from nightlies to a release build.
+
+    if bump_nightly && old_version.include?('-nightly')
+      # This is the case where we are updating a nightly build to the next nightly build.
+      # This change is usually done by the CI system and never committed.
+      # The "-nightlyYmdHM" is removed to add a new timestamp.
+      new_version = old_version.gsub(/\-nightly\d+$/, '') + "-nightly#{Time.now.strftime("%Y%m%d%H%M")}"
+    elsif bump_nightly
+      # This is the case after a production release and the version number is configured
+      # to start doing nightly builds.
+      new_version = old_version + "-nightly#{Time.now.strftime("%Y%m%d%H%M")}"
+    else
+      if old_version.include?('-nightly')
+        # From a nightly build to a release build.
+        new_version = old_version.gsub(/\-nightly\d+$/, '')
+      else
+        # From a release build to a nightly build. We use npm version for this.
+        new_version = updated_version(old_version.gsub(/\-nightly\d+$/, ''), arguments[:version])
+        new_version = new_version + "-nightly#{Time.now.strftime("%Y%m%d%H%M")}"
+      end
+    end
 
     ['javascript/node/selenium-webdriver/package.json',
-     'package-lock.json'].each do |file|
+     'package-lock.json',
+     'javascript/node/selenium-webdriver/BUILD.bazel'].each do |file|
       text = File.read(file).gsub(old_version, new_version)
       File.open(file, "w") { |f| f.puts text }
     end
 
-    Rake::Task['node:changelog'].invoke
+    Rake::Task['node:changelog'].invoke unless new_version.include?('-nightly') || bump_nightly
   end
 end
 

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

@@ -165,7 +165,7 @@ public void onResponseCompleted(Consumer<ResponseDetails> consumer) {
     if (browsingContextIds.isEmpty()) {
       this.bidi.addListener(responseCompleted, consumer);
     } else {
-      this.bidi.addListener(browsingContextIds, responseStarted, consumer);
+      this.bidi.addListener(browsingContextIds, responseCompleted, consumer);
     }
   }
 

java/src/org/openqa/selenium/grid/node/relay/RelayFlags.java

@@ -84,6 +84,14 @@ public class RelayFlags implements HasRoles {
   @ConfigValue(section = RELAY_SECTION, name = "status-endpoint", example = "\"/status\"")
   private String serviceStatusEndpoint;
 
+  @Parameter(
+      names = {"--service-protocol-version"},
+      description =
+          "Enforce a specific protocol version in HttpClient when communicating with the endpoint"
+              + " service status")
+  @ConfigValue(section = RELAY_SECTION, name = "protocol-version", example = "\"HTTP/1.1\"")
+  private String serviceProtocolVersion;
+
   @Override
   public Set<Role> getRoles() {
     return Collections.singleton(NODE_ROLE);

java/src/org/openqa/selenium/grid/node/relay/RelayOptions.java

@@ -25,6 +25,7 @@
 import com.google.common.collect.Multimap;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.http.HttpClient.Version;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
@@ -103,6 +104,27 @@ public URI getServiceStatusUri() {
     }
   }
 
+  public String getServiceProtocolVersion() {
+    String rawProtocolVersion = config.get(RELAY_SECTION, "protocol-version").orElse("");
+    String protocolVersion = rawProtocolVersion;
+    if (protocolVersion.isEmpty()) {
+      return protocolVersion;
+    } else {
+      protocolVersion = normalizeProtocolVersion(protocolVersion);
+    }
+    try {
+      return Version.valueOf(protocolVersion).toString();
+    } catch (IllegalArgumentException e) {
+      LOG.info("Unsupported protocol version: " + protocolVersion);
+      throw new ConfigException("Unsupported protocol version provided: " + rawProtocolVersion, e);
+    }
+  }
+
+  private String normalizeProtocolVersion(String protocolVersion) {
+    // Support input in the form of "http/1.1" or "HTTP/1.1"
+    return protocolVersion.toUpperCase().replaceAll("/", "_").replaceAll("\\.", "_");
+  }
+
   // Method being used in SessionSlot
   @SuppressWarnings("unused")
   private boolean isServiceUp(HttpClient client) {
@@ -160,6 +182,7 @@ public Map<Capabilities, Collection<SessionFactory>> getSessionFactories(
                     sessionTimeout,
                     getServiceUri(),
                     getServiceStatusUri(),
+                    getServiceProtocolVersion(),
                     immutable));
           }
           LOG.info(String.format("Mapping %s, %d times", immutable, maxSessions));

java/src/org/openqa/selenium/grid/node/relay/RelaySessionFactory.java

@@ -76,6 +76,7 @@ public class RelaySessionFactory implements SessionFactory {
   private final Duration sessionTimeout;
   private final URL serviceUrl;
   private final URL serviceStatusUrl;
+  private final String serviceProtocolVersion;
   private final Capabilities stereotype;
 
   public RelaySessionFactory(
@@ -84,12 +85,15 @@ public RelaySessionFactory(
       Duration sessionTimeout,
       URI serviceUri,
       URI serviceStatusUri,
+      String serviceProtocolVersion,
       Capabilities stereotype) {
     this.tracer = Require.nonNull("Tracer", tracer);
     this.clientFactory = Require.nonNull("HTTP client", clientFactory);
     this.sessionTimeout = Require.nonNull("Session timeout", sessionTimeout);
     this.serviceUrl = createUrlFromUri(Require.nonNull("Service URL", serviceUri));
     this.serviceStatusUrl = createUrlFromUri(serviceStatusUri);
+    this.serviceProtocolVersion =
+        Require.nonNull("Service protocol version", serviceProtocolVersion);
     this.stereotype = ImmutableCapabilities.copyOf(Require.nonNull("Stereotype", stereotype));
   }
 
@@ -209,7 +213,12 @@ public boolean isServiceUp() {
       // If no status endpoint was configured, we assume the server is up.
       return true;
     }
-    try (HttpClient client = clientFactory.createClient(serviceStatusUrl)) {
+
+    ClientConfig clientConfig = ClientConfig.defaultConfig().baseUrl(serviceStatusUrl);
+    if (!serviceProtocolVersion.isEmpty()) {
+      clientConfig = clientConfig.version(serviceProtocolVersion);
+    }
+    try (HttpClient client = clientFactory.createClient(clientConfig)) {
       HttpResponse response =
           client.execute(new HttpRequest(HttpMethod.GET, serviceStatusUrl.toString()));
       LOG.log(Debug.getDebugLogLevel(), () -> Contents.string(response));