update dependencies

3.1.4

.github/workflows/build.yml

@@ -8,9 +8,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Build with Gradle
         run: ./gradlew build

.gitignore

@@ -10,5 +10,7 @@ build/
 out/
 
 local.properties
+local.*
+local.*/
 config.json
 secret.gradle

CHANGELOG.md

@@ -1,5 +1,320 @@
 # Changelog
 
+## 3.2.0
+
+* `Versions`:
+  * `kotlin`: `1.7.22`
+  * `tgbotapi`: `4.2.0`
+  * `microutils`: `0.15.0`
+  * `kslog`: `0.5.4`
+  * `sqlite`: `3.40.0.0`
+
+## 3.1.4
+
+* `Versions`:
+  * `tgbotapi`: `4.1.3`
+  * `microutils`: `0.14.4`
+
+## 3.1.3
+
+* `Versions`:
+  * `tgbotapi`: `4.1.2`
+
+## 3.1.2
+
+* `Versions`:
+  * `microutils`: `0.14.2`
+  * `exposed`: `0.41.1`
+
+## 3.1.1
+
+* `Versions`:
+  * `tgbotapi`: `4.1.1`
+
+## 3.1.0
+
+* `Versions`:
+  * `kotlin`: `1.7.21`
+  * `microutils`: `0.14.1`
+  * `tgbotapi`: `4.1.0`
+  * `klock`: `3.4.0`
+  * `uuid`: `0.6.0`
+
+## 3.0.0
+
+* `Versions`:
+  * `microutils`: `0.14.0`
+  * `tgbotapi`: `4.0.0`
+  * `kslog`: `0.5.3`
+  * `exposed`: `0.40.1`
+  * `klock`: `3.3.1`
+
+## 2.4.1
+
+* `Versions`:
+  * `microutils`: `0.13.2`
+  * `tgbotapi`: `3.3.1`
+  * `klock`: `3.3.0`
+  * `ktor`: `2.1.3`
+  * `koin`: `3.2.2`
+
+## 2.4.0
+
+* `Versions`:
+  * `kotlin`: `1.7.20`
+  * `serialization`: `1.4.1`
+  * `tgbotapi`: `3.3.0`
+  * `microutils`: `0.13.1`
+  * `klock`: `3.2.0`
+  * `ktor`: `2.1.2`
+
+## 2.3.4
+
+* `Versions`:
+  * `tgbotapi`: `3.2.7`
+  * `microutils`: `0.12.16`
+
+## 2.3.3
+
+* `Versions`:
+  * `tgbotapi`: `3.2.6`
+  * `sqlite`: `3.39.3.0`
+
+## 2.3.2
+
+* `Versions`:
+  * `tgbotapi`: `3.2.3`
+  * `microutils`: `0.12.13`
+  * `kslog`: `0.5.2`
+
+## 2.3.1
+
+* `Versions`:
+  * `klock`: `3.1.0`
+  * `tgbotapi`: `3.2.1`
+  * `microutils`: `0.12.11`
+  * `ktor`: `2.1.1`
+
+## 2.3.0
+
+* `Bot`:
+  * Add option `reconnectOptions` in database config
+
+## 2.2.0
+
+* `Versions`:
+  * `serialization`: `1.4.0`
+  * `tgbotapi`: `3.2.0`
+  * `microutils`: `0.12.4`
+  * `kslog`: `0.5.1`
+
+## 2.1.1
+
+* `Bot`:
+  * Now it is possible to get bot from `koin`
+
+## 2.1.0
+
+* `Versions`:
+  * `tgbotapi`: `3.1.1`
+  * `ktor`: `2.1.0`
+  * `microutils`: `0.12.1`
+* `Plugins`:
+  * New fum of `Plugin` with `BehaviourContextWithFSM` receiver
+* `Bot`:
+  * Now bot uses `buildBehaviourWithFSM` to be able to setup bot with FSM
+
+## 2.0.0
+
+* `Versions`:
+  * `kotlin`: `1.7.10`
+  * `serialization`: `1.4.0-RC`
+  * `tgbotapi`: `3.0.2`
+  * `kslog`: `0.5.0`
+  * `uuid`: `0.5.0`
+  * `exposed`: `0.39.2`
+  * `microutils`: `0.12.0`
+
+## 1.4.1
+
+* `Versions`:
+  * `tgbotapi`: `2.2.2`
+  * `kslog`: `0.4.2`
+
+## 1.4.0
+
+* `Versions`:
+  * `kslog`: `0.4.1`
+
+## 1.3.1
+
+* `Versions`:
+  * `tgbotapi`: `2.2.1`
+  * `microutils`: `0.11.13`
+
+## 1.3.0
+
+* `Versions`
+  * `tgbotapi`: `2.2.0`
+
+## 1.2.3
+
+* `Versions`
+  * `tgbotapi`: `2.1.3`
+
+## 1.2.2
+
+* `Versions`
+  * `tgbotapi`: `2.1.2`
+  * `microutils`: `0.11.12`
+  * `coroutines`: `1.6.3`
+  * `ktor`: `2.0.3`
+
+## 1.2.1
+
+* `Versions`
+  * `tgbotapi`: `2.1.1`
+  * `microutils`: `0.11.6`
+  * `kslog`: `0.3.2`
+
+## 1.2.0
+
+* `Versions`
+  * `tgbotapi`: `2.1.0`
+
+## 1.1.2
+
+* `Versions`
+  * `tgbotapi`: `2.0.3`
+  * `microutils`: `0.11.3`
+  * `kslog`: `0.3.1`
+* `Plugin`:
+  * Now it is possible to use `object`s of plugins instead of classes
+
+## 1.1.1
+
+* `Versions`
+  * `coroutines`: `1.6.2`
+  * `tgbotapi`: `2.0.2`
+  * `microutils`: `0.11.0`
+  * `ktor`: `2.0.2`
+  * `uuid`: `0.4.1`
+
+## 1.1.0
+
+* `Versions`
+  * `tgbotapi`: `2.0.0`
+  * `microutils`: `0.10.5`
+* `Plugin`:
+  * All plugins will be loaded in parallel
+
+## 1.0.0
+
+* `Versions`
+  * `kotlin`: `1.6.21`
+  * `coroutines`: `1.6.1`
+  * `serialization`: `1.3.3`
+  * `exposed`: `0.38.2`
+  * `tgbotapi`: `1.1.0`
+  * `microutils`: `0.10.4`
+* `Common`:
+  * ___ALL THE SDI/KLASSINDEX FUNCTIONALITY HAS BEEN REMOVED___
+* `Plugin`:
+  * Now plugins must have empty constructor
+  * Now plugins may provide realization of two methods: `setupDI` and `setupBotPlugin`
+* `PlaguBot`:
+  * `Config` now is simple serializable `data class`
+  * `PlaguBot` now is more simple as a plugin
+
+## 0.5.1
+
+* `Versions`
+  * `tgbotapi`: `0.38.4`
+  * `microutils`: `0.9.5`
+
+## 0.5.0
+
+* `Versions`
+  * `kotlin`: `1.6.10`
+  * `coroutines`: `1.6.0`
+  * `serialization`: `1.3.2`
+  * `exposed`: `0.37.2`
+  * `tgbotapi`: `0.38.0`
+  * `microutils`: `0.9.0`
+
+## 0.4.1
+
+Temporal update for compatibility with java 1.8
+
+## 0.3.2
+
+* `Versions`
+  * `kotlin`: `1.5.20` -> `1.5.31`
+  * `coroutines`: `1.5.0` -> `1.5.2`
+  * `serialization`: `1.2.1` -> `1.2.2`
+  * `exposed`: `0.32.1` -> `0.34.2`
+  * `tgbotapi`: `0.35.1` -> `0.35.9`
+  * `microutils`: `0.5.15` -> `0.5.28`
+
+## 0.3.1
+
+* `Versions`
+  * `kotlin`: `1.5.10` -> `1.5.20`
+  * `tgbotapi`: `0.35.0` -> `0.35.1`
+  * `microutils`: `0.5.7` -> `0.5.15`
+
+## 0.3.0
+
+* `Versions`
+  * `kotlin`: `1.4.32` -> `1.5.10`
+  * `coroutines`: `1.4.3` -> `1.5.0`
+  * `serialization`: `1.1.0` -> `1.2.1`
+  * `exposed`: `0.31.1` -> `0.32.1`
+  * `sdi`: `0.4.1` -> `0.5.0`
+  * `tgbotapi`: `0.34.1` -> `0.35.0`
+  * `microutils`: `0.4.36` -> `0.5.7`
+* `Bot`
+  * Add plugin `PluginsHolder`
+  * Rewrite mechanism of `Config` working
+  * `PlaguBot` now is correctly serializable/deserializable
+
+## 0.2.1
+
+* `Versions`
+  * `tgbotapi`: `0.33.4` -> `0.34.0`
+  * `sqlite`: `3.30.1` -> `3.34.0`
+
+## 0.2.0
+
+* `Versions`
+  * `tgbotapi`: `0.33.4` -> `0.34.0`
+  * `exposed`: `0.30.2` -> `0.31.1`
+
+## 0.1.9
+
+* `Versions`
+  * `tgbotapi`: `0.33.3` -> `0.33.4`
+  * `microutils`: `0.4.33` -> `0.4.36`
+  * `exposed`: `0.30.1` -> `0.30.2`
+
+## 0.1.8
+
+* `Versions`
+  * `tgbotapi`: `0.33.2` -> `0.33.3`
+  * `microutils`: `0.4.32` -> `0.4.33`
+
+## 0.1.7
+
+* `Versions`
+  * `exposed`: `0.29.1` -> `0.30.1`
+  * `tgbotapi`: `0.33.1` -> `0.33.2`
+  * `microutils`: `0.4.31` -> `0.4.32`
+* `PlaguBot`
+  * New class `PlaguBot` (😊)
+  * `initPlaguBot` is deprecated
+  * New shortcut for params - `plagubot`. `PlaguBot` class can be put inside other plagubot
+  for additional opportunities
+
 ## 0.1.6
 
 * `Versions`

README.md

@@ -11,8 +11,33 @@ You can create your bot using
 
 | Template: | [![Use template](badges/use_template.svg)](https://github.com/InsanusMokrassar/PlaguBotPluginTemplate/generate) |
 |-----------|-----------------------------------------------------------------------------------------------------------------|
-| Bot version: | [![Download](https://api.bintray.com/packages/insanusmokrassar/PlaguBot/plagubot.bot/images/download.svg)](https://bintray.com/insanusmokrassar/PlaguBot/plagubot.bot/_latestVersion) |
-| Plugin version: | [![Download](https://api.bintray.com/packages/insanusmokrassar/PlaguBot/plagubot.plugin/images/download.svg)](https://bintray.com/insanusmokrassar/PlaguBot/plagubot.plugin/_latestVersion) |
+| Bot version: | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/plagubot.bot/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/plagubot.bot) |
+| Plugin version: | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/plagubot.plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/plagubot.plugin) |
 
 That is a set of libraries for plagubots. Look at the
 [PlaguBot Plugin template](https://insanusmokrassar.github.io/PlaguBotPluginTemplate/) to find how to create your bot.
+
+### Technical help
+
+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
+single<StatesManager<State>> {
+    // setup your manager and return here
+    // Default is:
+    DefaultStatesManager(
+        InMemoryDefaultStatesManagerRepo()
+    )
+}
+```
+
+Besides, you may setup handling errors lambda in the same function:
+
+```kotlin
+single<StateHandlingErrorHandler<State>> {
+    { state, e ->
+        logger.eS(e) { "Unable to handle state $state" } // logging by default
+        null // you should return new state or null, default callback will return null
+    }
+}
+```

bot/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm'
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "org.jetbrains.kotlin.kapt"
     id 'application'
 }
 
@@ -11,21 +10,19 @@ project.version="$version"
 apply from: "publish.gradle"
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-    api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_runtime_version"
-    api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    api "org.jetbrains.exposed:exposed-jdbc:$kotlin_exposed_version"
+    implementation libs.kt.stdlib
+    api libs.kt.coroutines
+    api libs.kt.serialization
+    api libs.jb.exposed.jdbc
 
-    api "dev.inmo:tgbotapi:$tgbotapi_version"
-    api "dev.inmo:sdi:$sdi_version"
-    api "dev.inmo:micro_utils.repos.exposed:$microutils_version"
+    api libs.tgbotapi
+    api libs.tgbotapi.behaviourBuilder.fsm
+    api libs.microutils.repos.exposed
+    api libs.kslog
 
-    api "com.github.matfax.klassindex:library:$klassindex_version"
-    kapt "com.github.matfax.klassindex:processor:$klassindex_version"
-    api "org.xerial:sqlite-jdbc:$sqlite_version"
+    api libs.sqlite
 
-    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+    testImplementation libs.kt.test.junit
 
     api project(":plagubot.plugin")
 }
@@ -34,10 +31,8 @@ application {
     mainClassName = 'dev.inmo.plagubot.AppKt'
 }
 
-kapt {
-    arguments {
-        arg("com.github.matfax.klassindex.IndexSubclasses", "dev.inmo.plagubot.Plugin")
-        arg("com.github.matfax.klassindex.IndexAnnotated", "dev.inmo.sdi.SDIIncluded")
-    }
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 

bot/pubconf.kpsb

@@ -1 +0,0 @@
-{"bintrayConfig":{"repo":"PlaguBot","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/PlaguBot","autoPublish":true,"overridePublish":true},"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","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"JVM"}

bot/publish.gradle

@@ -1,6 +1,4 @@
 apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
 
 task javadocJar(type: Jar) {
     from javadoc
@@ -50,33 +48,52 @@ publishing {
                     
                 }
             }
-            
-                repositories {
+            repositories {
+                if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
                     maven {
-                        name = "bintray"
-                        url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/PlaguBot/${project.name}/;publish=1;override=1")
-                        credentials {
-                            username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-                            password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                        name = "Gitea"
+                        url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+                
+                        credentials(HttpHeaderCredentials) {
+                            name = "Authorization"
+                            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://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')
                         }
+                
                     }
-                    
                 }
-            
+            }
         }
     }
 }
 
-signing {
-    useGpgCmd()
-    sign publishing.publications
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
+    
+    signing {
+        useGpgCmd()
+    
+        sign publishing.publications
+    }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
 }

bot/publish.kpsb

@@ -0,0 +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":"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,48 +1,25 @@
 package dev.inmo.plagubot
 
-import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
-import dev.inmo.plagubot.config.*
-import dev.inmo.plagubot.config.configJsonFormat
-import dev.inmo.tgbotapi.bot.Ktor.telegramBot
-import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
-import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviour
-import dev.inmo.tgbotapi.types.botCommandsLimit
-import kotlinx.coroutines.*
+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
 
-suspend inline fun initPlaguBot(
-    config: Config,
-    scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
-): Job {
-    val bot = telegramBot(config.botToken)
-
-    val paramsMap = config.params ?.toMap() ?: emptyMap()
-    val database = config.params ?.database ?: config.database.database
-    return bot.buildBehaviour(scope) {
-        val commands = config.plugins.flatMap {
-            it.apply { invoke(database, paramsMap) }
-            it.getCommands()
-        }.let {
-            val futureUnavailable = it.drop(botCommandsLimit.last)
-            if (futureUnavailable.isNotEmpty()) {
-                println("Next commands are out of range in setting command request and will be unavailable from autocompleting: ${futureUnavailable}")
-            }
-            it.take(botCommandsLimit.last)
-        }
-        safelyWithoutExceptions { setMyCommands(commands) }
-    }
-}
-
 /**
  * This method by default expects one argument in [args] field: path to config
  */
 @InternalSerializationApi
 suspend fun main(args: Array<String>) {
+    KSLog.default = KSLog("PlaguBot")
     val (configPath) = args
     val file = File(configPath)
-    val config = configJsonFormat.decodeFromString(ConfigSerializer, file.readText())
+    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")
 
-    val scope = CoroutineScope(Dispatchers.Default)
-    initPlaguBot(config, scope).join()
+    PlaguBot(json, config).start().join()
 }

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

@@ -1,16 +1,65 @@
 package dev.inmo.plagubot
 
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+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
 
 @Serializable
 @SerialName("Hello")
-data class HelloPlugin(
-    val parameter: String
-) : Plugin {
-    override suspend fun BehaviourContext.invoke(database: Database) {
-        println(parameter)
+object HelloPlugin : Plugin {
+    @Serializable
+    data class HelloPluginConfig(
+        val print: String
+    )
+
+    override fun Module.setupDI(database: Database, params: JsonObject) {
+        single {
+            get<Json>().decodeFromJsonElement(HelloPluginConfig.serializer(), params["helloPlugin"] ?: return@single null)
+
+
+        }
+    }
+
+    private sealed interface InternalFSMState : State {
+        override val context: IdChatIdentifier
+        data class DidntSaidHello(override val context: IdChatIdentifier) : InternalFSMState
+        data class SaidHelloOnce(override val context: IdChatIdentifier) : InternalFSMState
+    }
+
+    override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
+        val toPrint = koin.getOrNull<HelloPluginConfig>() ?.print ?: "Hello :)"
+        logger.d { toPrint }
+        logger.dS { getMe().toString() }
+        onCommand("hello_world") {
+            startChain(InternalFSMState.DidntSaidHello(it.chat.id))
+        }
+
+        strictlyOn { state: InternalFSMState.DidntSaidHello ->
+            sendMessage(state.context, toPrint)
+            InternalFSMState.SaidHelloOnce(state.context)
+        }
+
+        strictlyOn { state: InternalFSMState.SaidHelloOnce ->
+            val message = waitTextMessage().first()
+            reply(message, "Sorry, I can answer only this: $toPrint")
+            InternalFSMState.SaidHelloOnce(state.context)
+        }
     }
 }

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

@@ -0,0 +1,123 @@
+package dev.inmo.plagubot
+
+import dev.inmo.kslog.common.*
+import dev.inmo.micro_utils.common.Warning
+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.plagubot.config.*
+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 kotlinx.coroutines.*
+import kotlinx.serialization.Serializable
+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 org.koin.dsl.module
+
+val Scope.plagubot: PlaguBot
+    get() = get()
+
+val Koin.plagubot: PlaguBot
+    get() = get()
+
+@OptIn(Warning::class)
+@Serializable
+data class PlaguBot(
+    private val json: JsonObject,
+    private val config: Config
+) : Plugin {
+    @Transient
+    private val bot = telegramBot(config.botToken)
+
+    override fun Module.setupDI(database: Database, params: JsonObject) {
+        single { config }
+        single { config.plugins }
+        single { config.databaseConfig }
+        single { config.databaseConfig.database }
+        single { defaultJsonFormat }
+        single { this@PlaguBot }
+        single { bot }
+
+        includes(
+            config.plugins.mapNotNull {
+                runCatching {
+                    module {
+                        with(it) {
+                            setupDI(database, params)
+                        }
+                    }
+                }.onFailure { e ->
+                    logger.w("Unable to load DI part of $it", e)
+                }.getOrNull()
+            }
+        )
+    }
+
+    override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
+        config.plugins.map { plugin ->
+            launch {
+                runCatchingSafely {
+                    logger.i("Start loading of $plugin")
+                    with(plugin) {
+                        setupBotPlugin(koin)
+                    }
+                }.onFailure { e ->
+                    logger.w("Unable to load bot part of $plugin", e)
+                }.onSuccess {
+                    logger.i("Complete loading of $plugin")
+                }
+            }
+        }.joinAll()
+    }
+
+    /**
+     * This method will create an [Job] which will be the main [Job] of ran instance
+     */
+    suspend fun start(
+        scope: CoroutineScope = CoroutineScope(Dispatchers.IO)
+    ): Job {
+        logger.i("Start initialization")
+        val koinApp = KoinApplication.init()
+        koinApp.modules(
+            module {
+                setupDI(config.databaseConfig.database, json)
+            }
+        )
+        logger.i("Modules loaded")
+        GlobalContext.startKoin(koinApp)
+        logger.i("Koin started")
+        lateinit var behaviourContext: BehaviourContext
+        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 = { _, _ -> 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")
+        }
+    }
+}

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

@@ -1,166 +1,15 @@
 package dev.inmo.plagubot.config
 
-import com.github.matfax.klassindex.KlassIndex
+import dev.inmo.micro_utils.common.Warning
 import dev.inmo.plagubot.Plugin
-import dev.inmo.plagubot.PluginSerializer
-import dev.inmo.sdi.*
-import kotlinx.serialization.*
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.*
-import kotlinx.serialization.modules.*
-import kotlin.reflect.KClass
-
-@InternalSerializationApi
-internal inline fun <T : Plugin> KClass<T>.includeIn(builder: PolymorphicModuleBuilder<Plugin>) = builder.subclass(this, serializer())
-
-@InternalSerializationApi
-internal val configJsonFormat: Json
-    get() = Json {
-        ignoreUnknownKeys = true
-        serializersModule = SerializersModule {
-            polymorphic(Plugin::class) {
-                KlassIndex.getSubclasses(Plugin::class).flatMap { kclass ->
-                    kclass.includeIn(this)
-                    kclass.annotations.mapNotNull { it as? SerialName }.map {
-                        it.value to kclass.serializer()
-                    } + listOfNotNull(
-                        kclass.simpleName ?.let {
-                            it to kclass.serializer()
-                        }
-                    )
-                }.toMap().let {
-                    default { requiredType ->
-                        it[requiredType]
-                    }
-                }
-            }
-        }
-    }
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
+@Warning("This API is internal and can be changed without notifications of mentions of changes")
 @Serializable
 data class Config(
-    val plugins: List<@Contextual Plugin>,
-    val database: DatabaseConfig = DatabaseConfig(),
     val botToken: String,
-    @Contextual
-    val params: Module? = null
+    val plugins: List<Plugin>,
+    @SerialName("database")
+    val databaseConfig: DatabaseConfig = DatabaseConfig(),
 )
-
-@Serializer(Plugin::class)
-private class InternalPluginSerializer(
-    private val params: Module
-) : KSerializer<Plugin> {
-    override val descriptor: SerialDescriptor = PluginSerializer.descriptor
-
-    @InternalSerializationApi
-    override fun deserialize(decoder: Decoder): Plugin {
-        val asJson = JsonElement.serializer().deserialize(decoder)
-
-        return if (asJson is JsonPrimitive) {
-            params[asJson.jsonPrimitive.content] as Plugin
-        } else {
-            val jsonFormat = ((decoder as? JsonDecoder)?.json ?: configJsonFormat)
-            jsonFormat.decodeFromJsonElement(PluginSerializer, asJson)
-        }
-    }
-
-    @InternalSerializationApi
-    override fun serialize(encoder: Encoder, value: Plugin) {
-        params.keys.firstOrNull { params[it] === value } ?.also {
-            encoder.encodeString(it)
-        } ?: PluginSerializer.serialize(encoder, value)
-    }
-}
-
-private val DefaultModuleSerializer = ModuleSerializer(emptyList()) {
-
-}
-
-@Serializer(Module::class)
-private class InternalModuleSerializer(
-    private val original: JsonElement?,
-    private val params: Module
-) : KSerializer<Module> {
-    override val descriptor: SerialDescriptor = PluginSerializer.descriptor
-
-    @InternalSerializationApi
-    override fun deserialize(decoder: Decoder): Module {
-        val asJson = JsonElement.serializer().deserialize(decoder)
-
-        return if (asJson == original) {
-            params
-        } else {
-            configJsonFormat.decodeFromJsonElement(DefaultModuleSerializer, asJson)
-        }
-    }
-
-    @InternalSerializationApi
-    override fun serialize(encoder: Encoder, value: Module) = DefaultModuleSerializer.serialize(encoder, value)
-}
-
-private fun internalPluginSerializerSerializersModule(
-    internalPluginSerializer: InternalPluginSerializer,
-    internalModuleSerializer: InternalModuleSerializer?
-) = SerializersModule {
-    contextual(internalPluginSerializer)
-    contextual(internalModuleSerializer ?: return@SerializersModule)
-}
-
-@Serializer(Config::class)
-internal object ConfigSerializer : KSerializer<Config> {
-    private val jsonSerializer = JsonObject.serializer()
-    private val moduleSerializer = ModuleSerializer()
-
-    @InternalSerializationApi
-    override fun deserialize(decoder: Decoder): Config {
-        val json = jsonSerializer.deserialize(decoder)
-        val jsonFormat = (decoder as? JsonDecoder) ?.json ?: configJsonFormat
-        val paramsRow = json["params"]
-
-        val resultJsonFormat = if (paramsRow != null && paramsRow != JsonNull) {
-            val params = jsonFormat.decodeFromJsonElement(
-                moduleSerializer,
-                paramsRow
-            )
-
-            val pluginsSerializer = InternalPluginSerializer(params)
-            val moduleSerializer = InternalModuleSerializer(paramsRow, params)
-            Json(jsonFormat) {
-                serializersModule = decoder.serializersModule.overwriteWith(
-                    internalPluginSerializerSerializersModule(pluginsSerializer, moduleSerializer)
-                )
-            }
-        } else {
-            jsonFormat
-        }
-        return resultJsonFormat.decodeFromJsonElement(
-            Config.serializer(),
-            json
-        )
-    }
-
-    @InternalSerializationApi
-    override fun serialize(encoder: Encoder, value: Config) {
-        if (value.params != null) {
-            val pluginsSerializer = InternalPluginSerializer(value.params)
-
-            val jsonFormat = Json(configJsonFormat) {
-                serializersModule = encoder.serializersModule.overwriteWith(
-                    internalPluginSerializerSerializersModule(pluginsSerializer, null)
-                )
-            }
-
-            jsonSerializer.serialize(
-                encoder,
-                jsonFormat.encodeToJsonElement(
-                    Config.serializer(),
-                    value
-                ) as JsonObject
-            )
-        } else {
-            Config.serializer().serialize(encoder, value)
-        }
-    }
-}

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

@@ -0,0 +1,9 @@
+package dev.inmo.plagubot.config
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class DBConnectOptions(
+    val attempts: Int = 3,
+    val delay: Long = 1000L
+)

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

@@ -1,32 +1,43 @@
 package dev.inmo.plagubot.config
 
-import dev.inmo.sdi.SDIIncluded
+import dev.inmo.kslog.common.e
+import dev.inmo.kslog.common.logger
+import kotlinx.coroutines.delay
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import org.jetbrains.exposed.sql.Database
 import org.jetbrains.exposed.sql.transactions.transactionManager
+import org.koin.core.scope.Scope
 import org.sqlite.JDBC
+import java.lang.Exception
 import java.sql.Connection
 
-const val defaultDatabaseParamsName = "defaultDatabase"
-inline val Map<String, Any>.database: Database?
-    get() = (get(defaultDatabaseParamsName) as? DatabaseConfig) ?.database
+inline val Scope.database: Database?
+    get() = getOrNull<Database>()
 
 @Serializable
-@SDIIncluded
 data class DatabaseConfig(
     val url: String = "jdbc:sqlite:file:test?mode=memory&cache=shared",
     val driver: String = JDBC::class.qualifiedName!!,
     val username: String = "",
-    val password: String = ""
+    val password: String = "",
+    val reconnectOptions: DBConnectOptions? = DBConnectOptions()
 ) {
     @Transient
-    val database: Database = Database.connect(
-        url,
-        driver,
-        username,
-        password
-    ).also {
-        it.transactionManager.defaultIsolationLevel = Connection.TRANSACTION_SERIALIZABLE // Or Connection.TRANSACTION_READ_UNCOMMITTED
-    }
+    val database: Database = (0 until (reconnectOptions ?.attempts ?: 1)).firstNotNullOfOrNull {
+        runCatching {
+            Database.connect(
+                url,
+                driver,
+                username,
+                password
+            ).also {
+                it.transactionManager.defaultIsolationLevel = Connection.TRANSACTION_SERIALIZABLE // Or Connection.TRANSACTION_READ_UNCOMMITTED
+                it.connector().close()
+            }
+        }.onFailure {
+            logger.e(it)
+            Thread.sleep(reconnectOptions ?.delay ?: return@onFailure)
+        }.getOrNull()
+    } ?: error("Unable to create database")
 }

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

@@ -0,0 +1,7 @@
+package dev.inmo.plagubot.config
+
+import kotlinx.serialization.json.Json
+
+val defaultJsonFormat = Json {
+    ignoreUnknownKeys = true
+}

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

@@ -0,0 +1,3 @@
+package dev.inmo.plagubot.config
+
+typealias StateHandlingErrorHandler<T> = suspend (T, Throwable) -> T?

bot/src/test/kotlin/dev/inmo/plagubot/config/ConfigTest.kt

@@ -1,37 +0,0 @@
-package dev.inmo.plagubot.config
-
-import dev.inmo.plagubot.HelloPlugin
-import kotlinx.serialization.InternalSerializationApi
-import org.junit.Test
-import kotlin.test.assertEquals
-
-class ConfigTest {
-    @InternalSerializationApi
-    @Test
-    fun testThatPluginPassedToParamsWillBeCorrectlyUsedInPlugins() {
-        val rawConfig = """
-            {
-              "database": {
-              },
-              "botToken": "",
-              "plugins": [
-                "helloPlugin"
-              ],
-              "params": {
-                "helloPlugin": {"type": "dev.inmo.plagubot.HelloPlugin", "parameter": "Example"}
-              }
-            }
-        """.trimIndent()
-        val config = configJsonFormat.decodeFromString(ConfigSerializer, rawConfig)
-
-        assert(config.plugins.size == 1)
-        assert(config.plugins.first() is HelloPlugin)
-        assert((config.plugins.first() as HelloPlugin).parameter == "Example")
-
-        val redecoded = configJsonFormat.decodeFromString(ConfigSerializer, configJsonFormat.encodeToString(ConfigSerializer, config))
-        assertEquals(config.database, redecoded.database)
-        assertEquals(config.plugins, redecoded.plugins)
-        assertEquals(config.botToken, redecoded.botToken)
-        assertEquals(config.params ?.toMap(), redecoded.params ?.toMap())
-    }
-}

build.gradle

@@ -1,22 +1,22 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
+        classpath libs.buildscript.kt.gradle
+        classpath libs.buildscript.kt.serialization
+        classpath libs.buildscript.gh.release
     }
 }
 
 allprojects {
     repositories {
         mavenCentral()
-        jcenter()
         mavenLocal()
         maven { url 'https://jitpack.io' }
+        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
     }
 }
 

github_release.gradle

@@ -23,7 +23,7 @@ if (new File(projectDir, "secret.gradle").exists()) {
         owner "InsanusMokrassar"
         repo "PlaguBot"
 
-        tagName "${project.version}"
+        tagName "v${project.version}"
         releaseName "${project.version}"
         targetCommitish "${project.version}"
 

gradle.properties

@@ -4,19 +4,5 @@ org.gradle.parallel=true
 kotlin.js.generate.externals=true
 kotlin.incremental=true
 
-kotlin_version=1.4.32
-kotlin_coroutines_version=1.4.3
-kotlin_serialisation_runtime_version=1.1.0
-kotlin_exposed_version=0.29.1
-
-sdi_version=0.4.1
-tgbotapi_version=0.33.1
-microutils_version=0.4.31
-klassindex_version=4.1.0-rc.1
-
-sqlite_version=3.30.1
-
-github_release_plugin_version=2.2.12
-
 group=dev.inmo
-version=0.1.6
+version=3.2.0

gradle/libs.versions.toml

@@ -0,0 +1,50 @@
+[versions]
+
+kt = "1.7.22"
+kt-serialization = "1.4.1"
+kt-coroutines = "1.6.4"
+
+microutils = "0.15.0"
+tgbotapi = "4.2.0"
+kslog = "0.5.4"
+
+jb-exposed = "0.41.1"
+jb-dokka = "1.7.20"
+
+sqlite = "3.40.0.0"
+
+klock = "3.4.0"
+uuid = "0.6.0"
+
+ktor = "2.1.3"
+
+gh-release = "2.4.1"
+
+koin = "3.2.2"
+
+[libraries]
+
+kt-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kt" }
+
+kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kt-coroutines" }
+kt-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kt-serialization" }
+
+tgbotapi = { module = "dev.inmo:tgbotapi", version.ref = "tgbotapi" }
+tgbotapi-behaviourBuilder-fsm = { module = "dev.inmo:tgbotapi.behaviour_builder.fsm", version.ref = "tgbotapi" }
+microutils-repos-exposed = { module = "dev.inmo:micro_utils.repos.exposed", version.ref = "microutils" }
+kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
+
+koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
+
+jb-exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "jb-exposed" }
+
+sqlite = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" }
+
+
+kt-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kt" }
+
+
+buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kt" }
+buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" }
+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" }

gradle/wrapper/gradle-wrapper.properties

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

plugin/build.gradle

@@ -9,9 +9,16 @@ project.version="$version"
 apply from: "publish.gradle"
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_runtime_version"
+    implementation libs.kt.stdlib
+    api libs.kt.serialization
 
-    api "dev.inmo:tgbotapi:$tgbotapi_version"
-    api "dev.inmo:micro_utils.repos.exposed:$microutils_version"
+    api libs.tgbotapi
+    api libs.microutils.repos.exposed
+
+    api libs.koin
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }

plugin/pubconf.kpsb

@@ -1 +0,0 @@
-{"bintrayConfig":{"repo":"PlaguBot","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/PlaguBot","autoPublish":true,"overridePublish":true},"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","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"JVM"}

plugin/publish.gradle

@@ -1,6 +1,4 @@
 apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
 
 task javadocJar(type: Jar) {
     from javadoc
@@ -50,33 +48,52 @@ publishing {
                     
                 }
             }
-            
-                repositories {
+            repositories {
+                if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
                     maven {
-                        name = "bintray"
-                        url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/PlaguBot/${project.name}/;publish=1;override=1")
-                        credentials {
-                            username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-                            password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                        name = "Gitea"
+                        url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+                
+                        credentials(HttpHeaderCredentials) {
+                            name = "Authorization"
+                            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://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')
                         }
+                
                     }
-                    
                 }
-            
+            }
         }
     }
 }
 
-signing {
-    useGpgCmd()
-    sign publishing.publications
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
+    
+    signing {
+        useGpgCmd()
+    
+        sign publishing.publications
+    }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
 }

plugin/publish.kpsb

@@ -0,0 +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":"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/Plugin.kt

@@ -1,14 +1,17 @@
 package dev.inmo.plagubot
 
-import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.micro_utils.fsm.common.State
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.types.BotCommand
-import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
-import kotlinx.coroutines.CoroutineScope
+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.module.Module
 
 /**
+ * **ANY REALIZATION OF [Plugin] MUST HAVE CONSTRUCTOR WITH ABSENCE OF INCOMING PARAMETERS**
+ *
  * Use this interface for your bot. It is possible to use [kotlinx.serialization.SerialName] annotations on your plugins
  * to set up short name for your plugin. Besides, simple name of your class will be used as key for deserialization
  * too.
@@ -16,32 +19,26 @@ import org.jetbrains.exposed.sql.Database
 @Serializable(PluginSerializer::class)
 interface Plugin {
     /**
-     * In case you want to publish some processed by your plugin commands, you can provide it via this method
-     *
-     * @see BotCommand
+     * This method will be called when this plugin should configure di module based on the incoming params
      */
-    suspend fun getCommands(): List<BotCommand> = emptyList()
-
-    @Deprecated("Override other method with receiver BehaviourContext")
-    suspend operator fun invoke(
-        bot: TelegramBot,
+    fun Module.setupDI(
         database: Database,
-        updatesFilter: FlowsUpdatesFilter,
-        scope: CoroutineScope
+        params: JsonObject
     ) {}
 
     /**
-     * This method (usually) will be invoked just one time in the whole application.
+     * Override this method in cases when you want to declare common bot behaviour. In case you wish to use FSM, you
+     * should override the method with receiver [BehaviourContextWithFSM]
      */
-    suspend operator fun BehaviourContext.invoke(
-        database: Database
-    ) = invoke(bot, database, flowsUpdatesFilter, scope)
-
+    suspend fun BehaviourContext.setupBotPlugin(
+        koin: Koin
+    ) {}
     /**
-     * This method (usually) will be invoked just one time in the whole application.
+     * Override this method in cases when you want to declare full behaviour of the plugin. It is recommended to declare
+     * common logic of plugin in the [setupBotPlugin] with [BehaviourContext] receiver and use override this one
+     * for the FSM configuration
      */
-    suspend operator fun BehaviourContext.invoke(
-        database: Database,
-        params: Map<String, Any>
-    ) = invoke(database)
+    suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
+        (this as BehaviourContext).setupBotPlugin(koin)
+    }
 }

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

@@ -1,53 +1,25 @@
 package dev.inmo.plagubot
 
-import kotlinx.serialization.*
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.*
-
-private val defaultJson = Json {
-    ignoreUnknownKeys = true
-}
 
 @Serializer(Plugin::class)
-object PluginSerializer : KSerializer<Plugin> {
-    private val polymorphic = PolymorphicSerializer(Plugin::class)
-    override val descriptor: SerialDescriptor = JsonObject.serializer().descriptor
+class PluginSerializer : KSerializer<Plugin> {
+    override val descriptor: SerialDescriptor
+        get() = String.serializer().descriptor
 
-    @InternalSerializationApi
     override fun deserialize(decoder: Decoder): Plugin {
-        val format = (decoder as? JsonDecoder) ?.json ?: defaultJson
-        val asJson = JsonElement.serializer().deserialize(decoder)
-        val jsonObject = (asJson as? JsonObject)
-
-        val type = (jsonObject ?.get("type") as? JsonPrimitive) ?.contentOrNull
-        val external = if (type != null) {
-            try {
-                Class.forName(type) ?.kotlin ?.serializerOrNull()
-            } catch (e: Exception) {
-                null
-            }
-        } else {
-            null
-        }
-
-        return if (jsonObject != null && external != null) {
-            format.decodeFromJsonElement(
-                external as KSerializer<Plugin>,
-                JsonObject(jsonObject.toMutableMap().also { it.remove("type") })
-            )
-        } else {
-            format.decodeFromJsonElement(
-                polymorphic,
-                asJson
-            )
-        }
+        val kclass = Class.forName(decoder.decodeString()).kotlin
+        return (kclass.objectInstance ?: kclass.constructors.first { it.parameters.isEmpty() }.call()) as Plugin
     }
 
-    @InternalSerializationApi
     override fun serialize(encoder: Encoder, value: Plugin) {
-        val serializer = (value::class.serializerOrNull() ?: polymorphic) as KSerializer<Plugin>
-        serializer.serialize(encoder, value)
+        encoder.encodeString(
+            value::class.java.canonicalName
+        )
     }
-}
+}

settings.gradle

@@ -2,7 +2,12 @@ String[] toInclude = [":bot", ":plugin"]
 
 rootProject.name = 'plagubot'
 
-toInclude.each {
-    include (it)
-    project(it).name = "${rootProject.name}${it.replace(":", ".")}"
+toInclude.each { originalName ->
+    String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replace(":", File.separator)}"
+    String projectName = "${rootProject.name}${originalName.replace(":", ".")}"
+    String projectIdentifier = ":${projectName}"
+    include projectIdentifier
+    ProjectDescriptor project = project(projectIdentifier)
+    project.name = projectName
+    project.projectDir = new File(projectDirectory)
 }

template.config.json

@@ -4,13 +4,16 @@
     "driver": "org.sqlite.JDBC",
     "username": "OPTIONAL username",
     "password": "OPTIONAL password",
-    "initAutomatically": false
+    "reconnectOptions": {
+      "attempts": 3,
+      "delay": 1000
+    }
   },
   "botToken": "1234567890:ABCDEFGHIJKLMNOP_qrstuvwxyz12345678",
   "plugins": [
-    {
-      "type": "Hello",
-      "parameter": "Example"
-    }
-  ]
-}
+    "dev.inmo.plagubot.HelloPlugin"
+  ],
+  "helloPlugin": {
+    "print": "Hello World"
+  }
+}