Compare commits
1 Commits
b6921f09d1
...
afe113c2db
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
afe113c2db |
@@ -26,7 +26,7 @@ lazy val `telegram-bot-delivery` = (project in file("."))
|
||||
circeAkkaHttp
|
||||
),
|
||||
Docker / defaultLinuxInstallLocation := "/opt/telegram-bot-delivery",
|
||||
Docker / dockerExposedPorts := Seq(88, 8443),
|
||||
Docker / dockerExposedPorts := Seq(8443),
|
||||
Docker / dockerRepository := Some("registry.xeppaka.eu:443")
|
||||
)
|
||||
.enablePlugins(JavaServerAppPackaging)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
akka {
|
||||
loglevel = "DEBUG"
|
||||
loglevel = "INFO"
|
||||
|
||||
extensions = [akka.persistence.Persistence]
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root level="DEBUG">
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT"/>
|
||||
</root>
|
||||
</configuration>
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package eu.xeppaka.bot
|
||||
|
||||
import java.nio.file.Paths
|
||||
|
||||
import akka.actor.Scheduler
|
||||
import akka.actor.typed.scaladsl.AskPattern._
|
||||
import akka.actor.typed.scaladsl.Behaviors
|
||||
@@ -15,30 +17,28 @@ import scala.io.StdIn
|
||||
|
||||
object Main {
|
||||
def main(args: Array[String]): Unit = {
|
||||
val isProduction = System.getProperty("isProduction", "false").toBoolean
|
||||
val botId = System.getProperty("botId", "570855144:AAEv7b817cuq2JJI9f2kG5B9G3zW1x-btz4")
|
||||
val localPort = 8443
|
||||
val hookDomain = System.getProperty("hookDomain", "xeppaka.eu")
|
||||
val hookPort = System.getProperty("hookPort", "8443").toInt
|
||||
val useHttpsServer = System.getProperty("useHttpsServer", "true").toBoolean
|
||||
|
||||
val (botId, localPort, hookPort) = if (isProduction) {
|
||||
("693134480:AAE8JRXA6j1mkOKTaxapP6A-E4LPHRuiIf8", 88, 88) // delivery bot
|
||||
} else {
|
||||
("570855144:AAEv7b817cuq2JJI9f2kG5B9G3zW1x-btz4", 8443, 8443) // useless bot
|
||||
}
|
||||
val botBehavior = Behaviors.supervise(TelegramBot.behavior(botId, "0.0.0.0", localPort, hookDomain, hookPort, useHttpsServer)).onFailure(SupervisorStrategy.restart)
|
||||
val telegramBot = ActorSystem(botBehavior, "telegram-bot-delivery")
|
||||
// implicit val actorSystem: actor.ActorSystem = telegramBot.toUntyped
|
||||
// implicit val executionContext: ExecutionContextExecutor = telegramBot.dispatchers.lookup(DispatcherSelector.default())
|
||||
// implicit val scheduler: Scheduler = telegramBot.scheduler
|
||||
// implicit val timeout: Timeout = 10.seconds
|
||||
|
||||
val botBehavior = Behaviors.supervise(TelegramBot.behavior(botId, "0.0.0.0", localPort, hookPort)).onFailure(SupervisorStrategy.restart)
|
||||
val telegramBot = ActorSystem(botBehavior, "telegram-bot")
|
||||
implicit val actorSystem: actor.ActorSystem = telegramBot.toUntyped
|
||||
implicit val executionContext: ExecutionContextExecutor = telegramBot.dispatchers.lookup(DispatcherSelector.default())
|
||||
implicit val scheduler: Scheduler = telegramBot.scheduler
|
||||
implicit val timeout: Timeout = 10.seconds
|
||||
|
||||
println("Press enter to finish bot...")
|
||||
StdIn.readLine()
|
||||
|
||||
val stopFuture: Future[Done] = telegramBot ? (ref => TelegramBot.Stop(ref))
|
||||
|
||||
val terminateFuture = stopFuture
|
||||
.andThen { case _ => Http().shutdownAllConnectionPools() }
|
||||
.andThen { case _ => telegramBot.terminate() }
|
||||
|
||||
Await.ready(terminateFuture, 20.seconds)
|
||||
// println("Press enter to finish bot...")
|
||||
// StdIn.readLine()
|
||||
//
|
||||
// val stopFuture: Future[Done] = telegramBot ? (ref => TelegramBot.Stop(ref))
|
||||
//
|
||||
// val terminateFuture = stopFuture
|
||||
// .andThen { case _ => Http().shutdownAllConnectionPools() }
|
||||
// .andThen { case _ => telegramBot.terminate() }
|
||||
//
|
||||
// Await.ready(terminateFuture, 20.seconds)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package eu.xeppaka.bot
|
||||
|
||||
import java.io.InputStream
|
||||
import java.nio.file.Path
|
||||
import java.security.{KeyStore, SecureRandom}
|
||||
import java.util.UUID
|
||||
|
||||
@@ -20,7 +21,7 @@ import eu.xeppaka.bot.TelegramEntities._
|
||||
import javax.net.ssl.{KeyManagerFactory, SSLContext, TrustManagerFactory}
|
||||
|
||||
import scala.collection.immutable
|
||||
import scala.concurrent.ExecutionContextExecutor
|
||||
import scala.concurrent.{ExecutionContextExecutor, Future}
|
||||
import scala.concurrent.duration._
|
||||
import scala.io.Source
|
||||
import scala.util.{Failure, Success}
|
||||
@@ -34,7 +35,7 @@ object TelegramBot {
|
||||
case object GetBotInfo
|
||||
case object GetWebhookInfo
|
||||
|
||||
def behavior(botId: String, interface: String, localPort: Int, hookPort: Int): Behavior[Command] = Behaviors.setup[Command] { ctx =>
|
||||
def behavior(botId: String, interface: String, localPort: Int, hookDomain: String, hookPort: Int, useHttpsServer: Boolean = true): Behavior[Command] = Behaviors.setup[Command] { ctx =>
|
||||
ctx.log.info("action=start_bot")
|
||||
|
||||
implicit val untypedSystem: ActorSystem = ctx.system.toUntyped
|
||||
@@ -44,8 +45,8 @@ object TelegramBot {
|
||||
val botUri = BotUri(botId)
|
||||
val http: HttpExt = Http()
|
||||
val hookId = UUID.randomUUID().toString
|
||||
val webhookUri = Uri(s"https://xeppaka.eu:$hookPort/$hookId")
|
||||
val httpsContext = createHttpsConnectionContext
|
||||
val webhookUri = Uri(s"https://$hookDomain:$hookPort/$hookId")
|
||||
val httpsContext = if (useHttpsServer) Some(createHttpsConnectionContext) else None
|
||||
val stashBuffer = StashBuffer[Command](10)
|
||||
val dialogManager = ctx.spawnAnonymous(Behaviors.supervise(DialogManager.behavior(botUri)).onFailure(SupervisorStrategy.restart))
|
||||
val routes = botRoutes(hookId, dialogManager)(untypedSystem.scheduler)
|
||||
@@ -57,7 +58,7 @@ object TelegramBot {
|
||||
ctx.log.info("action=bind_server interface={} port={}", interface, localPort)
|
||||
|
||||
http
|
||||
.bindAndHandle(routes, interface, localPort, httpsContext)
|
||||
.bindAndHandle(routes, interface, localPort, httpsContext.getOrElse(http.defaultServerHttpContext))
|
||||
.onComplete {
|
||||
case Success(binding) => ctx.self ! BindingSuccess(binding)
|
||||
case Failure(exception) => ctx.self ! BindingFailure(exception)
|
||||
@@ -112,15 +113,21 @@ object TelegramBot {
|
||||
implicit val executionContextExecutor: ExecutionContextExecutor = ctx.system.dispatchers.lookup(DispatcherSelector.default())
|
||||
|
||||
val urlEntity = HttpEntity.Strict(ContentTypes.`text/plain(UTF-8)`, ByteString(webhookUri.toString()))
|
||||
val urlPart = Multipart.FormData.BodyPart.Strict("url", urlEntity)
|
||||
val urlPart = Some(Multipart.FormData.BodyPart.Strict("url", urlEntity))
|
||||
|
||||
val certificate = ByteString(Source.fromResource("telegram-bot.pem").mkString)
|
||||
val certificateEntity = HttpEntity.Strict(ContentTypes.`application/octet-stream`, certificate)
|
||||
val certificatePart = Multipart.FormData.BodyPart.Strict("certificate", certificateEntity, Map("filename" -> "telegram-bot.pem"))
|
||||
val certificatePart = if (useHttpsServer) {
|
||||
val certificate = ByteString(Source.fromResource("telegram-bot.pem").mkString)
|
||||
val certificateEntity = HttpEntity.Strict(ContentTypes.`application/octet-stream`, certificate)
|
||||
|
||||
val setWebhookFormData = Multipart.FormData.Strict(immutable.Seq(urlPart, certificatePart))
|
||||
Some(Multipart.FormData.BodyPart.Strict("certificate", certificateEntity, Map("filename" -> "cert.pem")))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
|
||||
Marshal(setWebhookFormData)
|
||||
val formParts = immutable.Seq(urlPart, certificatePart).flatten
|
||||
val formData = Multipart.FormData.Strict(formParts)
|
||||
|
||||
Marshal(formData)
|
||||
.to[RequestEntity]
|
||||
.flatMap(requestEntity => http.singleRequest(HttpRequest(uri = botUri.setWebhook, method = HttpMethods.POST, entity = requestEntity)))
|
||||
.onComplete {
|
||||
|
||||
Reference in New Issue
Block a user