Reuse json and httpClient across web import features

Author: egorikftp

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/common/di/NetworkModule.kt

@@ -0,0 +1,31 @@
+package io.github.composegears.valkyrie.ui.screen.webimport.common.di
+
+import com.composegears.leviathan.Leviathan
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.okhttp.OkHttp
+import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.serialization.kotlinx.json.json
+import kotlin.time.Duration.Companion.seconds
+import kotlinx.serialization.json.Json
+
+object NetworkModule : Leviathan() {
+
+    val json by instanceOf(keepAlive = true) {
+        Json {
+            ignoreUnknownKeys = true
+            isLenient = true
+        }
+    }
+
+    val httpClient by instanceOf {
+        HttpClient(OkHttp) {
+            install(HttpTimeout) {
+                requestTimeoutMillis = 30.seconds.inWholeMilliseconds
+            }
+            install(ContentNegotiation) {
+                json(inject(json))
+            }
+        }
+    }
+}

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/lucide/di/LucideModule.kt

@@ -1,39 +1,17 @@
 package io.github.composegears.valkyrie.ui.screen.webimport.lucide.di
 
 import com.composegears.leviathan.Leviathan
+import io.github.composegears.valkyrie.ui.screen.webimport.common.di.NetworkModule
 import io.github.composegears.valkyrie.ui.screen.webimport.lucide.data.LucideRepository
 import io.github.composegears.valkyrie.ui.screen.webimport.lucide.domain.LucideUseCase
-import io.ktor.client.HttpClient
-import io.ktor.client.engine.okhttp.OkHttp
-import io.ktor.client.plugins.HttpTimeout
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.serialization.kotlinx.json.json
-import kotlin.time.Duration.Companion.seconds
-import kotlinx.serialization.json.Json
 
 object LucideModule : Leviathan() {
-    private val json by instanceOf {
-        Json {
-            ignoreUnknownKeys = true
-            isLenient = true
-        }
-    }
-
-    private val httpClient by instanceOf {
-        HttpClient(OkHttp) {
-            install(HttpTimeout) {
-                requestTimeoutMillis = 30.seconds.inWholeMilliseconds
-            }
-            install(ContentNegotiation) {
-                json(inject(json))
-            }
-        }
-    }
+    private val network = NetworkModule
 
     private val lucideRepository by instanceOf {
         LucideRepository(
-            httpClient = inject(httpClient),
-            json = inject(json),
+            httpClient = inject(network.httpClient),
+            json = inject(network.json),
         )
     }
 

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/material/di/MaterialSymbolsModule.kt

@@ -1,38 +1,19 @@
 package io.github.composegears.valkyrie.ui.screen.webimport.material.di
 
 import com.composegears.leviathan.Leviathan
+import io.github.composegears.valkyrie.ui.screen.webimport.common.di.NetworkModule
+import io.github.composegears.valkyrie.ui.screen.webimport.common.di.NetworkModule.httpClient
 import io.github.composegears.valkyrie.ui.screen.webimport.material.data.config.MaterialSymbolsConfigRepository
 import io.github.composegears.valkyrie.ui.screen.webimport.material.data.font.MaterialFontRepository
 import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.MaterialSymbolsConfigUseCase
-import io.ktor.client.HttpClient
-import io.ktor.client.engine.okhttp.OkHttp
-import io.ktor.client.plugins.HttpTimeout
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.serialization.kotlinx.json.json
-import kotlin.time.Duration.Companion.seconds
-import kotlinx.serialization.json.Json
 
 object MaterialSymbolsModule : Leviathan() {
-    private val json by instanceOf {
-        Json {
-            ignoreUnknownKeys = true
-            isLenient = true
-        }
-    }
-    private val httpClient by instanceOf {
-        HttpClient(OkHttp) {
-            install(HttpTimeout) {
-                requestTimeoutMillis = 30.seconds.inWholeMilliseconds
-            }
-            install(ContentNegotiation) {
-                json(inject(json))
-            }
-        }
-    }
+    private val network = NetworkModule
+
     private val materialSymbolsConfigRepository by instanceOf {
         MaterialSymbolsConfigRepository(
-            httpClient = inject(httpClient),
-            json = inject(json),
+            httpClient = inject(network.httpClient),
+            json = inject(network.json),
         )
     }
     private val materialFontRepository by instanceOf {