react-native-theoplayer 11.4.0 → 11.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (83) hide show
  1. package/CHANGELOG.md +19 -1
  2. package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt +12 -0
  3. package/ios/RCTBridgeModule+ViewHelpers.swift +59 -0
  4. package/ios/THEOplayerRCTBridge.m +1 -0
  5. package/ios/THEOplayerRCTMainEventHandler.swift +1 -0
  6. package/ios/THEOplayerRCTPlayerAPI.swift +194 -254
  7. package/ios/THEOplayerRCTTrackMetadataAggregator.swift +2 -2
  8. package/ios/THEOplayerRCTTypeUtils.swift +16 -0
  9. package/ios/THEOplayerRCTView.swift +7 -1
  10. package/ios/ads/THEOplayerRCTAdsAPI+DAI.swift +22 -21
  11. package/ios/ads/THEOplayerRCTAdsAPI+Omid.swift +4 -9
  12. package/ios/ads/THEOplayerRCTAdsAPI.swift +39 -50
  13. package/ios/backgroundAudio/THEOplayerRCTBackgroundAudioManager.swift +1 -1
  14. package/ios/backgroundAudio/THEOplayerRCTNowPlayingManager.swift +96 -45
  15. package/ios/cache/THEOplayerRCTCacheAPI.swift +23 -11
  16. package/ios/casting/THEOplayerRCTCastAPI+Airplay.swift +20 -22
  17. package/ios/casting/THEOplayerRCTCastAPI+Chromecast.swift +28 -34
  18. package/ios/casting/THEOplayerRCTCastAPI.swift +5 -8
  19. package/ios/eventBroadcasting/THEOplayerRCTEventBroadcastAPI.swift +2 -4
  20. package/ios/theoAds/THEOplayerRCTTHEOAdsAPI.swift +16 -18
  21. package/ios/theolive/THEOplayerRCTTHEOliveAPI.swift +14 -14
  22. package/lib/commonjs/api/error/ContentProtectionError.js +2 -0
  23. package/lib/commonjs/api/error/ContentProtectionError.js.map +1 -0
  24. package/lib/commonjs/api/error/barrel.js +11 -0
  25. package/lib/commonjs/api/error/barrel.js.map +1 -1
  26. package/lib/commonjs/api/event/PlayerEvent.js +8 -0
  27. package/lib/commonjs/api/event/PlayerEvent.js.map +1 -1
  28. package/lib/commonjs/api/player/PlayerEventMap.js +1 -0
  29. package/lib/commonjs/api/player/PlayerEventMap.js.map +1 -1
  30. package/lib/commonjs/api/track/TextTrack.js +5 -2
  31. package/lib/commonjs/api/track/TextTrack.js.map +1 -1
  32. package/lib/commonjs/internal/THEOplayerView.js +4 -0
  33. package/lib/commonjs/internal/THEOplayerView.js.map +1 -1
  34. package/lib/commonjs/internal/adapter/WebEventForwarder.js +22 -0
  35. package/lib/commonjs/internal/adapter/WebEventForwarder.js.map +1 -1
  36. package/lib/commonjs/internal/adapter/event/PlayerEvents.js +8 -1
  37. package/lib/commonjs/internal/adapter/event/PlayerEvents.js.map +1 -1
  38. package/lib/commonjs/manifest.json +1 -1
  39. package/lib/module/api/error/ContentProtectionError.js +2 -0
  40. package/lib/module/api/error/ContentProtectionError.js.map +1 -0
  41. package/lib/module/api/error/barrel.js +1 -0
  42. package/lib/module/api/error/barrel.js.map +1 -1
  43. package/lib/module/api/event/PlayerEvent.js +9 -0
  44. package/lib/module/api/event/PlayerEvent.js.map +1 -1
  45. package/lib/module/api/player/PlayerEventMap.js +1 -0
  46. package/lib/module/api/player/PlayerEventMap.js.map +1 -1
  47. package/lib/module/api/track/TextTrack.js +5 -2
  48. package/lib/module/api/track/TextTrack.js.map +1 -1
  49. package/lib/module/internal/THEOplayerView.js +5 -1
  50. package/lib/module/internal/THEOplayerView.js.map +1 -1
  51. package/lib/module/internal/adapter/WebEventForwarder.js +23 -1
  52. package/lib/module/internal/adapter/WebEventForwarder.js.map +1 -1
  53. package/lib/module/internal/adapter/event/PlayerEvents.js +6 -0
  54. package/lib/module/internal/adapter/event/PlayerEvents.js.map +1 -1
  55. package/lib/module/manifest.json +1 -1
  56. package/lib/typescript/api/error/ContentProtectionError.d.ts +53 -0
  57. package/lib/typescript/api/error/ContentProtectionError.d.ts.map +1 -0
  58. package/lib/typescript/api/error/barrel.d.ts +1 -0
  59. package/lib/typescript/api/error/barrel.d.ts.map +1 -1
  60. package/lib/typescript/api/event/PlayerEvent.d.ts +15 -1
  61. package/lib/typescript/api/event/PlayerEvent.d.ts.map +1 -1
  62. package/lib/typescript/api/player/PlayerEventMap.d.ts +7 -2
  63. package/lib/typescript/api/player/PlayerEventMap.d.ts.map +1 -1
  64. package/lib/typescript/api/track/TextTrack.d.ts.map +1 -1
  65. package/lib/typescript/internal/THEOplayerView.d.ts +1 -0
  66. package/lib/typescript/internal/THEOplayerView.d.ts.map +1 -1
  67. package/lib/typescript/internal/adapter/WebEventForwarder.d.ts +1 -0
  68. package/lib/typescript/internal/adapter/WebEventForwarder.d.ts.map +1 -1
  69. package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts +5 -1
  70. package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts.map +1 -1
  71. package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts +4 -1
  72. package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts.map +1 -1
  73. package/package.json +1 -1
  74. package/src/api/error/ContentProtectionError.ts +58 -0
  75. package/src/api/error/barrel.ts +1 -0
  76. package/src/api/event/PlayerEvent.ts +16 -1
  77. package/src/api/player/PlayerEventMap.ts +7 -0
  78. package/src/api/track/TextTrack.ts +5 -2
  79. package/src/internal/THEOplayerView.tsx +8 -0
  80. package/src/internal/adapter/WebEventForwarder.ts +19 -0
  81. package/src/internal/adapter/event/PlayerEvents.ts +8 -0
  82. package/src/internal/adapter/event/native/NativePlayerEvent.ts +5 -0
  83. package/src/manifest.json +1 -1
@@ -42,46 +42,36 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
42
42
 
43
43
  @objc(setPaused:paused:)
44
44
  func setPaused(_ node: NSNumber, paused: Bool) -> Void {
45
- DispatchQueue.main.async {
46
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
47
- let player = theView.player {
48
- if paused && !player.paused {
49
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Triggering pause on TheoPlayer") }
50
- player.pause()
51
- } else if !paused && player.paused {
52
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Triggering play on TheoPlayer") }
53
- player.play()
54
- }
45
+ withViewAndPlayer(node) { _, player in
46
+ if paused && !player.paused {
47
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Triggering pause on TheoPlayer") }
48
+ player.pause()
49
+ } else if !paused && player.paused {
50
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Triggering play on TheoPlayer") }
51
+ player.play()
55
52
  }
56
53
  }
57
54
  }
58
55
 
59
56
  @objc(setAutoplay:autoplay:)
60
57
  func setAutoplay(_ node: NSNumber, autoplay: Bool) -> Void {
61
- DispatchQueue.main.async {
62
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
63
- let player = theView.player {
64
- if autoplay != player.autoplay {
65
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer to \(autoplay ? "autoplay" : "not autoplay")") }
66
- player.autoplay = autoplay
67
- }
58
+ withViewAndPlayer(node) { _, player in
59
+ if autoplay != player.autoplay {
60
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer to \(autoplay ? "autoplay" : "not autoplay")") }
61
+ player.autoplay = autoplay
68
62
  }
69
63
  }
70
64
  }
71
65
 
72
66
  @objc(setSource:src:)
73
67
  func setSource(_ node: NSNumber, src: NSDictionary) -> Void {
74
- DispatchQueue.main.async {
75
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView {
76
- let (sourceDescription, metadataAndChapterTrackDescriptions) = THEOplayerRCTSourceDescriptionBuilder.buildSourceDescription(src)
77
- if let player = theView.player {
78
- self.triggerViewHierarchyValidation(player)
79
- self.setNewSourceDescription(player: player, srcDescription: sourceDescription)
80
- theView.processMetadataAndChapterTracks(trackDescriptions: metadataAndChapterTrackDescriptions)
81
- }
82
- } else {
83
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Failed to update THEOplayer source.") }
84
- }
68
+ withViewAndPlayer(node) { theView, player in
69
+ let (sourceDescription, metadataAndChapterTrackDescriptions) = THEOplayerRCTSourceDescriptionBuilder.buildSourceDescription(src)
70
+ self.triggerViewHierarchyValidation(player)
71
+ self.setNewSourceDescription(player: player, srcDescription: sourceDescription)
72
+ theView.processMetadataAndChapterTracks(trackDescriptions: metadataAndChapterTrackDescriptions)
73
+ } onFailure: {
74
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Failed to update THEOplayer source.") }
85
75
  }
86
76
  }
87
77
 
@@ -105,44 +95,41 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
105
95
 
106
96
  @objc(setABRConfig:abrConfig:)
107
97
  func setABRConfig(_ node: NSNumber, abrConfig: NSDictionary) -> Void {
108
- DispatchQueue.main.async {
109
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
110
- let player = theView.player {
111
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Setting abrConfig on TheoPlayer") }
112
- if let configuredTargetBuffer = abrConfig["targetBuffer"] as? Double {
113
- player.abr.targetBuffer = configuredTargetBuffer
114
- } else if let configuredTargetBuffer = abrConfig["targetBuffer"] as? Int {
115
- player.abr.targetBuffer = Double(configuredTargetBuffer)
116
- }
117
- if let configuredPreferredPeakBitRate = abrConfig["preferredPeakBitRate"] as? Double {
118
- player.abr.preferredPeakBitRate = configuredPreferredPeakBitRate
119
- } else if let configuredPreferredPeakBitRate = abrConfig["preferredPeakBitRate"] as? Int {
120
- player.abr.preferredPeakBitRate = Double(configuredPreferredPeakBitRate)
98
+ withViewAndPlayer(node) { _, player in
99
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Setting abrConfig on TheoPlayer") }
100
+ if let configuredTargetBuffer = abrConfig["targetBuffer"] as? Double {
101
+ player.abr.targetBuffer = configuredTargetBuffer
102
+ } else if let configuredTargetBuffer = abrConfig["targetBuffer"] as? Int {
103
+ player.abr.targetBuffer = Double(configuredTargetBuffer)
104
+ }
105
+ if let configuredPreferredPeakBitRate = abrConfig["preferredPeakBitRate"] as? Double {
106
+ player.abr.preferredPeakBitRate = configuredPreferredPeakBitRate
107
+ } else if let configuredPreferredPeakBitRate = abrConfig["preferredPeakBitRate"] as? Int {
108
+ player.abr.preferredPeakBitRate = Double(configuredPreferredPeakBitRate)
109
+ }
110
+ if let configuredPreferredMaximumResolution = abrConfig["preferredMaximumResolution"] as? [String:Double] {
111
+ if let width = configuredPreferredMaximumResolution["width"],
112
+ let height = configuredPreferredMaximumResolution["height"] {
113
+ player.abr.preferredMaximumResolution = CGSize(width: width, height: height)
121
114
  }
122
- if let configuredPreferredMaximumResolution = abrConfig["preferredMaximumResolution"] as? [String:Double] {
123
- if let width = configuredPreferredMaximumResolution["width"],
124
- let height = configuredPreferredMaximumResolution["height"] {
125
- player.abr.preferredMaximumResolution = CGSize(width: width, height: height)
126
- }
127
- } else if let configuredPreferredMaximumResolution = abrConfig["preferredMaximumResolution"] as? [String:Int] {
128
- if let width = configuredPreferredMaximumResolution["width"],
129
- let height = configuredPreferredMaximumResolution["height"] {
130
- player.abr.preferredMaximumResolution = CGSize(width: Double(width), height: Double(height))
131
- }
115
+ } else if let configuredPreferredMaximumResolution = abrConfig["preferredMaximumResolution"] as? [String:Int] {
116
+ if let width = configuredPreferredMaximumResolution["width"],
117
+ let height = configuredPreferredMaximumResolution["height"] {
118
+ player.abr.preferredMaximumResolution = CGSize(width: Double(width), height: Double(height))
132
119
  }
133
- if let configuredStrategy = abrConfig["strategy"] as? String {
134
- player.abr.strategy = ABRStrategyConfiguration(type: THEOplayerRCTTypeUtils.abrStrategyFromString(configuredStrategy))
135
- } else if let configuredStrategy = abrConfig["strategy"] as? [String:Any] {
136
- if let type = configuredStrategy["type"] as? String {
137
- let abrType = THEOplayerRCTTypeUtils.abrStrategyFromString(type)
138
- var abrMetadata: ABRMetadata?
139
- if let metadata = configuredStrategy["metadata"] as? [String:Any],
140
- let bitrate = metadata["bitrate"] as? Double {
141
- abrMetadata = ABRMetadata(bitrate: bitrate)
142
- }
143
- let strategy = ABRStrategyConfiguration(type: abrType, metadata: abrMetadata)
144
- player.abr.strategy = strategy
120
+ }
121
+ if let configuredStrategy = abrConfig["strategy"] as? String {
122
+ player.abr.strategy = ABRStrategyConfiguration(type: THEOplayerRCTTypeUtils.abrStrategyFromString(configuredStrategy))
123
+ } else if let configuredStrategy = abrConfig["strategy"] as? [String:Any] {
124
+ if let type = configuredStrategy["type"] as? String {
125
+ let abrType = THEOplayerRCTTypeUtils.abrStrategyFromString(type)
126
+ var abrMetadata: ABRMetadata?
127
+ if let metadata = configuredStrategy["metadata"] as? [String:Any],
128
+ let bitrate = metadata["bitrate"] as? Double {
129
+ abrMetadata = ABRMetadata(bitrate: bitrate)
145
130
  }
131
+ let strategy = ABRStrategyConfiguration(type: abrType, metadata: abrMetadata)
132
+ player.abr.strategy = strategy
146
133
  }
147
134
  }
148
135
  }
@@ -150,99 +137,77 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
150
137
 
151
138
  @objc(setCurrentTime:time:)
152
139
  func setCurrentTime(_ node: NSNumber, time: NSNumber) -> Void {
153
- DispatchQueue.main.async {
154
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
155
- let player = theView.player {
156
- let timeValue = time.doubleValue * 0.001
157
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Seeking to \(timeValue) on TheoPlayer") }
158
- player.setCurrentTime(timeValue)
159
- }
140
+ withViewAndPlayer(node) { _, player in
141
+ let timeValue = time.doubleValue * 0.001
142
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Seeking to \(timeValue) on TheoPlayer") }
143
+ player.setCurrentTime(timeValue)
160
144
  }
161
145
  }
162
146
 
163
147
  @objc(goLive:)
164
148
  func goLive(_ node: NSNumber) -> Void {
165
- DispatchQueue.main.async {
166
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
167
- let player = theView.player {
168
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] goLive on TheoPlayer") }
169
- player.setCurrentTime(.infinity)
170
- }
149
+ withViewAndPlayer(node) { _, player in
150
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] goLive on TheoPlayer") }
151
+ player.setCurrentTime(.infinity)
171
152
  }
172
153
  }
173
154
 
174
155
  @objc(setMuted:muted:)
175
156
  func setMuted(_ node: NSNumber, muted: Bool) -> Void {
176
- DispatchQueue.main.async {
177
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
178
- let player = theView.player {
179
- if player.muted != muted {
180
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer to \(muted ? "muted" : "not muted")") }
181
- player.muted = muted
182
- }
157
+ withViewAndPlayer(node) { _, player in
158
+ if player.muted != muted {
159
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer to \(muted ? "muted" : "not muted")") }
160
+ player.muted = muted
183
161
  }
184
162
  }
185
163
  }
186
164
 
187
165
  @objc(setVolume:volume:)
188
166
  func setVolume(_ node: NSNumber, volume: NSNumber) -> Void {
189
- DispatchQueue.main.async {
190
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
191
- let player = theView.player {
192
- let newVolume = Float(truncating: volume)
193
- if player.volume != newVolume {
194
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer volume to \(newVolume)")}
195
- player.volume = newVolume
196
- }
167
+ withViewAndPlayer(node) { _, player in
168
+ let newVolume = Float(truncating: volume)
169
+ if player.volume != newVolume {
170
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer volume to \(newVolume)")}
171
+ player.volume = newVolume
197
172
  }
198
173
  }
199
174
  }
200
175
 
201
176
  @objc(setPlaybackRate:playbackRate:)
202
177
  func setPlaybackRate(_ node: NSNumber, playbackRate: NSNumber) -> Void {
203
- DispatchQueue.main.async {
204
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
205
- let player = theView.player {
206
- let playbackRateValue = playbackRate.doubleValue
207
- if player.playbackRate != playbackRateValue {
208
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Setting playbackRate on TheoPlayer to \(playbackRateValue)") }
209
- player.playbackRate = playbackRateValue
210
- }
178
+ withViewAndPlayer(node) { _, player in
179
+ let playbackRateValue = playbackRate.doubleValue
180
+ if player.playbackRate != playbackRateValue {
181
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Setting playbackRate on TheoPlayer to \(playbackRateValue)") }
182
+ player.playbackRate = playbackRateValue
211
183
  }
212
184
  }
213
185
  }
214
186
 
215
187
  @objc(setPresentationMode:presentationMode:)
216
188
  func setPresentationMode(_ node: NSNumber, presentationMode: String) -> Void {
217
- DispatchQueue.main.async {
218
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView {
219
- let newPresentationMode: PresentationMode = THEOplayerRCTTypeUtils.presentationModeFromString(presentationMode)
220
- theView.setPresentationMode(newPresentationMode: newPresentationMode)
221
- }
189
+ withView(node) { theView in
190
+ let newPresentationMode: PresentationMode = THEOplayerRCTTypeUtils.presentationModeFromString(presentationMode)
191
+ theView.setPresentationMode(newPresentationMode: newPresentationMode)
222
192
  }
223
193
  }
224
194
 
225
195
  @objc(setAspectRatio:ratio:)
226
196
  func setAspectRatio(_ node: NSNumber, ratio: String) -> Void {
227
- DispatchQueue.main.async {
197
+ withViewAndPlayer(node) { _, player in
228
198
  let newAspectRatio: AspectRatio = THEOplayerRCTTypeUtils.aspectRatioFromString(ratio)
229
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
230
- let player = theView.player {
231
- if player.aspectRatio != newAspectRatio {
232
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer's aspectRatio to \(ratio)") }
233
- player.aspectRatio = newAspectRatio
234
- }
199
+ if player.aspectRatio != newAspectRatio {
200
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer's aspectRatio to \(ratio)") }
201
+ player.aspectRatio = newAspectRatio
235
202
  }
236
203
  }
237
204
  }
238
205
 
239
206
  @objc(setPipConfig:pipConfig:)
240
207
  func setPipConfig(_ node: NSNumber, pipConfig: NSDictionary) -> Void {
241
- DispatchQueue.main.async {
242
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView {
243
- let pipConfig = self.parsePipConfig(configDict: pipConfig)
244
- theView.pipConfig = pipConfig
245
- }
208
+ withView(node) { theView in
209
+ let pipConfig = self.parsePipConfig(configDict: pipConfig)
210
+ theView.pipConfig = pipConfig
246
211
  }
247
212
  }
248
213
 
@@ -255,11 +220,9 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
255
220
 
256
221
  @objc(setBackgroundAudioConfig:backgroundAudioConfig:)
257
222
  func setBackgroundAudioConfig(_ node: NSNumber, backgroundAudioConfig: NSDictionary) -> Void {
258
- DispatchQueue.main.async {
223
+ withView(node) { theView in
259
224
  let newBackgroundAudioConfig: BackgroundAudioConfig = self.parseBackgroundAudioConfig(configDict: backgroundAudioConfig)
260
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView {
261
- theView.backgroundAudioConfig = newBackgroundAudioConfig
262
- }
225
+ theView.backgroundAudioConfig = newBackgroundAudioConfig
263
226
  }
264
227
  }
265
228
 
@@ -276,24 +239,21 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
276
239
 
277
240
  @objc(setSelectedTextTrack:uid:)
278
241
  func setSelectedTextTrack(_ node: NSNumber, uid: NSNumber) -> Void {
279
- DispatchQueue.main.async {
280
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
281
- let player = theView.player {
282
- let uidValue = uid.intValue
283
- let textTracks: TextTrackList = player.textTracks
284
- let textTrackCount = textTracks.count
285
- guard textTrackCount > 0 else {
286
- return
287
- }
288
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Showing textTrack \(uidValue) on TheoPlayer") }
289
- for i in 0..<textTrackCount {
290
- guard i < textTracks.count else { break }
291
- let textTrack: TextTrack = textTracks.get(i)
292
- if textTrack.uid == uidValue {
293
- textTrack.mode = TextTrackMode.showing
294
- } else if textTrack.mode == TextTrackMode.showing {
295
- textTrack.mode = TextTrackMode.disabled
296
- }
242
+ withViewAndPlayer(node) { _, player in
243
+ let uidValue = uid.intValue
244
+ let textTracks: TextTrackList = player.textTracks
245
+ let textTrackCount = textTracks.count
246
+ guard textTrackCount > 0 else {
247
+ return
248
+ }
249
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Showing textTrack \(uidValue) on TheoPlayer") }
250
+ for i in 0..<textTrackCount {
251
+ guard i < textTracks.count else { break }
252
+ let textTrack: TextTrack = textTracks.get(i)
253
+ if textTrack.uid == uidValue {
254
+ textTrack.mode = TextTrackMode.showing
255
+ } else if textTrack.mode == TextTrackMode.showing {
256
+ textTrack.mode = TextTrackMode.disabled
297
257
  }
298
258
  }
299
259
  }
@@ -301,84 +261,75 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
301
261
 
302
262
  @objc(setSelectedAudioTrack:uid:)
303
263
  func setSelectedAudioTrack(_ node: NSNumber, uid: NSNumber) -> Void {
304
- DispatchQueue.main.async {
305
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
306
- let player = theView.player {
307
- let uidValue = uid.intValue
308
- let audioTracks: AudioTrackList = player.audioTracks
309
- let audioTrackCount = audioTracks.count
310
- guard audioTrackCount > 0 else {
311
- return
312
- }
313
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Enabling audioTrack \(uidValue) on TheoPlayer") }
314
- for i in 0..<audioTrackCount {
315
- guard i < audioTracks.count else { break }
316
- let audioTrack: MediaTrack = audioTracks.get(i)
317
- audioTrack.enabled = (audioTrack.uid == uidValue)
318
- }
264
+ withViewAndPlayer(node) { _, player in
265
+ let uidValue = uid.intValue
266
+ let audioTracks: AudioTrackList = player.audioTracks
267
+ let audioTrackCount = audioTracks.count
268
+ guard audioTrackCount > 0 else {
269
+ return
270
+ }
271
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Enabling audioTrack \(uidValue) on TheoPlayer") }
272
+ for i in 0..<audioTrackCount {
273
+ guard i < audioTracks.count else { break }
274
+ let audioTrack: MediaTrack = audioTracks.get(i)
275
+ audioTrack.enabled = (audioTrack.uid == uidValue)
319
276
  }
320
277
  }
321
278
  }
322
279
 
323
280
  @objc(setSelectedVideoTrack:uid:)
324
281
  func setSelectedVideoTrack(_ node: NSNumber, uid: NSNumber) -> Void {
325
- DispatchQueue.main.async {
326
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
327
- let player = theView.player {
328
- let uidValue = uid.intValue
329
- let videoTracks: VideoTrackList = player.videoTracks
330
- let videoTrackCount = videoTracks.count
331
- guard videoTrackCount > 0 else {
332
- return
333
- }
334
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Enabling videoTrack \(uidValue) on TheoPlayer") }
335
- for i in 0..<videoTrackCount {
336
- guard i < videoTracks.count else { break }
337
- let videoTrack: MediaTrack = videoTracks.get(i)
338
- videoTrack.enabled = (videoTrack.uid == uidValue)
339
- }
282
+ withViewAndPlayer(node) { _, player in
283
+ let uidValue = uid.intValue
284
+ let videoTracks: VideoTrackList = player.videoTracks
285
+ let videoTrackCount = videoTracks.count
286
+ guard videoTrackCount > 0 else {
287
+ return
288
+ }
289
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Enabling videoTrack \(uidValue) on TheoPlayer") }
290
+ for i in 0..<videoTrackCount {
291
+ guard i < videoTracks.count else { break }
292
+ let videoTrack: MediaTrack = videoTracks.get(i)
293
+ videoTrack.enabled = (videoTrack.uid == uidValue)
340
294
  }
341
295
  }
342
296
  }
343
297
 
344
298
  @objc(setTargetVideoQuality:uids:)
345
299
  func setTargetVideoQuality(_ node: NSNumber, uids: [NSNumber]) -> Void {
346
- DispatchQueue.main.async {
347
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
348
- let player = theView.player {
349
- let videoTracks: VideoTrackList = player.videoTracks
350
- let videoTrackCount = videoTracks.count
351
- guard videoTrackCount > 0 else {
300
+ withViewAndPlayer(node) { _, player in
301
+ let videoTracks: VideoTrackList = player.videoTracks
302
+ let videoTrackCount = videoTracks.count
303
+ guard videoTrackCount > 0 else {
304
+ return
305
+ }
306
+ var activeVideoTrack: VideoTrack?
307
+ for i in 0..<videoTrackCount {
308
+ guard i < videoTracks.count else { break }
309
+ let videoTrack: MediaTrack = videoTracks.get(i)
310
+ if videoTrack.enabled {
311
+ activeVideoTrack = videoTrack as? VideoTrack
312
+ }
313
+ }
314
+ if let foundTrack = activeVideoTrack {
315
+ let requestedBandwidths = Set(uids.map { $0.intValue })
316
+ let currentBandwidths = Set(foundTrack.targetQualities?.map { $0.bandwidth } ?? [])
317
+ guard requestedBandwidths != currentBandwidths else {
318
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] targetQualities: \(uids) already set on active videotrack. Skipping update.") }
352
319
  return
353
320
  }
354
- var activeVideoTrack: VideoTrack?
355
- for i in 0..<videoTrackCount {
356
- guard i < videoTracks.count else { break }
357
- let videoTrack: MediaTrack = videoTracks.get(i)
358
- if videoTrack.enabled {
359
- activeVideoTrack = videoTrack as? VideoTrack
360
- }
321
+ let qualityCount = foundTrack.qualities.count
322
+ let matchingQualities = (0..<qualityCount).compactMap { index -> Quality? in
323
+ guard index < foundTrack.qualities.count else { return nil }
324
+ let quality = foundTrack.qualities.get(index)
325
+ return uids.contains(where: { $0.intValue == quality.bandwidth }) ? quality : nil
361
326
  }
362
- if let foundTrack = activeVideoTrack {
363
- let requestedBandwidths = Set(uids.map { $0.intValue })
364
- let currentBandwidths = Set(foundTrack.targetQualities?.map { $0.bandwidth } ?? [])
365
- guard requestedBandwidths != currentBandwidths else {
366
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] targetQualities: \(uids) already set on active videotrack. Skipping update.") }
367
- return
368
- }
369
- let qualityCount = foundTrack.qualities.count
370
- let matchingQualities = (0..<qualityCount).compactMap { index -> Quality? in
371
- guard index < foundTrack.qualities.count else { return nil }
372
- let quality = foundTrack.qualities.get(index)
373
- return uids.contains(where: { $0.intValue == quality.bandwidth }) ? quality : nil
374
- }
375
- foundTrack.targetQualities = matchingQualities.isEmpty ? nil : matchingQualities
376
- if DEBUG_PLAYER_API {
377
- if matchingQualities.count > 0 {
378
- PrintUtils.printLog(logText: "[NATIVE] targetQualities: \(uids) set on active videotrack. (matching: \(matchingQualities.map(\.bandwidth)))")
379
- } else {
380
- PrintUtils.printLog(logText: "[NATIVE] targetQualities: \(uids) set on active videotrack. (no match or empty) => no quality restriction.")
381
- }
327
+ foundTrack.targetQualities = matchingQualities.isEmpty ? nil : matchingQualities
328
+ if DEBUG_PLAYER_API {
329
+ if matchingQualities.count > 0 {
330
+ PrintUtils.printLog(logText: "[NATIVE] targetQualities: \(uids) set on active videotrack. (matching: \(matchingQualities.map(\.bandwidth)))")
331
+ } else {
332
+ PrintUtils.printLog(logText: "[NATIVE] targetQualities: \(uids) set on active videotrack. (no match or empty) => no quality restriction.")
382
333
  }
383
334
  }
384
335
  }
@@ -387,67 +338,58 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
387
338
 
388
339
  @objc(setPreload:type:)
389
340
  func setPreload(_ node: NSNumber, type: String) -> Void {
390
- DispatchQueue.main.async {
391
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
392
- let player = theView.player {
393
- let preloadType = THEOplayerRCTTypeUtils.preloadTypeFromString(type)
394
- if player.preload != preloadType {
395
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer preload type to \(type)") }
396
- player.preload = preloadType
397
- }
341
+ withViewAndPlayer(node) { _, player in
342
+ let preloadType = THEOplayerRCTTypeUtils.preloadTypeFromString(type)
343
+ if player.preload != preloadType {
344
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer preload type to \(type)") }
345
+ player.preload = preloadType
398
346
  }
399
347
  }
400
348
  }
401
349
 
402
350
  @objc(setTextTrackStyle:textTrackStyle:)
403
351
  func setTextTrackStyle(_ node: NSNumber, textTrackStyle: NSDictionary) -> Void {
404
- DispatchQueue.main.async {
405
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
406
- let player = theView.player {
407
- if let bgColorMap = textTrackStyle[TTS_PROP_BACKGROUND_COLOR] as? [String:Any],
408
- let r = bgColorMap[TTS_PROP_COLOR_R] as? Int,
409
- let g = bgColorMap[TTS_PROP_COLOR_G] as? Int,
410
- let b = bgColorMap[TTS_PROP_COLOR_B] as? Int,
411
- let a = bgColorMap[TTS_PROP_COLOR_A] as? Int {
412
- let bgColor = UIColor(red: CGFloat(r)/255.0, green: CGFloat(g)/255.0, blue: CGFloat(b)/255.0, alpha: CGFloat(a)/255.0)
413
- player.textTrackStyle?.backgroundColor = [TextTrackStyleRuleColor(bgColor)]
414
- }
415
- if let fontColorMap = textTrackStyle[TTS_PROP_FONT_COLOR] as? [String:Any],
416
- let r = fontColorMap[TTS_PROP_COLOR_R] as? Int,
417
- let g = fontColorMap[TTS_PROP_COLOR_G] as? Int,
418
- let b = fontColorMap[TTS_PROP_COLOR_B] as? Int,
419
- let a = fontColorMap[TTS_PROP_COLOR_A] as? Int {
420
- let fontColor = UIColor(red: CGFloat(r)/255.0, green: CGFloat(g)/255.0, blue: CGFloat(b)/255.0, alpha: CGFloat(a)/255.0)
421
- player.textTrackStyle?.fontColor = [TextTrackStyleRuleColor(fontColor)]
422
- }
423
- if let edgeStyle = textTrackStyle[TTS_PROP_EDGE_STYLE] as? String {
424
- player.textTrackStyle?.edgeStyle = [TextTrackStyleRuleString(THEOplayerRCTTypeUtils.textTrackEdgeStyleStringFromString(edgeStyle))]
425
- }
426
- if let fontFamily = textTrackStyle[TTS_PROP_FONT_FAMILY] as? String {
427
- player.textTrackStyle?.fontFamily = [TextTrackStyleRuleString(fontFamily)]
428
- }
429
- if let fontSize = textTrackStyle[TTS_PROP_FONT_SIZE] as? Int {
430
- player.textTrackStyle?.fontSize = [TextTrackStyleRuleNumber(fontSize)]
431
- }
432
- if let marginTop = textTrackStyle[TTS_PROP_MARGIN_TOP] as? Int {
433
- player.textTrackStyle?.marginTop = [TextTrackStyleRuleNumber(marginTop)]
434
- }
435
- if let marginLeft = textTrackStyle[TTS_PROP_MARGIN_LEFT] as? Int {
436
- player.textTrackStyle?.marginLeft = [TextTrackStyleRuleNumber(marginLeft)]
437
- }
352
+ withViewAndPlayer(node) { _, player in
353
+ if let bgColorMap = textTrackStyle[TTS_PROP_BACKGROUND_COLOR] as? [String:Any],
354
+ let r = bgColorMap[TTS_PROP_COLOR_R] as? Int,
355
+ let g = bgColorMap[TTS_PROP_COLOR_G] as? Int,
356
+ let b = bgColorMap[TTS_PROP_COLOR_B] as? Int,
357
+ let a = bgColorMap[TTS_PROP_COLOR_A] as? Int {
358
+ let bgColor = UIColor(red: CGFloat(r)/255.0, green: CGFloat(g)/255.0, blue: CGFloat(b)/255.0, alpha: CGFloat(a)/255.0)
359
+ player.textTrackStyle?.backgroundColor = [TextTrackStyleRuleColor(bgColor)]
360
+ }
361
+ if let fontColorMap = textTrackStyle[TTS_PROP_FONT_COLOR] as? [String:Any],
362
+ let r = fontColorMap[TTS_PROP_COLOR_R] as? Int,
363
+ let g = fontColorMap[TTS_PROP_COLOR_G] as? Int,
364
+ let b = fontColorMap[TTS_PROP_COLOR_B] as? Int,
365
+ let a = fontColorMap[TTS_PROP_COLOR_A] as? Int {
366
+ let fontColor = UIColor(red: CGFloat(r)/255.0, green: CGFloat(g)/255.0, blue: CGFloat(b)/255.0, alpha: CGFloat(a)/255.0)
367
+ player.textTrackStyle?.fontColor = [TextTrackStyleRuleColor(fontColor)]
368
+ }
369
+ if let edgeStyle = textTrackStyle[TTS_PROP_EDGE_STYLE] as? String {
370
+ player.textTrackStyle?.edgeStyle = [TextTrackStyleRuleString(THEOplayerRCTTypeUtils.textTrackEdgeStyleStringFromString(edgeStyle))]
371
+ }
372
+ if let fontFamily = textTrackStyle[TTS_PROP_FONT_FAMILY] as? String {
373
+ player.textTrackStyle?.fontFamily = [TextTrackStyleRuleString(fontFamily)]
374
+ }
375
+ if let fontSize = textTrackStyle[TTS_PROP_FONT_SIZE] as? Int {
376
+ player.textTrackStyle?.fontSize = [TextTrackStyleRuleNumber(fontSize)]
377
+ }
378
+ if let marginTop = textTrackStyle[TTS_PROP_MARGIN_TOP] as? Int {
379
+ player.textTrackStyle?.marginTop = [TextTrackStyleRuleNumber(marginTop)]
380
+ }
381
+ if let marginLeft = textTrackStyle[TTS_PROP_MARGIN_LEFT] as? Int {
382
+ player.textTrackStyle?.marginLeft = [TextTrackStyleRuleNumber(marginLeft)]
438
383
  }
439
384
  }
440
385
  }
441
386
 
442
387
  @objc(setKeepScreenOn:keepScreenOn:)
443
388
  func setKeepScreenOn(_ node: NSNumber, keepScreenOn: Bool) -> Void {
444
- DispatchQueue.main.async {
445
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
446
- let player = theView.player {
447
- if player.preventsDisplaySleepDuringVideoPlayback != keepScreenOn {
448
- if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer preventsDisplaySleepDuringVideoPlayback to \(keepScreenOn)") }
449
- player.preventsDisplaySleepDuringVideoPlayback = keepScreenOn
450
- }
389
+ withViewAndPlayer(node) { _, player in
390
+ if player.preventsDisplaySleepDuringVideoPlayback != keepScreenOn {
391
+ if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer preventsDisplaySleepDuringVideoPlayback to \(keepScreenOn)") }
392
+ player.preventsDisplaySleepDuringVideoPlayback = keepScreenOn
451
393
  }
452
394
  }
453
395
  }
@@ -480,10 +422,8 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
480
422
 
481
423
  @objc(willUnmount:)
482
424
  func willUnmount(_ node: NSNumber) -> Void {
483
- DispatchQueue.main.async {
484
- if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView {
485
- theView.willUnmount()
486
- }
425
+ withView(node) { theView in
426
+ theView.willUnmount()
487
427
  }
488
428
  }
489
429
  }
@@ -116,7 +116,7 @@ class THEOplayerRCTTrackMetadataAggregator {
116
116
  entry[PROP_STARTTIME] = THEOplayerRCTTypeUtils.encodeInfNan(textTrackCue.startTime * 1000)
117
117
  entry[PROP_ENDTIME] = THEOplayerRCTTypeUtils.encodeInfNan(textTrackCue.endTime * 1000)
118
118
  if let content = textTrackCue.content {
119
- entry[PROP_CUE_CONTENT] = content
119
+ entry[PROP_CUE_CONTENT] = THEOplayerRCTTypeUtils.bridgeSafe(content)
120
120
  } else if let contentString = textTrackCue.contentString {
121
121
  entry[PROP_CUE_CONTENT] = contentString
122
122
  }
@@ -150,7 +150,7 @@ class THEOplayerRCTTrackMetadataAggregator {
150
150
  } catch {
151
151
  do {
152
152
  // try reading as data
153
- attributesEntry[key] = try customAttributes.getBytes(for: key)
153
+ attributesEntry[key] = THEOplayerRCTTypeUtils.bridgeSafe(try customAttributes.getBytes(for: key))
154
154
  } catch {
155
155
  print("Unable to extract customAttribute from DateRange cue. Content is limited to String, Double or Data.")
156
156
  }