From f89e5042635c0ca08823a4e0602de5414cbf8c43 Mon Sep 17 00:00:00 2001 From: Martin Kouba Date: Fri, 7 Jun 2024 09:22:17 +0200 Subject: [PATCH] WebSockets Next: cancel returned Multi if the connection is closed - fixes #41025 --- .../errors/MultiClosedConnectionTest.java | 96 +++++++++++++++++++ .../next/runtime/WebSocketEndpointBase.java | 42 ++++---- 2 files changed, 112 insertions(+), 26 deletions(-) create mode 100644 extensions/websockets-next/deployment/src/test/java/io/quarkus/websockets/next/test/errors/MultiClosedConnectionTest.java diff --git a/extensions/websockets-next/deployment/src/test/java/io/quarkus/websockets/next/test/errors/MultiClosedConnectionTest.java b/extensions/websockets-next/deployment/src/test/java/io/quarkus/websockets/next/test/errors/MultiClosedConnectionTest.java new file mode 100644 index 0000000000000..d85c84b42bed5 --- /dev/null +++ b/extensions/websockets-next/deployment/src/test/java/io/quarkus/websockets/next/test/errors/MultiClosedConnectionTest.java @@ -0,0 +1,96 @@ +package io.quarkus.websockets.next.test.errors; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.net.URI; +import java.time.Duration; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import jakarta.inject.Inject; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.logging.Log; +import io.quarkus.test.QuarkusUnitTest; +import io.quarkus.test.common.http.TestHTTPResource; +import io.quarkus.websockets.next.OnError; +import io.quarkus.websockets.next.OnOpen; +import io.quarkus.websockets.next.WebSocket; +import io.quarkus.websockets.next.WebSocketConnection; +import io.quarkus.websockets.next.test.utils.WSClient; +import io.smallrye.mutiny.Multi; +import io.vertx.core.Vertx; +import io.vertx.core.impl.NoStackTraceThrowable; + +public class MultiClosedConnectionTest { + + @RegisterExtension + public static final QuarkusUnitTest test = new QuarkusUnitTest() + .withApplicationRoot(root -> { + root.addClasses(Echo.class, WSClient.class); + }); + + @Inject + Vertx vertx; + + @TestHTTPResource("echo") + URI testUri; + + @Test + void testError() throws InterruptedException { + WSClient client = WSClient.create(vertx).connect(testUri); + client.waitForMessages(1); + client.close(); + assertTrue(Echo.TERMINATION_LATCH.await(5, TimeUnit.SECONDS)); + assertTrue(Echo.ERROR_LATCH.await(5, TimeUnit.SECONDS)); + // Connection is closed and the returned Multi should be cancelled + int numOfMessages = Echo.MESSAGES.size(); + Thread.sleep(600); + // No more ticks are emitted + assertEquals(numOfMessages, Echo.MESSAGES.size()); + } + + @WebSocket(path = "/echo") + public static class Echo { + + static final CountDownLatch TERMINATION_LATCH = new CountDownLatch(1); + static final CountDownLatch ERROR_LATCH = new CountDownLatch(1); + + static final List MESSAGES = new CopyOnWriteArrayList<>(); + + @OnOpen + Multi onOpen() { + return Multi.createFrom() + .ticks() + .every(Duration.ofMillis(300)) + .map(tick -> tick + "") + .invoke(s -> { + Log.infof("Next tick: %s", s); + MESSAGES.add(s); + }) + .onTermination() + .invoke(() -> { + Log.info("Terminated!"); + TERMINATION_LATCH.countDown(); + }); + } + + @OnError + void onConnectionClosedError(NoStackTraceThrowable t, WebSocketConnection conn) { + Log.info("Error callback!"); + if (conn.isClosed()) { + String message = t.getMessage(); + if (message != null && message.contains("WebSocket is closed")) { + ERROR_LATCH.countDown(); + } + } + } + + } + +} diff --git a/extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketEndpointBase.java b/extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketEndpointBase.java index 03d39284e0170..5a1874647a0e3 100644 --- a/extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketEndpointBase.java +++ b/extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketEndpointBase.java @@ -319,20 +319,16 @@ public Uni sendText(String message, boolean broadcast) { return broadcast ? connection.broadcast().sendText(message) : connection.sendText(message); } - public Uni multiText(Multi multi, Function> action) { - multi.onFailure().recoverWithMulti(t -> doOnError(t).toMulti()) + public Uni multiText(Multi multi, Function> action) { + multi + // Encode and send message + .onItem().call(action) + .onFailure().recoverWithMulti(t -> { + return doOnError(t).toMulti(); + }) .subscribe().with( - m -> { - // Encode and send message - action.apply(m) - .onFailure().recoverWithUni(this::doOnError) - .subscribe() - .with(v -> LOG.debugf("Multi >> text message: %s", connection), - t -> LOG.errorf(t, "Unable to send text message from Multi: %s", connection)); - }, - t -> { - LOG.errorf(t, "Unable to send text message from Multi: %s ", connection); - }); + m -> LOG.debugf("Multi >> text message: %s", connection), + t -> LOG.errorf(t, "Unable to send text message from Multi: %s ", connection)); return Uni.createFrom().voidItem(); } @@ -340,20 +336,14 @@ public Uni sendBinary(Buffer message, boolean broadcast) { return broadcast ? connection.broadcast().sendBinary(message) : connection.sendBinary(message); } - public Uni multiBinary(Multi multi, Function> action) { - multi.onFailure().recoverWithMulti(t -> doOnError(t).toMulti()) + public Uni multiBinary(Multi multi, Function> action) { + multi + // Encode and send message + .onItem().call(action) + .onFailure().recoverWithMulti(t -> doOnError(t).toMulti()) .subscribe().with( - m -> { - // Encode and send message - action.apply(m) - .onFailure().recoverWithUni(this::doOnError) - .subscribe() - .with(v -> LOG.debugf("Multi >> binary message: %s", connection), - t -> LOG.errorf(t, "Unable to send binary message from Multi: %s", connection)); - }, - t -> { - LOG.errorf(t, "Unable to send text message from Multi: %s ", connection); - }); + m -> LOG.debugf("Multi >> binary message: %s", connection), + t -> LOG.errorf(t, "Unable to send binary message from Multi: %s ", connection)); return Uni.createFrom().voidItem(); } }