Update gradle.properties

CHANGELOG.md

@@ -1,274 +1,7 @@
 # Changelog
 
-## 11.1.1
-
-* `Bot`:
-  * Logic of creating `HttpClient` now works even if proxy is ommited
-
-## 11.1.0
-
-* `Bot`:
-  * Add opportunity to setup proxy
-
-## 11.0.0
-
-* `Versions`:
-    * `kotlin`: `2.3.10`
-    * `serialization`: `1.10.0`
-    * `microutils`: `0.29.1`
-    * `tgbotapi`: `32.0.0`
-    * `exposed`: `1.1.1`
-    * `sqlite`: `3.51.2.0`
-
-## 10.10.0
-
-* `Versions`:
-    * `kotlin`: `2.2.21`
-    * `microutils`: `0.26.8`
-    * `tgbotapi`: `30.0.2`
-
-## 10.9.0
-
-* `Versions`:
-    * `kotlin`: `2.2.20`
-    * `microutils`: `0.26.6`
-    * `tgbotapi`: `30.0.0`
-    * `koin`: `4.1.1`
-
-## 10.8.0
-
-* `Versions`:
-    * `kotlin`: `2.2.10`
-    * `microutils`: `0.26.3`
-    * `tgbotapi`: `28.0.1`
-
-## 10.7.0
-
-* `Versions`:
-  * `kotlin`: `2.2.0`
-  * `serialization`: `1.9.0`
-  * `microutils`: `0.26.2`
-  * `tgbotapi`: `27.1.1`
-  * `koin`: `4.1.0`
-
-## 10.6.0
-
-* `Versions`:
-  * `microutils`: `0.25.8`
-  * `tgbotapi`: `26.0.0`
-  * `sqlite`: `3.50.1.0`
-
-## 10.5.0
-
-* `Versions`:
-  * `kotlin`: `2.1.20`
-  * `serialization`: `1.8.1`
-  * `coroutines`: `1.10.2`
-  * `microutils`: `0.25.5`
-  * `tgbotapi`: `24.0.2`
-  * `exposed`: `0.61.0`
-  * `sqlite`: `3.49.1.0`
-  * `koin`: `4.0.4`
-
-## 10.4.0
-
-* `Versions`:
-  * `microutils`: `0.24.6`
-  * `tgbotapi`: `23.2.0`
-  * `exposed`: `0.59.0`
-  * `sqlite`: `3.49.0.0`
-
-## 10.3.1
-
-* `Versions`:
-  * `kotlin`: `2.1.10`
-  * `serialization`: `1.8.0`
-  * `coroutines`: `1.10.1`
-  * `microutils`: `0.24.5`
-  * `tgbotapi`: `23.1.2`
-  * `exposed`: `0.58.0`
-  * `sqlite`: `3.48.0.0`
-  * `koin`: `4.0.2`
-
-## 10.3.0
-
-* `Versions`:
-  * `microutils`: `0.23.2`
-  * `tgbotapi`: `22.0.0`
-  * `exposed`: `0.57.0`
-
-## 10.2.1
-
-* `Versions`:
-  * `tgbotapi`: `21.0.1`
-* `Bot`:
-  * Now all `CombinedSubcontextInitialAction.SubItem`s will be taken from `Koin` to setup root `subcontextInitialAction`
-
-## 10.2.0
-
-* `Versions`:
-  * `kotlin`: `2.1.0`
-  * `microutils`: `0.23.1`
-  * `tgbotapi`: `21.0.0`
-  * `exposed`: `0.56.0`
-  * `sqlite`: `3.47.1.0`
-
-## 10.1.1
-
-* `Versions`:
-  * `tgbotapi`: `20.0.1`
-
-## 10.1.0
-
-* `Versions`:
-  * `kotlin`: `2.0.21`
-  * `serialization`: `1.7.3`
-  * `coroutines`: `1.9.0`
-  * `microutils`: `0.23.0`
-  * `tgbotapi`: `20.0.0`
-  * `exposed`: `0.55.0`
-  * `sqlite`: `3.47.0.0`
-  * `koin`: `4.0.0`
-
-## 10.0.0
-
-**OVERALL LOGIC OF PLAGUBOT INITIALIZATION AND WORK HAS BEEN CHANGED**
-
-First of all, since this update `PlaguBot` will use default `StartPlugin` logic and will be built on top of it.
-All special methods of `Plugin` will be called from one of `PlaguBot` initialization phases:
-
-* `setupBotClient` will be called from `single` initialization of `telegramBot` (in `setupDI` phase)
-* `setupBotPlugin` will be called from `startPlugin` method in time of `buildBehaviourWithFSM` initialization
-
-* `Plugin`:
-  * Extension `Module.setupDI(Database,JsonObject)` has been dropped. Use `database` extension in `Module.setupDI(JsonObject)`
-* `Bot`:
-  * `dev.inmo.plagubot.config.Config` lost its `plugins` section. Now you may retrieve plugins from `Koin` only
-  * `defaultJsonFormat` became `Warning` feature due to the fact of its fully default nature
-  * `PlaguBot` lost old `start` method and took two new: with `args` as `Array<String>` and `initialConfig` as `JsonObject`
-
-**Migration:**
-
-* If you are running bot and doing it using `StartPlugin` launcher, add `dev.inmo.plagubot.PlaguBot` explicitly
-* In plugins: replace your `setupDI` overrides with `Database` as argument by the same one, but `database` will be
-available as extension in `single` or `factory` calls (as extension to `Scope` and `Koin`)
-
-## 9.3.0
-
-* `Bot`:
-  * Now bot is not built-in into `PlaguBot` and setted up as all other `Koin` dependencies
-  * Now it is possible to use `testServer` parameter for bots out of the box
-* `Plugin`:
-  * New method `setupBotClient` with arguments to let plugin setup bot more freely
-
-## 9.2.0
-
-* `Versions`:
-  * `kotlin`: `2.0.20`
-  * `serialization`: `1.7.2`
-  * `microutils`: `0.22.2`
-  * `tgbotapi`: `18.1.0`
-  * `exposed`: `0.54.0`
-  * `sqlite`: `3.46.1.0`
-
-## 9.1.0
-
-* `Versions`:
-  * `tgbotapi`: `17.0.0`
-
-## 9.0.0
-
-* `Versions`:
-  * `Kotlin`: `2.0.10`
-  * `Serialization`: `1.7.1`
-  * `MicroUtils`: `0.22.0`
-  * `tgbotapi`: `16.0.0`
-  * `Exposed`: `0.53.0`
-
-## 8.5.1
-
-* `Versions`:
-  * `MicroUtils`: `0.21.4`
-  * `tgbotapi`: `15.2.0`
-
-## 8.5.0
-
-* `Versions`:
-  * `MicroUtils`: `0.21.2`
-  * `tgbotapi`: `15.1.0`
-
-## 8.4.0
-
-* `Versions`:
-  * `Coroutines`: `1.8.1`
-  * `MicroUtils`: `0.21.1`
-  * `tgbotapi`: `15.0.0`
-  * `Exposed`: `0.51.1`
-
-## 8.3.0
-
-* `Versions`:
-  * `Serialization`: `1.6.3`
-  * `MicroUtils`: `0.20.45`
-  * `tgbotapi`: `12.0.1`
-  * `Exposed`: `0.49.0`
-  * `SQLite`: `3.45.3.0`
-  * `Koin`: `3.5.6`
-
-## 8.2.0
-
-* `Versions`:
-  * `Coroutines`: `1.8.0`
-  * `tgbotapi`: `10.1.0`
-  * `MicroUtils`: `0.20.35`
-
-## 8.1.1
-
-* `Versions`:
-  * `tgbotapi`: `10.0.1`
-  * `MicroUtils`: `0.20.32`
-  * `Exposed`: `0.47.0`
-
-## 8.1.0
-
-* Integrate `dev.inmo:micro_utils.startup` into project
-
-## 8.0.0
-
-* `Versions`:
-  * `tgbotapi`: `10.0.0`
-  * `MicroUtils`: `0.20.26`
-  * `Exposed`: `0.46.0`
-
-## 7.4.2
-
-* `Versions`:
-  * `Kotlin`: `1.9.22`
-  * `tgbotapi`: `9.4.3`
-  * `MicroUtils`: `0.20.23`
-  * `Koin`: `3.5.7`
-
-## 7.4.1
-
-* `Versions`:
-  * `Serialization`: `1.6.2`
-  * `tgbotapi`: `9.4.2`
-  * `Exposed`: `0.45.0`
-  * `SQLite`: `3.44.1.0`
-  * `MicroUtils`: `0.20.19`
-  * `uuid`: `0.8.2`
-  * `ktor`: `2.3.7`
-
 ## 7.3.0
 
-* `Versions`:
-  * `Kotlin`: `1.9.21`
-  * `Serialization`: `1.6.1`
-  * `tgbotapi`: `9.4.1`
-  * `ktor`: `2.3.6`
-  * `KSLog`: Removed explicit dependency, now it is declared in tgbotapi
-  * `MicroUtils`: `0.20.15`
-
 ## 7.2.3
 
 * `Versions`:

README.md

@@ -19,8 +19,6 @@ That is a set of libraries for plagubots. Look at the
 
 ### Technical help
 
-#### FSM
-
 In this bot has been used variant with FSM. That means that you may use all the [Behaviour Builder with FSM](https://bookstack.inmo.dev/books/telegrambotapi/page/behaviour-builder-with-fsm) functionality. In case you wish to setup states repo, you should use the next code in the `setupDI` of your plugin:
 
 ```kotlin
@@ -43,16 +41,3 @@ single<StateHandlingErrorHandler<State>> {
     }
 }
 ```
-
-#### Subcontext initial actions
-
-Bot will take all the `CombinedSubcontextInitialAction.SubItem`s from `Koin` to include it in root of
-`behaviourBuilder`. To create your own subitem:
-
-```kotlin
-singleWithRandomQualifier<CombinedSubcontextInitialAction.SubItem> {
-    CombinedSubcontextInitialAction.SubItem {
-        // do some action or throw error to rerun on next round
-    }
-}
-```

bot/build.gradle

@@ -20,9 +20,7 @@ dependencies {
     api libs.tgbotapi.behaviourBuilder.fsm
     api libs.microutils.repos.exposed
     api libs.microutils.koin
-    api libs.microutils.startup.launcher
+    api libs.kslog
-
-    api libs.ktor.engine.okhttp
 
     api libs.sqlite
 

bot/publish.gradle

@@ -1,7 +1,5 @@
-
 apply plugin: 'maven-publish'
 
-
 task javadocJar(type: Jar) {
     from javadoc
     archiveClassifier = 'javadoc'
@@ -50,29 +48,35 @@ publishing {
                     
                 }
             }
-        }
-    }
             repositories {
-        if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+                if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
                     maven {
-                name = "InmoNexus"
+                        name = "Gitea"
-                url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+                        url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
                 
-                credentials {
+                        credentials(HttpHeaderCredentials) {
-                    username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                            name = "Authorization"
-                    password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
+                            value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
                         }
+                
+                        authentication {
+                            header(HttpHeaderAuthentication)
+                        }
+                
                     }
                 }
                 if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
                     maven {
                         name = "sonatype"
-                url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
+                        url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
                 
                         credentials {
                             username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
                             password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
                         }
+                
+                    }
+                }
             }
         }
     }

bot/publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Bot","description":"Base PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Bot","description":"Base PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}

bot/src/main/kotlin/dev/inmo/plagubot/App.kt

@@ -1,11 +1,25 @@
 package dev.inmo.plagubot
 
+import dev.inmo.kslog.common.KSLog
+import dev.inmo.kslog.common.i
+import dev.inmo.plagubot.config.Config
+import dev.inmo.plagubot.config.defaultJsonFormat
 import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.json.jsonObject
+import java.io.File
 
 /**
  * This method by default expects one argument in [args] field: path to config
  */
 @InternalSerializationApi
 suspend fun main(args: Array<String>) {
-    PlaguBot.start(args).join()
+    KSLog.default = KSLog("PlaguBot")
+    val (configPath) = args
+    val file = File(configPath)
+    KSLog.i("Start read config from ${file.absolutePath}")
+    val json = defaultJsonFormat.parseToJsonElement(file.readText()).jsonObject
+    val config = defaultJsonFormat.decodeFromJsonElement(Config.serializer(), json)
+    KSLog.i("Config has been read")
+
+    PlaguBot(json, config).start().join()
 }

bot/src/main/kotlin/dev/inmo/plagubot/HelloPlugin.kt

@@ -2,18 +2,22 @@ package dev.inmo.plagubot
 
 import dev.inmo.kslog.common.*
 import dev.inmo.micro_utils.fsm.common.State
+import dev.inmo.plagubot.HelloPlugin.setupBotPlugin
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.api.send.sendMessage
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitText
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitTextMessage
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onUnhandledCommand
 import dev.inmo.tgbotapi.types.IdChatIdentifier
 import kotlinx.coroutines.flow.first
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
+import org.jetbrains.exposed.sql.Database
 import org.koin.core.Koin
 import org.koin.core.module.Module
 
@@ -25,8 +29,12 @@ object HelloPlugin : Plugin {
         val print: String
     )
 
-    override fun Module.setupDI(config: JsonObject) {
+    override fun Module.setupDI(database: Database, params: JsonObject) {
-        registerConfig<HelloPluginConfig>("helloPlugin") { null }
+        single {
+            get<Json>().decodeFromJsonElement(HelloPluginConfig.serializer(), params["helloPlugin"] ?: return@single null)
+
+
+        }
     }
 
     private sealed interface InternalFSMState : State {
@@ -35,13 +43,8 @@ object HelloPlugin : Plugin {
         data class SaidHelloOnce(override val context: IdChatIdentifier) : InternalFSMState
     }
 
-    override suspend fun startPlugin(koin: Koin) {
-        super.startPlugin(koin)
-        logger.i { "This logic called BEFORE the bot will be started and setup" }
-    }
-
     override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
-        val toPrint = koin.configOrNull<HelloPluginConfig>() ?.print ?: "Hello :)"
+        val toPrint = koin.getOrNull<HelloPluginConfig>() ?.print ?: "Hello :)"
         logger.d { toPrint }
         logger.dS { getMe().toString() }
         onCommand("hello_world") {

bot/src/main/kotlin/dev/inmo/plagubot/KoinExtensions.kt

@@ -1,28 +0,0 @@
-package dev.inmo.plagubot
-
-import org.koin.core.Koin
-import org.koin.core.definition.Definition
-import org.koin.core.module.Module
-import org.koin.core.qualifier.Qualifier
-import org.koin.core.qualifier.StringQualifier
-import org.koin.core.scope.Scope
-
-
-val Scope.plagubot: PlaguBot
-    get() = get()
-
-val Koin.plagubot: PlaguBot
-    get() = get()
-
-private val pluginsQualifier = StringQualifier("plagubotPlugins")
-internal fun Module.singlePlugins(
-    createdAtStart: Boolean = false,
-    definition: Definition<List<Plugin>>
-) = single(pluginsQualifier, createdAtStart, definition)
-val Scope.plugins: List<Plugin>
-    get() = get(pluginsQualifier)
-
-val Koin.plugins: List<Plugin>
-    get() = get(pluginsQualifier)
-
-

bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt

@@ -2,178 +2,70 @@ package dev.inmo.plagubot
 
 import dev.inmo.kslog.common.*
 import dev.inmo.micro_utils.common.Warning
-import dev.inmo.micro_utils.coroutines.runCatchingLogging
+import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.micro_utils.fsm.common.State
 import dev.inmo.micro_utils.fsm.common.StatesManager
 import dev.inmo.micro_utils.fsm.common.managers.*
 import dev.inmo.micro_utils.koin.getAllDistinct
-import dev.inmo.micro_utils.startup.launcher.StartLauncherPlugin
 import dev.inmo.plagubot.config.*
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.webhook.deleteWebhook
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
-import io.ktor.client.HttpClient
-import io.ktor.client.engine.HttpClientEngine
-import io.ktor.client.engine.HttpClientEngineFactory
-import io.ktor.client.engine.okhttp.OkHttp
 import kotlinx.coroutines.*
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.*
+import kotlinx.serialization.Transient
+import kotlinx.serialization.json.JsonObject
+import org.jetbrains.exposed.sql.Database
 import org.koin.core.Koin
+import org.koin.core.KoinApplication
+import org.koin.core.context.GlobalContext
 import org.koin.core.module.Module
 import org.koin.core.scope.Scope
-import java.io.File
+import org.koin.dsl.module
+
+val Scope.plagubot: PlaguBot
+    get() = get()
+
+val Koin.plagubot: PlaguBot
+    get() = get()
 
-/**
- * Central plugin-object that:
- * - Provides DI bindings for the bot, configuration and optional database
- * - Creates and configures Telegram bot client
- * - Builds BehaviourBuilder with FSM support and launches long polling
- * - Loads and initializes other plugins
- * - Exposes several start(...) overloads to bootstrap the application from JSON or strongly-typed configs
- *
- * Typical usage:
- * - Prepare JSON or typed configs
- * - Call one of start(...) methods
- * - The returned Job represents the bot lifecycle; awaiting it keeps the app running
- */
 @OptIn(Warning::class)
 @Serializable
-object PlaguBot : Plugin {
+data class PlaguBot(
-    /**
+    private val json: JsonObject,
-     * JSON format used for encoding/decoding PlaguBot-related configuration.
+    private val config: Config
-     *
+) : Plugin {
-     * Note:
+    @Transient
-     * - This property is not reactive. Set it only before starting the bot to affect configuration parsing/serialization.
+    private val bot = telegramBot(config.botToken)
-     */
-    var defaultJsonFormat = dev.inmo.plagubot.config.defaultJsonFormat
-        @Warning("This is not reactive set. Use this only BEFORE starting of bot") set
 
-    /**
+    override fun Module.setupDI(database: Database, params: JsonObject) {
-     * Allows other plugins to customize the [KtorRequestsExecutorBuilder] used by the bot client.
-     *
-     * For each plugin in DI (excluding this object), calls its own setupBotClient, passing the same [scope] and [params].
-     *
-     * @param scope Koin scope where the bot is being created
-     * @param params Raw JSON params of the bot part of the configuration
-     */
-    override fun KtorRequestsExecutorBuilder.setupBotClient(scope: Scope, params: JsonObject) {
-        val config = scope.get<Config>()
-        val clientFromHttpClientEngine = scope.getOrNull<HttpClientEngine>() ?.let {
-            HttpClient(it)
-        }
-        val clientFromKoin = clientFromHttpClientEngine ?: (scope.getOrNull<HttpClientEngineFactory<*>>() ?: OkHttp).let {
-            HttpClient(it)
-        }
-        this@setupBotClient.client = if (config.proxy != null) {
-            val initialClient = config.proxy.createDefaultClient()
-            initialClient.config {
-                install(clientFromKoin)
-            }
-        } else {
-            clientFromKoin
-        }
-        scope.plugins.filter { it !== this@PlaguBot }.forEach {
-            with(it) {
-                setupBotClient(scope, params)
-            }
-        }
-    }
-
-    /**
-     * Sets up application DI for the bot.
-     *
-     * Registers:
-     * - Decoded typed [Config] from provided [config] JSON
-     * - Raw [JsonObject] config itself for low-level access
-     * - Database-related config and database instance (if present in [Config])
-     * - This [PlaguBot] plugin instance
-     * - All plugins declared in launcher config as DI singletons
-     * - Configured [TelegramBot] built via [telegramBot] and customized by all plugins' setupBotClient
-     *
-     * @param config Raw PlaguBot JSON configuration
-     */
-    override fun Module.setupDI(config: JsonObject) {
-        single { get<Json>().decodeFromJsonElement(Config.serializer(), config) }
         single { config }
-        single { get<Config>().databaseConfig }
+        single { config.plugins }
-        single { get<Config>().databaseConfig.database }
+        single { config.databaseConfig }
+        single { config.databaseConfig.database }
+        single { defaultJsonFormat }
         single { this@PlaguBot }
-        singlePlugins { get<dev.inmo.micro_utils.startup.launcher.Config>().plugins.filterIsInstance<Plugin>() }
+        single { bot }
-        single {
+
-            val config = get<Config>()
+        includes(
-            telegramBot(
+            config.plugins.mapNotNull {
-                token = config.botToken,
+                runCatching {
-                testServer = config.testServer,
+                    module {
-                apiUrl = config.botApiServer
+                        with(it) {
-            ) {
+                            setupDI(database, params)
-                setupBotClient(this@single, get<JsonObject>())
                         }
                     }
+                }.onFailure { e ->
+                    logger.w("Unable to load DI part of $it", e)
+                }.getOrNull()
+            }
+        )
     }
 
-    /**
-     * Builds and starts the bot behaviour and FSM.
-     *
-     * Flow:
-     * - Collects [OnStartContextsConflictResolver], [OnUpdateContextsConflictResolver], [StatesManager] and [DefaultStatesManagerRepo] from DI (or creates defaults)
-     * - Builds BehaviourBuilder with FSM, logs errors, and calls [setupBotPlugin] for all plugins
-     * - Ensures webhook is removed before long polling with [deleteWebhook]
-     * - Starts long polling via [startGettingOfUpdatesByLongPolling] using the created behaviour context as scope and filter
-     * - Awaits the long-polling [Job] to keep the app alive
-     */
-    override suspend fun startPlugin(koin: Koin) {
-        super.startPlugin(koin)
-        val scope = koin.get<CoroutineScope>()
-
-        lateinit var behaviourContext: BehaviourContext
-        val onStartContextsConflictResolver by lazy { koin.getAllDistinct<OnStartContextsConflictResolver>() }
-        val onUpdateContextsConflictResolver by lazy { koin.getAllDistinct<OnUpdateContextsConflictResolver>() }
-        val bot = koin.get<TelegramBot>()
-        bot.buildBehaviourWithFSM(
-            scope = scope,
-            defaultExceptionsHandler = {
-                logger.e("Something went wrong", it)
-            },
-            statesManager = koin.getOrNull<StatesManager<State>>() ?: DefaultStatesManager(
-                koin.getOrNull<DefaultStatesManagerRepo<State>>() ?: InMemoryDefaultStatesManagerRepo<State>(),
-                onStartContextsConflictResolver = { old, new -> onStartContextsConflictResolver.firstNotNullOfOrNull { it(old, new) } ?: false },
-                onUpdateContextsConflictResolver = { old, new, currentNew -> onUpdateContextsConflictResolver.firstNotNullOfOrNull { it(old, new, currentNew) } ?: false }
-            ),
-            onStateHandlingErrorHandler = koin.getOrNull<StateHandlingErrorHandler<State>>() ?: { state, e ->
-                logger.eS(e) { "Unable to handle state $state" }
-                null
-            },
-            subcontextInitialAction = CombinedSubcontextInitialAction(koin.getAllDistinct()).subcontextInitialAction
-        ) {
-            logger.i("Start setup of bot part")
-            behaviourContext = this
-            setupBotPlugin(koin)
-            deleteWebhook()
-        }.start()
-        logger.i("Behaviour builder has been setup")
-
-        bot.startGettingOfUpdatesByLongPolling(scope = behaviourContext, updatesFilter = behaviourContext).also {
-            logger.i("Long polling has been started")
-        }.join()
-    }
-
-    /**
-     * Initializes and loads all other [Plugin]s from DI for the bot runtime.
-     *
-     * Each plugin is:
-     * - Logged as loading started
-     * - Executed via plugin.setupBotPlugin(...) inside a safe block
-     * - Logged on failure (as warning) or success (as info)
-     *
-     * [PlaguBot] itself is excluded from this list.
-     */
     override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
-        koin.plugins.filter { it !== this@PlaguBot }.forEach { plugin ->
+        config.plugins.forEach { plugin ->
-            runCatchingLogging(logger = logger) {
+            runCatchingSafely {
                 logger.i("Start loading of $plugin")
                 with(plugin) {
                     setupBotPlugin(koin)
@@ -187,151 +79,47 @@ object PlaguBot : Plugin {
     }
 
     /**
-     * Starts the application using raw JSON and a launcher config, optionally overriding PlaguBot config.
+     * This method will create an [Job] which will be the main [Job] of ran instance
-     *
-     * Behavior:
-     * - If [PlaguBot] is not present in [config.plugins], injects it into the plugins list
-     * - Optionally merges [plaguBotConfig] into [json]
-     * - Delegates to [StartLauncherPlugin.start] and returns the lifecycle [Job]
-     *
-     * @param json Raw JSON that may contain both launcher and PlaguBot configs
-     * @param config Parsed launcher configuration
-     * @param plaguBotConfig Optional typed PlaguBot config to merge/add
-     * @return Job representing the bot lifecycle
      */
     suspend fun start(
-        json: JsonObject,
+        scope: CoroutineScope = CoroutineScope(Dispatchers.IO)
-        config: dev.inmo.micro_utils.startup.launcher.Config,
-        plaguBotConfig: Config? = null
     ): Job {
-        KSLog.i("Config has been read")
+        logger.i("Start initialization")
-
+        val koinApp = KoinApplication.init()
-        // Adding of PlaguBot when it absent in config
+        koinApp.modules(
-        val (resultJson, resultConfig) = if (PlaguBot in config.plugins) {
+            module {
-            KSLog.i("Initial config contains PlaguBot, pass config as is to StartLauncherPlugin")
+                setupDI(config.databaseConfig.database, json)
-            json to config
+            }
-        } else {
-            KSLog.i("Start fixing of PlaguBot absence. If PlaguBot has been skipped by some reason, use dev.inmo.micro_utils.startup.launcher.main as startup point or StartLauncherPlugin directly")
-
-            val encodedPlaguBotConfig = plaguBotConfig ?.let {
-                defaultJsonFormat.encodeToJsonElement(Config.serializer(), it).jsonObject
-            } ?: JsonObject(emptyMap())
-
-            val resultJson = JsonObject(
-                encodedPlaguBotConfig + JsonObject(
-                    json + Pair(
-                        "plugins",
-                        JsonArray(
-                            (json["plugins"] as? JsonArray ?: JsonArray(emptyList())) + JsonPrimitive(PlaguBot::class.qualifiedName!!)
         )
-                    )
+        logger.i("Modules loaded")
-                )
+        GlobalContext.startKoin(koinApp)
-            )
+        logger.i("Koin started")
-            val resultConfig = defaultJsonFormat.decodeFromJsonElement(dev.inmo.micro_utils.startup.launcher.Config.serializer(), resultJson)
+        lateinit var behaviourContext: BehaviourContext
-            resultJson to resultConfig
+        val onStartContextsConflictResolver by lazy { koinApp.koin.getAllDistinct<OnStartContextsConflictResolver>() }
+        val onUpdateContextsConflictResolver by lazy { koinApp.koin.getAllDistinct<OnUpdateContextsConflictResolver>() }
+        bot.buildBehaviourWithFSM(
+            scope = scope,
+            defaultExceptionsHandler = {
+                logger.e("Something went wrong", it)
+            },
+            statesManager = koinApp.koin.getOrNull<StatesManager<State>>() ?: DefaultStatesManager(
+                koinApp.koin.getOrNull<DefaultStatesManagerRepo<State>>() ?: InMemoryDefaultStatesManagerRepo<State>(),
+                onStartContextsConflictResolver = { old, new -> onStartContextsConflictResolver.firstNotNullOfOrNull { it(old, new) } ?: false },
+                onUpdateContextsConflictResolver = { old, new, currentNew -> onUpdateContextsConflictResolver.firstNotNullOfOrNull { it(old, new, currentNew) } ?: false }
+            ),
+            onStateHandlingErrorHandler = koinApp.koin.getOrNull<StateHandlingErrorHandler<State>>() ?: { state, e ->
+                logger.eS(e) { "Unable to handle state $state" }
+                null
+            }
+        ) {
+            logger.i("Start setup of bot part")
+            behaviourContext = this
+            setupBotPlugin(koinApp.koin)
+            deleteWebhook()
+        }.start()
+        logger.i("Behaviour builder has been setup")
+        return bot.startGettingOfUpdatesByLongPolling(scope = behaviourContext, updatesFilter = behaviourContext).also {
+            logger.i("Long polling has been started")
         }
-
-        KSLog.i("Config initialization done. Passing config to StartLauncherPlugin")
-        return StartLauncherPlugin.start(
-            resultConfig,
-            resultJson
-        ).koin.get<CoroutineScope>().coroutineContext.job
-    }
-
-    /**
-     * Starts the application using typed launcher config and typed PlaguBot config.
-     *
-     * Behavior:
-     * - Merges both configs into a single JSON
-     * - Ensures [PlaguBot] is present in plugins list
-     * - Delegates to [start] that accepts JSON and launcher config
-     *
-     * @param pluginsConfig Launcher configuration
-     * @param plaguBotConfig Typed PlaguBot configuration
-     * @return Job representing the bot lifecycle
-     */
-    suspend fun start(
-        pluginsConfig: dev.inmo.micro_utils.startup.launcher.Config,
-        plaguBotConfig: Config
-    ): Job {
-        val json = JsonObject(
-            defaultJsonFormat.encodeToJsonElement(
-                dev.inmo.micro_utils.startup.launcher.Config.serializer(),
-                pluginsConfig
-            ).jsonObject + defaultJsonFormat.encodeToJsonElement(
-                Config.serializer(),
-                plaguBotConfig
-            ).jsonObject
-        )
-        val pluginsConfig = if (pluginsConfig.plugins.contains(PlaguBot)) {
-            pluginsConfig
-        } else {
-            pluginsConfig.copy(
-                plugins = pluginsConfig.plugins + PlaguBot,
-            )
-        }
-
-        return start(json, pluginsConfig)
-    }
-
-    /**
-     * Starts the application using raw JSON and a typed PlaguBot config.
-     *
-     * Behavior:
-     * - Encodes [plaguBotConfig] and merges it into [initialJson]
-     * - Delegates to [start] that takes a JSON only
-     *
-     * @param initialJson Initial JSON to start from
-     * @param plaguBotConfig Typed PlaguBot configuration that will be encoded and merged
-     * @return Job representing the bot lifecycle
-     */
-    suspend fun start(
-        initialJson: JsonObject,
-        plaguBotConfig: Config
-    ): Job {
-        val encodedPlaguBotConfig = defaultJsonFormat.encodeToJsonElement(Config.serializer(), plaguBotConfig).jsonObject
-
-        return start(
-            JsonObject(initialJson + encodedPlaguBotConfig)
-        )
-    }
-
-    /**
-     * Starts the plugins system using [StartLauncherPlugin.start].
-     *
-     * Parsing notes:
-     * - [initialJson] is decoded into launcher config
-     * - If [PlaguBot] is missing from the plugins list, it will be added automatically
-     *
-     * By using this method it is guaranteed that [PlaguBot] will be included into the set of plugins to launch.
-     *
-     * @param initialJson Raw JSON that includes launcher configuration (and optionally PlaguBot config)
-     * @return Job representing the bot lifecycle
-     */
-    suspend fun start(initialJson: JsonObject): Job {
-        val initialConfig = defaultJsonFormat.decodeFromJsonElement(dev.inmo.micro_utils.startup.launcher.Config.serializer(), initialJson)
-
-        return start(initialJson, initialConfig)
-    }
-
-    /**
-     * Starts the application from CLI arguments.
-     *
-     * Expects:
-     * - Exactly one argument: path to a file with JSON configuration
-     *
-     * The file is read, parsed as [JsonObject], and passed to [start(JsonObject)].
-     *
-     * @param args Command-line arguments; first element is a path to the config file
-     * @return Job representing the bot lifecycle
-     */
-    suspend fun start(args: Array<String>): Job {
-        KSLog.default = KSLog("PlaguBot")
-        val (configPath) = args
-        val file = File(configPath)
-        KSLog.i("Start read config from ${file.absolutePath}")
-
-        val initialJson = defaultJsonFormat.parseToJsonElement(file.readText()).jsonObject
-        return start(initialJson)
     }
 }

bot/src/main/kotlin/dev/inmo/plagubot/config/Config.kt

@@ -1,19 +1,15 @@
 package dev.inmo.plagubot.config
 
 import dev.inmo.micro_utils.common.Warning
-import dev.inmo.micro_utils.startup.plugin.StartPlugin
 import dev.inmo.plagubot.Plugin
-import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-@Warning("This API is internal and can be changed without notifications or mentions of changes")
+@Warning("This API is internal and can be changed without notifications of mentions of changes")
 @Serializable
 data class Config(
     val botToken: String,
+    val plugins: List<Plugin>,
     @SerialName("database")
     val databaseConfig: DatabaseConfig = DatabaseConfig(),
-    val botApiServer: String = telegramBotAPIDefaultUrl,
-    val testServer: Boolean = false,
-    val proxy: ProxyConfig? = null,
 )

bot/src/main/kotlin/dev/inmo/plagubot/config/DatabaseConfig.kt

@@ -5,8 +5,8 @@ import dev.inmo.kslog.common.logger
 import kotlinx.coroutines.delay
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import org.jetbrains.exposed.v1.jdbc.Database
+import org.jetbrains.exposed.sql.Database
-import org.jetbrains.exposed.v1.jdbc.transactions.transactionManager
+import org.jetbrains.exposed.sql.transactions.transactionManager
 import org.koin.core.scope.Scope
 import org.sqlite.JDBC
 import java.lang.Exception

bot/src/main/kotlin/dev/inmo/plagubot/config/JsonFormat.kt

@@ -1,9 +1,7 @@
 package dev.inmo.plagubot.config
 
-import dev.inmo.micro_utils.common.Warning
 import kotlinx.serialization.json.Json
 
-@Warning("This format will not be configured throw StartPlugin system. Use it will caution, it has no any configured things")
 val defaultJsonFormat = Json {
     ignoreUnknownKeys = true
 }

bot/src/main/kotlin/dev/inmo/plagubot/config/ProxyConfig.kt

@@ -1,47 +0,0 @@
-package dev.inmo.plagubot.config
-
-import io.ktor.client.*
-import io.ktor.client.engine.okhttp.OkHttp
-import io.ktor.client.plugins.*
-import io.ktor.client.request.*
-import io.ktor.http.*
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import java.net.Authenticator
-import java.net.InetSocketAddress
-import java.net.PasswordAuthentication
-import java.net.Proxy
-import kotlin.io.encoding.Base64
-
-@Serializable
-data class ProxyConfig(
-    val host: String,
-    val port: Int,
-    val username: String? = null,
-    val password: String? = null
-) {
-    @Transient
-    private val proxy = Proxy(Proxy.Type.SOCKS, InetSocketAddress(host, port))
-    fun createDefaultClient() = HttpClient(OkHttp) {
-        engine {
-            config {
-                proxy(this@ProxyConfig.proxy)
-                if (username != null && password != null) {
-                    val passwordAuthentication = PasswordAuthentication(
-                        username,
-                        password.toCharArray()
-                    )
-                    Authenticator.setDefault(object : Authenticator() {
-                        override fun getPasswordAuthentication(): PasswordAuthentication? {
-                            return if (requestingHost.lowercase() == host.lowercase()) {
-                                passwordAuthentication
-                            } else {
-                                null
-                            }
-                        }
-                    })
-                }
-            }
-        }
-    }
-}

build.gradle

@@ -12,30 +12,12 @@ buildscript {
     }
 }
 
-plugins {
-    alias(libs.plugins.nmcp.aggregation)
-}
-
-
-if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-    nmcpAggregation {
-        centralPortal {
-            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-            password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-            validationTimeout = Duration.ofHours(4)
-            publishingType = System.getenv('PUBLISHING_TYPE') != "" ? System.getenv('PUBLISHING_TYPE') : "USER_MANAGED"
-        }
-
-        publishAllProjectsProbablyBreakingProjectIsolation()
-    }
-}
-
 allprojects {
     repositories {
         mavenCentral()
         mavenLocal()
-        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
         maven { url 'https://jitpack.io' }
+        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
     }
 }
 

github_release.gradle

@@ -11,29 +11,22 @@ private String getCurrentVersionChangelog() {
     return changelogDataOS.toString().trim()
 }
 
-def githubTokenVariableName = "GITHUB_RELEASE_TOKEN"
+if (new File(projectDir, "secret.gradle").exists()) {
-def githubTokenVariableFromEnv = System.getenv(githubTokenVariableName)
-
-def secretFile = new File(projectDir, "secret.gradle")
-if (secretFile.exists() || project.hasProperty(githubTokenVariableName) || (githubTokenVariableFromEnv != "" && githubTokenVariableFromEnv != null)) {
-    if (secretFile.exists()) {
     apply from: './secret.gradle'
-    }
     apply plugin: "com.github.breadmoirai.github-release"
-    def githubReleaseToken = project.hasProperty(githubTokenVariableName) ? project.property(githubTokenVariableName).toString() : githubTokenVariableFromEnv
 
     githubRelease {
-        token githubReleaseToken
+        token "${project.property('GITHUB_RELEASE_TOKEN')}"
 
         releaseAssets.from('bot/build/distributions')
 
-        owner = "InsanusMokrassar"
+        owner "InsanusMokrassar"
-        repo = "PlaguBot"
+        repo "PlaguBot"
 
-        tagName = "v${project.version}"
+        tagName "v${project.version}"
-        releaseName = "${project.version}"
+        releaseName "${project.version}"
-        targetCommitish = "${project.version}"
+        targetCommitish "${project.version}"
 
-        body = getCurrentVersionChangelog()
+        body getCurrentVersionChangelog()
     }
 }

gradle.properties

@@ -1,8 +1,8 @@
-org.gradle.jvmargs=-Xmx2048m
+qorg.gradle.jvmargs=-Xmx2048m
 kotlin.code.style=official
 org.gradle.parallel=true
 kotlin.js.generate.externals=true
 kotlin.incremental=true
 
 group=dev.inmo
-version=11.1.1
+version=7.4.0

gradle/libs.versions.toml

@@ -1,25 +1,28 @@
 [versions]
 
-kt = "2.3.10"
+kt = "1.9.20"
-kt-serialization = "1.10.0"
+kt-serialization = "1.6.0"
-kt-coroutines = "1.10.2"
+kt-coroutines = "1.7.3"
 
-microutils = "0.29.1"
+microutils = "0.20.12"
-tgbotapi = "32.0.0"
+tgbotapi = "9.3.0"
-ktor = "3.4.1"
+kslog = "1.2.3"
 
-ksp = "2.3.6"
+ksp = "1.9.20-1.0.14"
 
-jb-exposed = "1.1.1"
+jb-exposed = "0.44.1"
-jb-dokka = "2.1.0"
+jb-dokka = "1.9.10"
 
-sqlite = "3.51.2.0"
+sqlite = "3.43.0.0"
 
-gh-release = "2.5.2"
+klock = "4.0.10"
+uuid = "0.8.1"
 
-koin = "4.1.1"
+ktor = "2.3.5"
 
-nmcp = "1.4.4"
+gh-release = "2.4.1"
+
+koin = "3.5.0"
 
 [libraries]
 
@@ -33,10 +36,7 @@ tgbotapi-behaviourBuilder-fsm = { module = "dev.inmo:tgbotapi.behaviour_builder.
 microutils-repos-exposed = { module = "dev.inmo:micro_utils.repos.exposed", version.ref = "microutils" }
 microutils-koin = { module = "dev.inmo:micro_utils.koin", version.ref = "microutils" }
 microutils-koin-generator = { module = "dev.inmo:micro_utils.koin.generator", version.ref = "microutils" }
-microutils-startup-launcher = { module = "dev.inmo:micro_utils.startup.launcher", version.ref = "microutils" }
+kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
-microutils-startup-plugin = { module = "dev.inmo:micro_utils.startup.plugin", version.ref = "microutils" }
-
-ktor-engine-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
 
 koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 
@@ -53,7 +53,3 @@ buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serializa
 buildscript-jb-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "jb-dokka" }
 buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
 buildscript-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
-
-[plugins]
-
-nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }

gradle/wrapper/gradle-wrapper.properties

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

plugin/build.gradle

@@ -14,7 +14,6 @@ dependencies {
 
     api libs.tgbotapi
     api libs.microutils.repos.exposed
-    api libs.microutils.startup.plugin
 
     api libs.koin
 }

plugin/publish.gradle

@@ -1,7 +1,5 @@
-
 apply plugin: 'maven-publish'
 
-
 task javadocJar(type: Jar) {
     from javadoc
     archiveClassifier = 'javadoc'
@@ -50,29 +48,35 @@ publishing {
                     
                 }
             }
-        }
-    }
             repositories {
-        if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+                if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
                     maven {
-                name = "InmoNexus"
+                        name = "Gitea"
-                url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+                        url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
                 
-                credentials {
+                        credentials(HttpHeaderCredentials) {
-                    username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                            name = "Authorization"
-                    password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
+                            value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
                         }
+                
+                        authentication {
+                            header(HttpHeaderAuthentication)
+                        }
+                
                     }
                 }
                 if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
                     maven {
                         name = "sonatype"
-                url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
+                        url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
                 
                         credentials {
                             username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
                             password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
                         }
+                
+                    }
+                }
             }
         }
     }

plugin/publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Plugin","description":"Base dependency for whole PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Plugin","description":"Base dependency for whole PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}

plugin/src/main/kotlin/dev/inmo/plagubot/KoinDatabaseExtensions.kt

@@ -1,11 +0,0 @@
-package dev.inmo.plagubot
-
-import org.jetbrains.exposed.v1.jdbc.Database
-import org.koin.core.Koin
-import org.koin.core.scope.Scope
-
-val Scope.database: Database
-    get() = get()
-
-val Koin.database: Database
-    get() = get()

plugin/src/main/kotlin/dev/inmo/plagubot/KoinExtensions.kt

@@ -1,54 +0,0 @@
-package dev.inmo.plagubot
-
-import kotlinx.serialization.InternalSerializationApi
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.serializer
-import org.koin.core.Koin
-import org.koin.core.module.Module
-import org.koin.core.scope.Scope
-import kotlin.reflect.KClass
-
-/**
- * Using [single] to register `T` with serializer [configSerializer]
- *
- * @param default Will be used if [field] is absent as an alternative way of config allocation. If null passed, error
- * will be thrown
- */
-inline fun <reified T> Module.registerConfig(configSerializer: KSerializer<T>, field: String?, noinline default: (Scope.(JsonObject) -> T?)? = null) {
-    single {
-        val fieldValue = get<JsonObject>().let {
-            if (field == null) {
-                it
-            } else {
-                it[field] ?: default ?.let { _ ->
-                    return@single default(it)
-                } ?: error("Unable to take field $field from config")
-            }
-        }
-        get<Json>().decodeFromJsonElement(configSerializer, fieldValue)
-    }
-}
-
-/**
- * Using [single] to register config with getting of [serializer] from [kClass]
- *
- * @param default Will be used if [field] is absent as an alternative way of config allocation. If null passed, error
- * will be thrown
- */
-@OptIn(InternalSerializationApi::class)
-inline fun <reified T : Any> Module.registerConfig(kClass: KClass<T>, field: String?, noinline default: (Scope.(JsonObject) -> T?)? = null) = registerConfig(kClass.serializer(), field, default)
-
-/**
- * Using [single] to register config with getting of [serializer] from [kClass]
- *
- * @param default Will be used if [field] is absent as an alternative way of config allocation. If null passed, error
- * will be thrown
- */
-inline fun <reified T : Any> Module.registerConfig(field: String?, noinline default: (Scope.(JsonObject) -> T?)? = null) = registerConfig(T::class, field, default)
-
-inline fun <reified T : Any> Scope.config() = get<T>()
-inline fun <reified T : Any> Koin.config() = get<T>()
-inline fun <reified T : Any> Scope.configOrNull() = getOrNull<T>()
-inline fun <reified T : Any> Koin.configOrNull() = getOrNull<T>()

plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt

@@ -1,14 +1,13 @@
 package dev.inmo.plagubot
 
 import dev.inmo.micro_utils.fsm.common.State
-import dev.inmo.micro_utils.startup.plugin.StartPlugin
-import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextWithFSM
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
+import org.jetbrains.exposed.sql.Database
 import org.koin.core.Koin
-import org.koin.core.scope.Scope
+import org.koin.core.module.Module
 
 /**
  * **ANY REALIZATION OF [Plugin] MUST HAVE CONSTRUCTOR WITH ABSENCE OF INCOMING PARAMETERS**
@@ -18,18 +17,14 @@ import org.koin.core.scope.Scope
  * too.
  */
 @Serializable(PluginSerializer::class)
-interface Plugin : StartPlugin {
+interface Plugin {
-    @Deprecated("Deprecated in favor to setupBotClient with arguments")
-    fun KtorRequestsExecutorBuilder.setupBotClient() {}
-
     /**
-     * Will be called on stage of bot setup
+     * This method will be called when this plugin should configure di module based on the incoming params
-     *
-     * @param scope The scope of [org.koin.core.module.Module.single] of bot definition
-     * @param params Params (in fact, the whole bot config)
      */
-    @Suppress("DEPRECATION")
+    fun Module.setupDI(
-    fun KtorRequestsExecutorBuilder.setupBotClient(scope: Scope, params: JsonObject) = setupBotClient()
+        database: Database,
+        params: JsonObject
+    ) {}
 
     /**
      * Override this method in cases when you want to declare common bot behaviour. In case you wish to use FSM, you

plugin/src/main/kotlin/dev/inmo/plagubot/PluginSerializer.kt

@@ -7,6 +7,7 @@ import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 
+@Serializer(Plugin::class)
 class PluginSerializer : KSerializer<Plugin> {
     override val descriptor: SerialDescriptor
         get() = String.serializer().descriptor

template.config.json

@@ -10,13 +10,6 @@
     }
   },
   "botToken": "1234567890:ABCDEFGHIJKLMNOP_qrstuvwxyz12345678",
-  "proxy": {
-    "host": "127.0.0.1",
-    "port": 1080,
-    "username": "OPTIONAL username",
-    "password": "OPTIONAL password",
-    "_note": "THIS OBJECT IS OPTIONAL"
-  },
   "plugins": [
     "dev.inmo.plagubot.HelloPlugin"
   ],