Merge branch 'trunk' into case-insensitive-hrader-name

Author: diemol

MODULE.bazel

@@ -1,7 +1,7 @@
 module(name = "selenium")
 
 bazel_dep(name = "apple_rules_lint", version = "0.3.2")
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")
+bazel_dep(name = "aspect_bazel_lib", version = "2.7.9")
 bazel_dep(name = "aspect_rules_esbuild", version = "0.20.1")
 bazel_dep(name = "aspect_rules_js", version = "1.42.3")
 bazel_dep(name = "aspect_rules_ts", version = "2.4.2")

java/src/org/openqa/selenium/bidi/BiDi.java

@@ -62,7 +62,7 @@ public <X> long addListener(Event<X> event, Consumer<X> handler) {
     return connection.addListener(event, handler);
   }
 
-  public <X> void addListener(String browsingContextId, Event<X> event, Consumer<X> handler) {
+  public <X> long addListener(String browsingContextId, Event<X> event, Consumer<X> handler) {
     Require.nonNull("Event to listen for", event);
     Require.nonNull("Browsing context id", browsingContextId);
     Require.nonNull("Handler to call", handler);
@@ -76,7 +76,7 @@ public <X> void addListener(String browsingContextId, Event<X> event, Consumer<X
                 "events",
                 Collections.singletonList(event.getMethod()))));
 
-    connection.addListener(event, handler);
+    return connection.addListener(event, handler);
   }
 
   public <X> long addListener(Set<String> browsingContextIds, Event<X> event, Consumer<X> handler) {

java/src/org/openqa/selenium/netty/server/WebSocketUpgradeHandler.java

@@ -44,10 +44,15 @@
 import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
 import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
 import io.netty.util.AttributeKey;
+import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.openqa.selenium.internal.Require;
+import org.openqa.selenium.remote.http.CloseMessage;
 import org.openqa.selenium.remote.http.Message;
 
 // Plenty of code in this class is taken from Netty's own
@@ -56,6 +61,7 @@
 
 class WebSocketUpgradeHandler extends ChannelInboundHandlerAdapter {
 
+  private static final Logger LOG = Logger.getLogger(WebSocketUpgradeHandler.class.getName());
   private final AttributeKey<Consumer<Message>> key;
   private final BiFunction<String, Consumer<Message>, Optional<Consumer<Message>>> factory;
   private WebSocketServerHandshaker handshaker;
@@ -180,6 +186,27 @@ private void handleWebSocketFrame(ChannelHandlerContext ctx, WebSocketFrame fram
 
   @Override
   public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-    ctx.close();
+    try {
+      Consumer<Message> consumer = ctx.channel().attr(key).get();
+
+      if (consumer != null) {
+        byte[] reason = Objects.toString(cause).getBytes(UTF_8);
+
+        // the spec defines it as max 123 bytes encoded in UTF_8
+        if (reason.length > 123) {
+          reason = Arrays.copyOf(reason, 123);
+          Arrays.fill(reason, 120, 123, (byte) '.');
+        }
+
+        try {
+          consumer.accept(new CloseMessage(1011, new String(reason, UTF_8)));
+        } catch (Exception ex) {
+          LOG.log(Level.FINE, "failed to send the close message", ex);
+        }
+      }
+    } finally {
+      LOG.log(Level.FINE, "exception caught, close the context", cause);
+      ctx.close();
+    }
   }
 }