Added DSL and simplified polling logic.

Changes: - Most of the polling logic has been replaced with coroutine code. - Added TelegramBotUpdateBuilder DSL to build the bot - Exposed TelegramBotApiClient's properties to allows custom extension - Simplified TelegramBotApiClient's HttpClient defaults - Replaced sealed classes with sealed interfaces - Added logger and json to TelegramBotApiContext - Removed @OptIn annotations - Expanded star imports for code readability outside IDE - bump library versions - bump gradle wrapper version
alllex · Dec 26, 2023 · 9df1523 · 9df1523
1 parent 2c37933
commit 9df1523
Show file tree

Hide file tree

Showing 20 changed files with 1,737 additions and 1,892 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -75,14 +75,24 @@ tasks.test {
 }
 
 val generateTelegramBotApi by tasks.registering(GenerateTelegramBotApiTask::class) {
+    group = "telegram"
     apiSpecFile = layout.projectDirectory.file("api-spec/telegram-bot-api.html")
     packageName = "me.alllex.tbot.api.model"
     telegramClientPackage = "me.alllex.tbot.api.client"
     outputDirectory = layout.projectDirectory.dir("src/main/generated-kotlin")
 }
 
-kotlin.sourceSets.main {
-    kotlin.srcDir(generateTelegramBotApi)
+kotlin.sourceSets {
+    all {
+        languageSettings {
+            optIn("me.alllex.tbot.api.client.BotKitInternalAPI")
+            optIn("kotlinx.serialization.ExperimentalSerializationApi")
+            optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+        }
+    }
+    main {
+        kotlin.srcDir(generateTelegramBotApi)
+    }
 }
 
 kotlin.compilerOptions {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jsoup:jsoup:1.16.1")
-    implementation("me.alllex.parsus:parsus-jvm:0.5.5")
+    implementation("org.jsoup:jsoup:1.17.1")
+    implementation("me.alllex.parsus:parsus-jvm:0.6.0")
 }
 
 val updateApiSpec by tasks.registering {

diff --git a/buildSrc/src/main/kotlin/GenerateTelegramBotApiTask.kt b/buildSrc/src/main/kotlin/GenerateTelegramBotApiTask.kt
@@ -3,7 +3,13 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
-import org.gradle.api.tasks.*
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskAction
 
 @CacheableTask
 abstract class GenerateTelegramBotApiTask : DefaultTask() {

diff --git a/buildSrc/src/main/kotlin/me/alllex/tbot/apigen/BotApiDefinitionParser.kt b/buildSrc/src/main/kotlin/me/alllex/tbot/apigen/BotApiDefinitionParser.kt
@@ -1,6 +1,12 @@
 package me.alllex.tbot.apigen
 
-import me.alllex.parsus.parser.*
+import me.alllex.parsus.parser.Grammar
+import me.alllex.parsus.parser.ParseException
+import me.alllex.parsus.parser.getOrElse
+import me.alllex.parsus.parser.map
+import me.alllex.parsus.parser.or
+import me.alllex.parsus.parser.parser
+import me.alllex.parsus.parser.repeatOneOrMore
 import me.alllex.parsus.token.regexToken
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Element

diff --git a/buildSrc/src/main/kotlin/me/alllex/tbot/apigen/BotApiGenerator.kt b/buildSrc/src/main/kotlin/me/alllex/tbot/apigen/BotApiGenerator.kt
@@ -554,20 +554,18 @@ class BotApiGenerator {
                 append("requestBody: $requestTypeName")
             }
             appendLine("): TelegramResponse<${returnType.value}> =")
-            appendLine("    executeRequest(\"$apiMethodName\", ${if (hasParams) "requestBody" else "null"}) {")
-            appendLine("        httpClient.$httpMethod {")
-            appendLine("            url {")
-            appendLine("                protocol = apiProtocol")
-            appendLine("                host = apiHost")
-            appendLine("                port = apiPort")
-            appendLine("                path(\"bot\$apiToken\", \"$apiMethodName\")")
-            appendLine("            }")
+            appendLine("    httpClient.$httpMethod {")
+            appendLine("        url {")
+            appendLine("            protocol = apiProtocol")
+            appendLine("            host = apiHost")
+            appendLine("            port = apiPort")
+            appendLine("            path(\"bot\$apiToken\", \"$apiMethodName\")")
+            appendLine("        }")
             if (hasParams) {
-                appendLine("            contentType(ContentType.Application.Json)")
-                appendLine("            setBody(requestBody)")
+                appendLine("        contentType(ContentType.Application.Json)")
+                appendLine("        setBody(requestBody)")
             }
-            appendLine("        }.body()")
-            appendLine("    }")
+            appendLine("    }.body()")
         }
 
         val tryMethodSourceCode = buildString {
@@ -738,9 +736,9 @@ class BotApiGenerator {
         }
         appendLine(" */")
         appendLine("@Serializable(with = ${name}Serializer::class)")
-        appendLine("sealed class $name {")
-        appendLine("    abstract val updateId: Long")
-        appendLine("    abstract val updateType: UpdateType")
+        appendLine("sealed interface $name {")
+        appendLine("    val updateId: Long")
+        appendLine("    val updateType: UpdateType")
         appendLine("}")
         for (updateField in types) {
             appendLine()
@@ -749,7 +747,7 @@ class BotApiGenerator {
             appendLine("data class ${updateField.updateTypeName()}(")
             appendLine("    override val updateId: Long,")
             appendLine("    val ${updateField.name}: ${updateField.type},")
-            appendLine("): $name() {")
+            appendLine("): $name {")
             appendLine("    override val updateType: UpdateType get() = UpdateType.${updateField.enumValue()}")
             appendLine("}")
         }
@@ -798,7 +796,7 @@ class BotApiGenerator {
             appendLine("@JsonClassDiscriminator(\"$discriminatorFieldName\")")
         }
 
-        appendLine("sealed class ${name.value}")
+        appendLine("sealed interface ${name.value}")
 
         if (discriminatorFieldName == null) {
             val avoidFields = setOf("description")
@@ -872,7 +870,7 @@ class BotApiGenerator {
             append("data object ")
             append(typeName.value)
             if (sealedParentName != null) {
-                append(" : ${sealedParentName.value}()")
+                append(" : ${sealedParentName.value}")
             }
             appendLine()
         } else {
@@ -884,7 +882,7 @@ class BotApiGenerator {
 
             append(")")
             if (sealedParentName != null) {
-                append(" : ${sealedParentName.value}()")
+                append(" : ${sealedParentName.value}")
             }
             appendLine(" {")
             appendLine("    ${generateDebugToString(typeName.value, trueFields)}")

diff --git a/buildSrc/src/main/kotlin/me/alllex/tbot/apigen/util.kt b/buildSrc/src/main/kotlin/me/alllex/tbot/apigen/util.kt
@@ -1,6 +1,6 @@
 package me.alllex.tbot.apigen
 
-import java.util.*
+import java.util.Locale
 
 
 /**

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
 jdkTarget = "8"
 jvmToolchain = "21"
-kotlinTarget = "1.9.0"
-kotlinPlugin = "1.9.10"
-kotlinx-coroutines = "1.6.4"
-kotlinx-serialization = "1.5.1"
-ktor = "2.3.2"
-log4j = "2.20.0"
+kotlinTarget = "1.9.20"
+kotlinPlugin = "1.9.20"
+kotlinx-coroutines = "1.7.3"
+kotlinx-serialization = "1.6.2"
+ktor = "2.3.7"
+log4j = "2.22.0"
 junit5 = "5.10.0"
 
 [libraries]

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME