[FIX] Try fix okhttp clien close

Author: makeevrserg

gradle.properties

@@ -13,7 +13,7 @@ klibs.java.ktarget=21
 # Project
 klibs.project.name=MessageBridge
 klibs.project.group=ru.astrainteractive.messagebridge
-klibs.project.version.string=0.24.1
+klibs.project.version.string=0.24.2
 klibs.project.description=Bridge for TG and Discord
 klibs.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 klibs.project.url=https://empireprojekt.ru

modules/messenger/discord/src/main/kotlin/ru/astrainteractive/messagebridge/messenger/discord/di/JdaMessengerModule.kt

@@ -21,6 +21,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.retryWhen
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runInterruptible
 import net.dv8tion.jda.api.JDABuilder
 import net.dv8tion.jda.api.entities.Activity
 import net.dv8tion.jda.api.requests.GatewayIntent
@@ -118,7 +119,7 @@ class JdaMessengerModule(
                     }
                 }
 
-                val jda = builder.build().awaitReady()
+                val jda = runInterruptible { builder.build().awaitReady() }
                 send(jda)
 
                 awaitClose {
@@ -140,7 +141,7 @@ class JdaMessengerModule(
         flow2 = coreModule.configKrate.cachedStateFlow.map { it.jdaConfig.channelId },
         transform = { jda, channelId ->
             callbackFlow {
-                val webhookClient = WebHookClientFactory(jda).create(channelId).first()
+                val webhookClient = runInterruptible { WebHookClientFactory(jda).create(channelId) }.first()
                 send(webhookClient)
                 awaitClose {
                     webhookClient.close()

modules/messenger/forge/src/main/kotlin/ru/astrainteractive/messagebridge/messenger/forge/event/ForgeEvents.kt

@@ -11,6 +11,7 @@ import net.minecraftforge.event.entity.living.LivingDeathEvent
 import net.minecraftforge.event.entity.player.PlayerEvent
 import net.minecraftforge.event.server.ServerStartedEvent
 import net.minecraftforge.event.server.ServerStoppingEvent
+import net.minecraftforge.eventbus.api.EventPriority
 import ru.astrainteractive.astralibs.event.flowEvent
 import ru.astrainteractive.astralibs.server.util.toPlain
 import ru.astrainteractive.klibs.kstorage.api.CachedKrate
@@ -93,7 +94,7 @@ class ForgeEvents(
             }
         }.launchIn(ioScope)
 
-    val serverChatEvent = flowEvent<ServerChatEvent>()
+    val serverChatEvent = flowEvent<ServerChatEvent>(EventPriority.HIGHEST)
         .onEach { info { "#serverChatEvent" } }
         .onEach { event ->
             ioScope.launch(dispatchers.IO) {

modules/messenger/telegram/src/main/kotlin/ru/astrainteractive/messagebridge/messenger/telegram/di/TelegramMessengerModule.kt

@@ -11,6 +11,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.shareIn
+import kotlinx.coroutines.runInterruptible
 import okhttp3.Credentials
 import okhttp3.OkHttpClient
 import org.telegram.telegrambots.client.okhttp.OkHttpTelegramClient
@@ -71,6 +72,7 @@ class TelegramMessengerModule(
                 send(okHttpClient)
 
                 awaitClose {
+                    okHttpClient.dispatcher.cancelAll()
                     okHttpClient.dispatcher.executorService.shutdown()
                     okHttpClient.connectionPool.evictAll()
                     okHttpClient.cache?.close()
@@ -143,14 +145,15 @@ class TelegramMessengerModule(
                     Supplier { okHttpClient }
                 )
                 try {
-                    tgLpApplication.registerBot(tgConfig.token, consumer)
+                    runInterruptible { tgLpApplication.registerBot(tgConfig.token, consumer) }
                     info { "#bridgeBotFlow loaded!" }
                     send(tgLpApplication)
                 } catch (e: TelegramApiErrorResponseException) {
                     info { "#bridgeBotFlow could not load event. Error ${e.message}" }
                 }
                 awaitClose {
                     info { "#bridgeBotFlow closing TelegramBotsLongPollingApplication..." }
+                    okHttpClient.dispatcher.cancelAll()
                     tgLpApplication.unregisterBot(tgConfig.token)
                     tgLpApplication.stop()
                     tgLpApplication.close()