KTOR-5540 Fix darwin ws pong message (#3747)

* KTOR-5540 Fix darwin ws pong message * Update ktor-client/ktor-client-darwin/darwin/test/DarwinEngineTest.kt Co-authored-by: Vitor Hugo Schwaab <vitor@schwaab.dev> --------- Co-authored-by: Rustam <rxsinukov@gmail.com> Co-authored-by: Vitor Hugo Schwaab <vitor@schwaab.dev>
ktorio · Sep 11, 2023 · 375b0d3 · 375b0d3
1 parent 17a5386
commit 375b0d3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/ktor-client/ktor-client-darwin/darwin/src/io/ktor/client/engine/darwin/DarwinUtils.kt b/ktor-client/ktor-client-darwin/darwin/src/io/ktor/client/engine/darwin/DarwinUtils.kt
@@ -15,7 +15,13 @@ import kotlinx.coroutines.*
 import platform.Foundation.*
 import platform.posix.*
 
-@OptIn(DelicateCoroutinesApi::class, UnsafeNumber::class, InternalAPI::class, ExperimentalForeignApi::class)
+@OptIn(
+    DelicateCoroutinesApi::class,
+    UnsafeNumber::class,
+    InternalAPI::class,
+    ExperimentalForeignApi::class,
+    BetaInteropApi::class
+)
 internal suspend fun OutgoingContent.toDataOrStream(): Any? {
     if (this is OutgoingContent.ByteArrayContent) return bytes().toNSData()
     if (this is OutgoingContent.NoContent) return null

diff --git a/...-client-darwin/darwin/src/io/ktor/client/engine/darwin/internal/DarwinWebsocketSession.kt b/...-client-darwin/darwin/src/io/ktor/client/engine/darwin/internal/DarwinWebsocketSession.kt
@@ -116,12 +116,13 @@ internal class DarwinWebsocketSession(
                 }
 
                 FrameType.PING -> {
+                    val payload = frame.readBytes()
                     task.sendPingWithPongReceiveHandler { error ->
                         if (error != null) {
                             cancel("Error receiving pong", DarwinHttpRequestException(error))
                             return@sendPingWithPongReceiveHandler
                         }
-                        _incoming.trySend(Frame.Pong(ByteReadPacket.Empty))
+                        _incoming.trySend(Frame.Pong(payload))
                     }
                 }
 
@@ -167,6 +168,7 @@ internal class DarwinWebsocketSession(
         socketJob.completeExceptionally(exception)
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     fun didClose(
         code: NSURLSessionWebSocketCloseCode,
         reason: NSData?,

diff --git a/ktor-client/ktor-client-darwin/darwin/test/DarwinEngineTest.kt b/ktor-client/ktor-client-darwin/darwin/test/DarwinEngineTest.kt
@@ -6,6 +6,7 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.client.tests.utils.*
 import io.ktor.http.*
+import io.ktor.test.dispatcher.*
 import io.ktor.websocket.*
 import kotlinx.cinterop.*
 import kotlinx.coroutines.*
@@ -231,6 +232,25 @@ class DarwinEngineTest {
         session.close()
     }
 
+
+    @Test
+    fun testWebSocketPingInterval() = testSuspend {
+        val client = HttpClient(Darwin) {
+            install(WebSockets) {
+                pingInterval = 1000
+            }
+        }
+
+        assertFailsWith<TimeoutCancellationException> {
+            client.webSocket("$TEST_WEBSOCKET_SERVER/websockets/echo") {
+                withTimeout(5000) {
+                    for (frame in incoming) {
+                    }
+                }
+            }
+        }
+    }
+
     private fun stringToNSUrlString(value: String): String {
         return Url(value).toNSUrl().absoluteString!!
     }