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

@@ -23,7 +23,7 @@ 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 xyz.r2turntrue.chzzk4j.types.channel.live.ChzzkLiveStatus
 import java.lang.Exception
 import java.net.SocketTimeoutException
 import java.time.LocalDateTime
@@ -37,7 +37,7 @@ object ChzzkHandler {
     private val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
 
     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() {
@@ -196,7 +196,6 @@ object ChzzkHandler {
     }
 }
 
-@OptIn(DelicateCoroutinesApi::class)
 class UserHandler(
     val channel: ChzzkChannel,
     val logger: Logger,
@@ -238,26 +237,6 @@ class UserHandler(
             listener.on(SessionChatMessageEvent::class.java) {
                 messageHandler.handle(it.message, user)
             }
-
-            GlobalScope.launch {
-                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
-                    )
-                )
-            }
-            
         } catch(e: Exception) {
             logger.error("Exception(${user.username}): ${e.stackTraceToString()}")
             throw RuntimeException("Exception: ${e.stackTraceToString()}")
@@ -280,7 +259,7 @@ class UserHandler(
     internal val isActive: Boolean
         get() = _isActive
 
-    internal fun isActive(value: Boolean, status: ChzzkLiveDetail) {
+    internal fun isActive(value: Boolean, status: ChzzkLiveStatus) {
         if(value) {
             CoroutineScope(Dispatchers.Default).launch {
                 logger.info("${user.username} is live.")
@@ -288,7 +267,7 @@ class UserHandler(
                 reloadUser(UserService.getUser(user.id.value)!!)
 
                 logger.info("ChzzkChat connecting... ${channel.channelName} - ${channel.channelId}")
-                listener.subscribeAsync(ChzzkSessionSubscriptionType.CHAT).join()
+                listener.subscribeAsync(ChzzkSessionSubscriptionType.CHAT)
 
                 streamStartTime = LocalDateTime.now()
 

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

@@ -14,7 +14,7 @@ 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 xyz.r2turntrue.chzzk4j.types.channel.live.ChzzkLiveStatus
 import kotlin.getValue
 
 val dotenv = dotenv {
@@ -31,7 +31,7 @@ object Connector {
     private val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
 
     fun getChannel(channelId: String): ChzzkChannel? = client.fetchChannel(channelId)
-    fun getLive(channelId: String): ChzzkLiveDetail? = client.fetchLiveDetail(channelId)
+    fun getLive(channelId: String): ChzzkLiveStatus? = client.fetchLiveStatus(channelId)
 
     init {
         logger.info("chzzk logged: ${client.isLoggedIn}")

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

@@ -14,8 +14,7 @@ import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder
 import org.slf4j.LoggerFactory
 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.ChzzkLiveStatus
-import xyz.r2turntrue.chzzk4j.types.channel.live.Resolution
 import java.time.Instant
 import kotlin.jvm.optionals.getOrNull
 
@@ -34,7 +33,7 @@ class Discord: ListenerAdapter() {
             return bot.getGuildById(guildId)?.getTextChannelById(channelId)
         }
 
-        fun sendDiscord(user: User, status: ChzzkLiveDetail) {
+        fun sendDiscord(user: User, status: ChzzkLiveStatus) {
             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.")
@@ -46,14 +45,7 @@ class Discord: ListenerAdapter() {
                 embed.setAuthor(user.username, "https://chzzk.naver.com/live/${user.token}")
                 embed.addField("카테고리", status.liveCategoryValue, true)
                 embed.addField("태그", status.tags.joinToString(", ") { it.trim() }, true)
-                status.defaultThumbnailImageUrl.getOrNull()?.let { embed.setImage(it) }
+                // embed.setImage(status.)
-                    ?: Resolution.entries.reversed().forEach {
-                        val thumbnail = status.getLiveImageUrl(it)
-                        if (thumbnail != null) {
-                            embed.setImage(thumbnail)
-                            return@forEach
-                        }
-                    }
 
                 channel.sendMessage(
                     MessageCreateBuilder()

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

@@ -37,10 +37,9 @@ fun Routing.wsSongRoutes() {
     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) {
+        if(sessions[uid]?.isEmpty() == true) {
             sessions.remove(uid)
         }
     }
@@ -89,50 +88,30 @@ fun Routing.wsSongRoutes() {
     }
 
     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) {
-            logger.warn("Invalid UID: $uid")
             close(CloseReason(CloseReason.Codes.CANNOT_ACCEPT, "Invalid UID"))
             return@webSocket
         }
-        try {
         addSession(uid, this)
-            logger.info("WebSocket connection established for user: $uid")
+        if(status[uid] == SongType.STREAM_OFF) {
-
-            // Start heartbeat
-            val heartbeatJob = songScope.launch {
-                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(
+                sendSerialized(SongResponse(
-                        SongResponse(
                     SongType.STREAM_OFF.value,
                     uid,
                     null,
                     null,
                     null,
-                        )
+                ))
-                    )
             }
         }
         try {
             for (frame in incoming) {
-                    when (frame) {
+                when(frame) {
                     is Frame.Text -> {
                         val text = frame.readText().trim()
-                            if (text == "ping") {
+                        if(text == "ping") {
                             send("pong")
                         } else {
                             val data = Json.decodeFromString<SongRequest>(text)
@@ -142,58 +121,45 @@ fun Routing.wsSongRoutes() {
                             }
                         }
                     }
-
                     is Frame.Ping -> send(Frame.Pong(frame.data))
                     else -> {}
                 }
             }
-            } catch (e: ClosedReceiveChannelException) {
+        } catch(e: ClosedReceiveChannelException) {
-                logger.error("WebSocket connection closed for user $uid: ${e.message}")
+            logger.error("Error in WebSocket: ${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) {
-            logger.error("Unexpected error in WebSocket for user $uid", e)
         }
     }
 
     dispatcher.subscribe(SongEvent::class) {
         logger.debug("SongEvent: {} / {} {}", it.uid, it.type, it.current?.name)
         songScope.launch {
-            broadcastMessage(
+            broadcastMessage(it.uid, SongResponse(
-                it.uid, SongResponse(
                 it.type.value,
                 it.uid,
                 it.reqUid,
                 it.current?.toSerializable(),
                 it.next?.toSerializable(),
                 it.delUrl
-                )
+            ))
-            )
         }
     }
     dispatcher.subscribe(TimerEvent::class) {
-        if (it.type == TimerType.STREAM_OFF) {
+        if(it.type == TimerType.STREAM_OFF) {
             songScope.launch {
-                broadcastMessage(
+                broadcastMessage(it.uid, SongResponse(
-                    it.uid, SongResponse(
                     it.type.value,
                     it.uid,
                     null,
                     null,
                     null,
-                    )
+                ))
-                )
             }
         }
     }
 }
-
 @Serializable
 data class SerializableYoutubeVideo(
     val url: String,