Cleanup gql subscription session state correctly (#859)

In case a socket got disconnected, the session state of the subscriptions did not get correctly cleaned up. The active operations did get closed but not removed and thus, when the client tried to reconnect, the server incorrectly detected an active subscription for an operation and immediately terminated the subscription.
Suwayomi · Feb 2, 2024 · 8aa75be · 8aa75be
1 parent dc124fb
commit 8aa75be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...tlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt b/...tlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt
@@ -178,6 +178,7 @@ class ApolloSubscriptionProtocolHandler(
     }
 
     private fun onDisconnect(context: WsContext): Flow<SubscriptionOperationMessage> {
+        logger.debug("Session \"${context.sessionId}\" disconnected")
         sessionState.terminateSession(context, CloseStatus(1000, "Normal Closure"))
         return emptyFlow()
     }

diff --git a/.../kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionSessionState.kt b/.../kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionSessionState.kt
@@ -90,7 +90,7 @@ internal class ApolloSubscriptionSessionState {
         code: CloseStatus,
     ) {
         sessionToOperationId.remove(context.sessionId)?.forEach {
-            activeOperations[it]?.cancel()
+            removeActiveOperation(it)
         }
         cachedGraphQLContext.remove(context.sessionId)
         context.closeSession(code)