dalbodeule/chibot-chzzk-bot
1
0
Fork 0
mirror of https://github.com/dalbodeule/chibot-chzzk-bot.git synced 2025-06-08 23:08:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[hotfix] coroutine related fixed. (4x)

Browse Source
This commit is contained in:
dalbodeule 2025-06-08 15:36:33 +09:00
parent 95676e9b39
commit 593b98b7fb
No known key found for this signature in database
GPG Key ID: EFA860D069C9FA65
1 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt
View File

@ -81,10 +81,12 @@ object ChzzkHandler {
} }
fun disable() { fun disable() {
CoroutineScope(Dispatchers.Default).launch {
handlers.forEach { handler -> handlers.forEach { handler ->
handler.disable() handler.disable()
} }
} }
}
internal fun reloadCommand(chzzkChannel: ChzzkChannel) { internal fun reloadCommand(chzzkChannel: ChzzkChannel) {
val handler = handlers.firstOrNull { it.channel.channelId == chzzkChannel.channelId } val handler = handlers.firstOrNull { it.channel.channelId == chzzkChannel.channelId }
@ -214,15 +216,26 @@ class UserHandler(
LiveStatusService.updateOrCreate(user, value) LiveStatusService.updateOrCreate(user, value)
} }
init { private suspend fun connect() {
val user = UserService.getUser(channel.channelId) val user = UserService.getUser(channel.channelId)
if(user?.accessToken == null || user.refreshToken == null) { if(user?.accessToken == null || user.refreshToken == null) {
throw RuntimeException("AccessToken or RefreshToken is not valid.") throw RuntimeException("AccessToken or RefreshToken is not valid.")
} }
try {
CoroutineScope(Dispatchers.Default).launch { val tokens = user.refreshToken?.let { token -> Connector.client.refreshAccessToken(token)}
connect() if(tokens == null) {
throw RuntimeException("AccessToken is not valid.")
}
client = Connector.getClient(tokens.first, tokens.second)
UserService.setRefreshToken(user, tokens.first, tokens.second)
chatChannelId = getChzzkChannelId(channel.channelId) ?: throw RuntimeException("Chat Channel ID is not found.")
client.loginAsync().await()
listener = ChzzkSessionBuilder(client).buildUserSession()
listener.createAndConnectAsync().await()
delay(1000L)
listener.on(SessionChatMessageEvent::class.java) { listener.on(SessionChatMessageEvent::class.java) {
messageHandler.handle(it.message, user) messageHandler.handle(it.message, user)
@ -244,33 +257,12 @@ class UserHandler(
null null
) )
) )
}
} catch(e: Exception) {
logger.error("Exception(${user.username}): ${e.stackTraceToString()}")
throw RuntimeException("Exception: ${e.stackTraceToString()}")
}
}
private suspend fun connect() {
val tokens = user.refreshToken?.let { token -> Connector.client.refreshAccessToken(token)}
if(tokens == null) {
throw RuntimeException("AccessToken is not valid.")
}
client = Connector.getClient(tokens.first, tokens.second)
UserService.setRefreshToken(user, tokens.first, tokens.second)
chatChannelId = getChzzkChannelId(channel.channelId) ?: throw RuntimeException("Chat Channel ID is not found.")
client.loginAsync().await()
listener = ChzzkSessionBuilder(client).buildUserSession()
listener.createAndConnectAsync().await()
delay(1000L)
messageHandler = MessageHandler(this@UserHandler) messageHandler = MessageHandler(this@UserHandler)
} }
internal fun disable() { internal suspend fun disable() {
listener.disconnectAsync().join() listener.disconnectAsync().await()
_isActive = false _isActive = false
} }