Merge pull request #136 from dalbodeule/debug

[hotfix] token claim fixed. (2x)

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

@@ -1,7 +1,11 @@
 package space.mori.chzzk_bot.chatbot.chzzk
 
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.future.await
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import org.koin.java.KoinJavaComponent.inject
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -13,8 +17,7 @@ import space.mori.chzzk_bot.common.models.User
 import space.mori.chzzk_bot.common.services.LiveStatusService
 import space.mori.chzzk_bot.common.services.TimerConfigService
 import space.mori.chzzk_bot.common.services.UserService
-import space.mori.chzzk_bot.common.utils.getChzzkChannelId
+import space.mori.chzzk_bot.common.utils.*
-import space.mori.chzzk_bot.common.utils.getUptime
 import xyz.r2turntrue.chzzk4j.ChzzkClient
 import xyz.r2turntrue.chzzk4j.session.ChzzkSessionBuilder
 import xyz.r2turntrue.chzzk4j.session.ChzzkSessionSubscriptionType
@@ -22,11 +25,10 @@ import xyz.r2turntrue.chzzk4j.session.ChzzkUserSession
 import xyz.r2turntrue.chzzk4j.session.event.SessionChatMessageEvent
 import xyz.r2turntrue.chzzk4j.types.channel.ChzzkChannel
 import xyz.r2turntrue.chzzk4j.types.channel.live.ChzzkLiveDetail
-import java.lang.Runnable
+import java.lang.Exception
-import java.lang.Thread
 import java.net.SocketTimeoutException
-import java.nio.charset.Charset
 import java.time.LocalDateTime
+import java.nio.charset.Charset
 
 object ChzzkHandler {
     private val handlers = mutableListOf<UserHandler>()
@@ -44,7 +46,7 @@ object ChzzkHandler {
         UserService.getAllUsers().map {
             if(!it.isDisabled)
                 try {
-                    getChannel(it.token)?.let { token -> addUser(token, it) }
+                    Connector.getChannel(it.token)?.let { token -> addUser(token, it) }
                 } catch(e: Exception) {
                     logger.info("Exception: ${it.token}(${it.username}) not found. ${e.stackTraceToString()}")
                 }
@@ -81,10 +83,8 @@ object ChzzkHandler {
     }
 
     fun disable() {
-        CoroutineScope(Dispatchers.Default).launch {
+        handlers.forEach { handler ->
-            handlers.forEach { handler ->
+            handler.disable()
-                handler.disable()
-            }
         }
     }
 
@@ -118,7 +118,7 @@ object ChzzkHandler {
                             try {
                                 it.isActive(true, streamInfo)
                             } catch(e: Exception) {
-                                logger.info("Thread 1 Exception: ${e.stackTraceToString()}")
+                                logger.info("Exception: ${e.stackTraceToString()}")
                             }
                         }
                         if (streamInfo?.isOnline == false && it.isActive) it.isActive(false, streamInfo)
@@ -146,14 +146,14 @@ object ChzzkHandler {
                             try {
                                 it.isActive(true, streamInfo)
                             } catch(e: Exception) {
-                                logger.info("Thread 2 Exception: ${e.stackTraceToString()}")
+                                logger.info("Exception: ${e.stackTraceToString()}")
                             }
                         }
                         if (streamInfo?.isOnline == false && it.isActive) it.isActive(false, streamInfo)
                     } catch (e: SocketTimeoutException) {
-                        logger.info("Thread 2 Timeout: ${it.channel.channelName} / ${e.stackTraceToString()}")
+                        logger.info("Thread 1 Timeout: ${it.channel.channelName} / ${e.stackTraceToString()}")
                     } catch (e: Exception) {
-                        logger.info("Thread 2 Exception: ${it.channel.channelName} / ${e.stackTraceToString()}")
+                        logger.info("Thread 1 Exception: ${it.channel.channelName} / ${e.stackTraceToString()}")
                     } finally {
                         Thread.sleep(5000)
                     }
@@ -204,10 +204,10 @@ class UserHandler(
     private var user: User,
     var streamStartTime: LocalDateTime?,
 ) {
-    lateinit var messageHandler: MessageHandler
+    var messageHandler: MessageHandler
-    lateinit var client: ChzzkClient
+    var client: ChzzkClient
-    lateinit var listener: ChzzkUserSession
+    var listener: ChzzkUserSession
-    lateinit var chatChannelId: String
+    var chatChannelId: String?
 
     private val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
     private var _isActive: Boolean
@@ -216,53 +216,57 @@ class UserHandler(
             LiveStatusService.updateOrCreate(user, value)
         }
 
-    private suspend fun connect() {
+    init {
         val user = UserService.getUser(channel.channelId)
 
         if(user?.accessToken == null || user.refreshToken == null) {
             throw RuntimeException("AccessToken or RefreshToken is not valid.")
         }
+        try {
+            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)
 
-        val tokens = user.refreshToken?.let { token -> Connector.client.refreshAccessToken(token)}
+            client.loginAsync().join()
-        if(tokens == null) {
+            listener = ChzzkSessionBuilder(client).buildUserSession()
-            throw RuntimeException("AccessToken is not valid.")
+            listener.createAndConnectAsync().join()
-        }
+            messageHandler = MessageHandler(this@UserHandler)
-        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.on(SessionChatMessageEvent::class.java) {
-        listener = ChzzkSessionBuilder(client).buildUserSession()
+                messageHandler.handle(it.message, user)
-        listener.createAndConnectAsync().await()
+            }
 
-        delay(1000L)
+            GlobalScope.launch {
-
+                val timer = TimerConfigService.getConfig(user)
-        listener.on(SessionChatMessageEvent::class.java) {
+                if (timer?.option == TimerType.UPTIME.value)
-            messageHandler.handle(it.message, user)
+                    dispatcher.post(
-        }
+                        TimerEvent(
-
+                            channel.channelId,
-        val timer = TimerConfigService.getConfig(user)
+                            TimerType.UPTIME,
-        if (timer?.option == TimerType.UPTIME.value)
+                            getUptime(streamStartTime!!)
-            dispatcher.post(
+                        )
-                TimerEvent(
+                    )
-                    channel.channelId,
+                else dispatcher.post(
-                    TimerType.UPTIME,
+                    TimerEvent(
-                    getUptime(streamStartTime!!)
+                        channel.channelId,
+                        TimerType.entries.firstOrNull { it.value == timer?.option } ?: TimerType.REMOVE,
+                        null
+                    )
                 )
-            )
+            }
-        else dispatcher.post(
+            
-            TimerEvent(
+        } catch(e: Exception) {
-                channel.channelId,
+            logger.error("Exception(${user.username}): ${e.stackTraceToString()}")
-                TimerType.entries.firstOrNull { it.value == timer?.option } ?: TimerType.REMOVE,
+            throw RuntimeException("Exception: ${e.stackTraceToString()}")
-                null
+        }
-            )
-        )
-
-        messageHandler = MessageHandler(this@UserHandler)
     }
 
-    internal suspend fun disable() {
+    internal fun disable() {
-        listener.disconnectAsync().await()
+        listener.disconnectAsync().join()
         _isActive = false
     }
 
@@ -280,8 +284,6 @@ class UserHandler(
     internal fun isActive(value: Boolean, status: ChzzkLiveDetail) {
         if(value) {
             CoroutineScope(Dispatchers.Default).launch {
-                connect()
-
                 logger.info("${user.username} is live.")
 
                 reloadUser(UserService.getUser(user.id.value)!!)

chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/utils/accessTokenRefresh.kt

@@ -1,15 +1,27 @@
 package space.mori.chzzk_bot.chatbot.utils
 
-import com.google.gson.reflect.TypeToken
+import com.google.gson.Gson
+import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import space.mori.chzzk_bot.chatbot.chzzk.dotenv
-import space.mori.chzzk_bot.common.utils.IData
 import space.mori.chzzk_bot.common.utils.client
 import xyz.r2turntrue.chzzk4j.ChzzkClient
 import java.io.IOException
 
+val client = OkHttpClient.Builder()
+    .addNetworkInterceptor { chain ->
+        chain.proceed(
+            chain.request()
+                .newBuilder()
+                .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36")
+                .build()
+        )
+    }
+    .build()
+val gson = Gson()
 
 data class RefreshTokenResponse(
     val accessToken: String,
@@ -36,9 +48,9 @@ fun ChzzkClient.refreshAccessToken(refreshToken: String): Pair<String, String> {
         try {
             if(!response.isSuccessful) throw IOException("Unexpected code ${response.code}")
             val body = response.body?.string()
-            val data = gson.fromJson(body, object: TypeToken<IData<RefreshTokenResponse>>() {})
+            val data = gson.fromJson(body, RefreshTokenResponse::class.java)
 
-            return Pair(data.content.accessToken, data.content.refreshToken)
+            return Pair(data.accessToken, data.refreshToken)
         } catch(e: Exception) {
             throw e
         }

webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt

@@ -228,7 +228,8 @@ val server = embeddedServer(Netty, port = 8080, ) {
             // common: logout
             get("/logout") {
                 call.sessions.clear<UserSession>()
-                call.respondRedirect(getFrontendURL(""))
+                call.response.status(HttpStatusCode.OK)
+                return@get
             }
         }