From 10ea73d1503385450db466b20355a10c32c0ad69 Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Thu, 11 Apr 2024 16:59:42 +0100 Subject: [PATCH] Handle PONG messages in WebSocket handlers See gh-534 --- .../graphql/server/webflux/GraphQlWebSocketHandler.java | 3 +++ .../graphql/server/webmvc/GraphQlWebSocketHandler.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlWebSocketHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlWebSocketHandler.java index c5afc368..8a8e868a 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlWebSocketHandler.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlWebSocketHandler.java @@ -183,6 +183,9 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { case PING -> { return Flux.just(this.codecDelegate.encode(session, GraphQlWebSocketMessage.pong(null))); } + case PONG -> { + return Flux.empty(); + } case COMPLETE -> { if (id != null) { Subscription subscription = subscriptions.remove(id); diff --git a/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandler.java index 0865291b..1f486827 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandler.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandler.java @@ -248,6 +248,8 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub ExceptionWebSocketHandlerDecorator.tryCloseWithError(session, ex, logger); } }); + case PONG -> { + } case COMPLETE -> { if (id != null) { Subscription subscription = state.getSubscriptions().remove(id);