[#503] HttpClient를 di를 통해 주입받는 것이 아닌, DroidKnightsNetwork 내 초기화

core/network/src/androidMain/kotlin/com/droidknights/app/core/network/engine/HttpClientEngine.kt → core/network/src/androidMain/kotlin/com/droidknights/app/core/network/HttpClient.kt

@@ -1,11 +1,11 @@
-package com.droidknights.app.core.network.engine
+package com.droidknights.app.core.network
 
 import io.ktor.client.HttpClient
 import io.ktor.client.HttpClientConfig
 import io.ktor.client.engine.okhttp.OkHttp
 import java.util.concurrent.TimeUnit
 
-actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(OkHttp) {
+internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(OkHttp) {
     config(this)
 
     engine {

core/network/src/commonMain/kotlin/com/droidknights/app/core/network/DroidKnightsNetwork.kt

@@ -1,11 +1,49 @@
 package com.droidknights.app.core.network
 
-import io.ktor.client.HttpClient
 import io.ktor.client.call.body
+import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.defaultRequest
+import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.client.plugins.logging.Logging
 import io.ktor.client.request.get
+import io.ktor.http.ContentType
+import io.ktor.http.URLProtocol
+import io.ktor.http.contentType
+import io.ktor.serialization.kotlinx.KotlinxSerializationConverter
+import kotlinx.serialization.json.Json
 
-class DroidKnightsNetwork(
-    val client: HttpClient,
-) {
-    suspend inline fun <reified T : Any> get(path: String): T = client.get(path).body()
+class DroidKnightsNetwork {
+    val httpClient = httpClient {
+        install(ContentNegotiation) {
+            val json = Json {
+                ignoreUnknownKeys = true
+                encodeDefaults = true
+            }
+            register(ContentType.Application.Json, KotlinxSerializationConverter(json))
+            register(ContentType.Text.Plain, KotlinxSerializationConverter(json))
+        }
+        install(Logging) {
+            level = LogLevel.ALL
+        }
+        install(HttpTimeout) {
+            connectTimeoutMillis = TIMEOUT_MILLIS
+            requestTimeoutMillis = TIMEOUT_MILLIS
+            socketTimeoutMillis = TIMEOUT_MILLIS
+        }
+        defaultRequest {
+            contentType(ContentType.Application.Json)
+            url {
+                protocol = URLProtocol.HTTPS
+                host = BASE_HOST
+            }
+        }
+    }
+
+    suspend inline fun <reified T : Any> get(path: String): T = httpClient.get(path).body()
+
+    companion object {
+        private const val TIMEOUT_MILLIS = 6_000L
+        private const val BASE_HOST = "raw.githubusercontent.com"
+    }
 }

core/network/src/commonMain/kotlin/com/droidknights/app/core/network/HttpClient.kt

@@ -0,0 +1,6 @@
+package com.droidknights.app.core.network
+
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+
+internal expect fun httpClient(config: HttpClientConfig<*>.() -> Unit = {}): HttpClient

core/network/src/commonMain/kotlin/com/droidknights/app/core/network/di/NetworkModule.kt

@@ -1,54 +1,8 @@
 package com.droidknights.app.core.network.di
 
 import com.droidknights.app.core.network.DroidKnightsNetwork
-import com.droidknights.app.core.network.di.NetworkDefaults.BASE_HOST
-import com.droidknights.app.core.network.di.NetworkDefaults.TIMEOUT_MILLIS
-import com.droidknights.app.core.network.engine.httpClient
-import io.ktor.client.HttpClient
-import io.ktor.client.plugins.HttpTimeout
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.client.plugins.defaultRequest
-import io.ktor.client.plugins.logging.LogLevel
-import io.ktor.client.plugins.logging.Logging
-import io.ktor.http.ContentType
-import io.ktor.http.URLProtocol
-import io.ktor.http.contentType
-import io.ktor.serialization.kotlinx.KotlinxSerializationConverter
-import kotlinx.serialization.json.Json
 import org.koin.dsl.module
 
 val coreNetworkModule = module {
-    single<HttpClient> {
-        val json = Json {
-            ignoreUnknownKeys = true
-            encodeDefaults = true
-        }
-        httpClient {
-            install(ContentNegotiation) {
-                register(ContentType.Application.Json, KotlinxSerializationConverter(json))
-                register(ContentType.Text.Plain, KotlinxSerializationConverter(json))
-            }
-            install(Logging) {
-                level = LogLevel.ALL
-            }
-            install(HttpTimeout) {
-                connectTimeoutMillis = TIMEOUT_MILLIS
-                requestTimeoutMillis = TIMEOUT_MILLIS
-                socketTimeoutMillis = TIMEOUT_MILLIS
-            }
-            defaultRequest {
-                contentType(ContentType.Application.Json)
-                url {
-                    protocol = URLProtocol.HTTPS
-                    host = BASE_HOST
-                }
-            }
-        }
-    }
-    single { DroidKnightsNetwork(get()) }
-}
-
-internal object NetworkDefaults {
-    const val TIMEOUT_MILLIS = 6_000L
-    const val BASE_HOST = "raw.githubusercontent.com"
+    single { DroidKnightsNetwork() }
 }

core/network/src/desktopMain/kotlin/com/droidknights/app/core/network/engine/HttpClientEngine.kt → core/network/src/desktopMain/kotlin/com/droidknights/app/core/network/HttpClient.kt

@@ -1,11 +1,11 @@
-package com.droidknights.app.core.network.engine
+package com.droidknights.app.core.network
 
 import io.ktor.client.HttpClient
 import io.ktor.client.HttpClientConfig
 import io.ktor.client.engine.okhttp.OkHttp
 import java.util.concurrent.TimeUnit
 
-actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(OkHttp) {
+internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(OkHttp) {
     config(this)
 
     engine {

core/network/src/iosMain/kotlin/com/droidknights/app/core/network/engine/HttpClientEngine.kt → core/network/src/iosMain/kotlin/com/droidknights/app/core/network/HttpClient.kt

@@ -1,10 +1,10 @@
-package com.droidknights.app.core.network.engine
+package com.droidknights.app.core.network
 
 import io.ktor.client.HttpClient
 import io.ktor.client.HttpClientConfig
 import io.ktor.client.engine.darwin.Darwin
 
-actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(Darwin) {
+internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(Darwin) {
     config(this)
     engine {
         configureRequest {

core/network/src/wasmJsMain/kotlin/com/droidknights/app/core/network/engine/HttpClientEngine.kt → core/network/src/wasmJsMain/kotlin/com/droidknights/app/core/network/HttpClient.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app.core.network.engine
+package com.droidknights.app.core.network
 
 import io.ktor.client.HttpClient
 import io.ktor.client.HttpClientConfig