complete startup module

This reverts commit 31022733ac.

.github/workflows/dokka_push.yml

@@ -11,9 +11,6 @@ jobs:
       - uses: actions/setup-java@v1
         with:
           java-version: 11
-      - name: Fix android 32.0.0 dx
-        continue-on-error: true
-        run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
       - name: Build
         run: ./gradlew build && ./gradlew dokkaHtml
       - name: Publish KDocs

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## 0.15.1
+
 ## 0.15.0
 
 * `Repos`:

dokka/build.gradle

@@ -17,7 +17,7 @@ kotlin {
 //        browser()
 //        nodejs()
 //    }
-    android()
+    android {}
 
     sourceSets {
         commonMain {
@@ -30,8 +30,8 @@ kotlin {
                         && it.hasProperty("kotlin")
                         && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
 //                        && it.kotlin.sourceSets.any { it.name.contains("jsMain") }
-//                        && it.kotlin.sourceSets.any { it.name.contains("jvmMain") }
-//                        && it.kotlin.sourceSets.any { it.name.contains("androidMain") }
+                        && it.kotlin.sourceSets.any { it.name.contains("jvmMain") }
+                        && it.kotlin.sourceSets.any { it.name.contains("androidMain") }
                     ) {
                         api it
                     }
@@ -62,7 +62,7 @@ kotlin {
                     if (
                         it != project
                         && it.hasProperty("kotlin")
-//                        && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
+                        && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
                         && it.kotlin.sourceSets.any { it.name.contains("jvmMain") }
                     ) {
                         api it
@@ -78,7 +78,7 @@ kotlin {
                     if (
                         it != project
                         && it.hasProperty("kotlin")
-//                        && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
+                        && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
                         && it.kotlin.sourceSets.any { it.name.contains("androidMain") }
                     ) {
                         api it
@@ -100,7 +100,7 @@ private List<SourceDirectorySet> findSourcesWithName(String... approximateNames)
             }.collect { it.kotlin }
 }
 
-dokkaHtml {
+tasks.dokkaHtml {
     dokkaSourceSets {
         configureEach {
             skipDeprecated.set(true)

gradle.properties

@@ -14,5 +14,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.15.0
-android_code_version=166
+version=0.15.1
+android_code_version=167

gradle/libs.versions.toml

@@ -4,6 +4,8 @@ kt = "1.7.20"
 kt-serialization = "1.4.1"
 kt-coroutines = "1.6.4"
 
+kslog = "0.5.4"
+
 jb-compose = "1.2.1"
 jb-exposed = "0.41.1"
 jb-dokka = "1.7.20"
@@ -60,6 +62,7 @@ ktor-server-websockets = { module = "io.ktor:ktor-server-websockets", version.re
 ktor-server-statusPages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktor" }
 ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" }
 
+kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
 
 klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "klock" }
 uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

ktor/client/src/jsMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualUniUpload.kt

@@ -28,6 +28,7 @@ import org.w3c.xhr.XMLHttpRequestResponseType
  * @param data [Map] where keys will be used as names for multipart parts and values as values. If you will pass
  * [dev.inmo.micro_utils.common.MPPFile] (File from JS or JVM platform). Also you may pass [UniUploadFileInfo] as value
  * in case you wish to pass other source of multipart binary data than regular file
+ * @suppress
  */
 actual suspend fun <T> HttpClient.uniUpload(
     url: String,

ktor/client/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualUniUpload.kt

@@ -27,6 +27,7 @@ import java.io.File
  * @param data [Map] where keys will be used as names for multipart parts and values as values. If you will pass
  * [dev.inmo.micro_utils.common.MPPFile] (File from JS or JVM platform). Also you may pass [UniUploadFileInfo] as value
  * in case you wish to pass other source of multipart binary data than regular file
+ * @suppress
  */
 actual suspend fun <T> HttpClient.uniUpload(
     url: String,

mppProjectWithSerialization.gradle

@@ -23,7 +23,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib')
-                implementation libs.kt.serialization
+                api libs.kt.serialization
             }
         }
         commonTest {

mppProjectWithSerializationAndCompose.gradle

@@ -23,7 +23,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib')
-                implementation libs.kt.serialization
+                api libs.kt.serialization
                 implementation compose.runtime
             }
         }

settings.gradle

@@ -32,6 +32,8 @@ String[] includes = [
     ":serialization:base64",
     ":serialization:encapsulator",
     ":serialization:typed_serializer",
+    ":startup:plugin",
+    ":startup:launcher",
 
     ":fsm:common",
     ":fsm:repos:common",

startup/launcher/build.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.plugin.serialization"
+}
+
+apply from: "$mppJavaProjectPresetPath"
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api internalProject("micro_utils.startup.plugin")
+            }
+        }
+    }
+}

startup/launcher/src/commonMain/kotlin/Config.kt

@@ -0,0 +1,9 @@
+package dev.inmo.micro_utils.startup.launcher
+
+import dev.inmo.micro_utils.startup.plugin.ServerPlugin
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Config(
+    val plugins: List<ServerPlugin>
+)

startup/launcher/src/commonMain/kotlin/DefaultJson.kt

@@ -0,0 +1,7 @@
+package dev.inmo.micro_utils.startup.launcher
+
+import kotlinx.serialization.json.Json
+
+val defaultJson = Json {
+    ignoreUnknownKeys = true
+}

startup/launcher/src/commonMain/kotlin/StartupLauncher.kt

@@ -0,0 +1,57 @@
+package dev.inmo.micro_utils.startup.launcher
+
+import dev.inmo.kslog.common.i
+import dev.inmo.kslog.common.taggedLogger
+import dev.inmo.kslog.common.w
+import dev.inmo.micro_utils.coroutines.runCatchingSafely
+import dev.inmo.micro_utils.startup.plugin.ServerPlugin
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
+import kotlinx.serialization.json.JsonObject
+import org.koin.core.Koin
+import org.koin.core.module.Module
+import org.koin.dsl.module
+
+object StartupLauncher : ServerPlugin {
+    internal val logger = taggedLogger(this)
+    override fun Module.setupDI(config: JsonObject) {
+        val pluginsConfig = defaultJson.decodeFromJsonElement(Config.serializer(), config)
+
+        single { pluginsConfig }
+        single { CoroutineScope(Dispatchers.Default) }
+
+        includes(
+            pluginsConfig.plugins.mapNotNull {
+                runCatching {
+                    module {
+                        with(it) {
+                            setupDI(config)
+                        }
+                    }
+                }.onFailure { e ->
+                    logger.w("Unable to load DI part of $it", e)
+                }.getOrNull()
+            }
+        )
+    }
+
+    override suspend fun startPlugin(koin: Koin) {
+        val scope = koin.get<CoroutineScope>()
+        koin.get<Config>().plugins.map { plugin ->
+            scope.launch {
+                runCatchingSafely {
+                    logger.i("Start loading of $plugin")
+                    with(plugin) {
+                        startPlugin(koin)
+                    }
+                }.onFailure { e ->
+                    logger.w("Unable to load bot part of $plugin", e)
+                }.onSuccess {
+                    logger.i("Complete loading of $plugin")
+                }
+            }
+        }.joinAll()
+    }
+}

startup/launcher/src/jvmMain/kotlin/ServerLauncher.kt

@@ -0,0 +1,36 @@
+package dev.inmo.micro_utils.startup.launcher
+
+import dev.inmo.kslog.common.KSLog
+import dev.inmo.kslog.common.i
+import dev.inmo.micro_utils.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.serialization.json.jsonObject
+import org.koin.core.KoinApplication
+import org.koin.core.context.GlobalContext
+import org.koin.dsl.module
+import java.io.File
+
+suspend fun main(args: Array<String>) {
+
+    KSLog.default = KSLog("ServerLauncher")
+    val (configPath) = args
+    val file = File(configPath)
+    KSLog.i("Start read config from ${file.absolutePath}")
+    val json = defaultJson.parseToJsonElement(file.readText()).jsonObject
+    KSLog.i("Config has been read")
+
+    with(StartupLauncher) {
+        logger.i("Start initialization")
+        val koinApp = KoinApplication.init()
+        koinApp.modules(
+            module {
+                setupDI(json)
+            }
+        )
+        logger.i("Modules loaded")
+        GlobalContext.startKoin(koinApp)
+        logger.i("Koin started")
+        startPlugin(koinApp.koin)
+        logger.i("Behaviour builder has been setup")
+    }
+}

startup/plugin/build.gradle

@@ -0,0 +1,19 @@
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.plugin.serialization"
+}
+
+apply from: "$mppJavaProjectPresetPath"
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api libs.koin
+                api libs.kt.serialization
+                api libs.kslog
+                api project(":micro_utils.coroutines")
+            }
+        }
+    }
+}

startup/plugin/src/commonMain/kotlin/ServerPlugin.kt

@@ -0,0 +1,34 @@
+package dev.inmo.micro_utils.startup.plugin
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonObject
+import org.koin.core.Koin
+import org.koin.core.module.Module
+
+@Serializable(ServerPlugin.Companion::class)
+interface ServerPlugin {
+    fun Module.setupDI(config: JsonObject) {}
+
+    suspend fun startPlugin(koin: Koin) {}
+
+    companion object : KSerializer<ServerPlugin> {
+        override val descriptor: SerialDescriptor
+            get() = String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): ServerPlugin {
+            val kclass = Class.forName(decoder.decodeString()).kotlin
+            return (kclass.objectInstance ?: kclass.constructors.first { it.parameters.isEmpty() }.call()) as ServerPlugin
+        }
+
+        override fun serialize(encoder: Encoder, value: ServerPlugin) {
+            encoder.encodeString(
+                value::class.java.canonicalName
+            )
+        }
+    }
+}