Bump ktor and add a test for gzip content encoding in JS (#4554)

* fix JS mockserver with binary content

* add a gzip test

* bump ktor

* revert uneeded changes

* remove debug

Author: martinbonnin

build-logic/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt

@@ -24,7 +24,7 @@ kotlinx-datetime = "0.4.0"
 kotlinx-serialization-json = "1.4.1"
 ksp = "1.7.21-1.0.8"
 ksp-duringideasync = "1.6.10-1.0.2"
-ktor = "2.0.2"
+ktor = "2.1.3"
 moshi = "1.12.0"
 moshix = "0.14.1"
 okhttp = "4.9.3"

gradle/libraries.toml

@@ -13,6 +13,7 @@ import okio.Timeout
 import okio.buffer
 import org.khronos.webgl.Int8Array
 import org.khronos.webgl.Uint8Array
+import org.khronos.webgl.set
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
@@ -76,9 +77,19 @@ actual class MockServer actual constructor(override val mockServerHandler: MockS
 
   private class SocketSink(private val socket: Socket) : Sink {
     override fun write(source: okio.Buffer, byteCount: Long) {
-      socket.write(source.readUtf8(byteCount))
+      socket.write(source.toUint8Array(byteCount))
     }
 
+    private fun okio.Buffer.toUint8Array(count: Long): Uint8Array {
+      val array = Uint8Array(count.toInt())
+
+      for (i in 0.until(count.toInt())) {
+        array.set(i.toInt(), get(i.toLong()))
+      }
+
+      skip(count)
+      return array
+    }
     override fun close() {}
     override fun flush() {}
     override fun timeout() = Timeout.NONE

libraries/apollo-mockserver/src/jsMain/kotlin/com/apollographql/apollo3/mockserver/MockServer.kt

@@ -0,0 +1,54 @@
+package com.apollographql.apollo3.network
+
+import com.apollographql.apollo3.mockserver.MockResponse
+import com.apollographql.apollo3.mockserver.MockServer
+import com.apollographql.apollo3.network.http.DefaultHttpEngine
+import com.apollographql.apollo3.network.http.get
+import com.apollographql.apollo3.testing.internal.runTest
+import okio.Buffer
+import okio.ByteString
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class HttpEngineTest {
+  // "Hello World" gzipped and hex encoded
+  val gzipData = """
+1f8b 0800 0000 0000 0003 f348 cdc9 c957
+08cf 2fca 4901 0056 b117 4a0b 0000 00   
+  """.replace(Regex("\\s"), "")
+
+  private fun String.toByteString(): ByteString {
+    val buffer = Buffer()
+    chunked(2).forEach {
+      buffer.writeByte(it.toInt(16))
+    }
+
+    return buffer.readByteString()
+  }
+
+  @Test
+  fun gzipTest() = runTest {
+    val mockServer = MockServer()
+
+    try {
+      mockServer.enqueue(MockResponse.Builder()
+          .addHeader("content-type", "application/text")
+          .addHeader("content-encoding", "gzip")
+          .body(gzipData.toByteString())
+          .build())
+
+      val engine = DefaultHttpEngine()
+
+      val response = engine.get(mockServer.url())
+          .execute()
+
+      val result = response.body?.readUtf8()
+      assertEquals("Hello World", result)
+
+    } catch (e: Exception) {
+      e.printStackTrace()
+    }
+
+    mockServer.stop()
+  }
+}

libraries/apollo-runtime/src/commonTest/kotlin/com/apollographql/apollo3/network/HttpEngineTest.kt

@@ -1,9 +1,12 @@
 package com.apollographql.apollo3.testing
 
+import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.annotations.ApolloDeprecatedSince
 import com.apollographql.apollo3.annotations.ApolloDeprecatedSince.Version.v3_4_1
 import com.apollographql.apollo3.annotations.ApolloExperimental
+import com.apollographql.apollo3.mockserver.MockServer
 import kotlinx.coroutines.CoroutineScope
+import okio.use
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
@@ -18,3 +21,26 @@ fun runTest(
 ) {
   com.apollographql.apollo3.testing.internal.runTest(skipDelays = false, context, before, after, block)
 }
+
+@ApolloExperimental
+class MockServerTest(val mockServer: MockServer, val apolloClient: ApolloClient, val scope: CoroutineScope)
+
+/**
+ * A convenience function that makes sure the MockServer and ApolloClient are properly closed at the end of the test
+ */
+@ApolloExperimental
+fun mockServerTest(block: suspend MockServerTest.() -> Unit) = com.apollographql.apollo3.testing.internal.runTest(true) {
+  val mockServer = MockServer()
+
+  val apolloClient = ApolloClient.Builder()
+      .serverUrl(mockServer.url())
+      .build()
+
+  try {
+    apolloClient.use {
+      MockServerTest(mockServer, it, this).block()
+    }
+  } finally {
+    mockServer.stop()
+  }
+}

libraries/apollo-testing-support/src/commonMain/kotlin/com/apollographql/apollo3/testing/runTest.kt

@@ -0,0 +1,33 @@
+import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
+
+plugins {
+  id("org.jetbrains.kotlin.multiplatform")
+  id("apollo.test")
+  id("com.apollographql.apollo3")
+}
+
+apolloTest {
+  mpp {}
+}
+
+kotlin {
+  sourceSets {
+    val commonMain by getting {
+      dependencies {
+        implementation(golatac.lib("apollo.runtime"))
+      }
+    }
+
+    val commonTest by getting {
+      dependencies {
+        implementation(golatac.lib("apollo.testingsupport"))
+      }
+    }
+  }
+}
+
+apollo {
+  service("service") {
+    packageName.set("gzip")
+  }
+}

tests/gzip/build.gradle.kts

@@ -0,0 +1,3 @@
+query GetString {
+  longString
+}

tests/gzip/lorem.txt.gz

@@ -0,0 +1,3 @@
+type Query {
+  longString: String!
+}

tests/gzip/src/commonMain/graphql/operations.graphql

@@ -0,0 +1,34 @@
+package test
+
+import com.apollographql.apollo3.mockserver.MockResponse
+import com.apollographql.apollo3.testing.HostFileSystem
+import com.apollographql.apollo3.testing.mockServerTest
+import com.apollographql.apollo3.testing.testsPath
+import gzip.GetStringQuery
+import okio.Path.Companion.toPath
+import okio.buffer
+import okio.use
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class GzipTest {
+  @Test
+  fun gzipTest() = mockServerTest {
+    // This contains a valid response encoded with gzip
+    val byteString = HostFileSystem.openReadOnly(testsPath.toPath().resolve("gzip/lorem.txt.gz")).use {
+      it.source().buffer().readByteString()
+    }
+
+    mockServer.enqueue(
+        MockResponse.Builder()
+            .addHeader("content-type", "application/text")
+            .addHeader("content-encoding", "gzip")
+            .body(byteString)
+            .build()
+    )
+    val response = apolloClient.query(GetStringQuery()).execute()
+    assertEquals(2225, response.data?.longString?.length)
+    assertTrue(response.data?.longString?.startsWith("Lorem ipsum dolor sit amet") == true)
+  }
+}