Skip to content

Handle WebSocket messages after MVC session closed #1451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DragonFSKY wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle WebSocket messages after MVC session closed #1451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...phql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,13 @@ protected void handleTextMessage(WebSocketSession session, TextMessage webSocket
}

private void handleInternal(WebSocketSession session, TextMessage webSocketMessage) throws IOException {
SessionState state = this.sessionInfoMap.get(session.getId());
if (state == null) {
return;
}
GraphQlWebSocketMessage message = decode(webSocketMessage);
String id = message.getId();
Map<String, Object> payload = message.getPayload();
SessionState state = getSessionInfo(session);
switch (message.resolvedType()) {
case SUBSCRIBE -> {
if (state.getConnectionInitPayload() == null) {
Expand Down
17 changes: 17 additions & 0 deletions ...src/test/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandlerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@

import static org.assertj.core.api.Assertions.as;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatNoException;
import static org.mockito.Mockito.mock;
import static org.springframework.graphql.server.support.GraphQlWebSocketMessageType.CONNECTION_ACK;
import static org.springframework.graphql.server.support.GraphQlWebSocketMessageType.PING;
Expand Down Expand Up @@ -273,6 +274,22 @@ public void handleConnectionClosed(WebSocketSessionInfo info, int status, Map<St
assertThat(called).isTrue();
}

@Test
void messageAfterConnectionClosed() throws Exception {
handle(this.handler, new TextMessage("{\"type\":\"connection_init\"}"));

StepVerifier.create(this.session.getOutput())
.consumeNextWith((message) -> assertMessageType(message, GraphQlWebSocketMessageType.CONNECTION_ACK))
.then(this.session::close)
.expectComplete()
.verify(TIMEOUT);

this.handler.afterConnectionClosed(this.session, CloseStatus.NORMAL);

assertThatNoException().isThrownBy(() ->
this.handler.handleTextMessage(this.session, new TextMessage("{\"type\":\"ping\"}")));
}

@Test
void connectionInitRejected() throws Exception {

Expand Down