dalbodeule/chibot-chzzk-bot
1
0
Fork 0
mirror of https://github.com/dalbodeule/chibot-chzzk-bot.git synced 2025-06-08 14:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cancel route scope on application stop and simplify ACK handling.

Browse Source 
Added a monitor to cancel the route scope when the application stops, ensuring proper resource cleanup. Removed the timeout logic in the ACK handling method, simplifying the flow while maintaining error handling.
This commit is contained in:
dalbodeule 2025-04-24 16:37:11 +09:00
parent 9c15c8f10d
commit d07cdb6ae8
No known key found for this signature in database
GPG Key ID: EFA860D069C9FA65
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withTimeoutOrNull
import kotlinx.io.IOException
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
@ -78,26 +77,23 @@ fun Routing.wsSongListRoutes() {
}
suspend fun waitForAck(ws: WebSocketServerSession, expectedType: Int): Boolean {
return withTimeoutOrNull(5000L) { // 5초 타임아웃
try {
for (frame in ws.incoming) {
if (frame is Text) {
val message = frame.readText()
if(message == "ping") {
return@withTimeoutOrNull true
}
val data = Json.decodeFromString<SongRequest>(message)
if (data.type == SongType.ACK.value) {
return@withTimeoutOrNull true // ACK 받음
}
try {
for (frame in ws.incoming) {
if (frame is Text) {
val message = frame.readText()
if (message == "ping") {
continue // Keep the loop running if a ping is received
}
val data = Json.decodeFromString<SongRequest>(message)
if (data.type == SongType.ACK.value) {
return true // ACK received
}
}
false // 채널이 닫힘
} catch (e: Exception) {
logger.warn("Error waiting for ACK: ${e.message}")
false
}
} ?: false // 타임아웃 시 false 반환
} catch (e: Exception) {
logger.warn("Error waiting for ACK: ${e.message}")
}
return false // Return false if no ACK received
}
@ -114,7 +110,7 @@ fun Routing.wsSongListRoutes() {
null
}
if(ws == null) continue
if (ws == null) continue
try {
// 메시지 전송 시도
@ -124,6 +120,7 @@ fun Routing.wsSongListRoutes() {
// ACK 대기
val ackReceived = waitForAck(ws, res.type)
if (ackReceived) {
logger.debug("ACK received for message to $uid on attempt $attempt.")
sentSuccessfully = true
} else {
logger.warn("ACK not received for message to $uid on attempt $attempt.")

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

@ -1,11 +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.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
@ -21,6 +23,10 @@ import java.util.concurrent.ConcurrentLinkedQueue
val routeScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
fun Routing.wsSongRoutes() {
environment.monitor.subscribe(ApplicationStopped) {
routeScope.cancel()
}
val sessions = ConcurrentHashMap<String, ConcurrentLinkedQueue<WebSocketServerSession>>()
val status = ConcurrentHashMap<String, SongType>()
val logger = LoggerFactory.getLogger("WSSongRoutes")