InsanusMokrassar/MicroUtils
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/MicroUtils.git synced 2024-10-31 21:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improvements in 'StartLauncherPlugin#start' methods

Browse Source
This commit is contained in:
InsanusMokrassar 2023-01-08 13:52:53 +06:00
parent a36425a905
commit 66fc6df3d7
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,6 +2,10 @@
## 0.16.6 ## 0.16.6
* `Startup`:
* `Launcher`:
* Improvements in `StartLauncherPlugin#start` methods
## 0.16.5 ## 0.16.5
* `Versions`: * `Versions`:

40
startup/launcher/src/commonMain/kotlin/StartLauncherPlugin.kt
View File

@ -14,6 +14,7 @@ import kotlinx.coroutines.launch
import kotlinx.serialization.SerialFormat import kotlinx.serialization.SerialFormat
import kotlinx.serialization.StringFormat import kotlinx.serialization.StringFormat
import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.decodeFromJsonElement
import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonObject
import org.koin.core.Koin import org.koin.core.Koin
import org.koin.core.KoinApplication import org.koin.core.KoinApplication
@ -93,18 +94,19 @@ object StartLauncherPlugin : StartPlugin {
/** /**
* Will create [KoinApplication], init, load modules using [StartLauncherPlugin] and start plugins using the same base * Will create [KoinApplication], init, load modules using [StartLauncherPlugin] and start plugins using the same base
* plugin * plugin. It is basic [start] method which accepts both [config] and [rawConfig] which suppose to be the same or
* at least [rawConfig] must contain serialized variant of [config]
* *
* @param rawConfig It is expected that this [JsonObject] will contain serialized [Config] ([StartLauncherPlugin] will * @param rawConfig It is expected that this [JsonObject] will contain serialized [Config] ([StartLauncherPlugin] will
* deserialize it in its [StartLauncherPlugin.setupDI] * deserialize it in its [StartLauncherPlugin.setupDI]
*/ */
suspend fun start(rawConfig: JsonObject) { suspend fun start(config: Config, rawConfig: JsonObject) {
logger.i("Start initialization") logger.i("Start initialization")
val koinApp = KoinApplication.init() val koinApp = KoinApplication.init()
koinApp.modules( koinApp.modules(
module { module {
setupDI(rawConfig) setupDI(config, rawConfig)
} }
) )
logger.i("Modules loaded") logger.i("Modules loaded")
@ -116,26 +118,26 @@ object StartLauncherPlugin : StartPlugin {
} }
/** /**
* Will create [KoinApplication], init, load modules using [StartLauncherPlugin] and start plugins using the same base * Call [start] with deserialized [Config] as config and [rawConfig] as is
* plugin
* *
* @param config In difference with other [start] method here config is already deserialized and this config will * @param rawConfig It is expected that this [JsonObject] will contain serialized [Config]
* be converted to [JsonObject] as raw config. That means that all plugins from [config] will receive */
* serialized version of [config] in [StartPlugin.setupDI] method suspend fun start(rawConfig: JsonObject) {
start(defaultJson.decodeFromJsonElement(Config.serializer(), rawConfig), rawConfig)
}
/**
* Call [start] with deserialized [Config] as is and serialize it to [JsonObject] to pass as the first parameter
* to the basic [start] method
*
* @param config Will be converted to [JsonObject] as raw config. That means that all plugins from [config] will
* receive serialized version of [config] in [StartPlugin.setupDI] method
*/ */
suspend fun start(config: Config) { suspend fun start(config: Config) {
logger.i("Start initialization") start(config, defaultJson.encodeToJsonElement(Config.serializer(), config).jsonObject)
val koinApp = KoinApplication.init()
logger.i("Koin app created")
koinApp.modules(
module {
setupDI(config)
}
)
startKoin(koinApp)
logger.i("Koin started")
startPlugin(koinApp.koin)
} }
} }