Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package team.darkmoderap.aikon.domain.avatar.event

import org.springframework.web.servlet.mvc.method.annotation.SseEmitter

class AvatarSseSubscribedEvent(
val emitter: SseEmitter,
)
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package team.darkmoderap.aikon.domain.avatar.service
import org.slf4j.LoggerFactory
import org.springframework.beans.factory.annotation.Value
import org.springframework.context.ApplicationEventPublisher
import org.springframework.context.event.EventListener
import org.springframework.scheduling.annotation.Async
import org.springframework.scheduling.annotation.Scheduled
import org.springframework.stereotype.Service
Expand All @@ -13,12 +14,12 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter
import team.darkmoderap.aikon.domain.avatar.dto.AvatarChangeResDto
import team.darkmoderap.aikon.domain.avatar.entity.AvatarEntity
import team.darkmoderap.aikon.domain.avatar.event.AvatarListChangedEvent
import team.darkmoderap.aikon.domain.avatar.event.AvatarSseSubscribedEvent
import team.darkmoderap.aikon.domain.avatar.repository.AvatarRepository
import team.darkmoderap.aikon.global.common.error.AikonException
import team.darkmoderap.aikon.global.common.error.ErrorCode
import java.io.IOException
import java.util.concurrent.CopyOnWriteArrayList
import java.util.concurrent.atomic.AtomicInteger

@Service
class SubscribeAvatarChangesServiceImpl(
Expand All @@ -29,74 +30,55 @@ class SubscribeAvatarChangesServiceImpl(
) : SubscribeAvatarChangesService {
private val logger = LoggerFactory.getLogger(SubscribeAvatarChangesServiceImpl::class.java)
private val emitters = CopyOnWriteArrayList<SseEmitter>()
private val activeConnections = AtomicInteger(0)

@Transactional(readOnly = true)
override fun execute(): SseEmitter {
if (activeConnections.incrementAndGet() > maxConnections) {
activeConnections.decrementAndGet()
if (emitters.size >= maxConnections) {
throw AikonException(ErrorCode.SSE_MAX_CONNECTIONS_EXCEEDED)
}
val emitter = SseEmitter(timeoutMillis)
emitters.add(emitter)
Comment thread
cfcromn marked this conversation as resolved.
Resolved

emitter.onCompletion {
if (emitters.remove(emitter)) {
logger.info("SSE connection closed. active={}", activeConnections.decrementAndGet())
}
}
emitter.onTimeout {
if (emitters.remove(emitter)) {
logger.info("SSE connection timed out. active={}", activeConnections.decrementAndGet())
}
}
emitter.onError { e ->
if (emitters.remove(emitter)) {
logger.warn("SSE connection error {}. active={}", e.message, activeConnections.decrementAndGet())
}
}
emitter.onCompletion { cleanup(emitter, "closed") }
emitter.onTimeout { cleanup(emitter, "timed out") }
emitter.onError { e -> cleanup(emitter, "error: ${e.message}") }

logger.info("SSE connection opened. active={}", activeConnections.get())
eventPublisher.publishEvent(emitter)
logger.info("SSE connection opened. active={}", emitters.size)
eventPublisher.publishEvent(AvatarSseSubscribedEvent(emitter))
return emitter
}

@Async
@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
fun handleSubscription(emitter: SseEmitter) {
send(emitter, findAvatarChanges())
@EventListener
@Transactional(readOnly = true)
fun onAvatarSseSubscribed(event: AvatarSseSubscribedEvent) {
send(event.emitter, findAvatarChanges())
}

@Async
@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT, fallbackExecution = true)
@Transactional(readOnly = true)
fun handleAvatarListChanged(event: AvatarListChangedEvent) {
val avatarChanges = findAvatarChanges()
emitters.forEach { emitter -> send(emitter, avatarChanges) }
}
Comment thread
cfcromn marked this conversation as resolved.
Resolved

@Scheduled(fixedDelayString = "\${aikon.sse.heartbeat-interval-millis:30000}")
@Scheduled(fixedDelayString = "\${aikon.sse.heartbeat-interval-millis:10000}")
fun sendHeartbeat() {
if (emitters.isEmpty()) return
val deadEmitters = mutableListOf<SseEmitter>()
emitters.forEach { emitter ->
var failed = false
synchronized(emitter) {
try {
emitter.send(SseEmitter.event().comment("heartbeat"))
} catch (exception: IOException) {
logger.warn("Removed failed emitter on heartbeat {}", exception.message)
deadEmitters.add(emitter)
} catch (exception: IllegalStateException) {
logger.warn("Removed closed emitter on heartbeat {}", exception.message)
deadEmitters.add(emitter)
} catch (e: IOException) {
logger.warn("Heartbeat send failed {}", e.message)
failed = true
} catch (e: IllegalStateException) {
logger.warn("Heartbeat send failed (closed emitter) {}", e.message)
failed = true
}
Comment thread
cfcromn marked this conversation as resolved.
Resolved
}
}
if (deadEmitters.isNotEmpty()) {
var removedCount = 0
deadEmitters.forEach { dead ->
if (emitters.remove(dead)) removedCount++
}
if (removedCount > 0) activeConnections.addAndGet(-removedCount)
if (failed) cleanup(emitter, "heartbeat failed")
Comment thread
cfcromn marked this conversation as resolved.
Resolved
}
}

Expand All @@ -109,6 +91,7 @@ class SubscribeAvatarChangesServiceImpl(
emitter: SseEmitter,
avatarChanges: List<AvatarChangeResDto>,
) {
var failed = false
synchronized(emitter) {
try {
emitter.send(
Expand All @@ -117,14 +100,24 @@ class SubscribeAvatarChangesServiceImpl(
.name(EVENT_NAME)
.data(avatarChanges),
)
} catch (exception: IOException) {
logger.warn("Removed failed avatar change emitter {}", exception.message)
if (emitters.remove(emitter)) activeConnections.decrementAndGet()
} catch (exception: IllegalStateException) {
logger.warn("Removed closed avatar change emitter {}", exception.message)
if (emitters.remove(emitter)) activeConnections.decrementAndGet()
} catch (e: IOException) {
logger.warn("Send failed, removing emitter {}", e.message)
failed = true
} catch (e: IllegalStateException) {
logger.warn("Send failed (closed emitter) {}", e.message)
failed = true
}
}
if (failed) cleanup(emitter, "send failed")
Comment thread
cfcromn marked this conversation as resolved.
Resolved
}

private fun cleanup(
emitter: SseEmitter,
reason: String,
) {
if (emitters.remove(emitter)) {
logger.info("SSE connection {} active={}", reason, emitters.size)
}
}
Comment thread
cfcromn marked this conversation as resolved.
Resolved

private fun AvatarEntity.toChangeResDto(): AvatarChangeResDto =
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ aikon:
public-base-url: ${FRONTEND_PUBLIC_BASE_URL:}
sse:
timeout-millis: 1800000
heartbeat-interval-millis: 30000
heartbeat-interval-millis: 10000
max-connections: 100

gemini:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import org.junit.jupiter.api.DisplayName
import org.junit.jupiter.api.Nested
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith
import org.mockito.ArgumentMatchers.any
import org.mockito.BDDMockito.given
import org.mockito.Mock
import org.mockito.Mockito.verify
Expand All @@ -18,6 +19,7 @@ import team.darkmoderap.aikon.domain.avatar.entity.enum.Gender
import team.darkmoderap.aikon.domain.avatar.entity.enum.GenerationStatus
import team.darkmoderap.aikon.domain.avatar.entity.enum.Style
import team.darkmoderap.aikon.domain.avatar.event.AvatarListChangedEvent
import team.darkmoderap.aikon.domain.avatar.event.AvatarSseSubscribedEvent
import team.darkmoderap.aikon.domain.avatar.repository.AvatarRepository
import team.darkmoderap.aikon.global.common.error.AikonException

Expand Down Expand Up @@ -46,15 +48,15 @@ class SubscribeAvatarChangesServiceImplTest {
@DisplayName("execute 메서드는")
inner class Execute {
@Test
@DisplayName("구독을 시작하면 emitter를 이벤트로 발행한다")
fun `publishes emitter event when subscription starts`() {
@DisplayName("구독을 시작하면 AvatarSseSubscribedEvent를 발행한다")
fun `publishes AvatarSseSubscribedEvent when subscription starts`() {
// Given — no setup needed

// When
val emitter = subscribeAvatarChangesService.execute()
subscribeAvatarChangesService.execute()

// Then
verify(eventPublisher).publishEvent(emitter)
verify(eventPublisher).publishEvent(any(AvatarSseSubscribedEvent::class.java))
}

@Test
Expand Down
Loading