mirror of
https://github.com/InsanusMokrassar/PlaguBot.git
synced 2026-04-16 15:08:47 +00:00
add opportunity to setup proxy
This commit is contained in:
@@ -22,6 +22,8 @@ dependencies {
|
||||
api libs.microutils.koin
|
||||
api libs.microutils.startup.launcher
|
||||
|
||||
api libs.ktor.engine.okhttp
|
||||
|
||||
api libs.sqlite
|
||||
|
||||
testImplementation libs.kt.test.junit
|
||||
|
||||
@@ -3,7 +3,6 @@ package dev.inmo.plagubot
|
||||
import dev.inmo.kslog.common.*
|
||||
import dev.inmo.micro_utils.common.Warning
|
||||
import dev.inmo.micro_utils.coroutines.runCatchingLogging
|
||||
import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
import dev.inmo.micro_utils.fsm.common.StatesManager
|
||||
import dev.inmo.micro_utils.fsm.common.managers.*
|
||||
@@ -16,6 +15,10 @@ import dev.inmo.tgbotapi.bot.ktor.telegramBot
|
||||
import dev.inmo.tgbotapi.extensions.api.webhook.deleteWebhook
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.*
|
||||
import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
|
||||
import io.ktor.client.HttpClient
|
||||
import io.ktor.client.engine.HttpClientEngine
|
||||
import io.ktor.client.engine.HttpClientEngineFactory
|
||||
import io.ktor.client.engine.okhttp.OkHttp
|
||||
import kotlinx.coroutines.*
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.json.*
|
||||
@@ -58,6 +61,19 @@ object PlaguBot : Plugin {
|
||||
* @param params Raw JSON params of the bot part of the configuration
|
||||
*/
|
||||
override fun KtorRequestsExecutorBuilder.setupBotClient(scope: Scope, params: JsonObject) {
|
||||
val config = scope.get<Config>()
|
||||
if (config.proxy != null) {
|
||||
val initialClient = config.proxy.createDefaultClient()
|
||||
val clientFromHttpClientEngine = scope.getOrNull<HttpClientEngine>() ?.let {
|
||||
HttpClient(it)
|
||||
}
|
||||
val clientFromKoin = clientFromHttpClientEngine ?: (scope.getOrNull<HttpClientEngineFactory<*>>() ?: OkHttp).let {
|
||||
HttpClient(it)
|
||||
}
|
||||
this@setupBotClient.client = initialClient.config {
|
||||
install(clientFromKoin)
|
||||
}
|
||||
}
|
||||
scope.plugins.filter { it !== this@PlaguBot }.forEach {
|
||||
with(it) {
|
||||
setupBotClient(scope, params)
|
||||
|
||||
@@ -14,5 +14,6 @@ data class Config(
|
||||
@SerialName("database")
|
||||
val databaseConfig: DatabaseConfig = DatabaseConfig(),
|
||||
val botApiServer: String = telegramBotAPIDefaultUrl,
|
||||
val testServer: Boolean = false
|
||||
val testServer: Boolean = false,
|
||||
val proxy: ProxyConfig? = null,
|
||||
)
|
||||
|
||||
47
bot/src/main/kotlin/dev/inmo/plagubot/config/ProxyConfig.kt
Normal file
47
bot/src/main/kotlin/dev/inmo/plagubot/config/ProxyConfig.kt
Normal file
@@ -0,0 +1,47 @@
|
||||
package dev.inmo.plagubot.config
|
||||
|
||||
import io.ktor.client.*
|
||||
import io.ktor.client.engine.okhttp.OkHttp
|
||||
import io.ktor.client.plugins.*
|
||||
import io.ktor.client.request.*
|
||||
import io.ktor.http.*
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.Transient
|
||||
import java.net.Authenticator
|
||||
import java.net.InetSocketAddress
|
||||
import java.net.PasswordAuthentication
|
||||
import java.net.Proxy
|
||||
import kotlin.io.encoding.Base64
|
||||
|
||||
@Serializable
|
||||
data class ProxyConfig(
|
||||
val host: String,
|
||||
val port: Int,
|
||||
val username: String? = null,
|
||||
val password: String? = null
|
||||
) {
|
||||
@Transient
|
||||
private val proxy = Proxy(Proxy.Type.SOCKS, InetSocketAddress(host, port))
|
||||
fun createDefaultClient() = HttpClient(OkHttp) {
|
||||
engine {
|
||||
config {
|
||||
proxy(this@ProxyConfig.proxy)
|
||||
if (username != null && password != null) {
|
||||
val passwordAuthentication = PasswordAuthentication(
|
||||
username,
|
||||
password.toCharArray()
|
||||
)
|
||||
Authenticator.setDefault(object : Authenticator() {
|
||||
override fun getPasswordAuthentication(): PasswordAuthentication? {
|
||||
return if (requestingHost.lowercase() == host.lowercase()) {
|
||||
passwordAuthentication
|
||||
} else {
|
||||
null
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user