Use AsyncStream

wafflestudio · Sep 6, 2024 · 0160679 · 0160679
1 parent 53c4a71
commit 0160679
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/ReactNativeKit/ReactNativeKit/EventEmitter/EventEmitter.swift b/ReactNativeKit/ReactNativeKit/EventEmitter/EventEmitter.swift
@@ -7,8 +7,8 @@ public actor EventEmitter<EventType: SupportedEvent> {
         RNEventEmitter.shared
     }
 
-    public var jsEventPublisher: AnyPublisher<JSEvent, Never> {
-        emitter.jsEventSubject.eraseToAnyPublisher()
+    public var jsEventStream: AsyncStream<JSEvent> {
+        emitter.jsEventStream.stream
     }
 
     public func emitEvent(_ event: EventType, payload: [AnyHashable: Any]? = [:]) async {

diff --git a/ReactNativeKit/ReactNativeKit/EventEmitter/RNEventEmitter.swift b/ReactNativeKit/ReactNativeKit/EventEmitter/RNEventEmitter.swift
@@ -4,7 +4,7 @@ import Combine
 
 @objc(RNEventEmitter)
 class RNEventEmitter: RCTEventEmitter {
-    let jsEventSubject = PassthroughSubject<JSEvent, Never>()
+    let jsEventStream = AsyncStream.makeStream(of: JSEvent.self)
     let registerEventSubject = CurrentValueSubject<RegisterEvent, Never>(.deregister)
 
     private static var _shared: RNEventEmitter?
@@ -38,11 +38,11 @@ class RNEventEmitter: RCTEventEmitter {
             registerEventSubject.value = registerEvent
         }
         let jsEvent = JSEvent(name: name, payload: payload)
-        jsEventSubject.send(jsEvent)
+        jsEventStream.continuation.yield(jsEvent)
     }
 }
 
-public struct JSEvent {
+public struct JSEvent: @unchecked Sendable {
     public let name: String
     public let payload: [AnyHashable: Any]?
 }

diff --git a/ReactNativeKit/ReactNativeKit/React.swift b/ReactNativeKit/ReactNativeKit/React.swift
@@ -9,6 +9,7 @@ import UIKit
 ///   - initialProperties: The initial properties that should be passed to the React Native module. These are made available in the React Native application via this.props.
 ///   - backgroundColor: The background color for the React Native View. Default is .clear.
 /// - Returns: A UIView configured to run the specified React Native application.
+@MainActor
 public func makeReactView(
     bundleURL: URL,
     moduleName: String,