Merge branch 'trunk' into nullaway

Author: diemol

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")

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 {

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"
   },