react-native-theoplayer 11.4.1 → 11.6.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 (155) hide show
  1. package/CHANGELOG.md +26 -1
  2. package/README.md +1 -0
  3. package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt +21 -0
  4. package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt +58 -85
  5. package/android/src/main/java/com/theoplayer/ReactTHEOplayerPackage.kt +3 -0
  6. package/android/src/main/java/com/theoplayer/media/MediaControlModule.kt +102 -0
  7. package/android/src/main/java/com/theoplayer/media/MediaControlProxy.kt +376 -0
  8. package/android/src/main/java/com/theoplayer/media/MediaNotificationBuilder.kt +78 -34
  9. package/android/src/main/java/com/theoplayer/media/MediaPlaybackService.kt +53 -20
  10. package/android/src/main/java/com/theoplayer/media/MediaSessionConfig.kt +6 -6
  11. package/android/src/main/java/com/theoplayer/media/MediaSessionConfigAdapter.kt +23 -20
  12. package/android/src/main/java/com/theoplayer/player/PlayerModule.kt +0 -1
  13. package/android/src/main/java/com/theoplayer/presentation/PipUtils.kt +98 -93
  14. package/android/src/main/java/com/theoplayer/util/ReadableExtension.kt +14 -0
  15. package/android/src/main/res/drawable/ic_next.xml +9 -0
  16. package/android/src/main/res/drawable/ic_prev.xml +9 -0
  17. package/android/src/main/res/values/strings.xml +4 -0
  18. package/ios/RCTBridgeModule+ViewHelpers.swift +59 -0
  19. package/ios/THEOplayerRCTBridge.m +17 -0
  20. package/ios/THEOplayerRCTDebug.swift +3 -0
  21. package/ios/THEOplayerRCTMainEventHandler.swift +18 -0
  22. package/ios/THEOplayerRCTPlayerAPI.swift +194 -254
  23. package/ios/THEOplayerRCTTypeUtils.swift +30 -0
  24. package/ios/THEOplayerRCTView.swift +22 -6
  25. package/ios/ads/THEOplayerRCTAdsAPI+DAI.swift +22 -21
  26. package/ios/ads/THEOplayerRCTAdsAPI+Omid.swift +4 -9
  27. package/ios/ads/THEOplayerRCTAdsAPI.swift +39 -50
  28. package/ios/backgroundAudio/THEOplayerRCTBackgroundAudioManager.swift +2 -2
  29. package/ios/backgroundAudio/THEOplayerRCTNowPlayingManager.swift +144 -47
  30. package/ios/backgroundAudio/THEOplayerRCTRemoteCommandsManager.swift +151 -68
  31. package/ios/backgroundAudio/THEOplayerRCTView+MediaControlConfig.swift +25 -11
  32. package/ios/casting/THEOplayerRCTCastAPI+Airplay.swift +20 -22
  33. package/ios/casting/THEOplayerRCTCastAPI+Chromecast.swift +28 -34
  34. package/ios/casting/THEOplayerRCTCastAPI.swift +5 -8
  35. package/ios/eventBroadcasting/THEOplayerRCTEventBroadcastAPI.swift +2 -4
  36. package/ios/mediaControl/THEOplayerRCTMediaControlAPI.swift +79 -0
  37. package/ios/mediaControl/THEOplayerRCTMediaControlManager.swift +38 -0
  38. package/ios/pip/THEOplayerRCTPipControlsManager.swift +9 -12
  39. package/ios/theoAds/THEOplayerRCTTHEOAdsAPI.swift +16 -18
  40. package/ios/theolive/THEOplayerRCTTHEOliveAPI.swift +14 -14
  41. package/lib/commonjs/api/error/ContentProtectionError.js +2 -0
  42. package/lib/commonjs/api/error/ContentProtectionError.js.map +1 -0
  43. package/lib/commonjs/api/error/barrel.js +11 -0
  44. package/lib/commonjs/api/error/barrel.js.map +1 -1
  45. package/lib/commonjs/api/event/PlayerEvent.js +16 -0
  46. package/lib/commonjs/api/event/PlayerEvent.js.map +1 -1
  47. package/lib/commonjs/api/media/MediaControlAPI.js +14 -0
  48. package/lib/commonjs/api/media/MediaControlAPI.js.map +1 -0
  49. package/lib/commonjs/api/media/barrel.js +11 -0
  50. package/lib/commonjs/api/media/barrel.js.map +1 -1
  51. package/lib/commonjs/api/player/PlayerEventMap.js +2 -0
  52. package/lib/commonjs/api/player/PlayerEventMap.js.map +1 -1
  53. package/lib/commonjs/api/player/THEOplayer.js.map +1 -1
  54. package/lib/commonjs/internal/THEOplayerView.js +8 -0
  55. package/lib/commonjs/internal/THEOplayerView.js.map +1 -1
  56. package/lib/commonjs/internal/adapter/THEOplayerAdapter.js +6 -0
  57. package/lib/commonjs/internal/adapter/THEOplayerAdapter.js.map +1 -1
  58. package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js +9 -9
  59. package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
  60. package/lib/commonjs/internal/adapter/WebEventForwarder.js +27 -0
  61. package/lib/commonjs/internal/adapter/WebEventForwarder.js.map +1 -1
  62. package/lib/commonjs/internal/adapter/event/PlayerEvents.js +14 -1
  63. package/lib/commonjs/internal/adapter/event/PlayerEvents.js.map +1 -1
  64. package/lib/commonjs/internal/adapter/media/MediaControlNativeAdapter.js +42 -0
  65. package/lib/commonjs/internal/adapter/media/MediaControlNativeAdapter.js.map +1 -0
  66. package/lib/commonjs/internal/adapter/media/MediaControlWebAdapter.js +32 -0
  67. package/lib/commonjs/internal/adapter/media/MediaControlWebAdapter.js.map +1 -0
  68. package/lib/commonjs/internal/adapter/web/WebMediaSession.js +78 -16
  69. package/lib/commonjs/internal/adapter/web/WebMediaSession.js.map +1 -1
  70. package/lib/commonjs/manifest.json +1 -1
  71. package/lib/module/api/error/ContentProtectionError.js +2 -0
  72. package/lib/module/api/error/ContentProtectionError.js.map +1 -0
  73. package/lib/module/api/error/barrel.js +1 -0
  74. package/lib/module/api/error/barrel.js.map +1 -1
  75. package/lib/module/api/event/PlayerEvent.js +18 -0
  76. package/lib/module/api/event/PlayerEvent.js.map +1 -1
  77. package/lib/module/api/media/MediaControlAPI.js +10 -0
  78. package/lib/module/api/media/MediaControlAPI.js.map +1 -0
  79. package/lib/module/api/media/barrel.js +1 -0
  80. package/lib/module/api/media/barrel.js.map +1 -1
  81. package/lib/module/api/player/PlayerEventMap.js +2 -0
  82. package/lib/module/api/player/PlayerEventMap.js.map +1 -1
  83. package/lib/module/api/player/THEOplayer.js.map +1 -1
  84. package/lib/module/internal/THEOplayerView.js +9 -1
  85. package/lib/module/internal/THEOplayerView.js.map +1 -1
  86. package/lib/module/internal/adapter/THEOplayerAdapter.js +6 -0
  87. package/lib/module/internal/adapter/THEOplayerAdapter.js.map +1 -1
  88. package/lib/module/internal/adapter/THEOplayerWebAdapter.js +9 -9
  89. package/lib/module/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
  90. package/lib/module/internal/adapter/WebEventForwarder.js +28 -1
  91. package/lib/module/internal/adapter/WebEventForwarder.js.map +1 -1
  92. package/lib/module/internal/adapter/event/PlayerEvents.js +11 -0
  93. package/lib/module/internal/adapter/event/PlayerEvents.js.map +1 -1
  94. package/lib/module/internal/adapter/media/MediaControlNativeAdapter.js +37 -0
  95. package/lib/module/internal/adapter/media/MediaControlNativeAdapter.js.map +1 -0
  96. package/lib/module/internal/adapter/media/MediaControlWebAdapter.js +27 -0
  97. package/lib/module/internal/adapter/media/MediaControlWebAdapter.js.map +1 -0
  98. package/lib/module/internal/adapter/web/WebMediaSession.js +78 -16
  99. package/lib/module/internal/adapter/web/WebMediaSession.js.map +1 -1
  100. package/lib/module/manifest.json +1 -1
  101. package/lib/typescript/api/error/ContentProtectionError.d.ts +53 -0
  102. package/lib/typescript/api/error/ContentProtectionError.d.ts.map +1 -0
  103. package/lib/typescript/api/error/barrel.d.ts +1 -0
  104. package/lib/typescript/api/error/barrel.d.ts.map +1 -1
  105. package/lib/typescript/api/event/PlayerEvent.d.ts +24 -1
  106. package/lib/typescript/api/event/PlayerEvent.d.ts.map +1 -1
  107. package/lib/typescript/api/media/MediaControlAPI.d.ts +30 -0
  108. package/lib/typescript/api/media/MediaControlAPI.d.ts.map +1 -0
  109. package/lib/typescript/api/media/MediaControlConfiguration.d.ts +5 -1
  110. package/lib/typescript/api/media/MediaControlConfiguration.d.ts.map +1 -1
  111. package/lib/typescript/api/media/barrel.d.ts +1 -0
  112. package/lib/typescript/api/media/barrel.d.ts.map +1 -1
  113. package/lib/typescript/api/player/PlayerEventMap.d.ts +12 -2
  114. package/lib/typescript/api/player/PlayerEventMap.d.ts.map +1 -1
  115. package/lib/typescript/api/player/THEOplayer.d.ts +5 -0
  116. package/lib/typescript/api/player/THEOplayer.d.ts.map +1 -1
  117. package/lib/typescript/internal/THEOplayerView.d.ts +2 -0
  118. package/lib/typescript/internal/THEOplayerView.d.ts.map +1 -1
  119. package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts +3 -1
  120. package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts.map +1 -1
  121. package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts +3 -2
  122. package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts.map +1 -1
  123. package/lib/typescript/internal/adapter/WebEventForwarder.d.ts +2 -0
  124. package/lib/typescript/internal/adapter/WebEventForwarder.d.ts.map +1 -1
  125. package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts +8 -1
  126. package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts.map +1 -1
  127. package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts +5 -1
  128. package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts.map +1 -1
  129. package/lib/typescript/internal/adapter/media/MediaControlNativeAdapter.d.ts +12 -0
  130. package/lib/typescript/internal/adapter/media/MediaControlNativeAdapter.d.ts.map +1 -0
  131. package/lib/typescript/internal/adapter/media/MediaControlWebAdapter.d.ts +14 -0
  132. package/lib/typescript/internal/adapter/media/MediaControlWebAdapter.d.ts.map +1 -0
  133. package/lib/typescript/internal/adapter/web/WebMediaSession.d.ts +10 -3
  134. package/lib/typescript/internal/adapter/web/WebMediaSession.d.ts.map +1 -1
  135. package/package.json +3 -3
  136. package/react-native-theoplayer.podspec +1 -1
  137. package/src/api/error/ContentProtectionError.ts +58 -0
  138. package/src/api/error/barrel.ts +1 -0
  139. package/src/api/event/PlayerEvent.ts +26 -1
  140. package/src/api/media/MediaControlAPI.ts +33 -0
  141. package/src/api/media/MediaControlConfiguration.ts +5 -1
  142. package/src/api/media/barrel.ts +1 -0
  143. package/src/api/player/PlayerEventMap.ts +14 -0
  144. package/src/api/player/THEOplayer.ts +6 -0
  145. package/src/internal/THEOplayerView.tsx +16 -0
  146. package/src/internal/adapter/THEOplayerAdapter.ts +9 -0
  147. package/src/internal/adapter/THEOplayerWebAdapter.ts +12 -9
  148. package/src/internal/adapter/WebEventForwarder.ts +26 -0
  149. package/src/internal/adapter/event/PlayerEvents.ts +18 -0
  150. package/src/internal/adapter/event/native/NativePlayerEvent.ts +7 -0
  151. package/src/internal/adapter/media/MediaControlNativeAdapter.ts +38 -0
  152. package/src/internal/adapter/media/MediaControlWebAdapter.ts +28 -0
  153. package/src/internal/adapter/web/WebMediaSession.ts +85 -21
  154. package/src/manifest.json +1 -1
  155. package/android/src/main/java/com/theoplayer/media/MediaQueueNavigator.kt +0 -33
@@ -7,7 +7,20 @@ import MediaPlayer
7
7
  class THEOplayerRCTNowPlayingManager {
8
8
  // MARK: Members
9
9
  private weak var player: THEOplayer?
10
- private var nowPlayingInfo = [String : Any]()
10
+ private weak var view: THEOplayerRCTView?
11
+ private let nowPlayingQueue = DispatchQueue(label: "com.theoplayer.reactnative.nowplayinginfo")
12
+ private var nowPlayingInfoStorage = [String : Any]()
13
+ private var nowPlayingInfoGeneration: Int = 0
14
+
15
+ // The player that most recently published Now Playing info to the process-wide info center.
16
+ // Used to scope clearing so a disabled player only clears its own info and never clobbers
17
+ // another (newly-active) owner during a multi-player hand-off.
18
+ private static weak var currentOwner: THEOplayerRCTNowPlayingManager?
19
+
20
+ // MARK: computed
21
+ private var mediaSessionEnabled: Bool {
22
+ self.view?.mediaControlConfig.mediaSessionEnabled ?? DEFAULT_MEDIA_SESSION_ENABLED
23
+ }
11
24
 
12
25
  // MARK: player Listeners
13
26
  private var durationChangeListener: EventListener?
@@ -25,19 +38,25 @@ class THEOplayerRCTNowPlayingManager {
25
38
  // update elapsed time on close
26
39
  if let player = self.player {
27
40
  updateCurrentTime(player.currentTime)
28
- self.processNowPlayingToInfoCenter()
41
+ self.processNowPlayingInfoToInfoCenter()
29
42
  }
30
43
 
31
44
  // clear nowPlayingInfo
32
- self.nowPlayingInfo = [:]
33
- self.clearNowPlayingOnInfoCenter()
45
+ self.clearNowPlayingInfoStorage()
46
+ if self.mediaSessionEnabled {
47
+ self.clearNowPlayingInfoOnInfoCenter()
48
+ } else {
49
+ // Disabled player being destroyed: still clean up, but only if it owns the shared info.
50
+ self.clearNowPlayingIfOwner()
51
+ }
34
52
 
35
53
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] Destroy, nowPlayingInfo cleared on infoCenter.") }
36
54
  }
37
55
 
38
56
  // MARK: - player setup / breakdown
39
- func setPlayer(_ player: THEOplayer) {
57
+ func setPlayer(_ player: THEOplayer, view: THEOplayerRCTView?) {
40
58
  self.player = player;
59
+ self.view = view
41
60
 
42
61
  // attach listeners
43
62
  self.attachListeners()
@@ -61,37 +80,88 @@ class THEOplayerRCTNowPlayingManager {
61
80
  }
62
81
  }
63
82
 
64
- func updateNowPlaying() {
65
- // Reset any existing playing info
66
- self.nowPlayingInfo = [:]
83
+ func updateNowPlayingInfo() {
84
+ // Reset any existing playing info; this invalidates any artwork fetch still in flight
85
+ let generation = self.clearNowPlayingInfoStorage()
86
+
87
+ // When the media session is disabled we must not publish, nor unconditionally clear (that would
88
+ // clobber another active owner). Only clear if this player currently owns the shared info.
89
+ guard self.mediaSessionEnabled else {
90
+ self.clearNowPlayingIfOwner()
91
+ return
92
+ }
67
93
 
68
94
  // Gather new playing info
69
95
  if let player = self.player,
70
96
  let sourceDescription = player.source,
71
97
  let metadata = sourceDescription.metadata {
72
98
  let artWorkUrlString = self.getArtWorkUrlStringFromSourceDescription(sourceDescription)
73
- self.nowPlayingInfo = [String : Any]()
74
99
  self.updateTitle(metadata.title)
75
- self.updateArtist(metadata.metadataKeys?["artist"] as? String)
100
+ self.updateSubtitleOrArtist(subtitle: metadata.metadataKeys?["subtitle"] as? String,
101
+ artist: metadata.metadataKeys?["artist"] as? String)
76
102
  self.updateAlbum(metadata.metadataKeys?["album"] as? String)
77
- self.updateSubtitle(metadata.metadataKeys?["subtitle"] as? String)
78
103
  self.updateDuration(player.duration)
79
104
  self.updateMediaType() // video
80
- self.updatePlaybackRate(player.playbackRate)
105
+ self.updatePlaybackRate(player.paused ? 0 : player.playbackRate)
81
106
  self.updateServiceIdentifier(metadata.metadataKeys?["nowPlayingServiceIdentifier"] as? String)
82
107
  self.updateContentIdentifier(metadata.metadataKeys?["nowPlayingContentIdentifier"] as? String)
83
108
  self.updateCurrentTime(player.currentTime)
84
- self.updateArtWork(artWorkUrlString) { [weak self] in
85
- self?.processNowPlayingToInfoCenter()
109
+ self.updateArtWork(artWorkUrlString, generation: generation) { [weak self] in
110
+ self?.processNowPlayingInfoToInfoCenter()
86
111
  }
87
112
  } else {
88
- self.clearNowPlayingOnInfoCenter()
113
+ self.clearNowPlayingInfoOnInfoCenter()
114
+ }
115
+ }
116
+
117
+ // MARK: - thread safe nowPlayingInfo access
118
+ // nowPlayingInfoStorage is touched both from the main thread (player event listeners,
119
+ // updateNowPlayingInfo, destroy) and from the URLSession delegate queue (artwork fetch
120
+ // completion). All access is serialized through nowPlayingQueue to avoid corrupting
121
+ // the dictionary storage.
122
+ //
123
+ // nowPlayingInfoGeneration identifies the source the storage is currently describing.
124
+ // It is bumped on every clear, so an artwork fetch that completes after a source change
125
+ // (or after the info was cleared) can detect that it is stale and skip both its write
126
+ // and the publication to the info center.
127
+ private func setNowPlayingInfoStorage(_ key: String, _ value: Any?) {
128
+ self.nowPlayingQueue.sync { self.nowPlayingInfoStorage[key] = value }
129
+ }
130
+
131
+ // Writes only when the generation is still current; returns false when stale.
132
+ private func setNowPlayingInfoStorage(_ key: String, _ value: Any?, ifGeneration generation: Int) -> Bool {
133
+ self.nowPlayingQueue.sync {
134
+ guard generation == self.nowPlayingInfoGeneration else {
135
+ return false
136
+ }
137
+ self.nowPlayingInfoStorage[key] = value
138
+ return true
139
+ }
140
+ }
141
+
142
+ private func isCurrentNowPlayingInfoGeneration(_ generation: Int) -> Bool {
143
+ self.nowPlayingQueue.sync { generation == self.nowPlayingInfoGeneration }
144
+ }
145
+
146
+ private func getNowPlayingInfoStorage() -> [String : Any] {
147
+ self.nowPlayingQueue.sync { self.nowPlayingInfoStorage }
148
+ }
149
+
150
+ @discardableResult
151
+ private func clearNowPlayingInfoStorage() -> Int {
152
+ self.nowPlayingQueue.sync {
153
+ self.nowPlayingInfoStorage = [:]
154
+ self.nowPlayingInfoGeneration += 1
155
+ return self.nowPlayingInfoGeneration
89
156
  }
90
157
  }
91
158
 
92
- private func processNowPlayingToInfoCenter() {
93
- let nowPlayingInfo = self.nowPlayingInfo
159
+ private func processNowPlayingInfoToInfoCenter() {
160
+ guard self.mediaSessionEnabled else { return }
161
+ let nowPlayingInfo = self.getNowPlayingInfoStorage()
94
162
  if !nowPlayingInfo.isEmpty {
163
+ // This player is now publishing to the shared info center: claim ownership.
164
+ THEOplayerRCTNowPlayingManager.currentOwner = self
95
165
  Task { @MainActor in
96
166
  MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
97
167
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] nowPlayingInfo processed to infoCenter.") }
@@ -101,12 +171,31 @@ class THEOplayerRCTNowPlayingManager {
101
171
  }
102
172
  }
103
173
  } else {
104
- self.clearNowPlayingOnInfoCenter()
174
+ self.clearNowPlayingInfoOnInfoCenter()
175
+ }
176
+ }
177
+
178
+ private func clearNowPlayingInfoOnInfoCenter() {
179
+ guard self.mediaSessionEnabled else { return }
180
+ if THEOplayerRCTNowPlayingManager.currentOwner === self {
181
+ THEOplayerRCTNowPlayingManager.currentOwner = nil
105
182
  }
183
+ self.performClearOnInfoCenter()
106
184
  }
107
185
 
108
- private func clearNowPlayingOnInfoCenter() {
186
+ /// Clear the shared Now Playing info only if this player currently owns it. Bypasses the
187
+ /// mediaSessionEnabled guard so a player can clean up its own info at the moment it is disabled,
188
+ /// without clobbering another (newly-active) owner during a multi-player hand-off.
189
+ private func clearNowPlayingIfOwner() {
190
+ guard THEOplayerRCTNowPlayingManager.currentOwner === self else { return }
191
+ THEOplayerRCTNowPlayingManager.currentOwner = nil
192
+ self.performClearOnInfoCenter()
193
+ }
194
+
195
+ private func performClearOnInfoCenter() {
109
196
  Task { @MainActor in
197
+ // Avoid redundant clears (and their log noise) when the info center is already empty.
198
+ guard MPNowPlayingInfoCenter.default().nowPlayingInfo?.isEmpty == false else { return }
110
199
  MPNowPlayingInfoCenter.default().nowPlayingInfo = nil
111
200
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] clearing nowPlayingInfo (to nil) on infoCenter.") }
112
201
 
@@ -130,62 +219,70 @@ class THEOplayerRCTNowPlayingManager {
130
219
 
131
220
  private func updateTitle(_ metadataTitle: String?) {
132
221
  if let title = metadataTitle {
133
- self.nowPlayingInfo[MPMediaItemPropertyTitle] = title
222
+ self.setNowPlayingInfoStorage(MPMediaItemPropertyTitle, title)
134
223
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] title [\(title)] stored in nowPlayingInfo.") }
135
224
  }
136
225
  }
137
226
 
138
- private func updateArtist(_ metadataArtist: String?) {
139
- if let artist = metadataArtist {
140
- self.nowPlayingInfo[MPMediaItemPropertyArtist] = artist
141
- if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] artist [\(artist)] stored in nowPlayingInfo.") }
227
+ // MPMediaItemPropertyArtist holds the secondary line shown below the title. An audio
228
+ // stream typically describes it through an artist, while a video stream has no artist but
229
+ // can provide a subtitle (e.g. title "My Series" with subtitle "ep.8: My Episode Title").
230
+ // Only one of both can be displayed, so the subtitle takes precedence when both are set.
231
+ private func updateSubtitleOrArtist(subtitle metadataSubtitle: String?, artist metadataArtist: String?) {
232
+ if let subtitleOrArtist = metadataSubtitle ?? metadataArtist {
233
+ self.setNowPlayingInfoStorage(MPMediaItemPropertyArtist, subtitleOrArtist)
234
+ if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] subtitle/artist [\(subtitleOrArtist)] stored in nowPlayingInfo.") }
142
235
  }
143
236
  }
144
237
 
145
238
  private func updateAlbum(_ metadataAlbum: String?) {
146
239
  if let album = metadataAlbum {
147
- self.nowPlayingInfo[MPMediaItemPropertyAlbumTitle] = album
240
+ self.setNowPlayingInfoStorage(MPMediaItemPropertyAlbumTitle, album)
148
241
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] album [\(album)] stored in nowPlayingInfo.") }
149
242
  }
150
243
  }
151
244
 
152
- private func updateSubtitle(_ metadataSubtitle: String?) {
153
- if let subtitle = metadataSubtitle {
154
- self.nowPlayingInfo[MPMediaItemPropertyArtist] = subtitle
155
- if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] subtitle [\(subtitle)] stored in nowPlayingInfo.") }
156
- }
157
- }
158
-
159
245
  private func updateServiceIdentifier(_ serviceId: String?) {
160
246
  if let serviceId = serviceId {
161
- self.nowPlayingInfo[MPNowPlayingInfoPropertyServiceIdentifier] = serviceId
247
+ self.setNowPlayingInfoStorage(MPNowPlayingInfoPropertyServiceIdentifier, serviceId)
162
248
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] serviceId [\(serviceId)] stored in nowPlayingInfo.") }
163
249
  }
164
250
  }
165
251
 
166
252
  private func updateContentIdentifier(_ contentId: String?) {
167
253
  if let contentId = contentId {
168
- self.nowPlayingInfo[MPNowPlayingInfoPropertyExternalContentIdentifier] = contentId
254
+ self.setNowPlayingInfoStorage(MPNowPlayingInfoPropertyExternalContentIdentifier, contentId)
169
255
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] contentId [\(contentId)] stored in nowPlayingInfo.") }
170
256
  }
171
257
  }
172
258
 
173
259
  private func updateMediaType() {
174
- self.nowPlayingInfo[MPNowPlayingInfoPropertyMediaType] = NSNumber(value: 2)
260
+ self.setNowPlayingInfoStorage(MPNowPlayingInfoPropertyMediaType, NSNumber(value: 2))
175
261
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] mediaType [hardcoded 2, for video] stored in nowPlayingInfo.") }
176
262
  }
177
263
 
178
- private func updateArtWork(_ urlString: String?, completion: (() -> Void)?) {
264
+ private func updateArtWork(_ urlString: String?, generation: Int, completion: (() -> Void)?) {
179
265
  if let artUrlString = urlString,
180
266
  let artUrl = URL(string: artUrlString) {
181
267
  let dataTask = URLSession.shared.dataTask(with: artUrl) { [weak self] (data, _, _) in
268
+ guard let welf = self else {
269
+ return
270
+ }
182
271
  if let displayIconData = data,
183
272
  let displayIcon = UIImage(data: displayIconData) {
184
- self?.nowPlayingInfo[MPMediaItemPropertyArtwork] = MPMediaItemArtwork(boundsSize: displayIcon.size) { size in
273
+ let artWork = MPMediaItemArtwork(boundsSize: displayIcon.size) { size in
185
274
  return displayIcon
186
275
  }
276
+ guard welf.setNowPlayingInfoStorage(MPMediaItemPropertyArtwork, artWork, ifGeneration: generation) else {
277
+ if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] Artwork arrived for an outdated source, discarding it.") }
278
+ return
279
+ }
187
280
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] Artwork stored in nowPlayingInfo.") }
188
281
  } else {
282
+ guard welf.isCurrentNowPlayingInfoGeneration(generation) else {
283
+ if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] Artwork failed for an outdated source, discarding it.") }
284
+ return
285
+ }
189
286
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] Failed to store artwork in nowPlayingInfo.") }
190
287
  }
191
288
  completion?()
@@ -197,22 +294,22 @@ class THEOplayerRCTNowPlayingManager {
197
294
  }
198
295
 
199
296
  private func updatePlaybackRate(_ playerPlaybackRate: Double) {
200
- self.nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = NSNumber(value: playerPlaybackRate)
297
+ self.setNowPlayingInfoStorage(MPNowPlayingInfoPropertyPlaybackRate, NSNumber(value: playerPlaybackRate))
201
298
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] playbackrate [\(playerPlaybackRate)] stored in nowPlayingInfo.") }
202
299
  }
203
300
 
204
301
  private func updateCurrentTime(_ currentTime: Double) {
205
- self.nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = NSNumber(value: currentTime)
302
+ self.setNowPlayingInfoStorage(MPNowPlayingInfoPropertyElapsedPlaybackTime, NSNumber(value: currentTime))
206
303
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] currentTime [\(currentTime)] stored in nowPlayingInfo.") }
207
304
  }
208
305
 
209
306
  private func updateDuration(_ duration: Double?) {
210
307
  if let duration = duration {
211
308
  let isLiveStream = duration.isInfinite
212
- self.nowPlayingInfo[MPNowPlayingInfoPropertyIsLiveStream] = isLiveStream
309
+ self.setNowPlayingInfoStorage(MPNowPlayingInfoPropertyIsLiveStream, isLiveStream)
213
310
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] isLiveStream [\(isLiveStream)] stored in nowPlayingInfo.") }
214
311
  if !isLiveStream {
215
- self.nowPlayingInfo[MPMediaItemPropertyPlaybackDuration] = NSNumber(value: duration)
312
+ self.setNowPlayingInfoStorage(MPMediaItemPropertyPlaybackDuration, NSNumber(value: duration))
216
313
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] duration [\(duration)] stored in nowPlayingInfo.") }
217
314
  }
218
315
  }
@@ -230,7 +327,7 @@ class THEOplayerRCTNowPlayingManager {
230
327
  let wplayer = player,
231
328
  let duration = wplayer.duration {
232
329
  welf.updateDuration(duration)
233
- welf.processNowPlayingToInfoCenter()
330
+ welf.processNowPlayingInfoToInfoCenter()
234
331
  }
235
332
  }
236
333
 
@@ -241,7 +338,7 @@ class THEOplayerRCTNowPlayingManager {
241
338
  let wplayer = player {
242
339
  welf.updatePlaybackRate(wplayer.playbackRate)
243
340
  welf.updateCurrentTime(wplayer.currentTime)
244
- welf.processNowPlayingToInfoCenter()
341
+ welf.processNowPlayingInfoToInfoCenter()
245
342
  }
246
343
  }
247
344
 
@@ -252,7 +349,7 @@ class THEOplayerRCTNowPlayingManager {
252
349
  let wplayer = player {
253
350
  welf.updatePlaybackRate(0)
254
351
  welf.updateCurrentTime(wplayer.currentTime)
255
- welf.processNowPlayingToInfoCenter()
352
+ welf.processNowPlayingInfoToInfoCenter()
256
353
  }
257
354
  }
258
355
 
@@ -264,7 +361,7 @@ class THEOplayerRCTNowPlayingManager {
264
361
  let wplayer = player {
265
362
  welf.updatePlaybackRate(wplayer.playbackRate)
266
363
  welf.updateCurrentTime(wplayer.currentTime)
267
- welf.processNowPlayingToInfoCenter()
364
+ welf.processNowPlayingInfoToInfoCenter()
268
365
  }
269
366
  }
270
367
 
@@ -275,14 +372,14 @@ class THEOplayerRCTNowPlayingManager {
275
372
  let wplayer = player {
276
373
  welf.updatePlaybackRate(wplayer.playbackRate)
277
374
  welf.updateCurrentTime(wplayer.currentTime)
278
- welf.processNowPlayingToInfoCenter()
375
+ welf.processNowPlayingInfoToInfoCenter()
279
376
  }
280
377
  }
281
378
 
282
379
  // SOURCE_CHANGE
283
380
  self.sourceChangeListener = player.addEventListener(type: PlayerEventTypes.SOURCE_CHANGE) { [weak self] event in
284
381
  if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO-EVENT] SOURCE_CHANGE \(event.source == nil ? "to nil" : "")") }
285
- self?.updateNowPlaying()
382
+ self?.updateNowPlayingInfo()
286
383
  }
287
384
  }
288
385