Update kotlin_version to v1.6.21

WebApp/build.gradle

@@ -38,7 +38,7 @@ kotlin {
             dependencies {
                 implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
                 implementation "dev.inmo:micro_utils.ktor.server:$micro_utils_version"
-                implementation "io.ktor:ktor-server-cio:$ktor_version"
+                implementation "io.ktor:ktor-server-tomcat:$ktor_version"
             }
         }
     }

WebApp/src/jsMain/kotlin/main.kt

@@ -1,24 +1,14 @@
-import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
-import dev.inmo.tgbotapi.types.webAppQueryIdField
 import dev.inmo.tgbotapi.webapps.*
 import io.ktor.client.HttpClient
-import io.ktor.client.call.receive
-import io.ktor.client.request.*
+import io.ktor.client.request.get
 import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.readText
-import io.ktor.http.*
-import io.ktor.http.content.TextContent
+import io.ktor.http.encodeURLPath
 import kotlinx.browser.document
 import kotlinx.browser.window
 import kotlinx.coroutines.*
 import kotlinx.dom.appendElement
 import kotlinx.dom.appendText
-import org.w3c.dom.HTMLElement
-
-fun HTMLElement.log(text: String) {
-    appendElement("p", {})
-    appendText(text)
-}
 
 fun main() {
     console.log("Web app started")
@@ -26,25 +16,22 @@ fun main() {
         val scope = CoroutineScope(Dispatchers.Default)
         runCatching {
             document.body ?.appendElement("button") {
-                addEventListener("click", {
-                    scope.launchSafelyWithoutExceptions {
-                        handleResult({ "Clicked" }) {
-                            HttpClient().post<HttpResponse>("${window.location.origin.removeSuffix("/")}/inline") {
-                                parameter(webAppQueryIdField, it)
-                                body = TextContent("Clicked", ContentType.Text.Plain)
-                                document.body ?.log(url.build().toString())
-                            }.coroutineContext.job.join()
-                        }
+                addEventListener(
+                    "click",
+                    {
+                        webApp.sendData("Clicked")
                     }
-                })
+                )
                 appendText("Example button")
             } ?: window.alert("Unable to load body")
             webApp.apply {
                 onThemeChanged {
-                    document.body ?.log("Theme changed: ${webApp.themeParams}")
+                    document.body ?.appendText("Theme changed: ${webApp.themeParams}")
+                    document.body ?.appendElement("p", {})
                 }
                 onViewportChanged {
-                    document.body ?.log("Viewport changed: ${it.isStateStable}")
+                    document.body ?.appendText("Viewport changed: ${it.isStateStable}")
+                    document.body ?.appendElement("p", {})
                 }
             }
             webApp.ready()

WebApp/src/jvmMain/kotlin/WebAppServer.kt

@@ -1,24 +1,16 @@
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.ktor.server.createKtorServer
-import dev.inmo.tgbotapi.extensions.api.answers.answer
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
-import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
 import dev.inmo.tgbotapi.extensions.api.send.*
-import dev.inmo.tgbotapi.extensions.api.telegramBot
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
-import dev.inmo.tgbotapi.types.BotCommand
-import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.InlineQueryResultArticle
-import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputTextMessageContent
-import dev.inmo.tgbotapi.types.webAppQueryIdField
-import dev.inmo.tgbotapi.types.webapps.WebAppInfo
 import io.ktor.application.call
-import io.ktor.http.HttpStatusCode
-import io.ktor.http.content.*
-import io.ktor.request.receiveText
-import io.ktor.response.respond
-import io.ktor.routing.*
+import io.ktor.http.content.files
+import io.ktor.http.content.static
+import io.ktor.routing.get
+import io.ktor.routing.routing
+import io.ktor.server.tomcat.Tomcat
 import kotlinx.coroutines.Dispatchers
 import java.io.File
 
@@ -31,8 +23,8 @@ import java.io.File
  * Will start the server to share the static (index.html and WebApp.js) on 0.0.0.0:8080
  */
 suspend fun main(vararg args: String) {
-    val bot = telegramBot(args.first(), testServer = args.any { it == "testServer" })
     createKtorServer(
+        Tomcat,
         "0.0.0.0",
         8080,
         additionalEngineEnvironmentConfigurator = {
@@ -42,52 +34,28 @@ suspend fun main(vararg args: String) {
         routing {
             static {
                 files(File("WebApp/build/distributions"))
-                default("WebApp/build/distributions/index.html")
-            }
-            post("inline") {
-                val requestBody = call.receiveText()
-                val queryId = call.parameters[webAppQueryIdField] ?: error("$webAppQueryIdField should be presented")
-
-                bot.answer(queryId, InlineQueryResultArticle(queryId, "Result", InputTextMessageContent(requestBody)))
-                call.respond(HttpStatusCode.OK)
             }
         }
     }.start(false)
 
-    bot.buildBehaviourWithLongPolling(
+    telegramBotWithBehaviourAndLongPolling(
+        args.first(),
         defaultExceptionsHandler = { it.printStackTrace() }
     ) {
-        onCommand("reply_markup") {
+        onCommand("start") {
             reply(
                 it,
-                "Button",
-                replyMarkup = replyKeyboard(resizeKeyboard = true, oneTimeKeyboard = true) {
-                    row {
-                        webAppButton("Open WebApp", WebAppInfo(args[1]))
-                    }
-                }
-
-            )
-        }
-        onCommand("inline") {
-            reply(
-                it,
-                "Button",
+                "Button:",
                 replyMarkup = inlineKeyboard {
                     row {
-                        webAppButton("Open WebApp", WebAppInfo(args[1]))
+                        webAppButton("Open", args[1])
                     }
                 }
-
             )
         }
-        setMyCommands(
-            BotCommand("reply_markup", "Use to get reply markup keyboard with web app trigger"),
-            BotCommand("inline", "Use to get inline keyboard with web app trigger"),
-        )
         allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
             println(it)
         }
         println(getMe())
-    }.join()
+    }.second.join()
 }

gradle.properties

@@ -3,6 +3,6 @@ org.gradle.parallel=true
 
 
 kotlin_version=1.6.21
-telegram_bot_api_version=0.38.21
+telegram_bot_api_version=0.38.19
 micro_utils_version=0.9.24
 ktor_version=1.6.8