Merge pull request #26 from InsanusMokrassar/1.0.0

1.0.0

.github/workflows/build.yml

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

.gitignore

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

CHANGELOG.md

@@ -1,437 +1,5 @@
 # Changelog
 
-## 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`:
-  * `tgbotapi`: `9.2.2`
-  * `exposed`: `0.44.0`
-  * `koin`: `3.5.0`
-  * `ktor`: `2.3.5`
-
-## 7.2.2
-
-* `Bot`:
-  * Now you may customize both `onStart` and `onUpdate` conflicts resolvers
-
-## 7.2.1
-
-* `Versions`:
-  * `tgbotapi`: `9.2.1`
-  * `ktor`: `2.3.4`
-
-## 7.2.0
-
-* `Version`:
-  * `tgbotapi`: `9.2.0`
-  * `kslog`: `1.1.2`
-  * `sqlite`: `3.43.0.0`
-
-## 7.1.0
-
-* `Version`:
-  * `microutils`: `0.19.9`
-  * `tgbotapi`: `9.1.0`
-  * `ktor`: `2.3.3`
-  * `coroutines`: `1.7.3`
-  * `koin`: `3.4.3`
-
-## 7.0.0
-
-* `Version`:
-  * `microutils`: `0.19.7`
-  * `tgbotapi`: `9.0.0`
-  * `ktor`: `2.3.2`
-  * `coroutines`: `1.7.2`
-
-## 6.1.0
-
-* `Version`:
-  * `kotlin`: `1.8.22`
-  * `microutils`: `0.19.4`
-  * `tgbotapi`: `8.1.0`
-  * `koin`: `3.4.2`
-  * `sqlite`: `3.42.0.0`
-
-## 6.0.1
-
-* `Version`:
-  * `microutils`: `0.19.2`
-  * `tgbotapi`: `8.0.1`
-  * `uuid`: `0.7.1`
-  * `ktor`: `2.3.1`
-  * `koin`: `3.4.1`
-
-## 6.0.0
-
-* `Versions`:
-  * `microutils`: `0.19.1`
-  * `tgbotapi`: `8.0.0`
-  * `klock`: `4.0.3`
-
-## 5.1.3
-
-* `Versions`:
-  * `serialization`: `1.5.1`
-  * `microutils`: `0.18.4`
-  * `tgbotapi`: `7.1.3`
-
-## 5.1.2
-
-* `Versions`:
-  * `microutils`: `0.18.1`
-  * `tgbotapi`: `7.1.2`
-
-## 5.1.1
-
-* `Versions`:
-    * `kotlin`: `1.8.21`
-    * `microutils`: `0.18.0`
-    * `tgbotapi`: `7.1.1`
-
-## 5.1.0
-
-* `Versions`:
-  * `tgbotapi`: `7.1.0`
-  * `sqlite`: `3.41.2.1`
-
-## 5.0.2
-
-* `Versions`:
-  * `kotlin`: `1.8.20`
-  * `microutils`: `0.17.8`
-  * `tgbotapi`: `7.0.2`
-  * `kslog`: `1.1.1`
-  * `ktor`: `2.3.0`
-  * `koin`: `3.4.0`
-
-## 5.0.1
-
-* `Versions`:
-  * `tgbotapi`: `7.0.1`
-
-## 5.0.0
-
-* `Versions`:
-  * `tgbotapi`: `7.0.0`
-  * `microutils`: `0.17.5`
-
-## 4.1.0
-
-* `Versions`:
-  * `tgbotapi`: `6.1.0`
-  * `microutils`: `0.17.3`
-
-## 4.0.3
-
-* `Versions`:
-  * `tgbotapi`: `6.0.3`
-  * `microutils`: `0.17.2`
-
-## 4.0.2
-
-* `Versions`:
-  * `tgbotapi`: `6.0.2`
-
-## 4.0.1
-
-* `Versions`:
-  * `tgbotapi`: `6.0.1`
-  * `microutils`: `17.0.1`
-  * `ktor`: `2.2.4`
-
-## 4.0.0
-
-* `Versions`:
-  * `kotlin`: `1.8.10`
-  * `tgbotapi`: `6.0.0`
-  * `microutils`: `0.17.0`
-
-## 3.5.0
-
-* `Versions`:
-  * `tgbotapi`: `5.2.0`
-  * `microutils`: `0.16.10`
-  * `koin`: `3.3.2`
-
-## 3.4.1
-
-* `setupBotPlugin` now works synchronously
-
-## 3.4.0
-
-* `Versions`:
-  * `tgbotapi`: `5.1.0`
-  * `microutils`: `0.16.8`
-  * `ktor`: `2.2.3`
-
-## 3.3.1
-
-* `Versions`:
-    * `tgbotapi`: `5.0.1`
-    * `microutils`: `0.16.6`
-    * `ktor`: `2.2.2`
-
-## 3.3.0
-
-* `Versions`:
-    * `tgbotapi`: `5.0.0`
-
-## 3.2.3
-
-* `Versions`:
-  * `tgbotapi`: `4.2.3`
-  * `microutils`: `0.16.4`
-
-## 3.2.2
-
-* `Versions`:
-  * `tgbotapi`: `4.2.2`
-  * `microutils`: `0.16.2`
-
-## 3.2.1
-
-* `Versions`:
-  * `tgbotapi`: `4.2.1`
-  * `microutils`: `0.16.0`
-  * `ktor`: `2.2.1`
-
-## 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`

README.md

@@ -16,28 +16,3 @@ You can create your bot using
 
 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

@@ -2,7 +2,6 @@ plugins {
     id 'org.jetbrains.kotlin.jvm'
     id "org.jetbrains.kotlin.plugin.serialization"
     id 'application'
-    id "com.google.devtools.ksp"
 }
 
 project.group="$group"
@@ -17,9 +16,7 @@ dependencies {
     api libs.jb.exposed.jdbc
 
     api libs.tgbotapi
-    api libs.tgbotapi.behaviourBuilder.fsm
     api libs.microutils.repos.exposed
-    api libs.microutils.koin
 
     api libs.sqlite
 
@@ -33,10 +30,7 @@ application {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-ksp { // this generator do not require any arguments and we should left `ksp` empty
 }
 

bot/publish.gradle

@@ -2,11 +2,11 @@ apply plugin: 'maven-publish'
 
 task javadocJar(type: Jar) {
     from javadoc
-    archiveClassifier = 'javadoc'
+    classifier = 'javadoc'
 }
 task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
-    archiveClassifier = 'sources'
+    classifier = 'sources'
 }
 
 publishing {
@@ -49,28 +49,14 @@ publishing {
                 }
             }
             repositories {
-                if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
-                    maven {
-                        name = "InmoNexus"
-                        url = uri("https://nexus.inmo.dev/repository/maven-releases/")
-                
-                        credentials {
-                            username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
-                            password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
-                        }
-                
-                    }
-                }
                 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')
                         }
-                
                     }
                 }
             }
@@ -92,27 +78,4 @@ if (project.hasProperty("signing.gnupg.keyName")) {
             dependsOn(it)
         }
     }
-
-    // Workaround to make android sign operations depend on signing tasks
-    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
-        def signingTasks = project.getTasks().withType(Sign.class)
-        mustRunAfter(signingTasks)
-    }
-    // Workaround to make test tasks use sign
-    project.getTasks().withType(Sign.class).configureEach { signTask ->
-        def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
-        def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
-        // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
-
-        // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
-        def debugTestTask = tasks.findByName("linkDebugTest$pubName")
-        if (debugTestTask != null) {
-            signTask.mustRunAfter(debugTestTask)
-        }
-        // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
-        def testTask = tasks.findByName("compileTestKotlin$pubName")
-        if (testTask != null) {
-            signTask.mustRunAfter(testTask)
-        }
-    }
 }

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://oss.sonatype.org/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":"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,9 +1,7 @@
 package dev.inmo.plagubot
 
-import dev.inmo.kslog.common.KSLog
+import dev.inmo.plagubot.config.*
-import dev.inmo.kslog.common.i
+import kotlinx.coroutines.*
-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
@@ -13,13 +11,10 @@ import java.io.File
  */
 @InternalSerializationApi
 suspend fun main(args: Array<String>) {
-    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

@@ -1,29 +1,23 @@
 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.BehaviourContext
-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 kotlinx.serialization.*
-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.KoinApplication
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
 import org.koin.core.module.Module
+import org.koin.dsl.module
 
 @Serializable
 @SerialName("Hello")
-object HelloPlugin : Plugin {
+class HelloPlugin : Plugin {
     @Serializable
     data class HelloPluginConfig(
         val print: String
@@ -32,34 +26,14 @@ object HelloPlugin : Plugin {
     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 suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
-        override val context: IdChatIdentifier
+        println(koin.get<HelloPluginConfig>().print)
-        data class DidntSaidHello(override val context: IdChatIdentifier) : InternalFSMState
+        println(getMe())
-        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))
+            reply(it, "Hello :)")
-        }
-
-        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/OnStartContextsConflictResolver.kt

@@ -1,16 +0,0 @@
-package dev.inmo.plagubot
-
-import dev.inmo.micro_utils.fsm.common.State
-
-fun interface OnStartContextsConflictResolver {
-    /**
-     * @param old Old state which is currently placed on the [State.context]
-     * @param new New state pretend to replace [old] one
-     * @return Should return:
-     *
-     * * Null in case when current realization unable to resolve conflict
-     * * False when current realization knows that [new] [State] must **not** replace [old] one
-     * * True when current realization knows that [new] [State] must replace [old] one
-     */
-    suspend operator fun invoke(old: State, new: State): Boolean?
-}

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

@@ -1,20 +0,0 @@
-package dev.inmo.plagubot
-
-import dev.inmo.micro_utils.fsm.common.State
-
-fun interface OnUpdateContextsConflictResolver {
-    /**
-     * This method will be called when [sourceStateWithOldContext] [State.context] and [newStateWithNewContext] are not equal and currently there is
-     * launched [currentStateOnNewContext] state on the chain with [State.context] from [currentStateOnNewContext]
-     *
-     * @param sourceStateWithOldContext Old state where from [newStateWithNewContext] came
-     * @param newStateWithNewContext New state with changing [State.context] (it is different with [sourceStateWithOldContext] [State.context])
-     * @param currentStateOnNewContext State which is currently running on [newStateWithNewContext] [State.context]
-     * @return Should return:
-     *
-     * * Null in case when current realization unable to resolve conflict
-     * * False when [currentStateOnNewContext] **should not** be stopped in favor to [newStateWithNewContext]
-     * * True when [currentStateOnNewContext] **should** be stopped in favor to [newStateWithNewContext]
-     */
-    suspend operator fun invoke(sourceStateWithOldContext: State, newStateWithNewContext: State, currentStateOnNewContext: State): Boolean?
-}

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

@@ -1,14 +1,6 @@
 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.micro_utils.koin.getAllDistinct
 import dev.inmo.plagubot.config.*
-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.*
@@ -24,34 +16,21 @@ import org.koin.core.context.GlobalContext
 import org.koin.core.module.Module
 import org.koin.core.scope.Scope
 import org.koin.dsl.module
+import java.util.logging.Level
+import java.util.logging.Logger
 
 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(
+    private val logger = Logger.getLogger("PlaguBot")
-        token = config.botToken,
+    @Transient
-        apiUrl = config.botApiServer
+    private val bot = telegramBot(config.botToken)
-    ) {
-        setupBotClient()
-    }
-
-    override fun KtorRequestsExecutorBuilder.setupBotClient() {
-        config.plugins.forEach {
-            with(it) {
-                setupBotClient()
-            }
-        }
-    }
 
     override fun Module.setupDI(database: Database, params: JsonObject) {
         single { config }
@@ -60,7 +39,6 @@ data class PlaguBot(
         single { config.databaseConfig.database }
         single { defaultJsonFormat }
         single { this@PlaguBot }
-        single { bot }
 
         includes(
             config.plugins.mapNotNull {
@@ -71,23 +49,20 @@ data class PlaguBot(
                         }
                     }
                 }.onFailure { e ->
-                    logger.w("Unable to load DI part of $it", e)
+                    logger.log(Level.WARNING, "Unable to load DI part of $it", e)
                 }.getOrNull()
             }
         )
     }
 
-    override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
+    override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
-        config.plugins.forEach { plugin ->
+        config.plugins.forEach {
-            runCatchingSafely {
+            runCatching {
-                logger.i("Start loading of $plugin")
+                with(it) {
-                with(plugin) {
                     setupBotPlugin(koin)
                 }
             }.onFailure { e ->
-                logger.w("Unable to load bot part of $plugin", e)
+                logger.log(Level.WARNING, "Unable to load bot part of $it", e)
-            }.onSuccess {
-                logger.i("Complete loading of $plugin")
             }
         }
     }
@@ -98,42 +73,26 @@ data class PlaguBot(
     suspend fun start(
         scope: CoroutineScope = CoroutineScope(Dispatchers.IO)
     ): Job {
-        logger.i("Start initialization")
+        logger.info("Start initialization")
         val koinApp = KoinApplication.init()
         koinApp.modules(
             module {
                 setupDI(config.databaseConfig.database, json)
             }
         )
-        logger.i("Modules loaded")
+        logger.info("Modules loaded")
         GlobalContext.startKoin(koinApp)
-        logger.i("Koin started")
+        logger.info("Koin started")
         lateinit var behaviourContext: BehaviourContext
-        val onStartContextsConflictResolver by lazy { koinApp.koin.getAllDistinct<OnStartContextsConflictResolver>() }
+        bot.buildBehaviour(scope = scope) {
-        val onUpdateContextsConflictResolver by lazy { koinApp.koin.getAllDistinct<OnUpdateContextsConflictResolver>() }
+            logger.info("Start setup of bot part")
-        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")
+        logger.info("Behaviour builder has been setup")
         return bot.startGettingOfUpdatesByLongPolling(scope = behaviourContext, updatesFilter = behaviourContext).also {
-            logger.i("Long polling has been started")
+            logger.info("Long polling has been started")
         }
     }
 }

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

@@ -1,17 +1,13 @@
 package dev.inmo.plagubot.config
 
-import dev.inmo.micro_utils.common.Warning
 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 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
 )

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

@@ -1,9 +0,0 @@
-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,15 +1,11 @@
 package dev.inmo.plagubot.config
 
-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
 
 inline val Scope.database: Database?
@@ -20,24 +16,15 @@ 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 = (0 until (reconnectOptions ?.attempts ?: 1)).firstNotNullOfOrNull {
+    val database: Database = Database.connect(
-        runCatching {
+        url,
-            Database.connect(
+        driver,
-                url,
+        username,
-                driver,
+        password
-                username,
+    ).also {
-                password
+        it.transactionManager.defaultIsolationLevel = Connection.TRANSACTION_SERIALIZABLE // Or Connection.TRANSACTION_READ_UNCOMMITTED
-            ).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/StateHandlingErrorHandler.kt

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

build.gradle

@@ -8,7 +8,6 @@ buildscript {
         classpath libs.buildscript.kt.gradle
         classpath libs.buildscript.kt.serialization
         classpath libs.buildscript.gh.release
-        classpath libs.buildscript.ksp
     }
 }
 
@@ -17,7 +16,6 @@ allprojects {
         mavenCentral()
         mavenLocal()
         maven { url 'https://jitpack.io' }
-        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
     }
 }
 

github_release.gradle

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

gradle.properties

@@ -5,4 +5,4 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 
 group=dev.inmo
-version=7.4.2
+version=1.0.0

gradle/libs.versions.toml

@@ -1,27 +1,27 @@
 [versions]
 
-kt = "1.9.22"
+kt = "1.6.21"
-kt-serialization = "1.6.2"
+kt-serialization = "1.3.3"
-kt-coroutines = "1.7.3"
+kt-coroutines = "1.6.1"
 
-microutils = "0.20.23"
+microutils = "0.10.4"
-tgbotapi = "9.4.3"
+tgbotapi = "1.1.0"
 
-ksp = "1.9.21-1.0.16"
+jb-exposed = "0.38.2"
+jb-dokka = "1.6.21"
 
-jb-exposed = "0.45.0"
+sqlite = "3.36.0.3"
-jb-dokka = "1.9.10"
 
-sqlite = "3.44.1.0"
+klock = "2.7.0"
+uuid = "0.4.0"
 
-klock = "4.0.10"
+ktor = "2.0.1"
-uuid = "0.8.2"
 
-ktor = "2.3.7"
+gh-release = "2.3.7"
 
-gh-release = "2.4.1"
+android-gradle = "7.0.4"
-
+dexcount = "3.1.0"
-koin = "3.5.3"
+koin = "3.2.0"
 
 [libraries]
 
@@ -31,10 +31,7 @@ kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", vers
 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" }
-microutils-koin = { module = "dev.inmo:micro_utils.koin", version.ref = "microutils" }
-microutils-koin-generator = { module = "dev.inmo:micro_utils.koin.generator", version.ref = "microutils" }
 
 koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 
@@ -50,4 +47,3 @@ buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin",
 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" }
-buildscript-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }

gradle/wrapper/gradle-wrapper.properties

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

plugin/build.gradle

@@ -19,6 +19,6 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_1_8
 }

plugin/publish.gradle

@@ -2,11 +2,11 @@ apply plugin: 'maven-publish'
 
 task javadocJar(type: Jar) {
     from javadoc
-    archiveClassifier = 'javadoc'
+    classifier = 'javadoc'
 }
 task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
-    archiveClassifier = 'sources'
+    classifier = 'sources'
 }
 
 publishing {
@@ -49,28 +49,14 @@ publishing {
                 }
             }
             repositories {
-                if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
-                    maven {
-                        name = "InmoNexus"
-                        url = uri("https://nexus.inmo.dev/repository/maven-releases/")
-                
-                        credentials {
-                            username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
-                            password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
-                        }
-                
-                    }
-                }
                 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')
                         }
-                
                     }
                 }
             }
@@ -92,27 +78,4 @@ if (project.hasProperty("signing.gnupg.keyName")) {
             dependsOn(it)
         }
     }
-
-    // Workaround to make android sign operations depend on signing tasks
-    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
-        def signingTasks = project.getTasks().withType(Sign.class)
-        mustRunAfter(signingTasks)
-    }
-    // Workaround to make test tasks use sign
-    project.getTasks().withType(Sign.class).configureEach { signTask ->
-        def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
-        def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
-        // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
-
-        // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
-        def debugTestTask = tasks.findByName("linkDebugTest$pubName")
-        if (debugTestTask != null) {
-            signTask.mustRunAfter(debugTestTask)
-        }
-        // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
-        def testTask = tasks.findByName("compileTestKotlin$pubName")
-        if (testTask != null) {
-            signTask.mustRunAfter(testTask)
-        }
-    }
 }

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://oss.sonatype.org/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":"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,9 +1,6 @@
 package dev.inmo.plagubot
 
-import dev.inmo.micro_utils.fsm.common.State
-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
@@ -19,8 +16,6 @@ import org.koin.core.module.Module
  */
 @Serializable(PluginSerializer::class)
 interface Plugin {
-    fun KtorRequestsExecutorBuilder.setupBotClient() {}
-
     /**
      * This method will be called when this plugin should configure di module based on the incoming params
      */
@@ -28,20 +23,7 @@ interface Plugin {
         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
-     * should override the method with receiver [BehaviourContextWithFSM]
-     */
     suspend fun BehaviourContext.setupBotPlugin(
         koin: Koin
     ) {}
-    /**
-     * 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 fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
-        (this as BehaviourContext).setupBotPlugin(koin)
-    }
 }

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

@@ -13,8 +13,7 @@ class PluginSerializer : KSerializer<Plugin> {
         get() = String.serializer().descriptor
 
     override fun deserialize(decoder: Decoder): Plugin {
-        val kclass = Class.forName(decoder.decodeString()).kotlin
+        return Class.forName(decoder.decodeString()).getDeclaredConstructor().newInstance() as Plugin
-        return (kclass.objectInstance ?: kclass.constructors.first { it.parameters.isEmpty() }.call()) as Plugin
     }
 
     override fun serialize(encoder: Encoder, value: Plugin) {

settings.gradle

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

template.config.json

@@ -4,10 +4,7 @@
     "driver": "org.sqlite.JDBC",
     "username": "OPTIONAL username",
     "password": "OPTIONAL password",
-    "reconnectOptions": {
+    "initAutomatically": false
-      "attempts": 3,
-      "delay": 1000
-    }
   },
   "botToken": "1234567890:ABCDEFGHIJKLMNOP_qrstuvwxyz12345678",
   "plugins": [