Update kotlin to v2.2.20

Update dependency dev.inmo:tgbotapi to v24.0.2

.github/workflows/build.yml

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

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.kotlin
 out/*
 *.iml
 target

README.md

@@ -22,11 +22,59 @@ there is [Makefile](Makefile) and you may use something like `make buildAndStart
 
 It is important to replace `"TOKEN"` in [Dockerfile](Dockerfile) or remove and add some config as a volume.
 
+### Config
+
+But you may set up several things for your bot. You should start with adding client object:
+
+```json
+{
+  "token": "your bot token",
+  "client": {
+    "connectionTimeoutMillis": 10000,
+    "requestTimeoutMillis": 10000,
+    "responseTimeoutMillis": 10000,
+    "proxy": {
+      "hostname": "127.0.0.1",
+      "port": 1080,
+      "type": "socks",
+      "username": "username",
+      "password": "password"
+    }
+  }
+}
+```
+
+__Required__ fields:
+
+* `token`
+* `client/proxy/hostname` (if you pass `client` and `proxy` fields) - hostname of proxy server
+* `client/proxy/password` - password for authentication on proxy server, required if `client/proxy/type` is `socks` and `client/proxy/username` passed
+
+__Optional__ fields:
+
+* `client` - object with client configs
+* `client/connectionTimeoutMillis` - timeout for connection to the server
+* `client/requestTimeoutMillis` - timeout for request complete (when request taken on server)
+* `client/responseTimeoutMillis` - timeout for getting a response after request taken on server
+* `client/proxy` - proxy settings
+* `client/proxy/port` - port of proxy server
+* `client/proxy/type` - type of proxy server (can be `socks` or `http`)
+* `client/proxy/username` - username for authentication on proxy server
+* `client/proxy/password` - password for authentication on proxy server
+
+Basically, your config looks like an object with token:
+
+```json
+{
+  "token": "your bot token"
+}
+```
+
 ## What next?
 
 There are several ways to continue:
 
-* [Tutorials](https://bookstack.inmo.dev/books/telegrambotapi)
+* [Tutorials](https://docs.inmo.dev/tgbotapi/index.html)
 * [Github readme](https://github.com/InsanusMokrassar/TelegramBotAPI)
 
 In other words, this template (and [TelegramBotAPI library](https://github.com/InsanusMokrassar/TelegramBotAPI)) does

build.gradle

@@ -24,6 +24,7 @@ dependencies {
     implementation libs.kotlin
 
     implementation libs.tgbotapi
+    implementation libs.ktor.client.okhttp
 }
 
 application {
@@ -31,6 +32,6 @@ application {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_17
 }

example.config.json

@@ -1,3 +1,15 @@
 {
-  "token": "your bot token"
+  "token": "your bot token",
+  "client": {
+    "connectionTimeoutMillis": 10000,
+    "requestTimeoutMillis": 10000,
+    "responseTimeoutMillis": 10000,
+    "proxy": {
+      "hostname": "127.0.0.1",
+      "port": 1080,
+      "type": "socks",
+      "username": "username",
+      "password": "password"
+    }
+  }
 }

gradle/libs.versions.toml

@@ -1,13 +1,16 @@
 [versions]
 
-kotlin = "1.8.20"
+kotlin = "2.2.20"
-tgbotapi = "7.0.2"
+tgbotapi = "24.0.2"
+ktor = "3.1.2"
 
 [libraries]
 
 kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 tgbotapi = { module = "dev.inmo:tgbotapi", version.ref = "tgbotapi" }
 
+ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
+
 # Libs for classpath
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-serialization-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

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

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

settings.gradle

@@ -1,3 +1 @@
 rootProject.name = 'telegram_bot'
-
-enableFeaturePreview("VERSION_CATALOGS")

src/main/kotlin/App.kt

@@ -1,8 +1,11 @@
+import config.Config
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviourWithLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
+import io.ktor.client.*
+import io.ktor.client.engine.okhttp.*
 import java.io.File
 import kotlinx.coroutines.*
 import kotlinx.serialization.json.Json
@@ -16,7 +19,14 @@ suspend fun main(args: Array<String>) {
     // decode config
     val config: Config = json.decodeFromString(Config.serializer(), File(args.first()).readText())
     // that is your bot
-    val bot = telegramBot(config.token)
+    val bot = telegramBot(config.token) {
+        client = HttpClient(OkHttp) {
+            config.client ?.apply {
+                // setting up telegram bot client
+                setupConfig()
+            }
+        }
+    }
 
     // that is kotlin coroutine scope which will be used in requests and parallel works under the hood
     val scope = CoroutineScope(Dispatchers.Default)

src/main/kotlin/Config.kt

@@ -1,6 +0,0 @@
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Config(
-    val token: String
-)

src/main/kotlin/config/Config.kt

@@ -0,0 +1,9 @@
+package config
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Config(
+    val token: String,
+    val client: HttpClientConfig? = null
+)

src/main/kotlin/config/HttpClientConfig.kt

@@ -0,0 +1,90 @@
+package config
+
+import dev.inmo.tgbotapi.types.MilliSeconds
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.okhttp.*
+import io.ktor.client.plugins.*
+import io.ktor.client.request.*
+import io.ktor.http.*
+import kotlinx.serialization.Serializable
+import java.net.*
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+@Serializable
+data class HttpClientConfig(
+    val connectionTimeoutMillis: MilliSeconds? = null,
+    val requestTimeoutMillis: MilliSeconds? = null,
+    val responseTimeoutMillis: MilliSeconds? = null,
+    val proxy: ProxyConfig? = null
+) {
+    @Serializable
+    data class ProxyConfig(
+        val hostname: String,
+        val type: ProxyType = ProxyType.socks,
+        val port: Int = type.defaultPort,
+        val username: String? = null,
+        val password: String? = null
+    ) {
+        @Serializable
+        enum class ProxyType(val defaultPort: Int, val proxyType: Proxy.Type) {
+            socks(1080, Proxy.Type.SOCKS),
+            http(3128, Proxy.Type.HTTP),
+        }
+
+        val socketAddress
+            get() = InetSocketAddress(hostname, port)
+    }
+
+    fun HttpClientConfig<OkHttpConfig>.setupConfig() {
+        // setting up telegram bot client
+        engine {
+            // Start setup bot client engine configuration
+            config {
+                // setting up connection timeout millis
+                connectionTimeoutMillis ?.let { connectTimeout(it, TimeUnit.MILLISECONDS) }
+                // setting up write timeout millis
+                requestTimeoutMillis ?.let { writeTimeout(it, TimeUnit.MILLISECONDS) }
+                // setting up read timeout millis
+                responseTimeoutMillis ?.let { readTimeout(it, TimeUnit.MILLISECONDS) }
+
+                // Start setup bot client engine proxy
+                this@HttpClientConfig.proxy ?.let { proxyConfig ->
+                    proxy(
+                        Proxy(
+                            proxyConfig.type.proxyType,
+                            proxyConfig.socketAddress
+                        )
+                    )
+
+                    proxyConfig.username ?.let { username ->
+                        when (proxyConfig.type) {
+                            config.HttpClientConfig.ProxyConfig.ProxyType.socks -> {
+                                val passwordAuthentication = PasswordAuthentication(
+                                    username,
+                                    proxyConfig.password ?.toCharArray() ?: error("For Socks proxy you should use both username and password or do not use authentication at all")
+                                )
+                                Authenticator.setDefault(object : Authenticator() {
+                                    override fun getPasswordAuthentication(): PasswordAuthentication? {
+                                        return if (requestingHost.lowercase() == proxyConfig.hostname.lowercase()) {
+                                            passwordAuthentication
+                                        } else {
+                                            null
+                                        }
+                                    }
+                                })
+                            }
+                            config.HttpClientConfig.ProxyConfig.ProxyType.http -> {
+                                val passwordSuffix = proxyConfig.password ?.let { ":$it" }
+                                val credentials = Base64.getEncoder().encodeToString("${username}${passwordSuffix}".toByteArray())
+                                this@setupConfig.defaultRequest {
+                                    header(HttpHeaders.ProxyAuthorization, "Basic $credentials")
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}