Merge ac8bceb into dc14131

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

@@ -29,12 +29,9 @@ public class BiDi implements Closeable {
 
   private final Duration timeout = Duration.ofSeconds(30);
   private final Connection connection;
-  private final BiDiSessionStatus status;
 
   public BiDi(Connection connection) {
     this.connection = Require.nonNull("WebSocket connection", connection);
-    this.status =
-        send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
   }
 
   @Override
@@ -119,6 +116,6 @@ public void clearListeners() {
   }
 
   public BiDiSessionStatus getBidiSessionStatus() {
-    return status;
+    return send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
   }
 }

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

@@ -66,21 +66,28 @@ public class Connection implements Closeable {
             return thread;
           });
   private static final AtomicLong NEXT_ID = new AtomicLong(1L);
-  private final WebSocket socket;
+  private WebSocket socket;
   private final Map<Long, Consumer<Either<Throwable, JsonInput>>> methodCallbacks =
       new ConcurrentHashMap<>();
   private final ReadWriteLock callbacksLock = new ReentrantReadWriteLock(true);
   private final Map<Event<?>, List<Consumer<?>>> eventCallbacks = new HashMap<>();
   private final HttpClient client;
-  private final AtomicBoolean underlyingSocketClosed;
+  private final AtomicBoolean underlyingSocketClosed = new AtomicBoolean();
 
   public Connection(HttpClient client, String url) {
     Require.nonNull("HTTP client", client);
     Require.nonNull("URL to connect to", url);
 
     this.client = client;
-    socket = this.client.openSocket(new HttpRequest(GET, url), new Listener());
-    underlyingSocketClosed = new AtomicBoolean();
+    // If WebDriver close() is called, it closes the session if it is the last browsing context.
+    // It also closes the WebSocket from the remote end.
+    // If WebDriver quit() is called, it also tries to close an already closed websocket and that
+    // causes errors.
+    // Ideally, such errors should not prevent freeing up resources.
+    // This measure is needed until "session.end" from BiDi is implemented by the browsers.
+    if (!underlyingSocketClosed.get()) {
+      socket = this.client.openSocket(new HttpRequest(GET, url), new Listener());
+    }
   }
 
   private static class NamedConsumer<X> implements Consumer<X> {
@@ -230,7 +237,10 @@ public void clearListeners() {
 
   @Override
   public void close() {
-    socket.close();
+    if (!underlyingSocketClosed.get()) {
+      underlyingSocketClosed.set(true);
+      socket.close();
+    }
     client.close();
   }