Skip to content

fix(ios): add thread-safety to HybridVideoPlayerEventEmitter listeners #4860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erank-pixel wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −5
Open

fix(ios): add thread-safety to HybridVideoPlayerEventEmitter listeners #4860

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions ...ges/react-native-video/ios/hybrids/VideoPlayerEmitter/HybridVideoPlayerEventEmitter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,30 @@ struct ListenerPair {
}

class HybridVideoPlayerEventEmitter: HybridVideoPlayerEventEmitterSpec {
var listeners: [ListenerPair] = []
private let listenersLock = NSLock()
private var _listeners: [ListenerPair] = []

// MARK: - Private helpers

private func addListener<T>(eventName: String, listener: T) -> ListenerSubscription {
let id = UUID()
listeners.append(ListenerPair(id: id, eventName: eventName, callback: listener))
listenersLock.lock()
_listeners.append(ListenerPair(id: id, eventName: eventName, callback: listener))
listenersLock.unlock()
return ListenerSubscription(remove: { [weak self] in
self?.listeners.removeAll { $0.id == id }
guard let self else { return }
self.listenersLock.lock()
self._listeners.removeAll { $0.id == id }
self.listenersLock.unlock()
})
}

private func emitEvent<T>(eventName: String, invoke: (T) throws -> Void) {
for pair in listeners where pair.eventName == eventName {
listenersLock.lock()
let snapshot = _listeners
listenersLock.unlock()

for pair in snapshot where pair.eventName == eventName {
if let callback = pair.callback as? T {
do {
try invoke(callback)
Expand Down Expand Up @@ -120,7 +130,9 @@ class HybridVideoPlayerEventEmitter: HybridVideoPlayerEventEmitterSpec {
}

func clearAllListeners() throws {
listeners.removeAll()
listenersLock.lock()
_listeners.removeAll()
listenersLock.unlock()
}

// MARK: - Event emission methods
Expand Down