expose subprotocol to client connections

Author: emattheis

extensions/websockets-next/deployment/src/test/java/io/quarkus/websockets/next/test/subprotocol/SubprotocolFromConnectionTest.java

@@ -0,0 +1,79 @@
+package io.quarkus.websockets.next.test.subprotocol;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.net.URI;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import jakarta.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.websockets.next.OnOpen;
+import io.quarkus.websockets.next.WebSocket;
+import io.quarkus.websockets.next.WebSocketClient;
+import io.quarkus.websockets.next.WebSocketClientConnection;
+import io.quarkus.websockets.next.WebSocketConnection;
+import io.quarkus.websockets.next.WebSocketConnector;
+
+public class SubprotocolFromConnectionTest {
+
+    @RegisterExtension
+    public static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .withApplicationRoot(root -> {
+                root.addClasses(Endpoint.class, Client.class);
+            }).overrideConfigKey("quarkus.websockets-next.server.supported-subprotocols", "oak,larch");
+
+    @TestHTTPResource("/")
+    URI endpointUri;
+
+    @Inject
+    WebSocketConnector<Client> connector;
+
+    @Test
+    void testSubprotocolFromConnection() throws InterruptedException, ExecutionException {
+        var connection = connector.baseUri(endpointUri).addSubprotocol("larch").connectAndAwait();
+        assertEquals("larch", connection.subprotocol());
+        assertTrue(Client.OPEN_LATCH.await(5, TimeUnit.SECONDS));
+        assertEquals("larch", Client.SUB_PROTOCOL.get());
+        assertTrue(Endpoint.OPEN_LATCH.await(5, TimeUnit.SECONDS));
+        assertEquals("larch", Endpoint.SUB_PROTOCOL.get());
+        connection.closeAndAwait();
+    }
+
+    @WebSocket(path = "/endpoint")
+    public static class Endpoint {
+
+        static final CountDownLatch OPEN_LATCH = new CountDownLatch(1);
+
+        static final AtomicReference<String> SUB_PROTOCOL = new AtomicReference<>();
+
+        @OnOpen
+        void connected(WebSocketConnection connection) {
+            SUB_PROTOCOL.set(connection.subprotocol());
+            OPEN_LATCH.countDown();
+        }
+    }
+
+    @WebSocketClient(path = "/endpoint")
+    public static class Client {
+
+        static final CountDownLatch OPEN_LATCH = new CountDownLatch(1);
+
+        static final AtomicReference<String> SUB_PROTOCOL = new AtomicReference<>();
+
+        @OnOpen
+        void connected(WebSocketClientConnection connection) {
+            SUB_PROTOCOL.set(connection.subprotocol());
+            OPEN_LATCH.countDown();
+        }
+    }
+
+}

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/Connection.java

@@ -97,6 +97,12 @@ default void closeAndAwait(CloseReason reason) {
      */
     HandshakeRequest handshakeRequest();
 
+    /**
+     *
+     * @return the subprotocol selected by the handshake
+     */
+    String subprotocol();
+
     /**
      *
      * @return the time when this connection was created

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/WebSocketConnection.java

@@ -36,12 +36,6 @@ public interface WebSocketConnection extends Connection {
      */
     Set<WebSocketConnection> getOpenConnections();
 
-    /**
-     *
-     * @return the subprotocol selected by the handshake
-     */
-    String subprotocol();
-
     /**
      * Makes it possible to send messages to all clients connected to the same WebSocket endpoint.
      *

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketConnectionBase.java

@@ -155,6 +155,11 @@ public HandshakeRequest handshakeRequest() {
         return handshakeRequest;
     }
 
+    @Override
+    public String subprotocol() {
+        return webSocket().subProtocol();
+    }
+
     @Override
     public Instant creationTime() {
         return creationTime;

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketConnectionImpl.java

@@ -65,11 +65,6 @@ public Set<WebSocketConnection> getOpenConnections() {
                 .collect(Collectors.toUnmodifiableSet());
     }
 
-    @Override
-    public String subprotocol() {
-        return webSocket.subProtocol();
-    }
-
     @Override
     public String toString() {
         return "WebSocket connection [endpointId=" + endpointId + ", path=" + webSocket.path() + ", id=" + identifier + "]";