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

@@ -7,8 +7,10 @@ import kotlinx.coroutines.launch
 import org.koin.java.KoinJavaComponent.inject
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import space.mori.chzzk_bot.chatbot.chzzk.Connector.client as ChzzkClient
 import space.mori.chzzk_bot.chatbot.chzzk.Connector.getChannel
 import space.mori.chzzk_bot.chatbot.discord.Discord
+import space.mori.chzzk_bot.chatbot.utils.refreshAccessToken
 import space.mori.chzzk_bot.common.events.*
 import space.mori.chzzk_bot.common.models.User
 import space.mori.chzzk_bot.common.services.LiveStatusService
@@ -38,7 +40,6 @@ object ChzzkHandler {
     }
 
     fun enable() {
-        botUid = Connector.client.fetchLoggedUser().userId
         UserService.getAllUsers().map {
             if(!it.isDisabled)
                 try {
@@ -216,28 +217,20 @@ class UserHandler(
         if(user?.accessToken == null || user.refreshToken == null) {
             throw RuntimeException("AccessToken or RefreshToken is not valid.")
         }
-        try {
 
-            client = Connector.getClient(user.accessToken!!, user.refreshToken!!)
+        val tokens = ChzzkClient.refreshAccessToken(user.refreshToken!!)
-
-            client.loginAsync().join()
-            client.refreshTokenAsync().join()
-
-            UserService.setRefreshToken(user, client.loginResult.accessToken(), client.loginResult.refreshToken())
 
+        client = Connector.getClient(tokens.first, tokens.second)
         listener = ChzzkSessionBuilder(client).buildUserSession()
 
-            listener.createAndConnectAsync().join()
+        UserService.setRefreshToken(user, tokens.first, tokens.second)
 
-            messageHandler = MessageHandler(this@UserHandler)
+        listener.createAndConnectAsync().join()
 
         listener.on(SessionChatMessageEvent::class.java) {
             messageHandler.handle(it.message, user)
         }
-        } catch(e: Exception) {
+        messageHandler = MessageHandler(this@UserHandler)
-            logger.error("Exception(${user.username}): ${e.stackTraceToString()}")
-            throw RuntimeException("Exception: ${e.stackTraceToString()}")
-        }
     }
 
     internal fun disable() {

chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/discord/Discord.kt

@@ -43,8 +43,8 @@ class Discord: ListenerAdapter() {
                 embed.setDescription("${user.username} 님이 방송을 시작했습니다.")
                 embed.setTimestamp(Instant.now())
                 embed.setAuthor(user.username, "https://chzzk.naver.com/live/${user.token}")
-                embed.addField("카테고리", status.liveCategoryValue, true)
+                embed.addField("카테고리", status.categoryType.getOrNull() ?: "Unknown", true)
-                embed.addField("태그", status.tags.joinToString(", ") { it.trim() }, true)
+                embed.addField("태그", status.tags.joinToString { "," }, true)
                 // embed.setImage(status.)
 
                 channel.sendMessage(

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

@@ -0,0 +1,55 @@
+package space.mori.chzzk_bot.chatbot.utils
+
+import com.google.gson.Gson
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+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,
+    val refreshToken: String,
+    val expiresIn: Int,
+    val tokenType: String = "Bearer",
+    val scope: String
+)
+
+fun ChzzkClient.refreshAccessToken(refreshToken: String): Pair<String, String> {
+    val url = "https://openapi.chzzk.naver.com/auth/v1/token"
+    val request = Request.Builder()
+        .url(url)
+        .header("Content-Type", "application/json")
+        .post(gson.toJson(mapOf(
+            "grantType" to "refresh_token",
+            "refreshToken" to refreshToken,
+            "clientId" to this.apiClientId,
+            "clientSecret" to this.apiSecret
+        )).toRequestBody())
+        .build()
+
+    client.newCall(request).execute().use { response ->
+        try {
+            if(!response.isSuccessful) throw IOException("Unexpected code ${response.code}")
+            val body = response.body?.string()
+            val data = gson.fromJson(body, RefreshTokenResponse::class.java)
+
+            return Pair(data.accessToken, data.refreshToken)
+        } catch(e: Exception) {
+            throw e
+        }
+    }
+}

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

@@ -22,16 +22,12 @@ import io.ktor.server.websocket.*
 import kotlinx.coroutines.delay
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import org.koin.java.KoinJavaComponent.inject
-import space.mori.chzzk_bot.common.events.CoroutinesEventBus
-import space.mori.chzzk_bot.common.events.UserRegisterEvent
 import space.mori.chzzk_bot.common.services.UserService
 import space.mori.chzzk_bot.webserver.routes.*
 import space.mori.chzzk_bot.webserver.utils.DiscordRatelimits
 import java.math.BigInteger
 import java.security.SecureRandom
 import java.time.Duration
-import kotlin.getValue
 import kotlin.time.toKotlinDuration
 
 val dotenv = dotenv {
@@ -85,8 +81,6 @@ val server = embeddedServer(Netty, port = 8080, ) {
         }
     }
     routing {
-        val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
-
         route("/auth") {
             // discord login
             authenticate("auth-oauth-discord") {
@@ -197,12 +191,7 @@ val server = embeddedServer(Netty, port = 8080, ) {
                     val userInfo = getChzzkUser(tokenResponse.content.accessToken)
 
                     if(userInfo.content != null) {
-                        var user = UserService.getUser(userInfo.content.channelId)
+                        val user = UserService.getUser(userInfo.content.channelId)
-
-                        if(user == null) {
-                            user = UserService.saveUser(userInfo.content.channelName , userInfo.content.channelId)
-                        }
-
                         call.sessions.set(
                             UserSession(
                                 session.state,
@@ -210,13 +199,7 @@ val server = embeddedServer(Netty, port = 8080, ) {
                                 listOf()
                             )
                         )
-                        UserService.setRefreshToken(user,
+                        user?.let { UserService.setRefreshToken(it, tokenResponse.content.accessToken, tokenResponse.content.refreshToken ?: "") }
-                            tokenResponse.content.accessToken,
-                            tokenResponse.content.refreshToken ?: ""
-                        )
-
-                        dispatcher.post(UserRegisterEvent(user.token))
-
                         call.respondRedirect(getFrontendURL(""))
                     }
                 } catch (e: Exception) {

webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiRoutes.kt

@@ -40,16 +40,12 @@ fun Routing.apiRoutes() {
     val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
 
     suspend fun getChzzkUserWithId(uid: String): ChzzkUserReceiveEvent? {
-        val completableDeferred = CompletableDeferred<ChzzkUserReceiveEvent>()
+        val completableDeferred = CompletableDeferred< ChzzkUserReceiveEvent>()
-        dispatcher.subscribe(ChzzkUserReceiveEvent::class) { event ->
-            if (event.uid == uid) {
-                completableDeferred.complete(event)
-            }
-        }
         val user = withTimeoutOrNull(5000) {
             dispatcher.post(ChzzkUserFindEvent(uid))
             completableDeferred.await()
         }
+
         return user
     }
 
@@ -126,7 +122,7 @@ fun Routing.apiRoutes() {
                 user.subordinates.toList()
             }
             returnUsers.addAll(subordinates.map {
-                val subStatus = getChzzkUserWithId(it.token)
+                val subStatus = getChzzkUserWithId(user.token)
                 return@map if (subStatus == null) {
                     null
                 } else {