Customized HttpResponse Per Platforms (#863)

* HttResponse is now Expect/Actual class to make easier to adding more variables.

* Oops

* adding more files for Kotlinx Serializations

* fixed Apple stuffs

* JVM's HttpResponse for body is ResponseBody from OKHttp.

* changing JVM Tests

* remove empty space

fuel-forge-jvm/src/main/kotlin/fuel/forge/ResponseExtension.kt

@@ -6,4 +6,4 @@ import com.github.kittinunf.forge.core.JSON
 import fuel.HttpResponse
 
 public fun <T : Any> HttpResponse.toForge(deserializer: JSON.() -> DeserializedResult<T>): DeserializedResult<T> =
-    Forge.modelFromJson(body, deserializer)
+    Forge.modelFromJson(body.string(), deserializer)

fuel-jackson-jvm/src/main/kotlin/fuel/jackson/ResponseExtension.kt

@@ -13,7 +13,7 @@ public val defaultMapper: ObjectMapper = ObjectMapper().registerKotlinModule()
 
 public inline fun <reified T : Any> HttpResponse.toJackson(mapper: ObjectMapper = defaultMapper): Result<T, Throwable> =
     doTry(work = {
-        Result.success(mapper.readValue(body))
+        Result.success(mapper.readValue(body.string()))
     }, errorHandler = {
         Result.failure(it)
     })

fuel-kotlinx-serialization/build.gradle.kts

@@ -74,7 +74,39 @@ kotlin {
         }
         val jsMain by getting
         val jsTest by getting
-        val iosMain by getting
-        val iosTest by getting
+
+        val appleMain by creating {
+            dependsOn(commonMain)
+        }
+
+        val iosMain by getting {
+            dependsOn(appleMain)
+        }
+        val macosArm64Main by getting {
+            dependsOn(appleMain)
+        }
+        val macosX64Main by getting {
+            dependsOn(appleMain)
+        }
+        val iosSimulatorArm64Main by getting {
+            dependsOn(appleMain)
+        }
+
+        val appleTest by creating {
+            dependsOn(commonTest)
+        }
+
+        val iosTest by getting {
+            dependsOn(appleTest)
+        }
+        val macosArm64Test by getting {
+            dependsOn(appleTest)
+        }
+        val macosX64Test by getting {
+            dependsOn(appleTest)
+        }
+        val iosSimulatorArm64Test by getting {
+            dependsOn(appleTest)
+        }
     }
 }

fuel-kotlinx-serialization/src/appleMain/kotlin/fuel/serialization/ResponseExtensions.kt

@@ -0,0 +1,14 @@
+package fuel.serialization
+
+import com.github.kittinunf.result.Result
+import com.github.kittinunf.result.runCatching
+import fuel.HttpResponse
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.json.Json
+
+public fun <T : Any> HttpResponse.toJson(
+    json: Json = Json { allowStructuredMapKeys = true },
+    deserializationStrategy: DeserializationStrategy<T>
+): Result<T?, Throwable> = runCatching {
+    body?.let { json.decodeFromString(deserializationStrategy, it) }
+}

fuel-kotlinx-serialization/src/jvmMain/kotlin/fuel/serialization/ResponseExtensions.kt

@@ -0,0 +1,14 @@
+package fuel.serialization
+
+import com.github.kittinunf.result.Result
+import com.github.kittinunf.result.runCatching
+import fuel.HttpResponse
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.json.Json
+
+public fun <T : Any> HttpResponse.toJson(
+    json: Json = Json { allowStructuredMapKeys = true },
+    deserializationStrategy: DeserializationStrategy<T>
+): Result<T?, Throwable> = runCatching {
+    json.decodeFromString(deserializationStrategy, body.string())
+}

fuel-moshi-jvm/src/main/kotlin/fuel/moshi/ResponseExtension.kt

@@ -11,20 +11,14 @@ public val defaultMoshi: Moshi.Builder = Moshi.Builder()
 
 public inline fun <reified T : Any> HttpResponse.toMoshi(): Result<T?, IOException> = toMoshi(T::class.java)
 
-public fun <T : Any> HttpResponse.toMoshi(clazz: Class<T>): Result<T?, IOException> = try {
-    Result.success(defaultMoshi.build().adapter(clazz).fromJson(body))
-} catch (ioe: IOException) {
-    Result.failure(ioe)
-}
+public fun <T : Any> HttpResponse.toMoshi(clazz: Class<T>): Result<T?, IOException> =
+    toMoshi(defaultMoshi.build().adapter(clazz))
 
-public fun <T : Any> HttpResponse.toMoshi(type: Type): Result<T?, IOException> = try {
-    Result.success(defaultMoshi.build().adapter<T>(type).fromJson(body))
-} catch (ioe: IOException) {
-    Result.failure(ioe)
-}
+public fun <T : Any> HttpResponse.toMoshi(type: Type): Result<T?, IOException> =
+    toMoshi(defaultMoshi.build().adapter(type))
 
 public fun <T : Any> HttpResponse.toMoshi(jsonAdapter: JsonAdapter<T>): Result<T?, IOException> = try {
-    Result.success(jsonAdapter.fromJson(body))
+    Result.success(jsonAdapter.fromJson(body.source()))
 } catch (ioe: IOException) {
     Result.failure(ioe)
 }

fuel/build.gradle.kts

@@ -71,7 +71,7 @@ kotlin {
 
         val jvmMain by getting {
             dependencies {
-                implementation(libs.okhttp)
+                api(libs.okhttp)
             }
         }
         val jvmTest by getting {

fuel/src/appleMain/kotlin/fuel/HttpResponse.kt

@@ -0,0 +1,9 @@
+package fuel
+
+import platform.Foundation.NSData
+
+public actual class HttpResponse {
+    public var statusCode: Int = -1
+    public var nsData: NSData? = null
+    public var body: String? = null
+}

fuel/src/appleMain/kotlin/fuel/HttpUrlFetcher.kt

@@ -83,7 +83,8 @@ internal class HttpUrlFetcher(private val sessionConfiguration: NSURLSessionConf
 
         return HttpResponse().apply {
             statusCode = httpResponse.statusCode.toInt()
-            body = bodyString ?: ""
+            nsData = data
+            body = bodyString
         }
     }
 

fuel/src/commonMain/kotlin/fuel/HttpResponse.kt

@@ -1,6 +1,3 @@
 package fuel
 
-public class HttpResponse {
-    public var statusCode: Int = -1
-    public var body: String = ""
-}
+public expect class HttpResponse

fuel/src/jsMain/kotlin/fuel/HttpResponse.kt

@@ -0,0 +1,11 @@
+package fuel
+
+import org.khronos.webgl.ArrayBuffer
+import org.w3c.files.Blob
+
+public actual class HttpResponse {
+    public var statusCode: Int = -1
+    public lateinit var array: ArrayBuffer
+    public var body: String = ""
+    public lateinit var blob: Blob
+}

fuel/src/jsMain/kotlin/fuel/HttpUrlFetcher.kt

@@ -3,7 +3,6 @@ package fuel
 import kotlinx.browser.window
 import kotlinx.coroutines.await
 import org.w3c.fetch.RequestInit
-
 internal class HttpUrlFetcher {
     suspend fun fetch(request: Request, method: String?, body: String? = null): HttpResponse {
         val urlString = request.parameters?.let {
@@ -19,7 +18,9 @@ internal class HttpUrlFetcher {
         ).await()
         return HttpResponse().apply {
             this.statusCode = res.status.toInt()
+            this.array = res.arrayBuffer().await()
             this.body = res.text().await()
+            this.blob = res.blob().await()
         }
     }
 }

fuel/src/jvmMain/kotlin/fuel/HttpResponse.kt

@@ -0,0 +1,8 @@
+package fuel
+
+import okhttp3.ResponseBody
+
+public actual class HttpResponse {
+    public var statusCode: Int = -1
+    public lateinit var body: ResponseBody
+}

fuel/src/jvmMain/kotlin/fuel/OKUtils.kt

@@ -17,7 +17,7 @@ internal suspend fun Call.await(): HttpResponse = suspendCancellableCoroutine {
         override fun onResponse(call: Call, response: Response) {
             val httpResponse = HttpResponse().apply {
                 statusCode = response.code
-                body = response.body.string()
+                body = response.body
             }
             it.resume(httpResponse)
         }

fuel/src/jvmTest/kotlin/fuel/HttpLoaderBuilderTest.kt

@@ -32,7 +32,7 @@ internal class HttpLoaderBuilderTest {
         mockWebServer.enqueue(MockResponse().setBody("Hello World"))
 
         val request = Request.Builder().url(mockWebServer.url("hello").toString()).build()
-        val response = JVMHttpLoader().get(request).body
+        val response = JVMHttpLoader().get(request).body.string()
         assertEquals("Hello World", response)
 
         mockWebServer.shutdown()
@@ -49,7 +49,7 @@ internal class HttpLoaderBuilderTest {
             .build()
 
         val request = Request.Builder().url(mockWebServer.url("hello").toString()).build()
-        val response = httpLoader.get(request).body
+        val response = httpLoader.get(request).body.string()
         assertEquals("Hello World", response)
     }
 
@@ -60,7 +60,7 @@ internal class HttpLoaderBuilderTest {
         val okhttp = OkHttpClient.Builder().callTimeout(30L, TimeUnit.MILLISECONDS).build()
         val httpLoader = FuelBuilder().config(okhttp).build()
         val request = Request.Builder().url(mockWebServer.url("hello2").toString()).build()
-        val response = httpLoader.get(request).body
+        val response = httpLoader.get(request).body.string()
         assertEquals("Hello World 2", response)
     }
 
@@ -70,7 +70,7 @@ internal class HttpLoaderBuilderTest {
 
         val request = Request.Builder().url(mockWebServer.url("socket").toString()).build()
         try {
-            JVMHttpLoader().get(request).body
+            JVMHttpLoader().get(request).body.string()
         } catch (ste: SocketTimeoutException) {
             assertNotNull(ste, "socket timeout")
         }

fuel/src/jvmTest/kotlin/fuel/HttpLoaderTest.kt

@@ -30,7 +30,7 @@ internal class HttpLoaderTest {
 
         val unsuccessfulRequest = Request.Builder().url(mockWebServer.url("get").toString()).build()
 
-        val string = httpLoader.get(unsuccessfulRequest).body
+        val string = httpLoader.get(unsuccessfulRequest).body.string()
 
         val request1 = mockWebServer.takeRequest()
 
@@ -44,7 +44,7 @@ internal class HttpLoaderTest {
 
         val request = Request.Builder().url(mockWebServer.url("get").toString()).build()
 
-        val string = httpLoader.get(request).body
+        val string = httpLoader.get(request).body.string()
 
         val request1 = mockWebServer.takeRequest()
 
@@ -151,7 +151,7 @@ internal class HttpLoaderTest {
             .url(mockWebServer.url("delete").toString())
             .build()
 
-        val string = httpLoader.delete(request).body
+        val string = httpLoader.delete(request).body.string()
 
         val request1 = mockWebServer.takeRequest()
 

fuel/src/jvmTest/kotlin/fuel/RoutingTest.kt

@@ -64,7 +64,7 @@ internal class RoutingTest {
         mockWebServer.enqueue(MockResponse().setBody("Hello World"))
 
         val getTest = TestApi.GetTest(mockWebServer.url("").toString())
-        val response = JVMHttpLoader().method(getTest.request).body
+        val response = JVMHttpLoader().method(getTest.request).body.string()
         val request1 = mockWebServer.takeRequest()
 
         assertEquals("Hello World", response)
@@ -76,7 +76,7 @@ internal class RoutingTest {
         mockWebServer.enqueue(MockResponse().setBody("Hello World With Params"))
 
         val getTest = TestApi.GetParamsTest(mockWebServer.url("").toString())
-        val response = JVMHttpLoader().method(getTest.request).body
+        val response = JVMHttpLoader().method(getTest.request).body.string()
         val request1 = mockWebServer.takeRequest()
 
         assertEquals("Hello World With Params", response)