Merge pull request #136 from dalbodeule/debug

[hotfix] token claim fixed. (2x)

README.md

@@ -1,6 +1,6 @@
-# chibot_chzzk_bot
+# nabot_chzzk_bot
 
-[![Discord](https://img.shields.io/discord/1250093195870867577)](https://discord.gg/up8ANZegmy)   [![Build Status](https://teamcity.mori.space/app/rest/builds/buildType:NabotChzzkBot_Build/statusIcon)](https://teamcity.mori.space/project/NabotChzzkBot)
+[![Discord](https://img.shields.io/discord/1250093195870867577)](https://discord.gg/up8ANZegmy)   [![Build Status](https://teamcity.mori.space/app/rest/builds/buildType:NabotChzzkBot_Build/statusIcon)](https://teamcity.mori.space/project/NabotChzzkBot)   [![Docker Image Version](https://img.shields.io/docker/v/dalbodeule/chzzkbot)](https://hub.docker.com/repository/docker/dalbodeule/chzzkbot/general)
 
 ## Chzzk Chatbot with [JDA5](https://github.com/discord-jda/JDA), [chzzk4j](https://github.com/R2turnTrue/chzzk4j)
 
@@ -17,6 +17,17 @@
 - [x] \<daily_counter:counter_name>
 - [x] \<days:yyyy-mm-dd>
 
+### 관리 명령어 (on Discord)
+- [x] /hook token: \[디스코드 연동 페이지에서 받은 Token]
+- [x] /alert channel: \[디스코드 Channel ID] content: \[알림 내용]
+- [x] /add label: \[명령어] content: \[내용]
+- [ ] /list
+- [x] /update label: \[명령어] content: \[내용]
+- [x] /delete label: \[명령어]
+### 매니저 명령어 (on Discord)
+- [x] /addmanager user: \[Discord user]
+- [x] /listmanager
+- [x] /removemanager user: \[Discord user]
 ### 관리 명령어 (on Chzzk chat)
 - [x] !명령어추가 \[명령어] \[내용]
 - [x] !명령어수정 \[명령어] \[내용]
@@ -31,6 +42,32 @@
 - [ ] !노래삭제 \[번호]
 - [ ] !노래설정 \[내용] \[켜기/끄기]
 
+### Envs
+- DISCORD_TOKEN
+- DB_URL
+- DB_USER
+- DB_PASS
+- RUN_AGENT = `false`
+- NID_AUT
+- NID_SES
+
+### 사용 예시
+- 팔로우
+  - `/add label: !팔로우 content: <name>님은 오늘로 <following>일째 팔로우네요!`
+- 출첵
+  - `/add label: !출첵 content: <name>님의 <daily_counter:attendance>번째 출석! fail_content: <name>님은 오늘 이미 출석했어요! <daily_counter:attendance>번 했네요?`
+  - `/add label: ? content: <name>님이 <counter:hook>개째 갈고리 수집`
+- ㄱㅇㅇ
+  - `/add label: ㄱㅇㅇ content: <counter:cute>번째 ㄱㅇㅇ`
+  - `/add label: ㄱㅇㅇ content:  나누 귀여움 +<counter:cute>`
+- 풉
+  - `/add label: 풉 content: <counter:poop>번째 비웃음?`
+  - `/add label: 풉키풉키 content: <counter:poop>번째 비웃음?`
+- 바보
+  - `/add label: 바보 content: 나 바보 아니다?`
+  - `/add label: 바보 content: <counter:fool> 번째 바보? 나 바보 아니다?`
+- 첫방송
+  - `/add label: 첫방송 content: 24년 7월 23일부터 <days:2024-07-23>일 째 방송중!`
 
 ## 사용 기술스택
 - [Exposed](https://github.com/JetBrains/Exposed)

build.gradle.kts

@@ -29,7 +29,6 @@ repositories {
 dependencies {
     // https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
     implementation("ch.qos.logback:logback-classic:1.5.13")
-    implementation("com.github.loki4j:loki-logback-appender:2.0.0")
 
     // https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")

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
@@ -9,13 +13,11 @@ 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.metrics.Metrics
 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
@@ -23,12 +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.util.concurrent.ConcurrentHashMap
+import java.nio.charset.Charset
 
 object ChzzkHandler {
     private val handlers = mutableListOf<UserHandler>()
@@ -37,9 +37,6 @@ object ChzzkHandler {
     @Volatile private var running: Boolean = false
     private val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
 
-    private val lastRunMap = ConcurrentHashMap<String, Long>()
-    private val requiredWait = 300_000L
-
     fun addUser(chzzkChannel: ChzzkChannel, user: User) {
         handlers.add(UserHandler(chzzkChannel, logger, user, streamStartTime = LocalDateTime.now()))
     }
@@ -49,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()}")
                 }
@@ -86,12 +83,10 @@ object ChzzkHandler {
     }
 
     fun disable() {
-        CoroutineScope(Dispatchers.Default).launch {
         handlers.forEach { handler ->
             handler.disable()
         }
     }
-    }
 
     internal fun reloadCommand(chzzkChannel: ChzzkChannel) {
         val handler = handlers.firstOrNull { it.channel.channelId == chzzkChannel.channelId }
@@ -123,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)
@@ -132,7 +127,6 @@ object ChzzkHandler {
                     } catch (e: Exception) {
                         logger.info("Thread 1 Exception: ${it.channel.channelName} / ${e.stackTraceToString()}")
                     } finally {
-                        lastRunMap[it.channel.channelId] = System.currentTimeMillis()
                         Thread.sleep(5000)
                     }
                 }
@@ -141,34 +135,25 @@ object ChzzkHandler {
         }
 
         val threadRunner2 = Runnable {
+            logger.info("Thread 2 started!")
             logger.info("Thread 2 started!")
             while (running) {
                 handlers.forEach {
                     if (!running) return@forEach
                     try {
-                        val now = System.currentTimeMillis()
-                        val lastRun = lastRunMap[it.channel.channelId] ?: 0L
-                        val waitedTime = now - lastRun
-
-                        if(waitedTime < requiredWait) {
-                            val sleepTime = requiredWait - waitedTime
-                            logger.info("Thread 2 Sleep: ${it.channel.channelName} / ${sleepTime}ms")
-                            Thread.sleep(sleepTime)
-                        }
-
                         val streamInfo = Connector.getLive(it.channel.channelId)
                         if (streamInfo?.isOnline == true && !it.isActive) {
                             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)
                     }
@@ -218,12 +203,11 @@ class UserHandler(
     val logger: Logger,
     private var user: User,
     var streamStartTime: LocalDateTime?,
-    val chatLogger: Logger = LoggerFactory.getLogger("${channel.channelName}-chat"),
 ) {
-    lateinit var client: ChzzkClient
+    var messageHandler: MessageHandler
-    lateinit var chatChannelId: String
+    var client: ChzzkClient
-    var listener: ChzzkUserSession? = null
+    var listener: ChzzkUserSession
-    lateinit var messageHandler: MessageHandler
+    var chatChannelId: String?
 
     private val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
     private var _isActive: Boolean
@@ -232,33 +216,31 @@ 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)}
+            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.")
+            chatChannelId = getChzzkChannelId(channel.channelId)
 
-        client.loginAsync().await()
+            client.loginAsync().join()
             listener = ChzzkSessionBuilder(client).buildUserSession()
-
+            listener.createAndConnectAsync().join()
-        delay(5000L)
-
             messageHandler = MessageHandler(this@UserHandler)
-        logger.info("${user.username} message handler init.")
+
-        listener?.on(SessionChatMessageEvent::class.java) {
+            listener.on(SessionChatMessageEvent::class.java) {
                 messageHandler.handle(it.message, user)
             }
-        logger.info("${user.username} is connected.")
 
+            GlobalScope.launch {
                 val timer = TimerConfigService.getConfig(user)
                 if (timer?.option == TimerType.UPTIME.value)
                     dispatcher.post(
@@ -277,10 +259,14 @@ class UserHandler(
                 )
             }
             
-    internal suspend fun disable() {
+        } catch(e: Exception) {
-        listener?.unsubscribeAsync(ChzzkSessionSubscriptionType.CHAT)?.await()
+            logger.error("Exception(${user.username}): ${e.stackTraceToString()}")
-        listener?.disconnectAsync()?.await()
+            throw RuntimeException("Exception: ${e.stackTraceToString()}")
+        }
+    }
 
+    internal fun disable() {
+        listener.disconnectAsync().join()
         _isActive = false
     }
 
@@ -298,18 +284,14 @@ class UserHandler(
     internal fun isActive(value: Boolean, status: ChzzkLiveDetail) {
         if(value) {
             CoroutineScope(Dispatchers.Default).launch {
-                if(listener == null)
-                    connect()
-
-                listener!!.createAndConnectAsync()?.await()
-                listener!!.subscribeAsync(ChzzkSessionSubscriptionType.CHAT)?.await()
                 logger.info("${user.username} is live.")
 
                 reloadUser(UserService.getUser(user.id.value)!!)
 
                 logger.info("ChzzkChat connecting... ${channel.channelName} - ${channel.channelId}")
+                listener.subscribeAsync(ChzzkSessionSubscriptionType.CHAT).join()
+
                 streamStartTime = LocalDateTime.now()
-                Metrics.increaseStreaming()
 
                 if(!_isActive) {
                     _isActive = true
@@ -343,10 +325,8 @@ class UserHandler(
         } else {
             logger.info("${user.username} is offline.")
             streamStartTime = null
-            listener?.unsubscribeAsync(ChzzkSessionSubscriptionType.CHAT)?.join()
+            listener.disconnectAsync().join()
-            listener?.disconnectAsync()?.join()
             _isActive = false
-            Metrics.decreaseStreaming()
 
             CoroutineScope(Dispatchers.Default).launch {
                 val events = listOf(
@@ -385,7 +365,6 @@ class UserHandler(
         GlobalScope.launch {
             delay(100L)
             client.sendChatToLoggedInChannel(msg.limitUtf8Length(100))
-            chatLogger.info("[SEND]${channel.channelName}: ${msg.limitUtf8Length(100)}{${msg.length} / 100}")
         }
     }
 }

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

@@ -11,8 +11,10 @@ import space.mori.chzzk_bot.common.services.*
 import space.mori.chzzk_bot.common.utils.getFollowDate
 import space.mori.chzzk_bot.common.utils.getUptime
 import space.mori.chzzk_bot.common.utils.getYoutubeVideo
+import xyz.r2turntrue.chzzk4j.chat.ChatMessage
+import xyz.r2turntrue.chzzk4j.chat.ChzzkChat
+import xyz.r2turntrue.chzzk4j.session.ChzzkUserSession
 import xyz.r2turntrue.chzzk4j.session.message.SessionChatMessage
-import xyz.r2turntrue.chzzk4j.types.channel.live.ChzzkLiveSettings
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
@@ -31,14 +33,12 @@ class MessageHandler(
 
     private val channel = handler.channel
     private val logger = handler.logger
-    private val chatLogger = handler.chatLogger
     private val listener = handler.listener
 
     private val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
 
     init {
         reloadCommand()
-        CoroutineScope(Dispatchers.Default).launch {
         dispatcher.subscribe(SongEvent::class) {
             if(it.type == SongType.STREAM_OFF) {
                 val user = UserService.getUser(channel.channelId)
@@ -48,7 +48,6 @@ class MessageHandler(
             }
         }
     }
-    }
 
     internal fun reloadCommand() {
         val user = UserService.getUser(channel.channelId)
@@ -63,8 +62,6 @@ class MessageHandler(
             "!신청곡" to this::songAddCommand,
             "!노래목록" to this::songListCommand,
             "!노래시작" to this::songStartCommand,
-            "!카테고리" to this::categoryChangeCommand,
-            "!방제" to this::titleChangeCommand,
         )
 
         manageCommands.forEach { (commandName, command) ->
@@ -87,11 +84,11 @@ class MessageHandler(
     }
 
     private fun commandListCommand(msg: SessionChatMessage, user: User) {
-        handler.sendChat("리스트는 여기입니다. https://chibot.mori.space/commands/${user.token}")
+        handler.sendChat("리스트는 여기입니다. https://nabot.mori.space/commands/${user.token}")
     }
 
     private fun manageAddCommand(msg: SessionChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
+        if (msg.profile.badges.none { it.imageUrl.contains("manager") }) {
             handler.sendChat("매니저만 명령어를 추가할 수 있습니다.")
             return
         }
@@ -112,7 +109,7 @@ class MessageHandler(
     }
 
     private fun manageUpdateCommand(msg: SessionChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
+        if (msg.profile.badges.none { it.imageUrl.contains("manager") }) {
             handler.sendChat("매니저만 명령어를 추가할 수 있습니다.")
             return
         }
@@ -134,7 +131,7 @@ class MessageHandler(
     }
 
     private fun manageRemoveCommand(msg: SessionChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
+        if (msg.profile.badges.none { it.imageUrl.contains("manager") }) {
             handler.sendChat("매니저만 명령어를 삭제할 수 있습니다.")
             return
         }
@@ -151,7 +148,7 @@ class MessageHandler(
     }
 
     private fun timerCommand(msg: SessionChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
+        if (msg.profile.badges.none { it.imageUrl.contains("manager") }) {
             handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
             return
         }
@@ -230,7 +227,7 @@ class MessageHandler(
 
         val config = SongConfigService.getConfig(user)
 
-        if(config.streamerOnly && msg.profile.badges.none { it.imageUrl.contains("manager") || it.imageUrl.contains("streamer") }) {
+        if(config.streamerOnly && msg.profile.badges.none { it.imageUrl.contains("manager") }) {
             handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
             return
         }
@@ -297,11 +294,11 @@ class MessageHandler(
             return
         }
         
-        handler.sendChat("리스트는 여기입니다. https://chibot.mori.space/songs/${user.token}")
+        handler.sendChat("리스트는 여기입니다. https://nabot.mori.space/songs/${user.token}")
     }
 
     private fun songStartCommand(msg: SessionChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
+        if (msg.profile.badges.none { it.imageUrl.contains("manager") }) {
             handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
             return
         }
@@ -310,7 +307,7 @@ class MessageHandler(
         if(user.discord != null) {
             bot.retrieveUserById(user.discord!!).queue { discordUser ->
                 discordUser?.openPrivateChannel()?.queue { channel ->
-                    channel.sendMessage("여기로 접속해주세요! ||https://chibot.mori.space/songlist||.")
+                    channel.sendMessage("여기로 접속해주세요! ||https://nabot.mori.space/songlist||.")
                         .queue()
                 }
             }
@@ -319,61 +316,9 @@ class MessageHandler(
         }
     }
 
-    private fun categoryChangeCommand(msg: SessionChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
-            handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
-            return
-        }
-
-        val parts = msg.content.split(" ", limit = 2)
-        if(parts.size <= 1) {
-            handler.sendChat("카테고리가 없습니다.")
-            return
-        }
-        val category = parts[1].let {
-            return@let when(it) {
-                "저챗", "토크", "JustChatting", "Just Chatting", "" -> "talk"
-                else -> it
-            }
-        }
-        handler.sendChat("$category 카테고리로 수정을 시도해볼게요!")
-        handler.client.searchCategories(category).handle { result, _ ->
-            if(result.size == 0) {
-                handler.sendChat("$category 카테고리는 없습니다.")
-                return@handle
-            }
-            val settings = ChzzkLiveSettings()
-            settings.category = result.first {
-                it.categoryValue == category
-            } ?: result[0]
-
-            handler.client.modifyLiveSettings(settings)
-            handler.sendChat("$category 로 수정했어요!")
-        }
-    }
-
-    private fun titleChangeCommand(msg: SessionChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
-            handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
-            return
-        }
-
-        val parts = msg.content.split(" ", limit = 2)
-        if(parts.size <= 1) {
-            handler.sendChat("입력된 방송 제목이 없습니다.")
-            return
-        }
-        val title = parts[1]
-        val settings = ChzzkLiveSettings()
-        settings.defaultLiveTitle = title
-
-        handler.client.modifyLiveSettings(settings)
-        handler.sendChat("$title 로 수정했어요!")
-    }
-
     internal fun handle(msg: SessionChatMessage, user: User) {
         if(msg.senderChannelId == ChzzkHandler.botUid) return
-        chatLogger.info("[RECV]${channel.channelName}: ${msg.content}{${msg.content.length} / 100}")
+
         val commandKey = msg.content.split(' ')[0]
         commands[commandKey.lowercase()]?.let { it(msg, user) }
     }
@@ -453,7 +398,3 @@ class MessageHandler(
         return result
     }
 }
-
-fun SessionChatMessage.Profile.Badge.isManager() = imageUrl.contains("manager")
-fun SessionChatMessage.Profile.Badge.isStreamer() = imageUrl.contains("streamer")
-fun SessionChatMessage.Profile.Badge.isModerator() = isManager() || isStreamer()

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
         }

common/build.gradle.kts

@@ -37,11 +37,6 @@ dependencies {
     // https://mvnrepository.com/artifact/com.google.code.gson/gson
     implementation("com.google.code.gson:gson:2.11.0")
 
-    api("io.micrometer:micrometer-registry-prometheus:1.15.1")
-
-    // https://mvnrepository.com/artifact/io.insert-koin/koin-core
-    api("io.insert-koin:koin-core:4.0.0")
-
     testImplementation(kotlin("test"))
 }
 

common/src/main/kotlin/space/mori/chzzk_bot/common/metrics/Metrics.kt

@@ -1,43 +0,0 @@
-package space.mori.chzzk_bot.common.metrics
-
-import io.micrometer.core.instrument.Gauge
-import io.micrometer.prometheusmetrics.PrometheusConfig
-import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
-import space.mori.chzzk_bot.common.services.UserService
-
-object Metrics {
-    val registry = PrometheusMeterRegistry(PrometheusConfig.DEFAULT)
-
-    var streamer =  0.0
-    val streamerGauge: Gauge = Gauge.builder("streamer_gauge", this) { streamer }
-        .description("Current All Streamer Count")
-        .register(registry)
-
-    var activeStreamer = 0.0
-    val activateGauge: Gauge = Gauge.builder("active_streamer_gauge", this) { activeStreamer }
-        .description("Current Active Streamer Count")
-        .register(registry)
-
-    var streaming: Double = 0.0
-    val streamingGauge: Gauge = Gauge.builder("streaming_gauge", this) { streaming }
-        .description("Current Streaming Streamer Count")
-        .register(registry)
-
-    fun refreshStreamerMetrics() {
-        val streamers = UserService.getAllUsers()
-
-        streamer = streamers.size.toDouble()
-        activeStreamer = streamers.filter { !it.isDisabled }.size.toDouble()
-    }
-
-    fun increaseStreaming(inc: Int = 1) {
-        streaming += inc
-    }
-    fun decreaseStreaming(dec: Int = 1) {
-        streaming -= dec
-    }
-
-    init {
-        refreshStreamerMetrics()
-    }
-}

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

@@ -12,7 +12,6 @@ import space.mori.chzzk_bot.chatbot.discord.Discord
 import space.mori.chzzk_bot.chatbot.chzzk.Connector as ChzzkConnector
 import space.mori.chzzk_bot.common.Connector
 import space.mori.chzzk_bot.common.events.CoroutinesEventBus
-import space.mori.chzzk_bot.common.metrics.Metrics
 import space.mori.chzzk_bot.webserver.start
 import space.mori.chzzk_bot.webserver.stop
 import java.util.concurrent.TimeUnit
@@ -26,7 +25,6 @@ val logger: Logger = LoggerFactory.getLogger("main")
 fun main(args: Array<String>) {
     val dispatcher = module {
         single { CoroutinesEventBus() }
-        single { Metrics.registry }
     }
     startKoin {
         modules(dispatcher)

src/main/resources/logback.xml

@@ -1,5 +1,5 @@
 <configuration>
-    <property name="lokiUrl" value="${LOKI_ENDPOINT}"/>
+
     <!-- 콘솔에 출력하는 기본 로그 설정 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -10,15 +10,6 @@
         </encoder>
     </appender>
 
-    <appender name="LOKI" class="com.github.loki4j.logback.Loki4jAppender">
-        <http>
-            <url>${lokiUrl}</url>
-        </http>
-        <labels>
-            app = chibot-chzzk-bot
-        </labels>
-    </appender>
-
     <!-- HikariCP 로그 레벨 설정 -->
     <logger name="com.zaxxer.hikari" level="INFO" />
     <logger name="o.m.jdbc.client.impl.StandardClient" level="INFO" />
@@ -40,8 +31,5 @@
     <root level="DEBUG">
         <appender-ref ref="STDOUT" />
     </root>
-    <root level="INFO">
-        <appender-ref ref="LOKI" />
-    </root>
 
 </configuration>

webserver/build.gradle.kts

@@ -34,16 +34,16 @@ dependencies {
     // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-reflect
     implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.21")
 
+    // https://mvnrepository.com/artifact/io.insert-koin/koin-core
+    implementation("io.insert-koin:koin-core:4.0.0")
+
     // https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
     implementation("ch.qos.logback:logback-classic:1.5.12")
 
     // https://mvnrepository.com/artifact/io.github.cdimascio/dotenv-kotlin
     implementation("io.github.cdimascio:dotenv-kotlin:6.4.2")
 
-    implementation("io.ktor:ktor-server-metrics-micrometer:$ktorVersion")
-
     implementation(project(":common"))
-    implementation("io.ktor:ktor-server-metrics-micrometer:3.1.3")
 
     testImplementation(kotlin("test"))
 }

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

@@ -11,7 +11,6 @@ import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.application.*
 import io.ktor.server.auth.*
 import io.ktor.server.engine.*
-import io.ktor.server.metrics.micrometer.MicrometerMetrics
 import io.ktor.server.netty.*
 import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.plugins.cors.routing.*
@@ -20,16 +19,9 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.sessions.*
 import io.ktor.server.websocket.*
-import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics
-import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics
-import io.micrometer.core.instrument.binder.system.ProcessorMetrics
-import io.micrometer.prometheusmetrics.PrometheusConfig
-import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
 import kotlinx.coroutines.delay
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import org.koin.core.context.startKoin
-import org.koin.dsl.module
 import org.koin.java.KoinJavaComponent.inject
 import space.mori.chzzk_bot.common.events.CoroutinesEventBus
 import space.mori.chzzk_bot.common.events.UserRegisterEvent
@@ -236,22 +228,11 @@ val server = embeddedServer(Netty, port = 8080, ) {
             // common: logout
             get("/logout") {
                 call.sessions.clear<UserSession>()
-                call.respondRedirect(getFrontendURL(""))
+                call.response.status(HttpStatusCode.OK)
+                return@get
             }
         }
 
-        val appMicrometerRegistry: PrometheusMeterRegistry by inject(PrometheusMeterRegistry::class.java)
-
-        install(MicrometerMetrics) {
-            registry = appMicrometerRegistry
-
-            meterBinders = listOf(
-                JvmMemoryMetrics(),
-                JvmGcMetrics(),
-                ProcessorMetrics()
-            )
-        }
-
         apiRoutes()
         apiSongRoutes()
         apiCommandRoutes()
@@ -262,8 +243,6 @@ val server = embeddedServer(Netty, port = 8080, ) {
         wsSongRoutes()
         wsSongListRoutes()
 
-        metricRoutes()
-
         swaggerUI("swagger-ui/index.html", "openapi/documentation.yaml") {
             options {
                 version = "1.2.0"

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

@@ -1,7 +1,6 @@
 package space.mori.chzzk_bot.webserver.routes
 
 import io.ktor.http.*
-import io.ktor.server.request.receive
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.sessions.*
@@ -16,7 +15,6 @@ import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.withTimeoutOrNull
 import space.mori.chzzk_bot.common.events.ChzzkUserFindEvent
 import space.mori.chzzk_bot.common.events.ChzzkUserReceiveEvent
-import space.mori.chzzk_bot.common.metrics.Metrics
 
 @Serializable
 data class GetUserDTO(
@@ -148,50 +146,4 @@ fun Routing.apiRoutes() {
             call.respond(HttpStatusCode.OK, returnUsers)
         }
     }
-
-    route("/settings") {
-        get {
-            val session = call.sessions.get<UserSession>()
-            if(session == null) {
-                call.respondText("No session found", status = HttpStatusCode.Unauthorized)
-                return@get
-            }
-            val user = UserService.getUser(session.id)
-            if(user == null) {
-                call.respondText("No user found", status = HttpStatusCode.NotFound)
-                return@get
-            }
-
-            call.respond(HttpStatusCode.OK, IUserSettingsDTO(
-                user.isDisabled,
-                user.isDisableStartupMsg
-            ))
-        }
-
-        post {
-            val session = call.sessions.get<UserSession>()
-            val body: IUserSettingsDTO = call.receive()
-            if(session == null) {
-                call.respondText("No session found", status = HttpStatusCode.Unauthorized)
-                return@post
-            }
-            val user = UserService.getUser(session.id)
-            if(user == null) {
-                call.respondText("No user found", status = HttpStatusCode.NotFound)
-                return@post
-            }
-
-            UserService.setIsDisabled(user, body.isBotDisabled)
-            UserService.setIsStartupDisabled(user, body.isBotMsgDisabled)
-
-            Metrics.refreshStreamerMetrics()
-
-            call.respond(HttpStatusCode.OK, body)
-        }
-    }
 }
-
-data class IUserSettingsDTO(
-    val isBotDisabled: Boolean,
-    val isBotMsgDisabled: Boolean
-)

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

@@ -1,36 +0,0 @@
-package space.mori.chzzk_bot.webserver.routes
-
-import io.ktor.server.application.ApplicationStopped
-import io.ktor.server.response.respondText
-import io.ktor.server.routing.Routing
-import io.ktor.server.routing.get
-import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
-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.metrics.Metrics
-import kotlin.getValue
-
-
-val metricScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
-fun Routing.metricRoutes() {
-    environment.monitor.subscribe(ApplicationStopped) {
-        metricScope.cancel()
-    }
-
-    val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
-    val registry: PrometheusMeterRegistry by inject(PrometheusMeterRegistry::class.java)
-
-    dispatcher.subscribe(UserRegisterEvent::class) {
-        Metrics.refreshStreamerMetrics()
-    }
-
-    get("/metrics") {
-        call.respondText(registry.scrape())
-    }
-
-}