From 831b558724058211f2dbb3cf2a72bf4cef6c34ec Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Wed, 4 May 2022 13:27:39 +0600
Subject: [PATCH] fixes

---
 WebApp/build.gradle                       |  2 +-
 WebApp/src/jsMain/kotlin/main.kt          | 34 ++++++++++-------------
 WebApp/src/jvmMain/kotlin/WebAppServer.kt |  3 --
 gradle.properties                         |  2 +-
 4 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/WebApp/build.gradle b/WebApp/build.gradle
index 7f73e5f..334217c 100644
--- a/WebApp/build.gradle
+++ b/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-tomcat:$ktor_version"
+                implementation "io.ktor:ktor-server-cio:$ktor_version"
             }
         }
     }
diff --git a/WebApp/src/jsMain/kotlin/main.kt b/WebApp/src/jsMain/kotlin/main.kt
index e157e65..ec54816 100644
--- a/WebApp/src/jsMain/kotlin/main.kt
+++ b/WebApp/src/jsMain/kotlin/main.kt
@@ -2,6 +2,7 @@ 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.statement.HttpResponse
 import io.ktor.client.statement.readText
@@ -14,41 +15,36 @@ 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")
     window.onload = {
         val scope = CoroutineScope(Dispatchers.Default)
         runCatching {
             document.body ?.appendElement("button") {
-                (this as HTMLElement).onclick = {
+                addEventListener("click", {
                     scope.launchSafelyWithoutExceptions {
-                        HttpClient().post<HttpResponse>("${window.location.origin.removeSuffix("/")}/inline") {
-                            parameter(webAppQueryIdField, webApp.initDataUnsafe.queryId)
-                            body = "Clicked"
-                            contentType(ContentType.Text.Plain)
-                        }
-                        handleResult(
-                            { "Clicked" }
-                        ) {
-                            HttpClient().post<HttpResponse>(
-                                "${window.location.origin}/inline"
-                            ) {
+                        handleResult({ "Clicked" }) {
+                            HttpClient().post<HttpResponse>("${window.location.origin.removeSuffix("/")}/inline") {
                                 parameter(webAppQueryIdField, it)
-                                body = "Clicked"
-                            }
+                                body = TextContent("Clicked", ContentType.Text.Plain)
+                                document.body ?.log(url.build().toString())
+                            }.coroutineContext.job.join()
                         }
                     }
-                }
+                })
                 appendText("Example button")
             } ?: window.alert("Unable to load body")
             webApp.apply {
                 onThemeChanged {
-                    document.body ?.appendText("Theme changed: ${webApp.themeParams}")
-                    document.body ?.appendElement("p", {})
+                    document.body ?.log("Theme changed: ${webApp.themeParams}")
                 }
                 onViewportChanged {
-                    document.body ?.appendText("Viewport changed: ${it.isStateStable}")
-                    document.body ?.appendElement("p", {})
+                    document.body ?.log("Viewport changed: ${it.isStateStable}")
                 }
             }
             webApp.ready()
diff --git a/WebApp/src/jvmMain/kotlin/WebAppServer.kt b/WebApp/src/jvmMain/kotlin/WebAppServer.kt
index 04b5174..f97fe17 100644
--- a/WebApp/src/jvmMain/kotlin/WebAppServer.kt
+++ b/WebApp/src/jvmMain/kotlin/WebAppServer.kt
@@ -19,8 +19,6 @@ import io.ktor.http.content.*
 import io.ktor.request.receiveText
 import io.ktor.response.respond
 import io.ktor.routing.*
-import io.ktor.server.tomcat.Tomcat
-import io.ktor.utils.io.readRemaining
 import kotlinx.coroutines.Dispatchers
 import java.io.File
 
@@ -35,7 +33,6 @@ import java.io.File
 suspend fun main(vararg args: String) {
     val bot = telegramBot(args.first(), testServer = args.any { it == "testServer" })
     createKtorServer(
-        Tomcat,
         "0.0.0.0",
         8080,
         additionalEngineEnvironmentConfigurator = {
diff --git a/gradle.properties b/gradle.properties
index 4c84427..8b4971b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,6 +3,6 @@ org.gradle.parallel=true
 
 
 kotlin_version=1.6.10
-telegram_bot_api_version=0.38.20
+telegram_bot_api_version=0.38.21
 micro_utils_version=0.9.24
 ktor_version=1.6.8