ping/pong handshake after subscription attempt

a8t3r · a8t3r · commit 4f43cb8a82a2 · 2025-06-09T22:40:44.000+03:00
diff --git a/kobby-generator-kotlin/src/main/kotlin/io/github/ermadmi78/kobby/generator/kotlin/ktor.kt b/kobby-generator-kotlin/src/main/kotlin/io/github/ermadmi78/kobby/generator/kotlin/ktor.kt
@@ -683,6 +683,14 @@ private fun TypeSpecBuilder.buildExecuteSubscriptionImplFun(schema: KobbySchema,
         }
         addStatement("")
 
+        buildSendMessage(layout, WS_CLIENT_MESSAGE_PING)
+        addStatement(
+            "$receiveMessage(${ktor.compositePropertySocket})·?:·throw·%T(%P, $request)",
+            graphql.subscriptionExceptionClass,
+            "Subscription timeout expired"
+        )
+        addStatement("")
+
         val returnClass: ClassName = if (adapter.extendedApi) {
             dto.graphql.subscriptionResultClass
         } else {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/adapter_extended_api/expected/io/github/ermadmi78/kobby/testcases/adapter_extended_api/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/adapter_extended_api/expected/io/github/ermadmi78/kobby/testcases/adapter_extended_api/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt
@@ -225,6 +225,10 @@ public open class CountryCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CountryClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CountryClientMessagePing())
+    receiveMessage(socket) ?: throw CountrySubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CountryReceiver<CountrySubscriptionResult> {
         override suspend fun receive(): CountrySubscriptionResult {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/adapter_throw_exception/expected/io/github/ermadmi78/kobby/testcases/adapter_throw_exception/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/adapter_throw_exception/expected/io/github/ermadmi78/kobby/testcases/adapter_throw_exception/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt
@@ -183,6 +183,10 @@ public open class CountryCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CountryClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CountryClientMessagePing())
+    receiveMessage(socket) ?: throw CountrySubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CountryReceiver<CountrySubscriptionResult> {
         override suspend fun receive(): CountrySubscriptionResult {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/cinema/expected/io/github/ermadmi78/kobby/testcases/cinema/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/cinema/expected/io/github/ermadmi78/kobby/testcases/cinema/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt
@@ -218,6 +218,10 @@ public open class CinemaCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CinemaClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CinemaClientMessagePing())
+    receiveMessage(socket) ?: throw CinemaSubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CinemaReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/cinema_infix/expected/io/github/ermadmi78/kobby/testcases/cinema/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/cinema_infix/expected/io/github/ermadmi78/kobby/testcases/cinema/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt
@@ -218,6 +218,10 @@ public open class CinemaCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CinemaClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CinemaClientMessagePing())
+    receiveMessage(socket) ?: throw CinemaSubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CinemaReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/customize_jackson/expected/io/github/ermadmi78/kobby/testcases/customize_jackson/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/customize_jackson/expected/io/github/ermadmi78/kobby/testcases/customize_jackson/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt
@@ -218,6 +218,10 @@ public open class CountryCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CountryClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CountryClientMessagePing())
+    receiveMessage(socket) ?: throw CountrySubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CountryReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/disable_builder/expected/io/github/ermadmi78/kobby/testcases/disable_builder/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/disable_builder/expected/io/github/ermadmi78/kobby/testcases/disable_builder/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt
@@ -218,6 +218,10 @@ public open class CountryCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CountryClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CountryClientMessagePing())
+    receiveMessage(socket) ?: throw CountrySubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CountryReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/disable_jackson/expected/io/github/ermadmi78/kobby/testcases/disable_jackson/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/disable_jackson/expected/io/github/ermadmi78/kobby/testcases/disable_jackson/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt
@@ -218,6 +218,10 @@ public open class CountryCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CountryClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CountryClientMessagePing())
+    receiveMessage(socket) ?: throw CountrySubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CountryReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/disable_ktor_receive_timeout/expected/io/github/ermadmi78/kobby/testcases/disable_ktor_receive_timeout/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/disable_ktor_receive_timeout/expected/io/github/ermadmi78/kobby/testcases/disable_ktor_receive_timeout/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt
@@ -218,6 +218,10 @@ public open class CountryCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CountryClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CountryClientMessagePing())
+    receiveMessage(socket) ?: throw CountrySubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CountryReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/disable_ktor_simple/expected/io/github/ermadmi78/kobby/testcases/disable_ktor_simple/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/disable_ktor_simple/expected/io/github/ermadmi78/kobby/testcases/disable_ktor_simple/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt
@@ -218,6 +218,10 @@ public open class CountryCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CountryClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CountryClientMessagePing())
+    receiveMessage(socket) ?: throw CountrySubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CountryReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/enable_commit/expected/io/github/ermadmi78/kobby/testcases/enable_commit/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/enable_commit/expected/io/github/ermadmi78/kobby/testcases/enable_commit/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt
@@ -218,6 +218,10 @@ public open class CinemaCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CinemaClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CinemaClientMessagePing())
+    receiveMessage(socket) ?: throw CinemaSubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CinemaReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/ktor_receive_timeout/expected/io/github/ermadmi78/kobby/testcases/ktor_receive_timeout/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/ktor_receive_timeout/expected/io/github/ermadmi78/kobby/testcases/ktor_receive_timeout/kobby/kotlin/adapter/ktor/CountryCompositeKtorAdapter.kt.txt
@@ -218,6 +218,10 @@ public open class CountryCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CountryClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CountryClientMessagePing())
+    receiveMessage(socket) ?: throw CountrySubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CountryReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/multifile/expected/io/github/ermadmi78/kobby/testcases/multifile/kobby/kotlin/adapter/ktor/GraphqlCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/multifile/expected/io/github/ermadmi78/kobby/testcases/multifile/kobby/kotlin/adapter/ktor/GraphqlCompositeKtorAdapter.kt.txt
@@ -218,6 +218,10 @@ public open class GraphqlCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, GraphqlClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, GraphqlClientMessagePing())
+    receiveMessage(socket) ?: throw GraphqlSubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : GraphqlReceiver<MySubscriptionDto> {
         override suspend fun receive(): MySubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/mutable_cinema_jackson/expected/io/github/ermadmi78/kobby/testcases/mutable_cinema_jackson/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/mutable_cinema_jackson/expected/io/github/ermadmi78/kobby/testcases/mutable_cinema_jackson/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt
@@ -218,6 +218,10 @@ public open class CinemaCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CinemaClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CinemaClientMessagePing())
+    receiveMessage(socket) ?: throw CinemaSubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CinemaReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/mutable_cinema_serialization/expected/io/github/ermadmi78/kobby/testcases/mutable_cinema_serialization/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/mutable_cinema_serialization/expected/io/github/ermadmi78/kobby/testcases/mutable_cinema_serialization/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt
@@ -220,6 +220,10 @@ public open class CinemaCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CinemaClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CinemaClientMessagePing())
+    receiveMessage(socket) ?: throw CinemaSubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CinemaReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/rename/expected/my/root/kto/KtoPrCompositeKtoPo.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/rename/expected/my/root/kto/KtoPrCompositeKtoPo.kt.txt
@@ -220,6 +220,10 @@ public open class KtoPrCompositeKtoPo(
     val subscriptionId = idGenerator()
     sendMessage(socket, GPrefClientMessageSubscribeGPost(subscriptionId, request))
 
+    sendMessage(socket, GPrefClientMessagePingGPost())
+    receiveMessage(socket) ?: throw GPrefSubscriptionExceptionGPost("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : PrefCtxReceiverPostCtx<DPrefMySubscriptionDPost> {
         override suspend fun receive(): DPrefMySubscriptionDPost {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/schema_truncation/expected/io/github/ermadmi78/kobby/testcases/schema_truncation/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/schema_truncation/expected/io/github/ermadmi78/kobby/testcases/schema_truncation/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt
@@ -220,6 +220,10 @@ public open class CinemaCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CinemaClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CinemaClientMessagePing())
+    receiveMessage(socket) ?: throw CinemaSubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CinemaReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/serialization_disable/expected/io/github/ermadmi78/kobby/testcases/serialization_disable/kobby/kotlin/adapter/ktor/SimpleCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/serialization_disable/expected/io/github/ermadmi78/kobby/testcases/serialization_disable/kobby/kotlin/adapter/ktor/SimpleCompositeKtorAdapter.kt.txt
@@ -218,6 +218,10 @@ public open class SimpleCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, SimpleClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, SimpleClientMessagePing())
+    receiveMessage(socket) ?: throw SimpleSubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : SimpleReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
diff --git a/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/serialization_main/expected/io/github/ermadmi78/kobby/testcases/serialization_main/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt b/kobby-gradle-plugin/src/test/resources/io/github/ermadmi78/kobby/testcases/serialization_main/expected/io/github/ermadmi78/kobby/testcases/serialization_main/kobby/kotlin/adapter/ktor/CinemaCompositeKtorAdapter.kt.txt
@@ -220,6 +220,10 @@ public open class CinemaCompositeKtorAdapter(
     val subscriptionId = idGenerator()
     sendMessage(socket, CinemaClientMessageSubscribe(subscriptionId, request))
 
+    sendMessage(socket, CinemaClientMessagePing())
+    receiveMessage(socket) ?: throw CinemaSubscriptionException("""Subscription timeout expired""",
+        request)
+
     try {
       block.invoke(object : CinemaReceiver<SubscriptionDto> {
         override suspend fun receive(): SubscriptionDto {
