update dependencies

2.3.3

CHANGELOG.md

@@ -1,11 +1,60 @@
 # Changelog
 
+## 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.0`
+  * `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
 

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

@@ -5,10 +5,14 @@ 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.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextWithFSM
+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.ChatId
+import kotlinx.coroutines.flow.first
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
@@ -28,14 +32,34 @@ object HelloPlugin : Plugin {
     override fun Module.setupDI(database: Database, params: JsonObject) {
         single {
             get<Json>().decodeFromJsonElement(HelloPluginConfig.serializer(), params["helloPlugin"] ?: return@single null)
+
+
         }
     }
 
-    override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
-        logger.d { koin.get<HelloPluginConfig>().print }
+    private sealed interface InternalFSMState : State {
+        override val context: ChatId
+        data class DidntSaidHello(override val context: ChatId) : InternalFSMState
+        data class SaidHelloOnce(override val context: ChatId) : 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") {
-            reply(it, "Hello :)")
+            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

@@ -5,8 +5,7 @@ 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.DefaultStatesManager
-import dev.inmo.micro_utils.fsm.common.managers.InMemoryDefaultStatesManagerRepo
+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
@@ -46,6 +45,7 @@ data class PlaguBot(
         single { config.databaseConfig.database }
         single { defaultJsonFormat }
         single { this@PlaguBot }
+        single { bot }
 
         includes(
             config.plugins.mapNotNull {
@@ -102,7 +102,8 @@ data class PlaguBot(
                 logger.e("Something went wrong", it)
             },
             statesManager = koinApp.koin.getOrNull<StatesManager<State>>() ?: DefaultStatesManager(
-                InMemoryDefaultStatesManagerRepo<State>()
+                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" }

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,11 +1,15 @@
 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?
@@ -16,15 +20,24 @@ 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")
 }

gradle.properties

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

gradle/libs.versions.toml

@@ -1,22 +1,22 @@
 [versions]
 
 kt = "1.7.10"
-kt-serialization = "1.4.0-RC"
+kt-serialization = "1.4.0"
 kt-coroutines = "1.6.4"
 
-microutils = "0.12.1"
-tgbotapi = "3.1.0"
-kslog = "0.5.0"
+microutils = "0.12.16"
+tgbotapi = "3.2.7"
+kslog = "0.5.2"
 
 jb-exposed = "0.39.2"
 jb-dokka = "1.7.10"
 
-sqlite = "3.36.0.3"
+sqlite = "3.39.3.0"
 
-klock = "3.0.0"
+klock = "3.1.0"
 uuid = "0.5.0"
 
-ktor = "2.1.0"
+ktor = "2.1.1"
 
 gh-release = "2.4.1"
 

template.config.json

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