diff --git a/src/main/kotlin/team/darkmoderap/aikon/domain/avatar/event/AvatarSseSubscribedEvent.kt b/src/main/kotlin/team/darkmoderap/aikon/domain/avatar/event/AvatarSseSubscribedEvent.kt new file mode 100644 index 0000000..69ae916 --- /dev/null +++ b/src/main/kotlin/team/darkmoderap/aikon/domain/avatar/event/AvatarSseSubscribedEvent.kt @@ -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, +) diff --git a/src/main/kotlin/team/darkmoderap/aikon/domain/avatar/service/SubscribeAvatarChangesServiceImpl.kt b/src/main/kotlin/team/darkmoderap/aikon/domain/avatar/service/SubscribeAvatarChangesServiceImpl.kt index 7710714..b0cfa24 100644 --- a/src/main/kotlin/team/darkmoderap/aikon/domain/avatar/service/SubscribeAvatarChangesServiceImpl.kt +++ b/src/main/kotlin/team/darkmoderap/aikon/domain/avatar/service/SubscribeAvatarChangesServiceImpl.kt @@ -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 @@ -13,12 +14,11 @@ 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( @@ -29,74 +29,55 @@ class SubscribeAvatarChangesServiceImpl( ) : SubscribeAvatarChangesService { private val logger = LoggerFactory.getLogger(SubscribeAvatarChangesServiceImpl::class.java) private val emitters = CopyOnWriteArrayList() - private val activeConnections = AtomicInteger(0) - @Transactional(readOnly = true) override fun execute(): SseEmitter { - if (activeConnections.incrementAndGet() > maxConnections) { - activeConnections.decrementAndGet() - throw AikonException(ErrorCode.SSE_MAX_CONNECTIONS_EXCEEDED) - } val emitter = SseEmitter(timeoutMillis) - emitters.add(emitter) - - 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()) + synchronized(emitters) { + if (emitters.size >= maxConnections) { + throw AikonException(ErrorCode.SSE_MAX_CONNECTIONS_EXCEEDED) } + emitters.add(emitter) } - logger.info("SSE connection opened. active={}", activeConnections.get()) - eventPublisher.publishEvent(emitter) + 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={}", 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) { + if (emitters.isEmpty()) return val avatarChanges = findAvatarChanges() emitters.forEach { emitter -> send(emitter, avatarChanges) } } - @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() 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: Exception) { + logger.warn("Heartbeat send failed {}", e.message) + failed = true } } - } - 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", complete = true) } } @@ -109,6 +90,7 @@ class SubscribeAvatarChangesServiceImpl( emitter: SseEmitter, avatarChanges: List, ) { + var failed = false synchronized(emitter) { try { emitter.send( @@ -117,12 +99,23 @@ 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: Exception) { + logger.warn("Send failed, removing emitter {}", e.message) + failed = true + } + } + if (failed) cleanup(emitter, "send failed", complete = true) + } + + private fun cleanup( + emitter: SseEmitter, + reason: String, + complete: Boolean = false, + ) { + if (emitters.remove(emitter)) { + logger.info("SSE connection {} active={}", reason, emitters.size) + if (complete) { + runCatching { emitter.complete() } } } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c76a2fc..259a4eb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -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: diff --git a/src/test/kotlin/team/darkmoderap/aikon/domain/avatar/service/SubscribeAvatarChangesServiceImplTest.kt b/src/test/kotlin/team/darkmoderap/aikon/domain/avatar/service/SubscribeAvatarChangesServiceImplTest.kt index 2dced47..c8f7a94 100644 --- a/src/test/kotlin/team/darkmoderap/aikon/domain/avatar/service/SubscribeAvatarChangesServiceImplTest.kt +++ b/src/test/kotlin/team/darkmoderap/aikon/domain/avatar/service/SubscribeAvatarChangesServiceImplTest.kt @@ -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 @@ -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 @@ -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