refactor: AsyncStream 기반 스트림을 Combine으로 수정

Author: opficdev

Application/DevLogData/Sources/Repository/TodoMutationEventBusImpl.swift

@@ -5,33 +5,17 @@
 //  Created by opfic on 6/6/26.
 //
 
-import Foundation
+import Combine
 import DevLogDomain
 
-actor TodoMutationEventBusImpl: TodoMutationEventBus {
-    private var continuations = [UUID: AsyncStream<TodoMutationEvent>.Continuation]()
+final class TodoMutationEventBusImpl: TodoMutationEventBus {
+    private let subject = PassthroughSubject<TodoMutationEvent, Never>()
 
-    func publish(_ event: TodoMutationEvent) async {
-        continuations.values.forEach { $0.yield(event) }
+    func publish(_ event: TodoMutationEvent) {
+        subject.send(event)
     }
 
-    func events() -> AsyncStream<TodoMutationEvent> {
-        let id = UUID()
-        let (stream, continuation) = AsyncStream.makeStream(of: TodoMutationEvent.self)
-
-        continuations[id] = continuation
-        continuation.onTermination = { [weak self] _ in
-            Task {
-                await self?.removeContinuation(id: id)
-            }
-        }
-
-        return stream
-    }
-}
-
-private extension TodoMutationEventBusImpl {
-    func removeContinuation(id: UUID) {
-        continuations[id] = nil
+    func observe() -> AnyPublisher<TodoMutationEvent, Never> {
+        subject.eraseToAnyPublisher()
     }
 }

Application/DevLogData/Sources/Repository/TodoRepositoryImpl.swift

@@ -110,7 +110,7 @@ final class TodoRepositoryImpl: TodoRepository {
     func upsertTodo(_ todo: Todo) async throws {
         let todoRequest = TodoRequest.fromDomain(todo)
         try await upsertTodo(todoRequest)
-        await todoMutationEventBus.publish(.updated(todo.id))
+        todoMutationEventBus.publish(.updated(todo.id))
     }
 
     func upsertTodo(_ todoDraft: TodoDraft) async throws {
@@ -131,7 +131,7 @@ final class TodoRepositoryImpl: TodoRepository {
         do {
             try await todoService.deleteTodo(todoId: todoId)
             widgetSyncEventBus.publish(.syncRequested)
-            await todoMutationEventBus.publish(.deleted(todoId))
+            todoMutationEventBus.publish(.deleted(todoId))
         } catch {
             throw error.toDomain()
         }
@@ -141,7 +141,7 @@ final class TodoRepositoryImpl: TodoRepository {
         do {
             try await todoService.undoDeleteTodo(todoId: todoId)
             widgetSyncEventBus.publish(.syncRequested)
-            await todoMutationEventBus.publish(.restored(todoId))
+            todoMutationEventBus.publish(.restored(todoId))
         } catch {
             throw error.toDomain()
         }

Application/DevLogData/Tests/Repository/TodoMutationEventBusImplTests.swift

@@ -5,23 +5,24 @@
 //  Created by opfic on 6/6/26.
 //
 
+import Combine
 import Testing
 import DevLogDomain
 @testable import DevLogData
 
 struct TodoMutationEventBusImplTests {
     @Test("TodoMutationEventBus는 발행된 이벤트를 관찰자에게 전달한다")
-    func todoMutationEventBus는_발행된_이벤트를_관찰자에게_전달한다() async {
+    func todoMutationEventBus는_발행된_이벤트를_관찰자에게_전달한다() {
         let bus = TodoMutationEventBusImpl()
-        let events = await bus.events()
-        let task = Task {
-            var iterator = events.makeAsyncIterator()
-            return await iterator.next()
-        }
+        var events = [TodoMutationEvent]()
+        var cancellables = Set<AnyCancellable>()
 
-        await bus.publish(.updated("todo-id"))
+        bus.observe()
+            .sink { events.append($0) }
+            .store(in: &cancellables)
 
-        let event = await task.value
-        #expect(event == .updated("todo-id"))
+        bus.publish(.updated("todo-id"))
+
+        #expect(events == [.updated("todo-id")])
     }
 }

Application/DevLogData/Tests/Repository/TodoRepositoryImplTests.swift

@@ -25,7 +25,7 @@ struct TodoRepositoryImplTests {
         let events = fixture.widgetSyncEventBus.events
         #expect(events == [.syncRequested, .syncRequested, .syncRequested])
 
-        let mutationEvents = await fixture.todoMutationEventBus.publishedEvents()
+        let mutationEvents = fixture.todoMutationEventBus.publishedEvents()
         #expect(mutationEvents == [.updated(todo.id), .deleted(todo.id), .restored(todo.id)])
     }
 
@@ -58,7 +58,7 @@ struct TodoRepositoryImplTests {
         let syncEvents = fixture.widgetSyncEventBus.events
         #expect(syncEvents.isEmpty)
 
-        let mutationEvents = await fixture.todoMutationEventBus.publishedEvents()
+        let mutationEvents = fixture.todoMutationEventBus.publishedEvents()
         #expect(mutationEvents.isEmpty)
     }
 
@@ -169,21 +169,19 @@ private final class WidgetSyncEventBusSpy: WidgetSyncEventBus {
     }
 }
 
-private actor TodoMutationEventBusSpy: TodoMutationEventBus {
+private final class TodoMutationEventBusSpy: TodoMutationEventBus {
     private var capturedEvents = [TodoMutationEvent]()
 
-    func publish(_ event: TodoMutationEvent) async {
+    func publish(_ event: TodoMutationEvent) {
         capturedEvents.append(event)
     }
 
     func publishedEvents() -> [TodoMutationEvent] {
         capturedEvents
     }
 
-    func events() async -> AsyncStream<TodoMutationEvent> {
-        AsyncStream { continuation in
-            continuation.finish()
-        }
+    func observe() -> AnyPublisher<TodoMutationEvent, Never> {
+        Empty().eraseToAnyPublisher()
     }
 }
 

Application/DevLogDomain/Sources/Protocol/TodoMutationEventBus.swift

@@ -5,7 +5,9 @@
 //  Created by opfic on 6/6/26.
 //
 
-public protocol TodoMutationEventBus: Sendable {
-    func publish(_ event: TodoMutationEvent) async
-    func events() async -> AsyncStream<TodoMutationEvent>
+import Combine
+
+public protocol TodoMutationEventBus {
+    func publish(_ event: TodoMutationEvent)
+    func observe() -> AnyPublisher<TodoMutationEvent, Never>
 }

Application/DevLogPresentation/Sources/Home/Home/HomeViewCoordinator.swift

@@ -13,17 +13,15 @@ import DevLogDomain
 @MainActor
 @Observable
 final class HomeViewCoordinator {
-    private enum AsyncStreamTaskID {
-        case todoMutationEvent
-    }
-
     let viewModel: HomeViewModel
     let router = NavigationRouter<HomeRoute>()
     private let container: DIContainer
     @ObservationIgnored
-    private var cancellable: AnyCancellable?
+    private var cancellables = Set<AnyCancellable>()
+    @ObservationIgnored
+    private var isTodoMutationEventBound = false
     @ObservationIgnored
-    private var streamTasks = [AsyncStreamTaskID: Task<Void, Never>]()
+    private var isWindowEventBound = false
 
     init(container: DIContainer) {
         self.container = container
@@ -40,10 +38,6 @@ final class HomeViewCoordinator {
         )
     }
 
-    deinit {
-        streamTasks.values.forEach { $0.cancel() }
-    }
-
     func fetchData() {
         viewModel.send(.fetchData)
     }
@@ -53,30 +47,33 @@ final class HomeViewCoordinator {
     }
 
     func bindTodoMutationEvent() {
-        guard streamTasks[.todoMutationEvent] == nil else { return }
+        guard isTodoMutationEventBound == false else { return }
+        isTodoMutationEventBound = true
 
         let bus = container.resolve(TodoMutationEventBus.self)
-        streamTasks[.todoMutationEvent] = Task { [weak self] in
-            let events = await bus.events()
-            for await event in events {
-                guard let self else { break }
+        bus.observe()
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] event in
+                guard let self else { return }
                 switch event {
                 case .updated, .deleted, .restored:
                     self.refreshRecentTodos()
                 }
             }
-        }
+            .store(in: &cancellables)
     }
 
     func bindWindowEvent(_ windowEvent: TodoEditorWindowEvent) {
-        guard cancellable == nil else { return }
+        guard isWindowEventBound == false else { return }
+        isWindowEventBound = true
 
-        cancellable = windowEvent.submits
+        windowEvent.submits
             .sink { [weak self] submit in
                 guard case .create(let value) = submit,
                       value.matchesCreate(source: .home) else { return }
                 self?.viewModel.send(.fetchData)
             }
+            .store(in: &cancellables)
     }
 
     func makeTodoManageViewModel() -> TodoManageViewModel {