3.3.1

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Telegram-bot changelog
 
+### 3.3.1
+* Added ability to use proxy. See `httpClient{}` section in bot configuration.
+
 ## 3.3.0
 
 * Fixed bug with missing media within input handling process.

README.md

@@ -21,7 +21,7 @@ build.gradle.kts example:
 
 ```gradle
 dependencies {
-    implementation("eu.vendeli:telegram-bot:3.3.0")
+    implementation("eu.vendeli:telegram-bot:3.3.1")
 }
 ```
 

gradle/libs.versions.toml

@@ -5,7 +5,7 @@ logback = "1.4.11"
 jackson = "2.15.3"
 reflections = "0.10"
 
-kotlin = "1.9.10"
+kotlin = "1.9.20"
 coroutines = "1.7.3"
 dokka = "1.8.20"
 kotlinter = "3.13.0"

telegram-bot/build.gradle.kts

@@ -41,7 +41,7 @@ dependencies {
 }
 
 group = "eu.vendeli"
-version = "3.3.0"
+version = "3.3.1"
 
 apply(from = "publishing.gradle.kts")
 

telegram-bot/src/main/kotlin/eu/vendeli/tgbot/types/internal/configuration/HttpConfiguration.kt

@@ -1,5 +1,7 @@
 package eu.vendeli.tgbot.types.internal.configuration
 
+import java.net.Proxy
+
 /**
  * A class containing the configuration for the bot http client.
  *
@@ -13,11 +15,13 @@ package eu.vendeli.tgbot.types.internal.configuration
  * @property maxRequestRetry Specifies a http request maximum retry if had some exceptions
  * @property retryDelay Multiplier for timeout at each retry, in milliseconds
  * i.e. for the base value [maxRequestRetry] the attempts will be in 3, 6, 9 seconds
+ * @property proxy Specifies proxy that will be used for http calls.
  */
 data class HttpConfiguration(
     var requestTimeoutMillis: Long? = null,
     var connectTimeoutMillis: Long? = null,
     var socketTimeoutMillis: Long? = null,
     var maxRequestRetry: Int = 3,
     var retryDelay: Long = 3000L,
+    var proxy: Proxy? = null
 )

telegram-bot/src/main/kotlin/eu/vendeli/tgbot/utils/ComponentConfigurations.kt

@@ -10,14 +10,13 @@ import com.fasterxml.jackson.module.kotlin.KotlinModule
 import eu.vendeli.tgbot.TelegramBot
 import eu.vendeli.tgbot.TelegramBot.Companion.logger
 import io.ktor.client.HttpClient
-import io.ktor.client.engine.cio.CIO
 import io.ktor.client.plugins.HttpRequestRetry
 import io.ktor.client.plugins.HttpTimeout
 import io.ktor.client.plugins.logging.Logging
 import io.ktor.client.request.HttpSendPipeline
 import io.ktor.http.isSuccess
 
-internal fun TelegramBot.getConfiguredHttpClient() = HttpClient(CIO) {
+internal fun TelegramBot.getConfiguredHttpClient() = HttpClient {
     install("RequestLogging") {
         sendPipeline.intercept(HttpSendPipeline.Monitoring) {
             logger.trace { "TgApiRequest: ${context.method} ${context.url.buildString()}" }
@@ -44,6 +43,10 @@ internal fun TelegramBot.getConfiguredHttpClient() = HttpClient(CIO) {
             retry * config.httpClient.retryDelay
         }
     }
+
+    engine {
+        proxy = config.httpClient.proxy
+    }
 }
 
 internal fun TelegramBot.Companion.getConfiguredMapper() = ObjectMapper().apply {