merge latest changes from main

kittinunf · May 22, 2024 · 3d65b38 · 3d65b38
1 parent feaa51e
commit 3d65b38
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 54 deletions.
diff --git a/fuel/src/jsMain/kotlin/fuel/HttpResponse.kt b/fuel/src/jsMain/kotlin/fuel/HttpResponse.kt
diff --git a/fuel/src/jsMain/kotlin/fuel/HttpUrlFetcher.kt b/fuel/src/jsMain/kotlin/fuel/HttpUrlFetcher.kt
diff --git a/fuel/src/jvmMain/kotlin/fuel/JVMHttpLoader.kt b/fuel/src/jvmMain/kotlin/fuel/JVMHttpLoader.kt
@@ -1,10 +1,11 @@
 package fuel
 
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import okhttp3.Call
 import okhttp3.Request.Builder
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-import okhttp3.executeAsync
+import okhttp3.coroutines.executeAsync
 import okhttp3.internal.http.HttpMethod
 
 public class JVMHttpLoader(callFactoryLazy: Lazy<Call.Factory>) : HttpLoader {

diff --git a/fuel/src/jvmTest/kotlin/fuel/HttpLoaderBuilderTest.kt b/fuel/src/jvmTest/kotlin/fuel/HttpLoaderBuilderTest.kt
@@ -4,6 +4,7 @@ import kotlinx.coroutines.runBlocking
 import mockwebserver3.MockResponse
 import mockwebserver3.MockWebServer
 import mockwebserver3.SocketPolicy
+import okhttp3.ExperimentalOkHttpApi
 import okhttp3.OkHttpClient
 import org.junit.After
 import org.junit.Assert.assertEquals
@@ -13,6 +14,7 @@ import java.net.SocketTimeoutException
 import java.util.concurrent.TimeUnit
 import kotlin.test.assertNotNull
 
+@OptIn(ExperimentalOkHttpApi::class)
 class HttpLoaderBuilderTest {
 
     private lateinit var mockWebServer: MockWebServer
@@ -29,7 +31,7 @@ class HttpLoaderBuilderTest {
 
     @Test
     fun `default okhttp settings`() = runBlocking {
-        mockWebServer.enqueue(MockResponse().setBody("Hello World"))
+        mockWebServer.enqueue(MockResponse(body = "Hello World"))
         val response = JVMHttpLoader().get {
             url = mockWebServer.url("hello").toString()
         }.body.string()
@@ -40,7 +42,7 @@ class HttpLoaderBuilderTest {
 
     @Test
     fun `default okhttp settings with parameter`() = runBlocking {
-        mockWebServer.enqueue(MockResponse().setBody("Hello World 3"))
+        mockWebServer.enqueue(MockResponse(body = "Hello World 3"))
         val response = JVMHttpLoader().get {
             url = mockWebServer.url("hello").toString()
             parameters = listOf("foo" to "bar")
@@ -52,7 +54,7 @@ class HttpLoaderBuilderTest {
 
     @Test
     fun `default okhttp settings with headers`() = runBlocking {
-        mockWebServer.enqueue(MockResponse().setBody("Hello World"))
+        mockWebServer.enqueue(MockResponse(body = "Hello World"))
         val response = JVMHttpLoader().get {
             url = mockWebServer.url("hello").toString()
         }.headers
@@ -63,7 +65,7 @@ class HttpLoaderBuilderTest {
 
     @Test
     fun `setting connect timeouts`() = runBlocking {
-        mockWebServer.enqueue(MockResponse().setBody("Hello World 4"))
+        mockWebServer.enqueue(MockResponse(body = "Hello World 4"))
 
         val httpLoader = FuelBuilder()
             .config {
@@ -78,7 +80,7 @@ class HttpLoaderBuilderTest {
 
     @Test
     fun `setting call timeouts`() = runBlocking {
-        mockWebServer.enqueue(MockResponse().setBody("Hello World 5"))
+        mockWebServer.enqueue(MockResponse(body = "Hello World 5"))
 
         val okhttp = OkHttpClient.Builder().callTimeout(30L, TimeUnit.MILLISECONDS).build()
         val httpLoader = FuelBuilder().config(okhttp).build()
@@ -90,7 +92,7 @@ class HttpLoaderBuilderTest {
 
     @Test
     fun `no socket response`(): Unit = runBlocking {
-        mockWebServer.enqueue(MockResponse().setBody("{}").setSocketPolicy(SocketPolicy.NO_RESPONSE))
+        mockWebServer.enqueue(MockResponse(body = "{}", socketPolicy = SocketPolicy.NoResponse))
         try {
             JVMHttpLoader().get {
                 url = mockWebServer.url("socket").toString()

diff --git a/fuel/src/jvmTest/kotlin/fuel/RoutingTest.kt b/fuel/src/jvmTest/kotlin/fuel/RoutingTest.kt
@@ -9,6 +9,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 
+@OptIn(ExperimentalOkHttpApi::class)
 class RoutingTest {
 
     sealed class TestApi(private val host: String) : FuelRouting {

diff --git a/fuel/src/wasmJsMain/kotlin/fuel/HttpResponse.wasmJs.kt b/fuel/src/wasmJsMain/kotlin/fuel/HttpResponse.wasmJs.kt
@@ -5,4 +5,5 @@ import org.w3c.fetch.Response
 public actual class HttpResponse {
     public var statusCode: Short = -1
     public var response: Response? = null
+    public var headers: Map<String, String> = emptyMap()
 }
diff --git a/fuel/src/wasmJsMain/kotlin/fuel/HttpUrlFetcher.kt b/fuel/src/wasmJsMain/kotlin/fuel/HttpUrlFetcher.kt
@@ -2,6 +2,7 @@ package fuel
 
 import kotlinx.browser.window
 import kotlinx.coroutines.suspendCancellableCoroutine
+import org.w3c.fetch.Headers
 import org.w3c.fetch.RequestInit
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
@@ -14,7 +15,7 @@ internal class HttpUrlFetcher {
 
         val requestInit = obj<RequestInit> {}
         requestInit.method = method
-        requestInit.headers = request.headers?.toJsReference()
+        requestInit.headers = request.headers.toJsReference()
         requestInit.body = body?.toJsString()
         return suspendCancellableCoroutine { continuation ->
             window.fetch(urlString, requestInit)
@@ -23,6 +24,7 @@ internal class HttpUrlFetcher {
                         continuation.resume(HttpResponse().apply {
                             statusCode = it.status
                             response = it
+                            headers = it.headers.mapToFuel()
                         })
                         null
                     } else {
@@ -36,4 +38,15 @@ internal class HttpUrlFetcher {
                 }
         }
     }
+
+    private fun Headers.mapToFuel(): Map<String, String> {
+        val headers = mutableMapOf<String, String>()
+        val keys = getKeys(this@mapToFuel)
+        for (i in 0 until keys.length) {
+            val key = keys[i].toString()
+            val value = this@mapToFuel.get(key)!!
+            headers[key] = value
+        }
+        return headers
+    }
 }
diff --git a/fuel/src/wasmJsMain/kotlin/fuel/Object.kt b/fuel/src/wasmJsMain/kotlin/fuel/Object.kt
@@ -18,3 +18,6 @@ public inline fun <T : JsAny> obj(init: T.() -> Unit): T {
 public operator fun JsAny.set(key: String, value: JsAny) {
     this[key] = value
 }
+
+public fun getKeys(headers: org.w3c.fetch.Headers): JsArray<JsString> =
+    js("Array.from(headers.keys())")