react-native-theoplayer 3.0.2 → 3.2.0

package/CHANGELOG.md

@@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.2.0] - 23-11-29
+
+### Fixed
+
+- Fixed an issue on iOS and Android were selecting an audio, video or text track that has a `uid` with value `0`, would fail.
+
+### Added
+
+- Added support for HLS #EXT-X-DATERANGE timed metadata tags. The tags appear as cues in a dedicated text track with type `daterange`.
+
+## [3.1.0] - 23-10-27
+
+### Changed
+
+- Revised audio focus protocol on Android. When resuming an app, audio focus is retrieved only if the player is not paused.
+- Changed the behaviour of the Android component supporting background playback. It is stopped but not disabled when setting `backgroundAudioConfiguration.enabled = true`.
+
+### Fixed
+
+- Fixed an issue on Android where during play-out of a locally stored media asset the `seekable` property would not update.
+- Fixed an issue on iOS where the error was not forwarded to theoplayer if a drm request fails on the iOS bridge
+
 ## [3.0.2] - 23-10-17
 
 ### Fixed

package/android/src/main/AndroidManifest.xml

@@ -32,7 +32,7 @@
       android:name="com.theoplayer.media.MediaPlaybackService"
       android:description="@string/background_playback_service_description"
       android:exported="false"
-      android:enabled="false"
+      android:enabled="true"
       android:foregroundServiceType="mediaPlayback">
       <intent-filter>
         <action android:name="android.media.browse.MediaBrowserService" />

package/android/src/main/java/com/theoplayer/PlayerConfigAdapter.kt

@@ -18,6 +18,7 @@ private const val PROP_PRELOAD = "preload"
 private const val PROP_UI_ENABLED = "uiEnabled"
 private const val PROP_CAST_STRATEGY = "strategy"
 private const val PROP_RETRY_CONFIG = "retryConfiguration"
+private const val PROP_HLS_DATE_RANGE = "hlsDateRange"
 private const val PROP_RETRY_MAX_RETRIES = "maxRetries"
 private const val PROP_RETRY_MIN_BACKOFF = "minimumBackoff"
 private const val PROP_RETRY_MAX_BACKOFF = "maximumBackoff"
@@ -44,6 +45,9 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
         if (hasKey(PROP_RETRY_CONFIG)) {
           networkConfiguration(networkConfig())
         }
+        if (hasKey(PROP_HLS_DATE_RANGE)) {
+          hlsDateRange(getBoolean(PROP_HLS_DATE_RANGE))
+        }
         pipConfiguration(PipConfiguration.Builder().build())
       }
     }.build()

package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt

@@ -38,6 +38,7 @@ import com.theoplayer.android.api.player.track.mediatrack.quality.AudioQuality
 import com.theoplayer.android.api.player.track.mediatrack.quality.Quality
 import com.theoplayer.android.api.player.track.mediatrack.quality.VideoQuality
 import com.theoplayer.android.api.player.track.texttrack.TextTrack
+import com.theoplayer.android.api.player.track.texttrack.TextTrackKind
 import com.theoplayer.android.api.player.track.texttrack.TextTrackMode
 import com.theoplayer.cast.CastEventAdapter
 import com.theoplayer.presentation.PresentationModeChangeContext
@@ -474,6 +475,10 @@ class PlayerEventEmitter internal constructor(
   }
 
   private fun onTextTrackAdd(event: AddTrackEvent) {
+    // By default, set metadata tracks to mode 'hidden', until we add an API to set the mode.
+    if (event.track.kind == TextTrackKind.METADATA.type) {
+      event.track.mode = TextTrackMode.HIDDEN
+    }
     dispatchTextTrackEvent(TrackEventType.ADD_TRACK, event.track)
   }
 

package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt

@@ -5,7 +5,6 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
-import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.os.Handler
 import android.os.IBinder
@@ -74,7 +73,7 @@ class ReactTHEOplayerContext private constructor(
   var imaIntegration: GoogleImaIntegration? = null
   var castIntegration: CastIntegration? = null
   var wasPlayingOnHostPause: Boolean = false
-  var isHostPaused: Boolean = false
+  private var isHostPaused: Boolean = false
 
   private val isBackgroundAudioEnabled: Boolean
     get() = backgroundAudioConfig.enabled
@@ -113,27 +112,6 @@ class ReactTHEOplayerContext private constructor(
     }
   }
 
-  private fun setPlaybackServiceEnabled(enabled: Boolean) {
-    // Toggle the MediaPlaybackService.
-    toggleComponent(enabled, ComponentName(reactContext.applicationContext, MediaPlaybackService::class.java))
-
-    // Also toggle any registered MediaButtonReceiver broadcast receiver.
-    // It will crash the app if it remains active and tries to find our disabled MediaBrowserService instance.
-    toggleComponent(enabled, ComponentName(reactContext.applicationContext, androidx.media.session.MediaButtonReceiver::class.java))
-  }
-
-  /**
-   * Enable or disable a receiver component.
-   */
-  private fun toggleComponent(enabled: Boolean, componentName: ComponentName) {
-    reactContext.applicationContext.packageManager.setComponentEnabledSetting(
-      componentName,
-      if (enabled) PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-      else PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-      PackageManager.DONT_KILL_APP
-    )
-  }
-
   private fun applyBackgroundPlaybackConfig(
     config: BackgroundAudioConfig,
     prevConfig: BackgroundAudioConfig?
@@ -148,13 +126,8 @@ class ReactTHEOplayerContext private constructor(
     if (BuildConfig.USE_PLAYBACK_SERVICE) {
       if (prevConfig?.enabled != true && config.enabled) {
         // Enable & bind background playback
-        setPlaybackServiceEnabled(true)
         bindMediaPlaybackService()
       } else if (prevConfig?.enabled == true) {
-        // First disable the MediaPlaybackService and MediaButtonReceiver so that no more media
-        // button events can be captured.
-        setPlaybackServiceEnabled(false)
-
         // Stop & unbind MediaPlaybackService.
         binder?.stopForegroundService()
         unbindMediaPlaybackService()
@@ -379,7 +352,9 @@ class ReactTHEOplayerContext private constructor(
     isHostPaused = false
     mediaSessionConnector?.setActive(true)
     playerView.onResume()
-    audioFocusManager?.retrieveAudioFocus()
+    if (!player.isPaused) {
+      audioFocusManager?.retrieveAudioFocus()
+    }
   }
 
   fun destroy() {

package/android/src/main/java/com/theoplayer/player/PlayerModule.kt

@@ -98,6 +98,10 @@ class PlayerModule(context: ReactApplicationContext) : ReactContextBaseJavaModul
 
   @ReactMethod
   fun setSelectedAudioTrack(tag: Int, uid: Int) {
+    if (uid == -1) {
+      // Do not allow disabling all audio tracks
+      return
+    }
     viewResolver.resolveViewByTag(tag) { view: ReactTHEOplayerView? ->
       view?.player?.let {
         for (track in it.audioTracks) {
@@ -109,6 +113,10 @@ class PlayerModule(context: ReactApplicationContext) : ReactContextBaseJavaModul
 
   @ReactMethod
   fun setSelectedVideoTrack(tag: Int, uid: Int) {
+    if (uid == -1) {
+      // Do not allow disabling all video tracks
+      return
+    }
     viewResolver.resolveViewByTag(tag) { view: ReactTHEOplayerView? ->
       view?.player?.let {
         for (track in it.videoTracks) {

package/android/src/main/java/com/theoplayer/track/TrackListAdapter.kt

@@ -11,6 +11,7 @@ import com.theoplayer.android.api.player.track.mediatrack.quality.Quality
 import com.theoplayer.android.api.player.track.mediatrack.quality.AudioQuality
 import com.theoplayer.android.api.player.track.mediatrack.quality.VideoQuality
 import com.theoplayer.android.api.player.track.mediatrack.MediaTrackList
+import com.theoplayer.android.api.player.track.texttrack.cue.DateRangeCue
 import com.theoplayer.util.TypeUtils
 
 private const val PROP_ID = "id"
@@ -35,6 +36,16 @@ private const val PROP_STARTTIME = "startTime"
 private const val PROP_ENDTIME = "endTime"
 private const val PROP_CUES = "cues"
 private const val PROP_CUE_CONTENT = "content"
+private const val PROP_ATTRIBUTE_CLASS = "class"
+private const val PROP_STARTDATE = "startDate"
+private const val PROP_ENDDATE = "endDate"
+private const val PROP_DURATION = "duration"
+private const val PROP_PLANNED_DURATION = "plannedDuration"
+private const val PROP_END_ON_NEXT = "endOnNext"
+private const val PROP_SCTE35CMD = "scte35Cmd"
+private const val PROP_SCTE35OUT = "scte35Out"
+private const val PROP_SCTE35IN = "scte35In"
+private const val PROP_CUSTOM_ATTRIBUTES = "customAttributes"
 
 object TrackListAdapter {
 
@@ -85,6 +96,38 @@ object TrackListAdapter {
         content.optString("content") ?: content.optString("contentString")
       )
     }
+
+    if (cue is DateRangeCue) {
+      cue.attributeClass?.run {
+        cuePayload.putString(PROP_ATTRIBUTE_CLASS, this)
+      }
+      cuePayload.putDouble(PROP_STARTDATE, cue.startDate.time.toDouble())
+      cue.endDate?.run {
+        cuePayload.putDouble(PROP_ENDDATE, this.time.toDouble())
+      }
+      cue.duration?.run {
+        cuePayload.putDouble(PROP_DURATION, TypeUtils.encodeInfNan(1e3 * this))
+      }
+      cue.plannedDuration?.run {
+        cuePayload.putDouble(PROP_PLANNED_DURATION, TypeUtils.encodeInfNan(1e3 * this))
+      }
+      cuePayload.putBoolean(PROP_END_ON_NEXT, cue.isEndOnNext)
+      cue.customAttributes?.asMap()?.run {
+        val attributes = Arguments.createMap()
+        forEach { (key, value) ->
+          when (value) {
+            is String -> attributes.putString(key, value)
+            is Boolean -> attributes.putBoolean(key, value)
+            is Int -> attributes.putInt(key, value)
+            is Double -> attributes.putDouble(key, value)
+            // TODO: support array & sub-objects
+          }
+        }
+        cuePayload.putMap(PROP_CUSTOM_ATTRIBUTES, attributes)
+      }
+      // TODO: Add SCTE marker properties
+    }
+
     return cuePayload
   }
 
@@ -128,7 +171,8 @@ object TrackListAdapter {
       qualityList?.forEach { quality ->
         qualities.pushMap(fromAudioQuality(quality))
       }
-    } catch (ignore: NullPointerException) {}
+    } catch (ignore: NullPointerException) {
+    }
     audioTrackPayload.putArray(PROP_QUALITIES, qualities)
     val activeQuality = audioTrack.activeQuality
     if (activeQuality != null) {
@@ -178,7 +222,8 @@ object TrackListAdapter {
           qualities.pushMap(fromVideoQuality(quality as VideoQuality))
         }
       }
-    } catch (ignore: java.lang.NullPointerException) {}
+    } catch (ignore: java.lang.NullPointerException) {
+    }
     videoTrackPayload.putArray(PROP_QUALITIES, qualities)
     val activeQuality = videoTrack.activeQuality
     if (activeQuality != null) {

package/ios/THEOplayerRCTNetworkUtils.swift

@@ -31,7 +31,6 @@ class THEOplayerRCTNetworkUtils: NSObject, URLSessionDataDelegate {
         let task = self.defaultUrlSession.dataTask(with: request) { data, response, error in
             if let error = error {
                 PrintUtils.printLog(logText: "request Error: \(error.localizedDescription)")
-                return
             }
             if let urlResponse = response as? HTTPURLResponse {
                 let statusCode = urlResponse.statusCode
@@ -44,7 +43,10 @@ class THEOplayerRCTNetworkUtils: NSObject, URLSessionDataDelegate {
                     }
                 }
                 completion?(data, statusCode, allHeaders, error)
+            } else {
+                completion?(data, -1, [:], error)
             }
+            
         }
         // start the task
         task.resume()

package/ios/THEOplayerRCTTextTrackEventHandler.swift

@@ -53,14 +53,14 @@ class THEOplayerRCTTextTrackEventHandler {
         }
         
         // ADD_TRACK
-        self.addTrackListener = player.textTracks.addEventListener(type: TextTrackListEventTypes.ADD_TRACK) { [weak self] event in
-            guard let welf = self else { return }
+        self.addTrackListener = player.textTracks.addEventListener(type: TextTrackListEventTypes.ADD_TRACK) { [weak self, weak player] event in
+            guard let welf = self, let wplayer = player else { return }
             if let forwardedTextTrackListEvent = welf.onNativeTextTrackListEvent,
                let textTrack = event.track as? TextTrack {
                 if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received ADD_TRACK event from THEOplayer textTrack list: trackUid = \(textTrack.uid)") }
                 // trigger tracklist event
                 forwardedTextTrackListEvent([
-                    "track" : THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackInfo(textTrack: textTrack),
+                    "track" : THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackInfo(textTrack: textTrack, player: wplayer),
                     "type" : TrackListEventType.ADD_TRACK.rawValue
                 ])
                 // start listening for cue events on this track and keep listener for later removal
@@ -77,14 +77,14 @@ class THEOplayerRCTTextTrackEventHandler {
         if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] AddTrack listener attached to THEOplayer textTrack list") }
         
         // REMOVE_TRACK
-        self.removeTrackListener = player.textTracks.addEventListener(type: TextTrackListEventTypes.REMOVE_TRACK) { [weak self] event in
-            guard let welf = self else { return }
+        self.removeTrackListener = player.textTracks.addEventListener(type: TextTrackListEventTypes.REMOVE_TRACK) { [weak self, weak player] event in
+            guard let welf = self, let wplayer = player else { return }
             if let forwardedTextTrackListEvent = welf.onNativeTextTrackListEvent,
                let textTrack = event.track as? TextTrack {
                 if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received REMOVE_TRACK event from THEOplayer textTrack list: trackUid = \(textTrack.uid)") }
                 // trigger tracklist event
                 forwardedTextTrackListEvent([
-                    "track" : THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackInfo(textTrack: textTrack),
+                    "track" : THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackInfo(textTrack: textTrack, player: wplayer),
                     "type" : TrackListEventType.REMOVE_TRACK.rawValue
                 ])
                 // stop listening for cue events on this track
@@ -109,14 +109,14 @@ class THEOplayerRCTTextTrackEventHandler {
         if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] RemoveTrack listener attached to THEOplayer textTrack list") }
         
         // CHANGE
-        self.changeTrackListener = player.textTracks.addEventListener(type: TextTrackListEventTypes.CHANGE) { [weak self] event in
-            guard let welf = self else { return }
+        self.changeTrackListener = player.textTracks.addEventListener(type: TextTrackListEventTypes.CHANGE) { [weak self, weak player] event in
+            guard let welf = self, let wplayer = player else { return }
             if let forwardedTextTrackListEvent = welf.onNativeTextTrackListEvent,
                let textTrack = event.track as? TextTrack {
                 if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received CHANGE event from THEOplayer textTrack list: trackUid = \(textTrack.uid)") }
                 // trigger tracklist event
                 forwardedTextTrackListEvent([
-                    "track" : THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackInfo(textTrack: textTrack),
+                    "track" : THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackInfo(textTrack: textTrack, player: wplayer),
                     "type" : TrackListEventType.CHANGE_TRACK.rawValue
                 ])
             }
@@ -176,48 +176,52 @@ class THEOplayerRCTTextTrackEventHandler {
     // MARK: - dynamic textTrack Listeners
     private func addCueListener(_ event: AddCueEvent) {
         if let forwardedTextTrackEvent = self.onNativeTextTrackEvent,
-           let textTrack = event.cue.track {
+           let textTrack = event.cue.track,
+           let player = self.player {
             if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received ADD_CUE event from textTrack: trackUid = \(textTrack.uid), cueUid = \(event.cue.uid)") }
             forwardedTextTrackEvent([
                 "trackUid" : textTrack.uid,
                 "type": TrackCueEventType.ADD_CUE.rawValue,
-                "cue": THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackCueInfo(textTrackCue: event.cue)
+                "cue": THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackCueInfo(textTrackCue: event.cue, player: player)
             ])
         }
     }
     
     private func removeCueListener(_ event: RemoveCueEvent) {
         if let forwardedTextTrackEvent = self.onNativeTextTrackEvent,
-           let textTrack = event.cue.track {
+           let textTrack = event.cue.track,
+           let player = self.player {
             if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received REMOVE_CUE event from textTrack: trackUid = \(textTrack.uid), cueUid = \(event.cue.uid)") }
             forwardedTextTrackEvent([
                 "trackUid" : textTrack.uid,
                 "type": TrackCueEventType.REMOVE_CUE.rawValue,
-                "cue": THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackCueInfo(textTrackCue: event.cue)
+                "cue": THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackCueInfo(textTrackCue: event.cue, player: player)
             ])
         }
     }
     
     private func enterCueListener(_ event: EnterCueEvent) {
         if let forwardedTextTrackEvent = self.onNativeTextTrackEvent,
-           let textTrack = event.cue.track {
+           let textTrack = event.cue.track,
+           let player = self.player {
             if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received ENTER_CUE event from textTrack: trackUid = \(textTrack.uid), cueUid = \(event.cue.uid)") }
             forwardedTextTrackEvent([
                 "trackUid" : textTrack.uid,
                 "type": TrackCueEventType.ENTER_CUE.rawValue,
-                "cue": THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackCueInfo(textTrackCue: event.cue)
+                "cue": THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackCueInfo(textTrackCue: event.cue, player: player)
             ])
         }
     }
     
     private func exitCueListener(_ event: ExitCueEvent) {
         if let forwardedTextTrackEvent = self.onNativeTextTrackEvent,
-           let textTrack = event.cue.track {
+           let textTrack = event.cue.track,
+           let player = self.player {
             if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received EXIT_CUE event from textTrack: trackUid = \(textTrack.uid), cueUid = \(event.cue.uid)") }
             forwardedTextTrackEvent([
                 "trackUid" : textTrack.uid,
                 "type": TrackCueEventType.EXIT_CUE.rawValue,
-                "cue": THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackCueInfo(textTrackCue: event.cue)
+                "cue": THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackCueInfo(textTrackCue: event.cue, player: player)
             ])
         }
     }

package/ios/THEOplayerRCTTrackMetadataAggregator.swift

@@ -24,7 +24,14 @@ let PROP_STARTTIME: String = "startTime"
 let PROP_ENDTIME: String = "endTime"
 let PROP_CUES: String = "cues"
 let PROP_CUE_CONTENT: String = "content"
+let PROP_CUE_CUSTOM_ATTRIBUTES: String = "customAttributes"
 let PROP_SRC: String = "src"
+let PROP_START_DATE: String = "startDate"
+let PROP_END_DATE: String = "endDate"
+let PROP_ATTRIBUTE_CLASS: String = "class"
+let PROP_DURATION: String = "duration"
+let PROP_PLANNED_DURATION: String = "plannedDuration"
+let PROP_END_ON_NEXT: String = "endOnNext"
 
 class THEOplayerRCTTrackMetadataAggregator {
 
@@ -33,7 +40,7 @@ class THEOplayerRCTTrackMetadataAggregator {
         let audioTracks: AudioTrackList = player.audioTracks
         let videoTracks: VideoTrackList = player.videoTracks
         return [
-            EVENT_PROP_TEXT_TRACKS : THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackListInfo(textTracks: textTracks, metadataTracks: metadataTracksInfo),
+            EVENT_PROP_TEXT_TRACKS : THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackListInfo(textTracks: textTracks, metadataTracks: metadataTracksInfo, player: player),
             EVENT_PROP_AUDIO_TRACKS : THEOplayerRCTTrackMetadataAggregator.aggregatedAudioTrackListInfo(audioTracks: audioTracks),
             EVENT_PROP_VIDEO_TRACKS : THEOplayerRCTTrackMetadataAggregator.aggregatedVideoTrackListInfo(videoTracks: videoTracks),
             EVENT_PROP_SELECTED_TEXT_TRACK: THEOplayerRCTTrackMetadataAggregator.selectedTextTrack(textTracks: textTracks),
@@ -44,19 +51,19 @@ class THEOplayerRCTTrackMetadataAggregator {
     }
 
     // MARK: TEXTTRACKS
-    class func aggregatedTextTrackListInfo(textTracks: TextTrackList, metadataTracks: [[String:Any]]) -> [[String:Any]] {
+    class func aggregatedTextTrackListInfo(textTracks: TextTrackList, metadataTracks: [[String:Any]], player: THEOplayer) -> [[String:Any]] {
         var trackEntries:[[String:Any]] = metadataTracks
         guard textTracks.count > 0 else {
             return trackEntries
         }
         for i in 0...textTracks.count-1 {
             let textTrack: TextTrack = textTracks.get(i)
-            trackEntries.append(THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackInfo(textTrack: textTrack))
+            trackEntries.append(THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackInfo(textTrack: textTrack, player: player))
         }
         return trackEntries
     }
     
-    class func aggregatedTextTrackInfo(textTrack: TextTrack) -> [String:Any] {
+    class func aggregatedTextTrackInfo(textTrack: TextTrack, player: THEOplayer) -> [String:Any] {
         var entry: [String:Any] = [:]
         entry[PROP_ID] = textTrack.id
         entry[PROP_UID] = textTrack.uid
@@ -70,7 +77,7 @@ class THEOplayerRCTTrackMetadataAggregator {
         if !textTrack.cues.isEmpty {
             var cueList: [[String:Any]] = []
             for cue in textTrack.cues {
-                cueList.append(THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackCueInfo(textTrackCue: cue))
+                cueList.append(THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackCueInfo(textTrackCue: cue, player: player))
             }
             entry[PROP_CUES] = cueList
         }
@@ -91,17 +98,66 @@ class THEOplayerRCTTrackMetadataAggregator {
     }
     
     // MARK: TEXTTRACK CUES
-    class func aggregatedTextTrackCueInfo(textTrackCue: TextTrackCue) -> [String:Any] {
+    class func aggregatedTextTrackCueInfo(textTrackCue: TextTrackCue, player: THEOplayer) -> [String:Any] {
         var entry: [String:Any] = [:]
         entry[PROP_ID] = textTrackCue.id
         entry[PROP_UID] = textTrackCue.uid
-        entry[PROP_STARTTIME] = THEOplayerRCTTypeUtils.encodeInfNan((textTrackCue.startTime ?? 0) * 1000)
-        entry[PROP_ENDTIME] = THEOplayerRCTTypeUtils.encodeInfNan((textTrackCue.endTime ?? 0) * 1000)
+        var startTime = textTrackCue.startTime
+        var endTime = textTrackCue.endTime
+        if let dateRangeCue = textTrackCue as? DateRangeCue,
+           let programDateTime = player.currentProgramDateTime?.timeIntervalSince1970 {
+            let currentTime = player.currentTime
+            let offset = programDateTime - currentTime
+            startTime = dateRangeCue.startDate.timeIntervalSince1970 - offset
+            endTime = dateRangeCue.endDate != nil ? dateRangeCue.endDate!.timeIntervalSince1970 - offset : .infinity
+        }
+        entry[PROP_STARTTIME] = THEOplayerRCTTypeUtils.encodeInfNan((startTime ?? 0) * 1000)
+        entry[PROP_ENDTIME] = THEOplayerRCTTypeUtils.encodeInfNan((endTime ?? 0) * 1000)
         if let content = textTrackCue.content {
             entry[PROP_CUE_CONTENT] = content
         } else if let contentString = textTrackCue.contentString {
             entry[PROP_CUE_CONTENT] = contentString
         }
+        if let dateRangeCue = textTrackCue as? DateRangeCue {
+            entry[PROP_START_DATE] = dateRangeCue.startDate.timeIntervalSince1970 * 1000
+            if let endDate = dateRangeCue.endDate {
+                entry[PROP_END_DATE] = endDate.timeIntervalSince1970 * 1000
+            }
+            if let attributeClass = dateRangeCue.attributeClass {
+                entry[PROP_ATTRIBUTE_CLASS] = attributeClass
+            }
+            if let duration = dateRangeCue.duration {
+                entry[PROP_DURATION] = THEOplayerRCTTypeUtils.encodeInfNan(duration * 1000)
+            }
+            if let plannedDuration = dateRangeCue.plannedDuration {
+                entry[PROP_PLANNED_DURATION] = THEOplayerRCTTypeUtils.encodeInfNan(plannedDuration * 1000)
+            }
+            entry[PROP_END_ON_NEXT] = dateRangeCue.endOnNext
+            let customAttributes = dateRangeCue.customAttributes
+            let customAttributesDict = customAttributes.getAttributesAsDictionary()
+            if !customAttributesDict.isEmpty {
+                var attributesEntry: [String:Any] = [:]
+                for (key, _) in customAttributesDict {
+                    do {
+                        // try reading as string
+                        attributesEntry[key] = try customAttributes.getString(for: key)
+                    } catch {
+                        do {
+                            // try reading as double
+                            attributesEntry[key] = try customAttributes.getDouble(for: key)
+                        } catch {
+                            do {
+                                // try reading as data
+                                attributesEntry[key] = try customAttributes.getBytes(for: key)
+                            } catch {
+                                print("Unable to extract customAttribute from DateRange cue. Content is limited to String, Double or Data.")
+                            }
+                        }
+                    }
+                }
+                entry[PROP_CUE_CUSTOM_ATTRIBUTES] = attributesEntry
+            }
+        }
         return entry
     }
 

package/ios/THEOplayerRCTView.swift

@@ -37,6 +37,7 @@ public class THEOplayerRCTView: UIView {
     private var license: String?
     private var licenseUrl: String?
     private var chromeless: Bool = true
+    private var hlsDateRange: Bool = false
     private var config: THEOplayerConfiguration?
     
     // MARK: - Initialisation / view setup
@@ -108,6 +109,7 @@ public class THEOplayerRCTView: UIView {
                                                                         pip: self.playerPipConfiguration(),
                                                                         ads: self.playerAdsConfiguration(),
                                                                         cast: self.playerCastConfiguration(),
+                                                                        hlsDateRange: self.hlsDateRange,
                                                                         license: self.license,
                                                                         licenseUrl: self.licenseUrl))
         self.initAdsIntegration()
@@ -120,6 +122,7 @@ public class THEOplayerRCTView: UIView {
     private func initPlayer() -> THEOplayer? {
         self.player = THEOplayer(configuration: THEOplayerConfiguration(chromeless: self.chromeless,
                                                                         ads: self.playerAdsConfiguration(),
+                                                                        hlsDateRange: self.hlsDateRange,
                                                                         license: self.license,
                                                                         licenseUrl: self.licenseUrl,
                                                                         pip: self.playerPipConfiguration()))
@@ -168,6 +171,7 @@ public class THEOplayerRCTView: UIView {
         self.license = configDict["license"] as? String
         self.licenseUrl = configDict["licenseUrl"] as? String
         self.chromeless = configDict["chromeless"] as? Bool ?? true
+        self.hlsDateRange = configDict["hlsDateRange"] as? Bool ?? false
         self.parseAdsConfig(configDict: configDict)
         self.parseCastConfig(configDict: configDict)
         if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] config prop updated.") }

package/ios/contentprotection/THEOplayerRCTContentProtectionAPI.swift

@@ -211,8 +211,10 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
             THEOplayerRCTNetworkUtils.shared.requestFromUrl(url: url, method: method, body: bodyData, headers: headers) { data, statusCode, responseHeaders, error in
                 if let responseError = error {
                     print(CPI_TAG, "Certificate request failure: error = \(responseError.localizedDescription)")
+                    completion(data, error)
                 } else if statusCode >= 400 {
                     PrintUtils.printLog(logText: "Certificate request failure: statusCode = \(statusCode)")
+                    completion(data, nil)
                 } else {
                     if DEBUG_CONTENT_PROTECTION_API {print(CPI_TAG, "Certificate request success: statusCode = \(statusCode)") }
                     let certificateRequest = CertificateRequest(url: urlString, method: method, headers: headers, body: bodyData)
@@ -278,8 +280,10 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
             THEOplayerRCTNetworkUtils.shared.requestFromUrl(url: url, method: method, body: bodyData, headers: headers) { data, statusCode, responseHeaders, error in
                 if let responseError = error {
                     print(CPI_TAG, "License request failure: error = \(responseError.localizedDescription)")
+                    completion(data, error)
                 } else if statusCode >= 400 {
                     print(CPI_TAG, "License request failure: statusCode = \(statusCode)")
+                    completion(data, nil)
                 } else {
                     if DEBUG_CONTENT_PROTECTION_API {print(CPI_TAG, "License request success: statusCode = \(statusCode)") }
                     let licenseRequest = LicenseRequest(url: urlString, method: method, headers: headers, body: bodyData, fairplaySkdUrl: nil, useCredentials: false)

package/lib/commonjs/api/config/PlayerConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["PlayerConfiguration.ts"],"sourcesContent":["import type { AdsConfiguration } from '../ads/AdsConfiguration';\nimport type { CastConfiguration } from '../cast/CastConfiguration';\nimport type { MediaControlConfiguration } from '../media/MediaControlConfiguration';\nimport type { RetryConfiguration } from '../utils/RetryConfiguration';\n\nexport interface PlayerConfiguration {\n  /**\n   * The directory in which the THEOplayer library worker files are located.\n   * These worker files are THEOplayer.transmux.*\n   *\n   * @remarks\n   * <br/> - This parameter is required when using a HLS source and has no default.\n   *\n   * @example\n   * `'/lib/theoplayer/'`\n   */\n  libraryLocation?: string;\n\n  /**\n   * The muted autoplay policy for web.\n   *\n   * @remarks\n   * <br/> - The muted autoplay policy is impacted by this property and {@link SourceConfiguration.mutedAutoplay}.\n   *\n   * @defaultValue `'none'`.\n   */\n  mutedAutoplay?: MutedAutoplayConfiguration;\n\n  /**\n   * The ads configuration for the player.\n   */\n  ads?: AdsConfiguration;\n\n  /**\n   * The cast configuration for the player.\n   */\n  cast?: CastConfiguration;\n\n  /**\n   * The configuration of media controls and media sessions across platforms.\n   */\n  mediaControl?: MediaControlConfiguration;\n\n  /**\n   * The license for the player\n   */\n  readonly license?: string;\n\n  /**\n   * The url to fetch the license for the player\n   */\n  readonly licenseUrl?: string;\n\n  /**\n   * Sets whether the native player is chromeless (without UI).\n   *\n   * @remarks\n   * <br/> - This parameter only applies to Web platforms.\n   */\n  readonly chromeless?: boolean;\n\n  /**\n   * The retry configuration for the player.\n   *\n   * @remarks\n   * <br/> - This parameter only applies to Web and Android platforms.\n   */\n  readonly retryConfiguration?: RetryConfiguration;\n}\n\n/**\n * The muted autoplay policy of a player for web.\n * <br/> - `'none'`: Disallow muted autoplay. If the player is requested to autoplay while unmuted, and the platform does not support unmuted autoplay, the player will not start playback.\n * <br/> - `'all'`: Allow muted autoplay. If the player is requested to autoplay while unmuted, and the platform supports muted autoplay, the player will start muted playback.\n * <br/> - `'content'`: Allow muted autoplay only for the main content. Disallow muted autoplay for e.g. advertisements. (Not yet supported.)\n *\n * @public\n */\nexport type MutedAutoplayConfiguration = 'none' | 'all' | 'content';\n"],"mappings":""}
+{"version":3,"names":[],"sources":["PlayerConfiguration.ts"],"sourcesContent":["import type { AdsConfiguration } from '../ads/AdsConfiguration';\nimport type { CastConfiguration } from '../cast/CastConfiguration';\nimport type { MediaControlConfiguration } from '../media/MediaControlConfiguration';\nimport type { RetryConfiguration } from '../utils/RetryConfiguration';\n\nexport interface PlayerConfiguration {\n  /**\n   * The directory in which the THEOplayer library worker files are located.\n   * These worker files are THEOplayer.transmux.*\n   *\n   * @remarks\n   * <br/> - This parameter is required when using a HLS source and has no default.\n   *\n   * @example\n   * `'/lib/theoplayer/'`\n   */\n  libraryLocation?: string;\n\n  /**\n   * The muted autoplay policy for web.\n   *\n   * @remarks\n   * <br/> - The muted autoplay policy is impacted by this property and {@link SourceConfiguration.mutedAutoplay}.\n   *\n   * @defaultValue `'none'`.\n   */\n  mutedAutoplay?: MutedAutoplayConfiguration;\n\n  /**\n   * The ads configuration for the player.\n   */\n  ads?: AdsConfiguration;\n\n  /**\n   * The cast configuration for the player.\n   */\n  cast?: CastConfiguration;\n\n  /**\n   * The configuration of media controls and media sessions across platforms.\n   */\n  mediaControl?: MediaControlConfiguration;\n\n  /**\n   * The license for the player\n   */\n  readonly license?: string;\n\n  /**\n   * The url to fetch the license for the player\n   */\n  readonly licenseUrl?: string;\n\n  /**\n   * Sets whether the native player is chromeless (without UI).\n   *\n   * @remarks\n   * <br/> - This parameter only applies to Web platforms.\n   */\n  readonly chromeless?: boolean;\n\n  /**\n   * Sets whether DateRange tags from the playlists should be imported as a textTrack.\n   */\n  readonly hlsDateRange?: boolean;\n\n  /**\n   * The retry configuration for the player.\n   *\n   * @remarks\n   * <br/> - This parameter only applies to Web and Android platforms.\n   */\n  readonly retryConfiguration?: RetryConfiguration;\n}\n\n/**\n * The muted autoplay policy of a player for web.\n * <br/> - `'none'`: Disallow muted autoplay. If the player is requested to autoplay while unmuted, and the platform does not support unmuted autoplay, the player will not start playback.\n * <br/> - `'all'`: Allow muted autoplay. If the player is requested to autoplay while unmuted, and the platform supports muted autoplay, the player will start muted playback.\n * <br/> - `'content'`: Allow muted autoplay only for the main content. Disallow muted autoplay for e.g. advertisements. (Not yet supported.)\n *\n * @public\n */\nexport type MutedAutoplayConfiguration = 'none' | 'all' | 'content';\n"],"mappings":""}

package/lib/commonjs/api/track/DateRangeCue.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isDateRangeCue = isDateRangeCue;
+/**
+ * Represents a cue of a HLS date range metadata text track.
+ *
+ * @public
+ */
+
+/**
+ * Check whether a text track cue is of type DateRangeCue.
+ */
+function isDateRangeCue(cue) {
+  return cue.customAttributes != undefined;
+}
+//# sourceMappingURL=DateRangeCue.js.map

package/lib/commonjs/api/track/DateRangeCue.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["isDateRangeCue","cue","customAttributes","undefined"],"sources":["DateRangeCue.ts"],"sourcesContent":["import type { TextTrackCue } from './TextTrackCue';\n\n/**\n * Represents a cue of a HLS date range metadata text track.\n *\n * @public\n */\nexport interface DateRangeCue extends TextTrackCue {\n  /**\n   * The class of the date range cue.\n   *\n   * @remarks\n   * <br/> - The class is a client-defined string specifying a set of attributes with associated value semantics.\n   */\n  class: string | undefined;\n\n  /**\n   * The playback position at which the date range cue becomes active, as a Date.\n   */\n  startDate: Date;\n\n  /**\n   * The playback position at which the date range cue becomes inactive, as a Date.\n   */\n  endDate: Date | undefined;\n\n  /**\n   * The duration of the date range cue, in milliseconds.\n   */\n  duration: number | undefined;\n\n  /**\n   * The planned duration of the date range cue, in milliseconds.\n   *\n   * @remarks\n   * <br/> - This is used when the exact duration is not known yet.\n   */\n  plannedDuration: number | undefined;\n\n  /**\n   * Whether end-on-next is enabled for the date range cue.\n   *\n   * @remarks\n   * <br/> - End-on-next results in the {@link DateRangeCue.endDate} of the date range cue becoming equal to the {@link DateRangeCue.startDate} of the next date range cue with the same {@link DateRangeCue.\"class\"}, once it is known.\n   */\n  endOnNext: boolean;\n\n  /**\n   * The SCTE 'cmd' splice_info_section of the date range cue.\n   */\n  scte35Cmd: ArrayBuffer | undefined;\n\n  /**\n   * The SCTE 'out' splice_info_section of the date range cue.\n   */\n  scte35Out: ArrayBuffer | undefined;\n\n  /**\n   * The SCTE 'in' splice_info_section of the date range cue.\n   */\n  scte35In: ArrayBuffer | undefined;\n\n  /**\n   * Custom attributes extracted from the cue source.\n   */\n  customAttributes: Record<string, string | number | ArrayBuffer>;\n}\n\n/**\n * Check whether a text track cue is of type DateRangeCue.\n */\nexport function isDateRangeCue(cue: TextTrackCue): cue is DateRangeCue {\n  return (cue as DateRangeCue).customAttributes != undefined;\n}\n"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;;AA8DA;AACA;AACA;AACO,SAASA,cAAcA,CAACC,GAAiB,EAAuB;EACrE,OAAQA,GAAG,CAAkBC,gBAAgB,IAAIC,SAAS;AAC5D"}

package/lib/commonjs/api/track/TextTrack.js

@@ -17,6 +17,8 @@ let TextTrackType = exports.TextTrackType = /*#__PURE__*/function (TextTrackType
   TextTrackType["srt"] = "srt";
   TextTrackType["ttml"] = "ttml";
   TextTrackType["webvtt"] = "webvtt";
+  TextTrackType["daterange"] = "daterange";
+  TextTrackType["eventstream"] = "eventstream";
   return TextTrackType;
 }({});
 let TextTrackKind = exports.TextTrackKind = /*#__PURE__*/function (TextTrackKind) {