debug chzzk login 4

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

@@ -28,8 +28,7 @@ repositories {
 
 dependencies {
     // https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
-    implementation("ch.qos.logback:logback-classic:1.5.13")
+    implementation("ch.qos.logback:logback-classic:1.5.12")
-    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/build.gradle.kts

@@ -16,10 +16,10 @@ dependencies {
     }
 
     // https://mvnrepository.com/artifact/io.github.R2turnTrue/chzzk4j
-    implementation("io.github.R2turnTrue:chzzk4j:0.1.1")
+    implementation("io.github.R2turnTrue:chzzk4j:0.0.12")
 
     // https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
-    implementation("ch.qos.logback:logback-classic:1.5.13")
+    implementation("ch.qos.logback:logback-classic:1.5.12")
 
     // 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,34 +1,29 @@
 package space.mori.chzzk_bot.chatbot.chzzk
 
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.future.await
+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.chzzk
 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.chat.ChatEventListener
-import xyz.r2turntrue.chzzk4j.ChzzkClient
+import xyz.r2turntrue.chzzk4j.chat.ChatMessage
-import xyz.r2turntrue.chzzk4j.session.ChzzkSessionBuilder
+import xyz.r2turntrue.chzzk4j.chat.ChzzkChat
-import xyz.r2turntrue.chzzk4j.session.ChzzkSessionSubscriptionType
-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.Exception
-import java.lang.Runnable
-import java.lang.Thread
 import java.net.SocketTimeoutException
-import java.nio.charset.Charset
 import java.time.LocalDateTime
-import java.util.concurrent.ConcurrentHashMap
 
 object ChzzkHandler {
     private val handlers = mutableListOf<UserHandler>()
@@ -37,27 +32,20 @@ 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()))
+        handlers.add(UserHandler(chzzkChannel, logger, user, streamStartTime = null))
     }
 
     fun enable() {
-        botUid = Connector.client.fetchLoggedUser().userId
+        botUid = chzzk.loggedUser.userId
         UserService.getAllUsers().map {
             if(!it.isDisabled)
-                try {
+                chzzk.getChannel(it.token)?.let { token -> addUser(token, it) }
-                    getChannel(it.token)?.let { token -> addUser(token, it) }
-                } catch(e: Exception) {
-                    logger.info("Exception: ${it.token}(${it.username}) not found. ${e.stackTraceToString()}")
-                }
         }
 
         handlers.forEach { handler ->
-            val streamInfo = Connector.getLive(handler.channel.channelId)
+            val streamInfo = getStreamInfo(handler.listener.channelId)
-            if (streamInfo?.isOnline == true) handler.isActive(true, streamInfo)
+            if (streamInfo.content?.status == "OPEN") handler.isActive(true, streamInfo)
         }
 
         dispatcher.subscribe(UserRegisterEvent::class) {
@@ -86,10 +74,8 @@ object ChzzkHandler {
     }
 
     fun disable() {
-        CoroutineScope(Dispatchers.Default).launch {
+        handlers.forEach { handler ->
-            handlers.forEach { handler ->
+            handler.disable()
-                handler.disable()
-            }
         }
     }
 
@@ -118,21 +104,20 @@ object ChzzkHandler {
                 handlers.forEach {
                     if (!running) return@forEach
                     try {
-                        val streamInfo = Connector.getLive(it.channel.channelId)
+                        val streamInfo = getStreamInfo(it.channel.channelId)
-                        if (streamInfo?.isOnline == true && !it.isActive) {
+                        if (streamInfo.content?.status == "OPEN" && !it.isActive) {
                             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)
+                        if (streamInfo.content?.status == "CLOSE" && it.isActive) it.isActive(false, streamInfo)
                     } catch (e: SocketTimeoutException) {
                         logger.info("Thread 1 Timeout: ${it.channel.channelName} / ${e.stackTraceToString()}")
                     } catch (e: Exception) {
                         logger.info("Thread 1 Exception: ${it.channel.channelName} / ${e.stackTraceToString()}")
                     } finally {
-                        lastRunMap[it.channel.channelId] = System.currentTimeMillis()
                         Thread.sleep(5000)
                     }
                 }
@@ -141,30 +126,21 @@ 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 streamInfo = getStreamInfo(it.channel.channelId)
-                        val lastRun = lastRunMap[it.channel.channelId] ?: 0L
+                        if (streamInfo.content?.status == "OPEN" && !it.isActive) {
-                        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)
+                        if (streamInfo.content?.status == "CLOSE" && it.isActive) it.isActive(false, streamInfo)
                     } catch (e: SocketTimeoutException) {
                         logger.info("Thread 2 Timeout: ${it.channel.channelName} / ${e.stackTraceToString()}")
                     } catch (e: Exception) {
@@ -212,18 +188,14 @@ object ChzzkHandler {
     }
 }
 
-@OptIn(DelicateCoroutinesApi::class)
 class UserHandler(
     val channel: ChzzkChannel,
     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 listener: ChzzkChat
-    var listener: ChzzkUserSession? = null
-    lateinit var messageHandler: MessageHandler
 
     private val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
     private var _isActive: Boolean
@@ -232,56 +204,36 @@ class UserHandler(
             LiveStatusService.updateOrCreate(user, value)
         }
 
-    private suspend fun connect() {
+    init {
-        val user = UserService.getUser(channel.channelId)
+        listener = chzzk.chat(channel.channelId)
+            .withAutoReconnect(true)
+            .withChatListener(object : ChatEventListener {
+                override fun onConnect(chat: ChzzkChat, isReconnecting: Boolean) {
+                    logger.info("${channel.channelName} - ${channel.channelId} / reconnected: $isReconnecting")
+                }
 
-        if(user?.accessToken == null || user.refreshToken == null) {
+                override fun onError(ex: Exception) {
-            throw RuntimeException("AccessToken or RefreshToken is not valid.")
+                    logger.info("ChzzkChat error. ${channel.channelName} - ${channel.channelId}")
-        }
+                    logger.info(ex.stackTraceToString())
+                }
 
-        val tokens = user.refreshToken?.let { token -> Connector.client.refreshAccessToken(token)}
+                override fun onChat(msg: ChatMessage) {
-        if(tokens == null) {
+                    if(!_isActive) return
-            throw RuntimeException("AccessToken is not valid.")
+                    messageHandler.handle(msg, user)
-        }
+                }
-        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()
-
-        delay(5000L)
 
+                override fun onConnectionClosed(code: Int, reason: String?, remote: Boolean, tryingToReconnect: Boolean) {
+                    logger.info("ChzzkChat closed. ${channel.channelName} - ${channel.channelId}")
+                    logger.info("Reason: $reason / $tryingToReconnect")
+                }
+            })
+            .build()
         messageHandler = MessageHandler(this@UserHandler)
-        logger.info("${user.username} message handler init.")
-        listener?.on(SessionChatMessageEvent::class.java) {
-            messageHandler.handle(it.message, user)
-        }
-        logger.info("${user.username} is connected.")
-
-        val timer = TimerConfigService.getConfig(user)
-        if (timer?.option == TimerType.UPTIME.value)
-            dispatcher.post(
-                TimerEvent(
-                    channel.channelId,
-                    TimerType.UPTIME,
-                    getUptime(streamStartTime!!)
-                )
-            )
-        else dispatcher.post(
-            TimerEvent(
-                channel.channelId,
-                TimerType.entries.firstOrNull { it.value == timer?.option } ?: TimerType.REMOVE,
-                null
-            )
-        )
     }
 
-    internal suspend fun disable() {
-        listener?.unsubscribeAsync(ChzzkSessionSubscriptionType.CHAT)?.await()
-        listener?.disconnectAsync()?.await()
 
-        _isActive = false
+    internal fun disable() {
+        listener.closeAsync()
     }
 
     internal fun reloadCommand() {
@@ -295,21 +247,17 @@ class UserHandler(
     internal val isActive: Boolean
         get() = _isActive
 
-    internal fun isActive(value: Boolean, status: ChzzkLiveDetail) {
+    internal fun isActive(value: Boolean, status: IData<IStreamInfo?>) {
         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}")
-                streamStartTime = LocalDateTime.now()
+                listener.connectAsync().await()
-                Metrics.increaseStreaming()
+
+                streamStartTime = status.content?.openDate?.let { convertChzzkDateToLocalDateTime(it) }
 
                 if(!_isActive) {
                     _isActive = true
@@ -333,7 +281,7 @@ class UserHandler(
                     delay(5000L)
                     try {
                         if(!user.isDisableStartupMsg)
-                            sendChat("${user.username} 님! 오늘도 열심히 방송하세요!")
+                            listener.sendChat("${user.username} 님! 오늘도 열심히 방송하세요!")
                         Discord.sendDiscord(user, status)
                     } catch(e: Exception) {
                         logger.info("Stream on logic has some error: ${e.stackTraceToString()}")
@@ -343,10 +291,8 @@ class UserHandler(
         } else {
             logger.info("${user.username} is offline.")
             streamStartTime = null
-            listener?.unsubscribeAsync(ChzzkSessionSubscriptionType.CHAT)?.join()
+            listener.closeAsync()
-            listener?.disconnectAsync()?.join()
             _isActive = false
-            Metrics.decreaseStreaming()
 
             CoroutineScope(Dispatchers.Default).launch {
                 val events = listOf(
@@ -369,23 +315,4 @@ class UserHandler(
             }
         }
     }
-
-    private fun String.limitUtf8Length(maxBytes: Int): String {
-        val bytes = this.toByteArray(Charset.forName("UTF-8"))
-        if (bytes.size <= maxBytes) return this
-        var truncatedString = this
-        while (truncatedString.toByteArray(Charset.forName("UTF-8")).size > maxBytes) {
-            truncatedString = truncatedString.substring(0, truncatedString.length - 1)
-        }
-        return truncatedString
-    }
-
-    @OptIn(DelicateCoroutinesApi::class)
-    internal fun sendChat(msg: String) {
-        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/Connector.kt

@@ -1,66 +1,24 @@
 package space.mori.chzzk_bot.chatbot.chzzk
 
 import io.github.cdimascio.dotenv.dotenv
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import org.koin.java.KoinJavaComponent.inject
 import org.slf4j.LoggerFactory
-import space.mori.chzzk_bot.common.events.ChzzkUserFindEvent
+import xyz.r2turntrue.chzzk4j.Chzzk
-import space.mori.chzzk_bot.common.events.ChzzkUserReceiveEvent
+import xyz.r2turntrue.chzzk4j.ChzzkBuilder
-import space.mori.chzzk_bot.common.events.CoroutinesEventBus
-import xyz.r2turntrue.chzzk4j.ChzzkClient
-import xyz.r2turntrue.chzzk4j.ChzzkClientBuilder
-import xyz.r2turntrue.chzzk4j.auth.ChzzkLegacyLoginAdapter
-import xyz.r2turntrue.chzzk4j.auth.ChzzkSimpleUserLoginAdapter
 import xyz.r2turntrue.chzzk4j.types.channel.ChzzkChannel
-import xyz.r2turntrue.chzzk4j.types.channel.live.ChzzkLiveDetail
-import kotlin.getValue
 
 val dotenv = dotenv {
     ignoreIfMissing = true
 }
 
-@OptIn(DelicateCoroutinesApi::class)
 object Connector {
-    val adapter = ChzzkLegacyLoginAdapter(dotenv["NID_AUT"], dotenv["NID_SES"])
+    val chzzk: Chzzk = ChzzkBuilder()
-    val client: ChzzkClient = ChzzkClientBuilder(dotenv["NAVER_CLIENT_ID"], dotenv["NAVER_CLIENT_SECRET"])
+        .withAuthorization(dotenv["NID_AUT"], dotenv["NID_SES"])
-        .withLoginAdapter(adapter)
         .build()
     private val logger = LoggerFactory.getLogger(this::class.java)
-    private val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
 
-    fun getChannel(channelId: String): ChzzkChannel? = client.fetchChannel(channelId)
+    fun getChannel(channelId: String): ChzzkChannel? = chzzk.getChannel(channelId)
-    fun getLive(channelId: String): ChzzkLiveDetail? = client.fetchLiveDetail(channelId)
 
     init {
-        logger.info("chzzk logged: ${client.isLoggedIn}")
+        logger.info("chzzk logged: ${chzzk.isLoggedIn} / ${chzzk.loggedUser?.nickname ?: "----"}")
-
-        client.loginAsync().join()
-
-        dispatcher.subscribe(ChzzkUserFindEvent::class) { event ->
-            GlobalScope.launch {
-                val user = getChannel(event.uid)
-
-                dispatcher.post(ChzzkUserReceiveEvent(
-                    find = user != null,
-                    uid = user?.channelId,
-                    nickname = user?.channelName,
-                    isStreamOn = user?.isBroadcasting,
-                    avatarUrl = user?.channelImageUrl
-                ))
-            }
-        }
     }
-
-    fun getClient(accessToken: String, refreshToken: String): ChzzkClient {
-        val adapter = ChzzkSimpleUserLoginAdapter(accessToken, refreshToken)
-        val client = ChzzkClientBuilder(dotenv["NAVER_CLIENT_ID"], dotenv["NAVER_CLIENT_SECRET"])
-            .withLoginAdapter(adapter)
-            .build()
-
-        return client
-    }
-
-
 }

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

@@ -11,16 +11,17 @@ 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.session.message.SessionChatMessage
+import xyz.r2turntrue.chzzk4j.chat.ChatMessage
-import xyz.r2turntrue.chzzk4j.types.channel.live.ChzzkLiveSettings
+import xyz.r2turntrue.chzzk4j.chat.ChzzkChat
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
 
+
 class MessageHandler(
     private val handler: UserHandler
 ) {
-    private val commands = mutableMapOf<String, (msg: SessionChatMessage, user: User) -> Unit>()
+    private val commands = mutableMapOf<String, (msg: ChatMessage, user: User) -> Unit>()
 
     private val counterPattern = Regex("<counter:([^>]+)>")
     private val personalCounterPattern = Regex("<counter_personal:([^>]+)>")
@@ -31,20 +32,17 @@ 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) {
-            dispatcher.subscribe(SongEvent::class) {
+            if(it.type == SongType.STREAM_OFF) {
-                if(it.type == SongType.STREAM_OFF) {
+                val user = UserService.getUser(channel.channelId)
-                    val user = UserService.getUser(channel.channelId)
+                if(! user?.let { usr -> SongListService.getSong(usr) }.isNullOrEmpty()) {
-                    if(! user?.let { usr -> SongListService.getSong(usr) }.isNullOrEmpty()) {
+                    SongListService.deleteUser(user)
-                        SongListService.deleteUser(user)
-                    }
                 }
             }
         }
@@ -63,8 +61,6 @@ class MessageHandler(
             "!신청곡" to this::songAddCommand,
             "!노래목록" to this::songListCommand,
             "!노래시작" to this::songStartCommand,
-            "!카테고리" to this::categoryChangeCommand,
-            "!방제" to this::titleChangeCommand,
         )
 
         manageCommands.forEach { (commandName, command) ->
@@ -75,90 +71,85 @@ class MessageHandler(
             this.commands.put(it.command.lowercase()) { msg, user ->
                 logger.debug("${channel.channelName} - ${it.command} - ${it.content}/${it.failContent}")
 
-                val result = replaceCounters(
+                val result = replaceCounters(Pair(it.content, it.failContent), user, msg, listener, msg.profile?.nickname ?: "")
-                    Pair(it.content, it.failContent),
+                listener.sendChat(result)
-                    user,
-                    msg,
-                    msg.profile?.nickname ?: ""
-                )
-                handler.sendChat(result)
             }
         }
     }
 
-    private fun commandListCommand(msg: SessionChatMessage, user: User) {
+    private fun commandListCommand(msg: ChatMessage, user: User) {
-        handler.sendChat("리스트는 여기입니다. https://chibot.mori.space/commands/${user.token}")
+        listener.sendChat("리스트는 여기입니다. https://nabot.mori.space/commands/${user.token}")
     }
 
-    private fun manageAddCommand(msg: SessionChatMessage, user: User) {
+    private fun manageAddCommand(msg: ChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
+        if (msg.profile?.userRoleCode == "common_user") {
-            handler.sendChat("매니저만 명령어를 추가할 수 있습니다.")
+            listener.sendChat("매니저만 명령어를 추가할 수 있습니다.")
             return
         }
 
         val parts = msg.content.split(" ", limit = 3)
         if (parts.size < 3) {
-            handler.sendChat("명령어 추가 형식은 '!명령어추가 명령어 내용'입니다.")
+            listener.sendChat("명령어 추가 형식은 '!명령어추가 명령어 내용'입니다.")
             return
         }
         if (commands.containsKey(parts[1])) {
-            handler.sendChat("${parts[1]} 명령어는 이미 있는 명령어입니다.")
+            listener.sendChat("${parts[1]} 명령어는 이미 있는 명령어입니다.")
             return
         }
         val command = parts[1]
         val content = parts[2]
         CommandService.saveCommand(user, command, content, "")
-        handler.sendChat("명령어 '$command' 추가되었습니다.")
+        listener.sendChat("명령어 '$command' 추가되었습니다.")
     }
 
-    private fun manageUpdateCommand(msg: SessionChatMessage, user: User) {
+    private fun manageUpdateCommand(msg: ChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
+        if (msg.profile?.userRoleCode == "common_user") {
-            handler.sendChat("매니저만 명령어를 추가할 수 있습니다.")
+            listener.sendChat("매니저만 명령어를 추가할 수 있습니다.")
             return
         }
 
         val parts = msg.content.split(" ", limit = 3)
         if (parts.size < 3) {
-            handler.sendChat("명령어 수정 형식은 '!명령어수정 명령어 내용'입니다.")
+            listener.sendChat("명령어 수정 형식은 '!명령어수정 명령어 내용'입니다.")
             return
         }
         if (!commands.containsKey(parts[1])) {
-            handler.sendChat("${parts[1]} 명령어는 없는 명령어입니다.")
+            listener.sendChat("${parts[1]} 명령어는 없는 명령어입니다.")
             return
         }
         val command = parts[1]
         val content = parts[2]
         CommandService.updateCommand(user, command, content, "")
-        handler.sendChat("명령어 '$command' 수정되었습니다.")
+        listener.sendChat("명령어 '$command' 수정되었습니다.")
         ChzzkHandler.reloadCommand(channel)
     }
 
-    private fun manageRemoveCommand(msg: SessionChatMessage, user: User) {
+    private fun manageRemoveCommand(msg: ChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
+        if (msg.profile?.userRoleCode == "common_user") {
-            handler.sendChat("매니저만 명령어를 삭제할 수 있습니다.")
+            listener.sendChat("매니저만 명령어를 삭제할 수 있습니다.")
             return
         }
 
         val parts = msg.content.split(" ", limit = 2)
         if (parts.size < 2) {
-            handler.sendChat("명령어 삭제 형식은 '!명령어삭제 명령어'입니다.")
+            listener.sendChat("명령어 삭제 형식은 '!명령어삭제 명령어'입니다.")
             return
         }
         val command = parts[1]
         CommandService.removeCommand(user, command)
-        handler.sendChat("명령어 '$command' 삭제되었습니다.")
+        listener.sendChat("명령어 '$command' 삭제되었습니다.")
         ChzzkHandler.reloadCommand(channel)
     }
 
-    private fun timerCommand(msg: SessionChatMessage, user: User) {
+    private fun timerCommand(msg: ChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
+        if (msg.profile?.userRoleCode == "common_user") {
-            handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
+            listener.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
             return
         }
 
         val parts = msg.content.split(" ", limit = 3)
         if (parts.size < 2) {
-            handler.sendChat("타이머 명령어 형식을 잘 찾아봐주세요!")
+            listener.sendChat("타이머 명령어 형식을 잘 찾아봐주세요!")
             return
         }
 
@@ -187,13 +178,13 @@ class MessageHandler(
                 when (parts[2]) {
                     "업타임" -> {
                         TimerConfigService.saveOrUpdateConfig(user, TimerType.UPTIME)
-                        handler.sendChat("기본 타이머 설정이 업타임으로 바뀌었습니다.")
+                        listener.sendChat("기본 타이머 설정이 업타임으로 바뀌었습니다.")
                     }
                     "삭제" -> {
                         TimerConfigService.saveOrUpdateConfig(user, TimerType.REMOVE)
-                        handler.sendChat("기본 타이머 설정이 삭제로 바뀌었습니다.")
+                        listener.sendChat("기본 타이머 설정이 삭제로 바뀌었습니다.")
                     }
-                    else -> handler.sendChat("!타이머 설정 (업타임/삭제) 형식으로 써주세요!")
+                    else -> listener.sendChat("!타이머 설정 (업타임/삭제) 형식으로 써주세요!")
                 }
             }
             else -> {
@@ -207,9 +198,9 @@ class MessageHandler(
                         dispatcher.post(TimerEvent(user.token, TimerType.TIMER, timestamp.toString()))
                     }
                 } catch (e: NumberFormatException) {
-                    handler.sendChat("!타이머/숫자 형식으로 적어주세요! 단위: 분")
+                    listener.sendChat("!타이머/숫자 형식으로 적어주세요! 단위: 분")
                 } catch (e: Exception) {
-                    handler.sendChat("타이머 설정 중 오류가 발생했습니다.")
+                    listener.sendChat("타이머 설정 중 오류가 발생했습니다.")
                     logger.error("Error processing timer command: ${e.message}", e)
                 }
             }
@@ -217,21 +208,21 @@ class MessageHandler(
     }
 
     // songs
-    private fun songAddCommand(msg: SessionChatMessage, user: User) {
+    private fun songAddCommand(msg: ChatMessage, user: User) {
         if(SongConfigService.getConfig(user).disabled) {
             return
         }
 
         val parts = msg.content.split(" ", limit = 2)
         if (parts.size < 2) {
-            handler.sendChat("유튜브 URL을 입력해주세요!")
+            listener.sendChat("유튜브 URL을 입력해주세요!")
             return
         }
 
         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?.userRoleCode == "common_user") {
-            handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
+            listener.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
             return
         }
 
@@ -239,34 +230,34 @@ class MessageHandler(
         val songs = SongListService.getSong(user)
 
         if(songs.size >= config.queueLimit) {
-            handler.sendChat("더이상 노래를 신청할 수 없습니다. 잠시 뒤 다시 시도해주세요!")
+            listener.sendChat("더이상 노래를 신청할 수 없습니다. 잠시 뒤 다시 시도해주세요!")
             return
         }
-        if(songs.filter { it.uid == msg.senderChannelId }.size  >= config.personalLimit) {
+        if(songs.filter { it.uid == msg.userId }.size  >= config.personalLimit) {
-            handler.sendChat("더이상 노래를 신청할 수 없습니다. 잠시 뒤 다시 시도해주세요!")
+            listener.sendChat("더이상 노래를 신청할 수 없습니다. 잠시 뒤 다시 시도해주세요!")
             return
         }
 
         try {
             val video = getYoutubeVideo(url)
             if (video == null) {
-                handler.sendChat("유튜브에서 찾을 수 없어요!")
+                listener.sendChat("유튜브에서 찾을 수 없어요!")
                 return
             }
 
             if (songs.any { it.url == video.url }) {
-                handler.sendChat("같은 노래가 이미 신청되어 있습니다.")
+                listener.sendChat("같은 노래가 이미 신청되어 있습니다.")
                 return
             }
 
             if (video.length > 600) {
-                handler.sendChat("10분이 넘는 노래는 신청할 수 없습니다.")
+                listener.sendChat("10분이 넘는 노래는 신청할 수 없습니다.")
                 return
             }
 
             SongListService.saveSong(
                 user,
-                msg.senderChannelId,
+                msg.userId,
                 video.url,
                 video.name,
                 video.author,
@@ -278,31 +269,31 @@ class MessageHandler(
                     SongEvent(
                         user.token,
                         SongType.ADD,
-                        msg.senderChannelId,
+                        msg.userId,
                         null,
                         video,
                     )
                 )
             }
 
-            handler.sendChat("노래가 추가되었습니다. ${video.name} - ${video.author}")
+            listener.sendChat("노래가 추가되었습니다. ${video.name} - ${video.author}")
         } catch(e: Exception) {
-            handler.sendChat("유튜브 영상 주소로 다시 신청해주세요!")
+            listener.sendChat("유튜브 영상 주소로 다시 신청해주세요!")
             logger.info(e.stackTraceToString())
         }
     }
 
-    private fun songListCommand(msg: SessionChatMessage, user: User) {
+    private fun songListCommand(msg: ChatMessage, user: User) {
         if(SongConfigService.getConfig(user).disabled) {
             return
         }
         
-        handler.sendChat("리스트는 여기입니다. https://chibot.mori.space/songs/${user.token}")
+        listener.sendChat("리스트는 여기입니다. https://nabot.mori.space/songs/${user.token}")
     }
 
-    private fun songStartCommand(msg: SessionChatMessage, user: User) {
+    private fun songStartCommand(msg: ChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
+        if (msg.profile?.userRoleCode == "common_user") {
-            handler.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
+            listener.sendChat("매니저만 이 명령어를 사용할 수 있습니다.")
             return
         }
 
@@ -310,85 +301,33 @@ 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()
                 }
             }
         } else {
-            handler.sendChat("나봇 홈페이지의 노래목록 페이지를 이용해주세요! 디스코드 연동을 하시면 DM으로 바로 전송됩니다.")
+            listener.sendChat("나봇 홈페이지의 노래목록 페이지를 이용해주세요! 디스코드 연동을 하시면 DM으로 바로 전송됩니다.")
         }
     }
 
-    private fun categoryChangeCommand(msg: SessionChatMessage, user: User) {
+    internal fun handle(msg: ChatMessage, user: User) {
-        if (msg.profile.badges.none { it.isModerator() }) {
+        if(msg.userId == ChzzkHandler.botUid) return
-            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) }
     }
 
-    private fun replaceCounters(chat: Pair<String, String>, user: User, msg: SessionChatMessage, userName: String): String {
+    private fun replaceCounters(chat: Pair<String, String>, user: User, msg: ChatMessage, listener: ChzzkChat, userName: String): String {
         var result = chat.first
         var isFail = false
 
         // Replace dailyCounterPattern
         result = dailyCounterPattern.replace(result) { matchResult ->
             val name = matchResult.groupValues[1]
-            val dailyCounter = CounterService.getDailyCounterValue(name, msg.senderChannelId, user)
+            val dailyCounter = CounterService.getDailyCounterValue(name, msg.userId, user)
 
             if (dailyCounter.second) {
-                CounterService.updateDailyCounterValue(name, msg.senderChannelId, 1, user).first.toString()
+                CounterService.updateDailyCounterValue(name, msg.userId, 1, user).first.toString()
             } else {
                 isFail = true
                 dailyCounter.first.toString()
@@ -400,7 +339,7 @@ class MessageHandler(
             result = chat.second
             result = dailyCounterPattern.replace(result) { matchResult ->
                 val name = matchResult.groupValues[1]
-                val dailyCounter = CounterService.getDailyCounterValue(name, msg.senderChannelId, user)
+                val dailyCounter = CounterService.getDailyCounterValue(name, msg.userId, user)
                 dailyCounter.first.toString()
             }
         }
@@ -408,15 +347,15 @@ class MessageHandler(
         // Replace followPattern
         result = followPattern.replace(result) { _ ->
             try {
-                val followingDate = handler.chatChannelId?.let { getFollowDate(it, msg.senderChannelId) }
+                val followingDate = getFollowDate(listener.chatId, msg.userId)
-                    ?.content?.streamingProperty?.following?.followDate ?: LocalDateTime.now().minusDays(1).toString()
+                    .content?.streamingProperty?.following?.followDate
 
-                val period = followingDate.let {
+                val period = followingDate?.let {
                     val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
                     val pastDate = LocalDateTime.parse(it, formatter)
                     val today = LocalDateTime.now()
                     ChronoUnit.DAYS.between(pastDate, today)
-                } + 1
+                } ?: 0
 
                 period.toString()
             } catch (e: Exception) {
@@ -444,7 +383,7 @@ class MessageHandler(
         // Replace personalCounterPattern
         result = personalCounterPattern.replace(result) { matchResult ->
             val name = matchResult.groupValues[1]
-            CounterService.updatePersonalCounterValue(name, msg.senderChannelId, 1, user).toString()
+            CounterService.updatePersonalCounterValue(name, msg.userId, 1, user).toString()
         }
 
         // Replace namePattern
@@ -452,8 +391,5 @@ 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/discord/Discord.kt

@@ -12,12 +12,11 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEve
 import net.dv8tion.jda.api.hooks.ListenerAdapter
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder
 import org.slf4j.LoggerFactory
+import space.mori.chzzk_bot.common.utils.IData
+import space.mori.chzzk_bot.common.utils.IStreamInfo
 import space.mori.chzzk_bot.chatbot.discord.commands.*
 import space.mori.chzzk_bot.common.models.User
-import xyz.r2turntrue.chzzk4j.types.channel.live.ChzzkLiveDetail
-import xyz.r2turntrue.chzzk4j.types.channel.live.Resolution
 import java.time.Instant
-import kotlin.jvm.optionals.getOrNull
 
 val dotenv = dotenv {
     ignoreIfMissing = true
@@ -34,26 +33,20 @@ class Discord: ListenerAdapter() {
             return bot.getGuildById(guildId)?.getTextChannelById(channelId)
         }
 
-        fun sendDiscord(user: User, status: ChzzkLiveDetail) {
+        fun sendDiscord(user: User, status: IData<IStreamInfo?>) {
+            if(status.content == null) return
             if(user.liveAlertMessage != null && user.liveAlertGuild != null && user.liveAlertChannel != null) {
                 val channel = getChannel(user.liveAlertGuild ?: 0, user.liveAlertChannel ?: 0)
                     ?: throw RuntimeException("${user.liveAlertChannel} is not valid.")
 
                 val embed = EmbedBuilder()
-                embed.setTitle(status.title, "https://chzzk.naver.com/live/${user.token}")
+                embed.setTitle(status.content!!.liveTitle, "https://chzzk.naver.com/live/${user.token}")
                 embed.setDescription("${user.username} 님이 방송을 시작했습니다.")
                 embed.setTimestamp(Instant.now())
-                embed.setAuthor(user.username, "https://chzzk.naver.com/live/${user.token}")
+                embed.setAuthor(user.username, "https://chzzk.naver.com/live/${user.token}", status.content!!.channel.channelImageUrl)
-                embed.addField("카테고리", status.liveCategoryValue, true)
+                embed.addField("카테고리", status.content!!.liveCategoryValue, true)
-                embed.addField("태그", status.tags.joinToString(", ") { it.trim() }, true)
+                embed.addField("태그", status.content!!.tags.joinToString(", "), true)
-                status.defaultThumbnailImageUrl.getOrNull()?.let { embed.setImage(it) }
+                embed.setImage(status.content!!.liveImageUrl.replace("{type}", "1080"))
-                    ?: Resolution.entries.reversed().forEach {
-                        val thumbnail = status.getLiveImageUrl(it)
-                        if (thumbnail != null) {
-                            embed.setImage(thumbnail)
-                            return@forEach
-                        }
-                    }
 
                 channel.sendMessage(
                     MessageCreateBuilder()

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

@@ -1,46 +0,0 @@
-package space.mori.chzzk_bot.chatbot.utils
-
-import com.google.gson.reflect.TypeToken
-import okhttp3.MediaType.Companion.toMediaType
-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
-
-
-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 dotenv["NAVER_CLIENT_ID"],
-            "clientSecret" to dotenv["NAVER_CLIENT_SECRET"]
-        )).toRequestBody("application/json; charset=utf-8".toMediaType()))
-        .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, object: TypeToken<IData<RefreshTokenResponse>>() {})
-
-            return Pair(data.content.accessToken, data.content.refreshToken)
-        } catch(e: Exception) {
-            throw e
-        }
-    }
-}

common/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     api("com.zaxxer:HikariCP:6.1.0")
 
     // https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
-    implementation("ch.qos.logback:logback-classic:1.5.13")
+    implementation("ch.qos.logback:logback-classic:1.5.12")
 
     // https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client
     implementation("org.mariadb.jdbc:mariadb-java-client:3.5.0")
@@ -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/events/ChzzkUserFindEvent.kt

@@ -1,7 +0,0 @@
-package space.mori.chzzk_bot.common.events
-
-data class ChzzkUserFindEvent(
-    val uid: String
-): Event {
-    val TAG = javaClass.simpleName
-}

common/src/main/kotlin/space/mori/chzzk_bot/common/events/ChzzkUserReceiveEvent.kt

@@ -1,11 +0,0 @@
-package space.mori.chzzk_bot.common.events
-
-data class ChzzkUserReceiveEvent(
-    val find: Boolean = true,
-    val uid: String? = null,
-    val nickname: String? = null,
-    val isStreamOn: Boolean? = null,
-    val avatarUrl: String? = null,
-): Event {
-    val TAG = javaClass.simpleName
-}

common/src/main/kotlin/space/mori/chzzk_bot/common/events/TimerEvents.kt

@@ -5,8 +5,7 @@ enum class TimerType(var value: Int) {
     TIMER(1),
     REMOVE(2),
 
-    STREAM_OFF(50),
+    STREAM_OFF(50)
-    ACK(51)
 }
 
 class TimerEvent(

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()
-    }
-}

common/src/main/kotlin/space/mori/chzzk_bot/common/utils/ChzzkApis.kt

@@ -52,18 +52,47 @@ data class NicknameColor(
     val colorCode: String = ""
 )
 
-data class LiveStatus(
+// Stream info
-    val liveTitle: String,
+data class IStreamInfo(
-    val status: String,
+    val liveId: Int = 0,
-    val concurrentUserCount: Int,
+    val liveTitle: String = "",
-    val accumulateCount: Int,
+    val status: String = "",
-    val paidPromotion: Boolean,
+    val liveImageUrl: String = "",
-    val adult: Boolean,
+    val defaultThumbnailImageUrl: String? = null,
-    val krOnlyViewing: Boolean,
+    val concurrentUserCount: Int = 0,
-    val openDate: String,
+    val accumulateCount: Int = 0,
-    val closeDate: String?,
+    val openDate: String = "",
-    val clipActive: Boolean,
+    val closeDate: String = "",
-    val chatChannelId: String
+    val adult: Boolean = false,
+    val clipActive: Boolean = false,
+    val tags: List<String> = emptyList(),
+    val chatChannelId: String = "",
+    val categoryType: String = "",
+    val liveCategory: String = "",
+    val liveCategoryValue: String = "",
+    val chatActive: Boolean = true,
+    val chatAvailableGroup: String = "",
+    val paidPromotion: Boolean = false,
+    val chatAvailableCondition: String = "",
+    val minFollowerMinute: Int = 0,
+    val livePlaybackJson: String = "",
+    val p2pQuality: List<Any> = emptyList(),
+    val channel: Channel = Channel(),
+    val livePollingStatusJson: String = "",
+    val userAdultStatus: String? = null,
+    val chatDonationRankingExposure: Boolean = true,
+    val adParameter: AdParameter = AdParameter()
+)
+
+data class Channel(
+    val channelId: String = "",
+    val channelName: String = "",
+    val channelImageUrl: String = "",
+    val verifiedMark: Boolean = false
+)
+
+data class AdParameter(
+    val tag: String = ""
 )
 
 // OkHttpClient에 Interceptor 추가
@@ -99,21 +128,38 @@ fun getFollowDate(chatID: String, userId: String) : IData<IFollowContent?> {
     }
 }
 
-fun getChzzkChannelId(channelId: String): String? {
+fun getStreamInfo(userId: String) : IData<IStreamInfo?> {
-    val url = "https://api.chzzk.naver.com/polling/v3/channels/$channelId/live-status?includePlayerRecommendContent=false"
+    val url = "https://api.chzzk.naver.com/service/v3/channels/${userId}/live-detail"
     val request = Request.Builder()
         .url(url)
-        .header("Content-Type", "application/json")
-        .get()
         .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, object: TypeToken<IData<LiveStatus?>>() {})
+            val follow = gson.fromJson(body, object: TypeToken<IData<IStreamInfo?>>() {})
 
-            return data.content?.chatChannelId
+            return follow
+        } catch(e: Exception) {
+            throw e
+        }
+    }
+}
+
+fun getUserInfo(userId: String): IData<Channel?> {
+    val url = "https://api.chzzk.naver.com/service/v1/channels/${userId}"
+    val request = Request.Builder()
+        .url(url)
+        .build()
+
+    client.newCall(request).execute().use { response ->
+        try {
+            if(!response.isSuccessful) throw IOException("Unexpected code ${response.code}")
+            val body = response.body?.string()
+            val channel = gson.fromJson(body, object: TypeToken<IData<Channel?>>() {})
+
+            return channel
         } catch(e: Exception) {
             throw e
         }

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

@@ -10,7 +10,7 @@ repositories {
     mavenCentral()
 }
 
-val ktorVersion = "3.1.3"
+val ktorVersion = "3.0.1"
 
 dependencies {
     implementation("io.ktor:ktor-server-core:$ktorVersion")
@@ -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,26 +19,16 @@ 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
 import space.mori.chzzk_bot.common.services.UserService
 import space.mori.chzzk_bot.webserver.routes.*
 import space.mori.chzzk_bot.webserver.utils.DiscordRatelimits
+import wsSongListRoutes
 import java.math.BigInteger
 import java.security.SecureRandom
 import java.time.Duration
-import kotlin.getValue
 import kotlin.time.toKotlinDuration
 
 val dotenv = dotenv {
@@ -93,8 +82,6 @@ val server = embeddedServer(Netty, port = 8080, ) {
         }
     }
     routing {
-        val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
-
         route("/auth") {
             // discord login
             authenticate("auth-oauth-discord") {
@@ -189,7 +176,7 @@ val server = embeddedServer(Netty, port = 8080, ) {
                         clientSecret = dotenv["NAVER_CLIENT_SECRET"]
                     )
 
-                    val response = applicationHttpClient.post("https://openapi.chzzk.naver.com/auth/v1/token") {
+                    val response = applicationHttpClient.post("https://chzzk.naver.com/auth/v1/token") {
                         contentType(ContentType.Application.Json)
                         setBody(tokenRequest)
                     }
@@ -205,12 +192,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,
@@ -218,13 +200,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) {
@@ -236,22 +212,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 +227,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.*
@@ -12,11 +11,7 @@ import space.mori.chzzk_bot.common.events.CoroutinesEventBus
 import space.mori.chzzk_bot.common.services.SongConfigService
 import space.mori.chzzk_bot.common.services.UserService
 import space.mori.chzzk_bot.webserver.UserSession
-import kotlinx.coroutines.CompletableDeferred
+import space.mori.chzzk_bot.webserver.utils.ChzzkUserCache
-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(
@@ -41,20 +36,6 @@ data class GetSessionDTO(
 fun Routing.apiRoutes() {
     val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
 
-    suspend fun getChzzkUserWithId(uid: String): 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
-    }
-
     route("/") {
         get {
             call.respondText("Hello World!", status =
@@ -69,21 +50,21 @@ fun Routing.apiRoutes() {
 
     route("/user/{uid}") {
         get {
-        val uid = call.parameters["uid"]
+            val uid = call.parameters["uid"]
             if(uid == null) {
                 call.respondText("Require UID", status = HttpStatusCode.NotFound)
                 return@get
             }
-            val user = getChzzkUserWithId(uid)
+            val user = ChzzkUserCache.getCachedUser(uid)
-            if (user?.find == false) {
+            if(user?.content == null) {
                 call.respondText("User not found", status = HttpStatusCode.NotFound)
                 return@get
             } else {
                 call.respond(HttpStatusCode.OK, GetUserDTO(
-                    user?.uid ?: "",
+                    user.content!!.channel.channelId,
-                    user?.nickname ?: "",
+                    user.content!!.channel.channelName,
-                    user?.isStreamOn ?: false,
+                    user.content!!.status == "OPEN",
-                    user?.avatarUrl ?: ""
+                    user.content!!.channel.channelImageUrl
                 ))
             }
         }
@@ -101,7 +82,7 @@ fun Routing.apiRoutes() {
                 user = UserService.saveUser("임시닉네임", session.id)
             }
             val songConfig = SongConfigService.getConfig(user)
-            val status = getChzzkUserWithId(user.token)
+            val status = ChzzkUserCache.getCachedUser(session.id)
             val returnUsers = mutableListOf<GetSessionDTO>()
 
             if(status == null) {
@@ -110,14 +91,14 @@ fun Routing.apiRoutes() {
             }
 
             if (user.username == "임시닉네임") {
-                status.let { stats -> UserService.updateUser(user, stats.uid ?: "", stats.nickname ?: "") }
+                status.content?.channel?.let { it1 -> UserService.updateUser(user, it1.channelId, it1.channelName) }
             }
 
             returnUsers.add(GetSessionDTO(
-                status.uid ?: user.token,
+                status.content?.channel?.channelId ?: user.username,
-                status.nickname ?: user.username,
+                status.content?.channel?.channelName ?: user.token,
-                status.isStreamOn == true,
+                status.content?.status == "OPEN",
-                status.avatarUrl ?: "",
+                status.content?.channel?.channelImageUrl ?: "",
                 songConfig.queueLimit,
                 songConfig.personalLimit,
                 songConfig.streamerOnly,
@@ -128,15 +109,15 @@ fun Routing.apiRoutes() {
                 user.subordinates.toList()
             }
             returnUsers.addAll(subordinates.map {
-                val subStatus = getChzzkUserWithId(it.token)
+                val subStatus = ChzzkUserCache.getCachedUser(it.token)
-                return@map if (subStatus == null) {
+                return@map if (subStatus?.content == null) {
                     null
                 } else {
                     GetSessionDTO(
-                        subStatus.uid ?: "",
+                        subStatus.content!!.channel.channelId,
-                        subStatus.nickname ?: "",
+                        subStatus.content!!.channel.channelName,
-                        subStatus.isStreamOn == true,
+                        subStatus.content!!.status == "OPEN",
-                        subStatus.avatarUrl ?: "",
+                        subStatus.content!!.channel.channelImageUrl,
                         0,
                         0,
                         false,
@@ -148,50 +129,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())
-    }
-
-}

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

@@ -1,54 +1,115 @@
-package space.mori.chzzk_bot.webserver.routes
-
-import io.ktor.client.plugins.websocket.WebSocketException
-import io.ktor.server.application.*
 import io.ktor.server.routing.*
 import io.ktor.server.sessions.*
 import io.ktor.server.websocket.*
+import io.ktor.util.logging.Logger
 import io.ktor.websocket.*
-import kotlinx.coroutines.*
+import io.ktor.websocket.Frame.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
-import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.delay
-import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import org.koin.java.KoinJavaComponent.inject
-import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import space.mori.chzzk_bot.common.events.*
 import space.mori.chzzk_bot.common.models.SongList
+import space.mori.chzzk_bot.common.models.SongLists.uid
 import space.mori.chzzk_bot.common.models.User
+import space.mori.chzzk_bot.common.services.SongConfigService
 import space.mori.chzzk_bot.common.services.SongListService
 import space.mori.chzzk_bot.common.services.UserService
 import space.mori.chzzk_bot.common.utils.YoutubeVideo
 import space.mori.chzzk_bot.common.utils.getYoutubeVideo
 import space.mori.chzzk_bot.webserver.UserSession
+import space.mori.chzzk_bot.webserver.routes.SongResponse
+import space.mori.chzzk_bot.webserver.routes.toSerializable
 import space.mori.chzzk_bot.webserver.utils.CurrentSong
-import java.io.IOException
 import java.util.concurrent.ConcurrentHashMap
 
 fun Routing.wsSongListRoutes() {
+    val sessions = ConcurrentHashMap<String, WebSocketServerSession>()
+    val status = ConcurrentHashMap<String, SongType>()
     val logger = LoggerFactory.getLogger("WSSongListRoutes")
+
     val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
-    val songListScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
 
-    // Manage all active sessions
+    fun addSession(uid: String, session: WebSocketServerSession) {
-    val sessionHandlers = ConcurrentHashMap<String, SessionHandler>()
+        if (sessions[uid] != null) {
-
+            CoroutineScope(Dispatchers.Default).launch {
-    // Handle application shutdown
+                sessions[uid]?.close(
-    environment.monitor.subscribe(ApplicationStopped) {
+                    CloseReason(CloseReason.Codes.VIOLATED_POLICY, "Duplicated sessions.")
-        sessionHandlers.values.forEach {
+                )
-            songListScope.launch {
-                it.close(CloseReason(CloseReason.Codes.NORMAL, "Server shutting down"))
             }
         }
+        sessions[uid] = session
+    }
+
+    fun removeSession(uid: String) {
+        sessions.remove(uid)
+    }
+
+    suspend fun waitForAck(ws: WebSocketServerSession, expectedType: Int): Boolean {
+        val timeout = 5000L // 5 seconds timeout
+        val startTime = System.currentTimeMillis()
+        while (System.currentTimeMillis() - startTime < timeout) {
+            for (frame in ws.incoming) {
+                if (frame is Text) {
+                    val message = frame.readText()
+                    if(message == "ping") {
+                        return true
+                    }
+                    val data = Json.decodeFromString<SongRequest>(message)
+                    if (data.type == SongType.ACK.value) {
+                        return true // ACK received
+                    }
+                }
+            }
+            delay(100) // Check every 100 ms
+        }
+        return false // Timeout
+    }
+
+    suspend fun sendWithRetry(uid: String, res: SongResponse, maxRetries: Int = 5, delayMillis: Long = 3000L) {
+        var attempt = 0
+        var sentSuccessfully = false
+
+        while (attempt < maxRetries && !sentSuccessfully) {
+            val ws = sessions[uid]
+            try {
+                if(ws == null) {
+                    delay(delayMillis)
+                    continue
+                }
+                // Attempt to send the message
+                ws.sendSerialized(res)
+                logger.debug("Message sent successfully to $uid on attempt $attempt")
+                // Wait for ACK
+                val ackReceived = waitForAck(ws, res.type)
+                if (ackReceived == true) {
+                    sentSuccessfully = true
+                } else {
+                    logger.warn("ACK not received for message to $uid on attempt $attempt.")
+                }
+            } catch (e: Exception) {
+                attempt++
+                logger.warn("Failed to send message to $uid on attempt $attempt. Retrying in $delayMillis ms.")
+                logger.warn(e.stackTraceToString())
+            } finally {
+                // Wait before retrying
+                delay(delayMillis)
+            }
+        }
+
+        if (!sentSuccessfully) {
+            logger.error("Failed to send message to $uid after $maxRetries attempts.")
+        }
     }
 
-    // WebSocket endpoint
     webSocket("/songlist") {
         val session = call.sessions.get<UserSession>()
-        val user: User? = session?.id?.let { UserService.getUser(it) }
+        val user = session?.id?.let { UserService.getUser(it) }
-
         if (user == null) {
             close(CloseReason(CloseReason.Codes.CANNOT_ACCEPT, "Invalid SID"))
             return@webSocket
@@ -56,291 +117,175 @@ fun Routing.wsSongListRoutes() {
 
         val uid = user.token
 
-        // Ensure only one session per user
+        addSession(uid, this)
-        sessionHandlers[uid]?.close(CloseReason(CloseReason.Codes.VIOLATED_POLICY, "Another session is already active."))
 
-        val handler = SessionHandler(uid, this, dispatcher, logger)
+        if (status[uid] == SongType.STREAM_OFF) {
-        sessionHandlers[uid] = handler
+            CoroutineScope(Dispatchers.Default).launch {
+                sendSerialized(SongResponse(
+                    SongType.STREAM_OFF.value,
+                    uid,
+                    null,
+                    null,
+                    null,
+                ))
+            }
+            removeSession(uid)
+        }
 
-        // Initialize session
-        handler.initialize()
-
-        // Listen for incoming frames
         try {
             for (frame in incoming) {
                 when (frame) {
-                    is Frame.Text -> handler.handleTextFrame(frame.readText())
+                    is Text -> {
-                    is Frame.Ping -> send(Frame.Pong(frame.data))
+                        if (frame.readText().trim() == "ping") {
-                    else -> Unit
+                            send("pong")
+                        } else {
+                            val data = frame.readText().let { Json.decodeFromString<SongRequest>(it) }
+
+                            // Handle song requests
+                            handleSongRequest(data, user, dispatcher, logger)
+                        }
+                    }
+                    is Ping -> send(Pong(frame.data))
+                    else -> ""
                 }
             }
         } catch (e: ClosedReceiveChannelException) {
-            logger.info("Session closed: ${e.message}")
+            logger.error("Error in WebSocket: ${e.message}")
-        } catch (e: IOException) {
-            logger.error("IO error: ${e.message}")
-        } catch (e: Exception) {
-            logger.error("Unexpected error: ${e.message}")
         } finally {
-            sessionHandlers.remove(uid)
+            removeSession(uid)
-            handler.close(CloseReason(CloseReason.Codes.NORMAL, "Session ended"))
         }
     }
 
-    // Subscribe to SongEvents
+    dispatcher.subscribe(SongEvent::class) {
-    dispatcher.subscribe(SongEvent::class) { event ->
+        logger.debug("SongEvent: {} / {} {}", it.uid, it.type, it.current?.name)
-        val handler = sessionHandlers[event.uid]
+        CoroutineScope(Dispatchers.Default).launch {
-        songListScope.launch {
+            val user = UserService.getUser(it.uid)
-            handler?.sendSongResponse(event)
+            if (user != null) {
+                sendWithRetry(
+                    user.token, SongResponse(
+                        it.type.value,
+                        it.uid,
+                        it.reqUid,
+                        it.current?.toSerializable(),
+                        it.next?.toSerializable(),
+                        it.delUrl
+                    )
+                )
+            }
         }
     }
 
-    // Subscribe to TimerEvents
+    dispatcher.subscribe(TimerEvent::class) {
-    dispatcher.subscribe(TimerEvent::class) { event ->
+        if (it.type == TimerType.STREAM_OFF) {
-        if (event.type == TimerType.STREAM_OFF) {
+            CoroutineScope(Dispatchers.Default).launch {
-            val handler = sessionHandlers[event.uid]
+                val user = UserService.getUser(it.uid)
-            songListScope.launch {
+                if (user != null) {
-                handler?.sendTimerOff()
+                    sendWithRetry(
+                        user.token, SongResponse(
+                            it.type.value,
+                            it.uid,
+                            null,
+                            null,
+                            null,
+                        )
+                    )
+                }
             }
         }
     }
 }
 
-class SessionHandler(
+suspend fun handleSongRequest(
-    private val uid: String,
+    data: SongRequest,
-    private val session: WebSocketServerSession,
+    user: User,
-    private val dispatcher: CoroutinesEventBus,
+    dispatcher: CoroutinesEventBus,
-    private val logger: Logger
+    logger: Logger
 ) {
-    private val ackMap = ConcurrentHashMap<String, CompletableDeferred<Boolean>>()
+    if (data.maxQueue != null && data.maxQueue > 0) SongConfigService.updateQueueLimit(user, data.maxQueue)
-    private val sessionMutex = Mutex()
+    if (data.maxUserLimit != null && data.maxUserLimit > 0) SongConfigService.updatePersonalLimit(user, data.maxUserLimit)
-    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+    if (data.isStreamerOnly != null) SongConfigService.updateStreamerOnly(user, data.isStreamerOnly)
+    if (data.isDisabled != null) SongConfigService.updateDisabled(user, data.isDisabled)
 
-    suspend fun initialize() {
+    when (data.type) {
-        // Send initial status if needed,
+        SongType.ADD.value -> {
-        // For example, send STREAM_OFF if applicable
+            data.url?.let { url ->
-        // This can be extended based on your requirements
+                try {
-    }
+                    val youtubeVideo = getYoutubeVideo(url)
-
+                    if (youtubeVideo != null) {
-    suspend fun handleTextFrame(text: String) {
+                        CoroutineScope(Dispatchers.Default).launch {
-        if (text.trim() == "ping") {
+                            SongListService.saveSong(
-            session.send("pong")
+                                user,
-            return
+                                user.token,
-        }
+                                url,
-
+                                youtubeVideo.name,
-        val data = try {
+                                youtubeVideo.author,
-            Json.decodeFromString<SongRequest>(text)
+                                youtubeVideo.length,
-        } catch (e: Exception) {
+                                user.username
-            logger.warn("Failed to decode SongRequest: ${e.message}")
+                            )
-            return
+                            dispatcher.post(
-        }
+                                SongEvent(
-
+                                    user.token,
-        when (data.type) {
+                                    SongType.ADD,
-            SongType.ACK.value -> handleAck(data.uid)
+                                    user.token,
-            else -> handleSongRequest(data)
+                                    CurrentSong.getSong(user),
-        }
+                                    youtubeVideo
-    }
+                                )
-
+                            )
-    private fun handleAck(requestUid: String) {
+                        }
-        ackMap[requestUid]?.complete(true)
+                    }
-        ackMap.remove(requestUid)
+                } catch (e: Exception) {
-    }
+                    logger.debug("SongType.ADD Error: $uid $e")
-
-    private fun handleSongRequest(data: SongRequest) {
-        scope.launch {
-            SongRequestProcessor.process(data, uid, dispatcher, this@SessionHandler, logger)
-        }
-    }
-
-    suspend fun sendSongResponse(event: SongEvent) {
-        val response = SongResponse(
-            type = event.type.value,
-            uid = event.uid,
-            reqUid = event.reqUid,
-            current = event.current?.toSerializable(),
-            next = event.next?.toSerializable(),
-            delUrl = event.delUrl
-        )
-        sendWithRetry(response)
-    }
-
-    suspend fun sendTimerOff() {
-        val response = SongResponse(
-            type = TimerType.STREAM_OFF.value,
-            uid = uid,
-            reqUid = null,
-            current = null,
-            next = null,
-            delUrl = null
-        )
-        sendWithRetry(response)
-    }
-
-    private suspend fun sendWithRetry(res: SongResponse, maxRetries: Int = 5, delayMillis: Long = 3000L) {
-        var attempt = 0
-        while (attempt < maxRetries) {
-            try {
-                session.sendSerialized(res)
-                val ackDeferred = CompletableDeferred<Boolean>()
-                ackMap[res.uid] = ackDeferred
-
-                val ackReceived = withTimeoutOrNull(5000L) { ackDeferred.await() } ?: false
-                if (ackReceived) {
-                    logger.debug("ACK received for message to $uid on attempt $attempt.")
-                    return
-                } else {
-                    logger.warn("ACK not received for message to $uid on attempt $attempt.")
                 }
-            } catch (e: IOException) {
+            }
-                logger.warn("Failed to send message to $uid on attempt $attempt: ${e.message}")
+        }
-                if (e is WebSocketException) {
+        SongType.REMOVE.value -> {
-                    close(CloseReason(CloseReason.Codes.PROTOCOL_ERROR, "WebSocket error"))
+            data.url?.let { url ->
-                    return
+                val songs = SongListService.getSong(user)
+                val exactSong = songs.firstOrNull { it.url == url }
+                if (exactSong != null) {
+                    SongListService.deleteSong(user, exactSong.uid, exactSong.name)
                 }
-            } catch (e: CancellationException) {
+                dispatcher.post(
-                throw e
+                    SongEvent(
-            } catch (e: Exception) {
+                        user.token,
-                logger.warn("Unexpected error while sending message to $uid on attempt $attempt: ${e.message}")
+                        SongType.REMOVE,
-            }
+                        null,
-
+                        null,
-            attempt++
+                        null,
-            delay(delayMillis)
+                        url
-        }
+                    )
-
+                )
-        logger.error("Failed to send message to $uid after $maxRetries attempts.")
-    }
-
-    suspend fun close(reason: CloseReason) {
-        try {
-            session.close(reason)
-        } catch (e: Exception) {
-            logger.warn("Error closing session: ${e.message}")
-        }
-    }
-}
-
-object SongRequestProcessor {
-    private val songMutex = Mutex()
-
-    suspend fun process(
-        data: SongRequest,
-        uid: String,
-        dispatcher: CoroutinesEventBus,
-        handler: SessionHandler,
-        logger: Logger
-    ) {
-        val user = UserService.getUser(uid) ?: return
-
-        when (data.type) {
-            SongType.ADD.value -> handleAdd(data, user, dispatcher, handler, logger)
-            SongType.REMOVE.value -> handleRemove(data, user, dispatcher, logger)
-            SongType.NEXT.value -> handleNext(user, dispatcher, logger)
-            else -> {
-                // Handle other types if necessary
             }
         }
-    }
+        SongType.NEXT.value -> {
-
-    private suspend fun handleAdd(
-        data: SongRequest,
-        user: User,
-        dispatcher: CoroutinesEventBus,
-        handler: SessionHandler,
-        logger: Logger
-    ) {
-        val url = data.url ?: return
-        val youtubeVideo = getYoutubeVideo(url) ?: run {
-            logger.warn("Failed to fetch YouTube video for URL: $url")
-            return
-        }
-
-        songMutex.withLock {
-            SongListService.saveSong(
-                user,
-                user.token,
-                url,
-                youtubeVideo.name,
-                youtubeVideo.author,
-                youtubeVideo.length,
-                user.username
-            )
-        }
-
-        dispatcher.post(
-            SongEvent(
-                uid = user.token,
-                type = SongType.ADD,
-                reqUid = user.token,
-                current = CurrentSong.getSong(user),
-                next = youtubeVideo
-            )
-        )
-    }
-
-    private suspend fun handleRemove(
-        data: SongRequest,
-        user: User,
-        dispatcher: CoroutinesEventBus,
-        logger: Logger
-    ) {
-        val url = data.url ?: return
-
-        songMutex.withLock {
-            val songs = SongListService.getSong(user)
-            val exactSong = songs.firstOrNull { it.url == url }
-            if (exactSong != null) {
-                SongListService.deleteSong(user, exactSong.uid, exactSong.name)
-            }
-        }
-
-        dispatcher.post(
-            SongEvent(
-                uid = user.token,
-                type = SongType.REMOVE,
-                delUrl = url,
-                reqUid = null,
-                current = null,
-                next = null,
-            )
-        )
-    }
-
-    private suspend fun handleNext(
-        user: User,
-        dispatcher: CoroutinesEventBus,
-        logger: Logger
-    ) {
-        var song: SongList? = null
-        var youtubeVideo: YoutubeVideo? = null
-
-        songMutex.withLock {
             val songList = SongListService.getSong(user)
+            var song: SongList? = null
+            var youtubeVideo: YoutubeVideo? = null
+
             if (songList.isNotEmpty()) {
                 song = songList[0]
                 SongListService.deleteSong(user, song.uid, song.name)
             }
-        }
 
-        song?.let {
+            song?.let {
-            youtubeVideo = YoutubeVideo(
+                youtubeVideo = YoutubeVideo(
-                it.url,
+                    song.url,
-                it.name,
+                    song.name,
-                it.author,
+                    song.author,
-                it.time
+                    song.time
+                )
+            }
+            dispatcher.post(
+                SongEvent(
+                    user.token,
+                    SongType.NEXT,
+                    song?.uid,
+                    youtubeVideo
+                )
             )
+
+            CurrentSong.setSong(user, youtubeVideo)
         }
-
-        dispatcher.post(
-            SongEvent(
-                uid = user.token,
-                type = SongType.NEXT,
-                current = null,
-                next = youtubeVideo,
-                reqUid = null,
-                delUrl = null
-            )
-        )
-
-        CurrentSong.setSong(user, youtubeVideo)
     }
 }
 
@@ -348,10 +293,10 @@ object SongRequestProcessor {
 data class SongRequest(
     val type: Int,
     val uid: String,
-    val url: String? = null,
+    val url: String?,
-    val maxQueue: Int? = null,
+    val maxQueue: Int?,
-    val maxUserLimit: Int? = null,
+    val maxUserLimit: Int?,
-    val isStreamerOnly: Boolean? = null,
+    val isStreamerOnly: Boolean?,
-    val remove: Int? = null,
+    val remove: Int?,
-    val isDisabled: Boolean? = null
+    val isDisabled: Boolean?,
 )

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

@@ -1,20 +1,14 @@
 package space.mori.chzzk_bot.webserver.routes
 
-import io.ktor.server.application.ApplicationStopped
 import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
 import io.ktor.websocket.*
-import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
 import org.koin.java.KoinJavaComponent.inject
 import org.slf4j.LoggerFactory
 import space.mori.chzzk_bot.common.events.*
@@ -23,16 +17,10 @@ import space.mori.chzzk_bot.common.utils.YoutubeVideo
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentLinkedQueue
 
-val songScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
 fun Routing.wsSongRoutes() {
-    environment.monitor.subscribe(ApplicationStopped) {
-        songScope.cancel()
-    }
     val sessions = ConcurrentHashMap<String, ConcurrentLinkedQueue<WebSocketServerSession>>()
     val status = ConcurrentHashMap<String, SongType>()
     val logger = LoggerFactory.getLogger("WSSongRoutes")
-    val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
-    val ackMap = ConcurrentHashMap<String, ConcurrentHashMap<WebSocketServerSession, CompletableDeferred<Boolean>>>()
 
     fun addSession(uid: String, session: WebSocketServerSession) {
         sessions.computeIfAbsent(uid) { ConcurrentLinkedQueue() }.add(session)
@@ -40,7 +28,7 @@ fun Routing.wsSongRoutes() {
 
     fun removeSession(uid: String, session: WebSocketServerSession) {
         sessions[uid]?.remove(session)
-        if (sessions[uid]?.isEmpty() == true) {
+        if(sessions[uid]?.isEmpty() == true) {
             sessions.remove(uid)
         }
     }
@@ -54,141 +42,104 @@ fun Routing.wsSongRoutes() {
         var attempt = 0
         while (attempt < maxRetries) {
             try {
-                session.sendSerialized(message)
+                session.sendSerialized(message)  // 메시지 전송 시도
-                val ackDeferred = CompletableDeferred<Boolean>()
+                return true  // 성공하면 true 반환
-                ackMap.computeIfAbsent(message.uid) { ConcurrentHashMap() }[session] = ackDeferred
-                val ackReceived = withTimeoutOrNull(delayMillis) { ackDeferred.await() } ?: false
-                if (ackReceived) {
-                    ackMap[message.uid]?.remove(session)
-                    return true
-                } else {
-                    attempt++
-                    logger.warn("ACK not received for message to ${message.uid} on attempt $attempt.")
-                }
             } catch (e: Exception) {
                 attempt++
                 logger.info("Failed to send message on attempt $attempt. Retrying in $delayMillis ms.")
                 e.printStackTrace()
-                delay(delayMillis)
+                delay(delayMillis)  // 재시도 전 대기
             }
         }
-        return false
+        return false  // 재시도 실패 시 false 반환
     }
 
     fun broadcastMessage(userId: String, message: SongResponse) {
         val userSessions = sessions[userId]
+
         userSessions?.forEach { session ->
-            songScope.launch {
+            CoroutineScope(Dispatchers.Default).launch {
                 val success = sendWithRetry(session, message)
                 if (!success) {
-                    logger.info("Removing session for user $userId due to repeated failures.")
+                    println("Removing session for user $userId due to repeated failures.")
-                    removeSession(userId, session)
+                    userSessions.remove(session)  // 실패 시 세션 제거
                 }
             }
         }
     }
 
     webSocket("/song/{uid}") {
-        logger.info("WebSocket connection attempt received")
         val uid = call.parameters["uid"]
         val user = uid?.let { UserService.getUser(it) }
-        if (uid == null || user == null) {
+        if (uid == null) {
-            logger.warn("Invalid UID: $uid")
             close(CloseReason(CloseReason.Codes.CANNOT_ACCEPT, "Invalid UID"))
             return@webSocket
         }
+        if (user == null) {
+            close(CloseReason(CloseReason.Codes.CANNOT_ACCEPT, "Invalid UID"))
+            return@webSocket
+        }
+
+        addSession(uid, this)
+
+        if(status[uid] == SongType.STREAM_OFF) {
+            CoroutineScope(Dispatchers.Default).launch {
+                sendSerialized(SongResponse(
+                    SongType.STREAM_OFF.value,
+                    uid,
+                    null,
+                    null,
+                    null,
+                ))
+            }
+        }
+
         try {
-            addSession(uid, this)
+            for (frame in incoming) {
-            logger.info("WebSocket connection established for user: $uid")
+                when(frame) {
-
+                    is Frame.Text -> {
-            // Start heartbeat
+                        if(frame.readText().trim() == "ping") {
-            val heartbeatJob = songScope.launch {
+                            send("pong")
-                while (true) {
-                    try {
-                        send(Frame.Ping(ByteArray(0)))
-                        delay(30000) // 30 seconds
-                    } catch (e: Exception) {
-                        logger.error("Heartbeat failed for user $uid", e)
-                        break
-                    }
-                }
-            }
-
-            if (status[uid] == SongType.STREAM_OFF) {
-                songScope.launch {
-                    sendSerialized(
-                        SongResponse(
-                            SongType.STREAM_OFF.value,
-                            uid,
-                            null,
-                            null,
-                            null,
-                        )
-                    )
-                }
-            }
-            try {
-                for (frame in incoming) {
-                    when (frame) {
-                        is Frame.Text -> {
-                            val text = frame.readText().trim()
-                            if (text == "ping") {
-                                send("pong")
-                            } else {
-                                val data = Json.decodeFromString<SongRequest>(text)
-                                if (data.type == SongType.ACK.value) {
-                                    ackMap[data.uid]?.get(this)?.complete(true)
-                                    ackMap[data.uid]?.remove(this)
-                                }
-                            }
                         }
+                    }
+                    is Frame.Ping -> send(Frame.Pong(frame.data))
+                    else -> {
 
-                        is Frame.Ping -> send(Frame.Pong(frame.data))
-                        else -> {}
                     }
                 }
-            } catch (e: ClosedReceiveChannelException) {
-                logger.error("WebSocket connection closed for user $uid: ${e.message}")
-            } catch (e: Exception) {
-                logger.error("Unexpected error in WebSocket for user $uid", e)
-            } finally {
-                logger.info("Cleaning up WebSocket connection for user $uid")
-                removeSession(uid, this)
-                ackMap[uid]?.remove(this)
-                heartbeatJob.cancel()
             }
-        } catch(e: Exception) {
+        } catch(e: ClosedReceiveChannelException) {
-            logger.error("Unexpected error in WebSocket for user $uid", e)
+            logger.error("Error in WebSocket: ${e.message}")
+        } finally {
+            removeSession(uid, this)
         }
     }
 
+    val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
+
     dispatcher.subscribe(SongEvent::class) {
         logger.debug("SongEvent: {} / {} {}", it.uid, it.type, it.current?.name)
-        songScope.launch {
+        CoroutineScope(Dispatchers.Default).launch {
-            broadcastMessage(
+            broadcastMessage(it.uid, SongResponse(
-                it.uid, SongResponse(
+                it.type.value,
-                    it.type.value,
+                it.uid,
-                    it.uid,
+                it.reqUid,
-                    it.reqUid,
+                it.current?.toSerializable(),
-                    it.current?.toSerializable(),
+                it.next?.toSerializable(),
-                    it.next?.toSerializable(),
+                it.delUrl
-                    it.delUrl
+            ))
-                )
-            )
         }
     }
     dispatcher.subscribe(TimerEvent::class) {
-        if (it.type == TimerType.STREAM_OFF) {
+        if(it.type == TimerType.STREAM_OFF) {
-            songScope.launch {
+            CoroutineScope(Dispatchers.Default).launch {
-                broadcastMessage(
+                broadcastMessage(it.uid, SongResponse(
-                    it.uid, SongResponse(
+                    it.type.value,
-                        it.type.value,
+                    it.uid,
-                        it.uid,
+                    null,
-                        null,
+                    null,
-                        null,
+                    null,
-                        null,
+                ))
-                    )
-                )
             }
         }
     }
@@ -201,7 +152,9 @@ data class SerializableYoutubeVideo(
     val author: String,
     val length: Int
 )
+
 fun YoutubeVideo.toSerializable() = SerializableYoutubeVideo(url, name, author, length)
+
 @Serializable
 data class SongResponse(
     val type: Int,

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

@@ -1,20 +1,13 @@
 package space.mori.chzzk_bot.webserver.routes
 
-import io.ktor.server.application.ApplicationStopped
 import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
 import io.ktor.websocket.*
-import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
 import org.koin.java.KoinJavaComponent.inject
 import org.slf4j.LoggerFactory
 import space.mori.chzzk_bot.common.events.*
@@ -24,19 +17,14 @@ import space.mori.chzzk_bot.webserver.utils.CurrentTimer
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentLinkedQueue
 
-val timerScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
 fun Routing.wsTimerRoutes() {
-    environment.monitor.subscribe(ApplicationStopped) {
-        timerScope.cancel()
-    }
     val sessions = ConcurrentHashMap<String, ConcurrentLinkedQueue<WebSocketServerSession>>()
     val logger = LoggerFactory.getLogger("WSTimerRoutes")
-    val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
-    val ackMap = ConcurrentHashMap<String, ConcurrentHashMap<WebSocketServerSession, CompletableDeferred<Boolean>>>()
 
     fun addSession(uid: String, session: WebSocketServerSession) {
         sessions.computeIfAbsent(uid) { ConcurrentLinkedQueue() }.add(session)
     }
+
     fun removeSession(uid: String, session: WebSocketServerSession) {
         sessions[uid]?.remove(session)
         if(sessions[uid]?.isEmpty() == true) {
@@ -44,132 +32,82 @@ fun Routing.wsTimerRoutes() {
         }
     }
 
-    suspend fun sendWithRetry(
-        session: WebSocketServerSession,
-        message: TimerResponse,
-        maxRetries: Int = 3,
-        delayMillis: Long = 2000L
-    ): Boolean {
-        var attempt = 0
-        while (attempt < maxRetries) {
-            try {
-                session.sendSerialized(message)
-                val ackDeferred = CompletableDeferred<Boolean>()
-                ackMap.computeIfAbsent(message.uid) { ConcurrentHashMap() }[session] = ackDeferred
-                val ackReceived = withTimeoutOrNull(delayMillis) { ackDeferred.await() } ?: false
-                if (ackReceived) {
-                    ackMap[message.uid]?.remove(session)
-                    return true
-                } else {
-                    attempt++
-                    logger.warn("ACK not received for message to ${message.uid} on attempt $attempt.")
-                }
-            } catch (e: Exception) {
-                attempt++
-                logger.info("Failed to send message on attempt $attempt. Retrying in $delayMillis ms.")
-                e.printStackTrace()
-                delay(delayMillis)
-            }
-        }
-        return false
-    }
-
-    fun broadcastMessage(uid: String, message: TimerResponse) {
-        val userSessions = sessions[uid]
-        userSessions?.forEach { session ->
-            timerScope.launch {
-                val success = sendWithRetry(session, message.copy(uid = uid))
-                if (!success) {
-                    logger.info("Removing session for user $uid due to repeated failures.")
-                    removeSession(uid, session)
-                }
-            }
-        }
-    }
-
     webSocket("/timer/{uid}") {
         val uid = call.parameters["uid"]
         val user = uid?.let { UserService.getUser(it) }
-        if (uid == null || user == null) {
+        if (uid == null) {
             close(CloseReason(CloseReason.Codes.CANNOT_ACCEPT, "Invalid UID"))
             return@webSocket
         }
+        if (user == null) {
+            close(CloseReason(CloseReason.Codes.CANNOT_ACCEPT, "Invalid UID"))
+            return@webSocket
+        }
+
         addSession(uid, this)
         val timer = CurrentTimer.getTimer(user)
 
-        if (timer?.type == TimerType.STREAM_OFF) {
+        if(timer?.type == TimerType.STREAM_OFF) {
-            timerScope.launch {
+            CoroutineScope(Dispatchers.Default).launch {
-                sendSerialized(TimerResponse(TimerType.STREAM_OFF.value, null, uid))
+                sendSerialized(TimerResponse(TimerType.STREAM_OFF.value, null))
             }
         } else {
-            timerScope.launch {
+            CoroutineScope(Dispatchers.Default).launch {
-                if(timer?.type == TimerType.STREAM_OFF) {
+                if (timer == null) {
-                    sendSerialized(TimerResponse(TimerType.STREAM_OFF.value, null, uid))
+                    sendSerialized(
+                        TimerResponse(
+                            TimerConfigService.getConfig(user)?.option ?: TimerType.REMOVE.value,
+                            null
+                        )
+                    )
                 } else {
-                    if (timer == null) {
+                    sendSerialized(
-                        sendSerialized(
+                        TimerResponse(
-                            TimerResponse(
+                            timer.type.value,
-                                TimerConfigService.getConfig(user)?.option ?: TimerType.REMOVE.value,
+                            timer.time
-                                null,
-                                uid
-                            )
                         )
-                    } else {
+                    )
-                        sendSerialized(
-                            TimerResponse(
-                                timer.type.value,
-                                timer.time,
-                                uid
-                            )
-                        )
-                    }
                 }
             }
         }
+
         try {
             for (frame in incoming) {
                 when(frame) {
                     is Frame.Text -> {
-                        val text = frame.readText().trim()
+                        if(frame.readText().trim() == "ping") {
-                        if(text == "ping") {
                             send("pong")
-                        } else {
-                            val data = Json.decodeFromString<TimerRequest>(text)
-                            if (data.type == TimerType.ACK.value) {
-                                ackMap[data.uid]?.get(this)?.complete(true)
-                                ackMap[data.uid]?.remove(this)
-                            }
                         }
                     }
                     is Frame.Ping -> send(Frame.Pong(frame.data))
-                    else -> {}
+                    else -> {
+
+                    }
                 }
             }
         } catch(e: ClosedReceiveChannelException) {
             logger.error("Error in WebSocket: ${e.message}")
         } finally {
             removeSession(uid, this)
-            ackMap[uid]?.remove(this)
         }
     }
 
+    val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
+
     dispatcher.subscribe(TimerEvent::class) {
         logger.debug("TimerEvent: {} / {}", it.uid, it.type)
         val user = UserService.getUser(it.uid)
         CurrentTimer.setTimer(user!!, it)
-        timerScope.launch {
+        CoroutineScope(Dispatchers.Default).launch {
-            broadcastMessage(it.uid, TimerResponse(it.type.value, it.time ?: "", it.uid))
+            sessions[it.uid]?.forEach { ws ->
+                ws.sendSerialized(TimerResponse(it.type.value, it.time ?: ""))
+            }
         }
     }
 }
+
 @Serializable
 data class TimerResponse(
     val type: Int,
-    val time: String?,
+    val time: String?
-    val uid: String
-)
-@Serializable
-data class TimerRequest(
-    val type: Int,
-    val uid: String
 )

webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/ChzzkUserCache.kt

@@ -0,0 +1,50 @@
+package space.mori.chzzk_bot.webserver.utils
+
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import org.slf4j.LoggerFactory
+import space.mori.chzzk_bot.common.utils.IData
+import space.mori.chzzk_bot.common.utils.IStreamInfo
+import space.mori.chzzk_bot.common.utils.getStreamInfo
+import space.mori.chzzk_bot.common.utils.getUserInfo
+import java.time.Instant
+import java.util.concurrent.ConcurrentHashMap
+
+object ChzzkUserCache {
+    private val cache = ConcurrentHashMap<String, CachedUser>()
+    private const val EXP_SECONDS = 600L
+    private val mutex = Mutex()
+    private val logger = LoggerFactory.getLogger(this::class.java)
+
+    suspend fun getCachedUser(id: String): IData<IStreamInfo?>? {
+        val now = Instant.now()
+        var user = cache[id]
+
+        if(user == null || user.timestamp.plusSeconds(EXP_SECONDS).isBefore(now)) {
+            mutex.withLock {
+                if(user == null || user.timestamp.plusSeconds(EXP_SECONDS)?.isBefore(now) != false) {
+                    var findUser = getStreamInfo(id)
+                    if(findUser.content == null) {
+                        val userInfo = getUserInfo(id)
+
+                        if(userInfo.content == null) return null
+
+                        findUser = IData(200, null, IStreamInfo(
+                            channel = userInfo.content!!
+                        ))
+                    }
+
+                    user = CachedUser(findUser)
+                    user.let { cache[id] = user }
+                }
+            }
+        }
+
+        return cache[id]?.user
+    }
+}
+
+data class CachedUser(
+    val user: IData<IStreamInfo?>,
+    val timestamp: Instant = Instant.now(),
+)