Merge branch 'trunk' into firefox-entensions

Author: RenderMichael

MODULE.bazel

@@ -20,7 +20,7 @@ bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
 bazel_dep(name = "rules_dotnet", version = "0.16.1")
 bazel_dep(name = "rules_java", version = "7.11.1")
 bazel_dep(name = "rules_jvm_external", version = "6.6")
-bazel_dep(name = "rules_nodejs", version = "6.3.0")
+bazel_dep(name = "rules_nodejs", version = "6.3.2")
 bazel_dep(name = "rules_oci", version = "1.7.6")
 bazel_dep(name = "rules_pkg", version = "0.10.1")
 bazel_dep(name = "rules_python", version = "0.33.0")

dotnet/src/webdriver/WebDriver.cs

@@ -612,20 +612,7 @@ protected virtual async Task<Response> ExecuteAsync(string driverCommandToExecut
         {
             Command commandToExecute = new Command(SessionId, driverCommandToExecute, parameters);
 
-            Response commandResponse;
-
-            try
-            {
-                commandResponse = await this.executor.ExecuteAsync(commandToExecute).ConfigureAwait(false);
-            }
-            catch (System.Net.Http.HttpRequestException e)
-            {
-                commandResponse = new Response
-                {
-                    Status = WebDriverResult.UnknownError,
-                    Value = e
-                };
-            }
+            Response commandResponse = await this.executor.ExecuteAsync(commandToExecute).ConfigureAwait(false);
 
             if (commandResponse.Status != WebDriverResult.Success)
             {

java/src/org/openqa/selenium/grid/commands/EventBusCommand.java

@@ -26,7 +26,9 @@
 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -107,6 +109,24 @@ public Server<?> asServer(Config initialConfig) {
     EventBus bus = events.getEventBus();
 
     BaseServerOptions serverOptions = new BaseServerOptions(config);
+    List<CountDownLatch> pending = new ArrayList<>();
+
+    EventName healthCheck = new EventName("healthcheck");
+    bus.addListener(
+        new EventListener<>(
+            healthCheck,
+            Object.class,
+            obj -> {
+              synchronized (pending) {
+                // Concurrent health checks might influence each other, we can ignore this.
+                // We only want to see any event is delivered to tell the bus is healthy.
+                pending.removeIf(
+                    latch -> {
+                      latch.countDown();
+                      return true;
+                    });
+              }
+            }));
 
     return new NettyServer(
         serverOptions,
@@ -117,10 +137,10 @@ public Server<?> asServer(Config initialConfig) {
                         req -> {
                           CountDownLatch latch = new CountDownLatch(1);
 
-                          EventName healthCheck = new EventName("healthcheck");
-                          bus.addListener(
-                              new EventListener<>(
-                                  healthCheck, Object.class, obj -> latch.countDown()));
+                          synchronized (pending) {
+                            pending.add(latch);
+                          }
+
                           bus.fire(new Event(healthCheck, "ping"));
 
                           try {

java/src/org/openqa/selenium/grid/log/LoggingOptions.java

@@ -98,6 +98,9 @@ public void configureLogging() {
       return;
     }
 
+    // Keep current loggers if they are being manually set
+    if (LogManager.getLogManager().getProperty("handlers") != null) return;
+
     // Remove all handlers from existing loggers
     LogManager logManager = LogManager.getLogManager();
     Enumeration<String> names = logManager.getLoggerNames();

javascript/grid-ui/package.json

@@ -22,7 +22,7 @@
     "pretty-ms": "9.1.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-modal": "3.16.1",
+    "react-modal": "3.16.3",
     "react-router-dom": "6.27.0",
     "source-map-explorer": "2.5.3"
   },
@@ -51,7 +51,7 @@
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "14.3.1",
     "@testing-library/user-event": "14.5.2",
-    "esbuild": "0.24.0",
+    "esbuild": "0.24.2",
     "ts-standard": "12.0.2",
     "typescript": "5.6.3"
   },

javascript/private/gen_file.py

@@ -19,7 +19,8 @@
 """
 
 def get_atom_name(name):
-    # TODO: Convert camelCase and snake_case to BIG_SNAKE_CASE
+    # We had a todo here to convert camelCase and snake_case to BIG_SNAKE_CASE, but this code
+    # will be removed when BiDi is the default, so we're not going to bother with that.
     name = os.path.basename(name)
     return name.upper()
 
@@ -76,7 +77,7 @@ def generate_header(file_name, out, js_map, just_declare, utf8):
     define_guard = "WEBDRIVER_%s" % os.path.basename(file_name.upper()).replace(".", "_")
     include_stddef = "" if utf8 else "\n#include <stddef.h>  // For wchar_t."
     out.write("""%s
-    
+
 /* AUTO GENERATED - DO NOT EDIT BY HAND */
 #ifndef %s
 #define %s
@@ -85,12 +86,12 @@ def generate_header(file_name, out, js_map, just_declare, utf8):
 
 namespace webdriver {
 namespace atoms {
-    
+
 """ % (_copyright, define_guard, define_guard, include_stddef))
 
     string_type = "std::string" if utf8 else "std::wstring"
     char_type = "char" if utf8 else "wchar_t"
-    
+
     for (name, file) in js_map.items():
         if just_declare:
             out.write("extern const %s* const %s[];\n" % (char_type, name.upper()))
@@ -109,7 +110,7 @@ def generate_header(file_name, out, js_map, just_declare, utf8):
 
 }  // namespace atoms
 }  // namespace webdriver
-    
+
 #endif  // %s
 """ % (string_type, char_type, string_type, define_guard))
 
@@ -123,7 +124,7 @@ def generate_cc_source(out, js_map, utf8):
 
 namespace webdriver {
 namespace atoms {
-    
+
 """ % _copyright)
 
     for (name, file) in js_map.items():