react-native-theoplayer 10.7.0 → 10.8.0

package/CHANGELOG.md

@@ -5,6 +5,30 @@ 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).
 
+## [10.8.0] - 26-01-22
+
+### Added
+
+- Added support on iOS to push the initial state of the player from the iOS bridge to the React native adapter.
+
+### Fixed
+
+- Fixed an issue on iOS where the integrationParameters from the contentProtection section of the source were not processed correctly, resulting in failures for DRM connectors that depend on them.
+- Fixed an issue on iOS where the player could crash when terminating the app while the player is backgrounded in fullscreen.
+- Fixed an issue on Android where `player.ads.currentAds` would not return an array of ads due to a native error.
+- Fixed an issue on Android where the player would sometimes have wrong dimensions after transitioning to fullscreen presentation mode.
+- Fixed an issue on Android where the `useEMSG` property was not included when setting a TheoAds source description.
+
+### Added
+
+- Added RNRepo support for Android to the example app. More info on the official [documentation](https://rnrepo.org/) page.
+
+## [10.7.1] - 26-01-06
+
+### Added
+
+- Added a `multiSession` property to `DRMConfiguration` to enable multi-key content on Android platforms.
+
 ## [10.7.0] - 25-12-19
 
 ### Added

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

@@ -291,7 +291,10 @@ class PlayerEventEmitter internal constructor(
 
   fun preparePlayer(player: Player) {
     attachListeners(player)
+    emitPlayerReady(player)
+  }
 
+  fun emitPlayerReady(player: Player) {
     val payload = Arguments.createMap()
     payload.putMap(
       EVENT_PROP_STATE,

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

@@ -20,12 +20,15 @@ private const val TAG = "ReactTHEOplayerView"
 class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
   FrameLayout(reactContext), LifecycleEventListener {
 
-  private val eventEmitter: PlayerEventEmitter =
+  // Set true to bypass ReactNative lifecycle, avoiding THEOplayerView being disposed by Fabric
+  var bypassDropInstanceOnReactLifecycle = false
+  val eventEmitter: PlayerEventEmitter =
     PlayerEventEmitter(reactContext.reactApplicationContext, this)
   val broadcast = EventBroadcastAdapter(this)
   var presentationManager: PresentationManager? = null
   var playerContext: ReactTHEOplayerContext? = null
-  private var isInitialized: Boolean = false
+  var isInitialized: Boolean = false
+    private set
   private var config: PlayerConfigAdapter? = null
 
   val adsApi: AdsApiWrapper

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

@@ -23,7 +23,9 @@ class ReactTHEOplayerViewManager : ViewGroupManager<ReactTHEOplayerView>() {
    * {@link ViewManager} subclass.
    */
   override fun onDropViewInstance(view: ReactTHEOplayerView) {
-    view.releasePlayer()
+    if (!view.bypassDropInstanceOnReactLifecycle) {
+      view.releasePlayer()
+    }
   }
 
   @ReactProp(name = PROP_CONFIG)

package/android/src/main/java/com/theoplayer/ads/AdAdapter.kt

@@ -56,10 +56,12 @@ object AdAdapter {
   /**
    * Convert a list of native Ads to a ReactNative Ads.
    */
-  fun fromAds(ads: List<Ad>): WritableArray {
+  fun fromAds(ads: List<Ad?>): WritableArray {
     val payload = Arguments.createArray()
     for (ad in ads) {
-      payload.pushMap(fromAd(ad, true))
+      if (ad !== null) {
+        payload.pushMap(fromAd(ad, true))
+      }
     }
     return payload
   }

package/android/src/main/java/com/theoplayer/drm/ContentProtectionAdapter.kt

@@ -44,6 +44,7 @@ const val PROP_LICENSE_TYPE_TEMPORARY: String = "temporary"
 const val PROP_LICENSE_TYPE_PERSISTENT: String = "persistent"
 const val PROP_QUERY_PARAMETERS: String = "queryParameters"
 const val PROP_CERTIFICATE: String = "certificate"
+const val PROP_MULTISESSION: String = "multiSession"
 const val PROP_KEYS: String = "keys"
 const val PROP_ID: String = "id"
 const val PROP_VALUE: String = "value"
@@ -104,6 +105,9 @@ object ContentProtectionAdapter {
       if (jsonConfig.has(PROP_INTEGRATION_PARAMETERS)) {
         integrationParameters(fromJSONObjectToMap(jsonConfig.getJSONObject(PROP_INTEGRATION_PARAMETERS)))
       }
+      if (jsonConfig.has(PROP_MULTISESSION)) {
+        multiSession(jsonConfig.getBoolean(PROP_MULTISESSION))
+      }
       queryParameters(fromJSONObjectToMap(jsonConfig.optJSONObject(PROP_QUERY_PARAMETERS)))
     }.build()
   }

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

@@ -1,6 +1,7 @@
 package com.theoplayer.player
 
 import android.os.Build
+import android.util.Log
 import com.facebook.react.bridge.*
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.module.model.ReactModuleInfo
@@ -18,6 +19,8 @@ import com.theoplayer.audio.BackgroundAudioConfigAdapter
 import com.theoplayer.presentation.PipConfigAdapter
 import com.theoplayer.track.TextTrackStyleAdapter
 import com.theoplayer.util.ViewResolver
+import com.theoplayer.util.findReactRootView
+import com.theoplayer.util.getClosestParentOfType
 
 @Suppress("unused")
 @ReactModule(name = PlayerModule.NAME)
@@ -287,13 +290,11 @@ class PlayerModule(context: ReactApplicationContext) : ReactContextBaseJavaModul
   @ReactMethod(isBlockingSynchronousMethod = true)
   fun getUsableScreenDimensions(): WritableMap {
     // Pass the dimensions of the top-most View in the view hierarchy.
-    val topView = reactApplicationContext.currentActivity?.window?.decorView?.rootView
-    reactApplicationContext.resources.displayMetrics.also {
-      val density = it.density
-      return Arguments.createMap().apply {
-        putDouble("width", (topView?.width ?: 0) / density.toDouble())
-        putDouble("height", (topView?.height ?: 0) / density.toDouble())
-      }
+    val topView = findReactRootView( reactApplicationContext)
+    val density = reactApplicationContext.resources.displayMetrics.density.toDouble()
+    return Arguments.createMap().apply {
+      putDouble("width", (topView?.width ?: 0) / density)
+      putDouble("height", (topView?.height ?: 0) / density)
     }
   }
 }

package/android/src/main/java/com/theoplayer/presentation/FullscreenLayoutObserver.kt

@@ -2,11 +2,11 @@ package com.theoplayer.presentation
 
 import android.util.Log
 import android.view.View
-import android.view.ViewGroup
 import android.view.ViewTreeObserver
-import androidx.core.view.children
+import com.facebook.react.ReactRootView
 import com.facebook.react.views.view.ReactViewGroup
 import com.theoplayer.ReactTHEOplayerView
+import com.theoplayer.util.applyOnViewTree
 
 private const val TAG = "FSLayoutObserver"
 
@@ -20,14 +20,13 @@ class FullScreenLayoutObserver {
   private var globalLayoutListener: ViewTreeObserver.OnGlobalLayoutListener? = null
   private var attached: ReactViewGroup? = null
 
-  fun attach(viewGroup: ReactViewGroup?) {
+  fun attach(viewGroup: ReactViewGroup?, root: ReactRootView) {
     if (attached != null) {
       Log.w(TAG, "A previously attached ViewGroup was not properly detached.")
     }
 
     viewGroup?.let { reactPlayerGroup ->
       globalLayoutListener = ViewTreeObserver.OnGlobalLayoutListener {
-        val root = getRootViewFrom(reactPlayerGroup)
         reactPlayerGroup.post {
           applyOnViewTree(reactPlayerGroup) { view ->
             if (view == reactPlayerGroup || view is ReactTHEOplayerView) {
@@ -51,24 +50,3 @@ class FullScreenLayoutObserver {
     globalLayoutListener = null
   }
 }
-
-/**
- * Find the view root, most likely the decorView
- */
-fun getRootViewFrom(view: View): View {
-  var current = view
-  while (current.parent is View) {
-    current = current.parent as View
-  }
-  return current
-}
-
-/**
- * Conditionally apply an operation on each view in a hierarchy.
- */
-fun applyOnViewTree(view: View, doOp: (View) -> Unit) {
-  doOp(view)
-  if (view is ViewGroup) {
-    view.children.forEach { ch -> applyOnViewTree(ch, doOp) }
-  }
-}

package/android/src/main/java/com/theoplayer/presentation/PresentationManager.kt

@@ -10,13 +10,14 @@ import android.content.pm.PackageManager
 import android.os.Build
 import android.view.View
 import android.view.ViewGroup
-import android.view.ViewParent
 import androidx.activity.ComponentActivity
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.children
 import androidx.lifecycle.Lifecycle
 import com.facebook.react.ReactRootView
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
 import com.theoplayer.BuildConfig
@@ -26,6 +27,8 @@ import com.theoplayer.ReactTHEOplayerView
 import com.theoplayer.android.api.error.ErrorCode
 import com.theoplayer.android.api.error.THEOplayerException
 import com.theoplayer.android.api.player.PresentationMode
+import com.theoplayer.util.findReactRootView
+import com.theoplayer.util.getClosestParentOfType
 
 const val IS_TRANSITION_INTO_PIP = "isTransitioningToPip"
 const val IS_IN_PIP_MODE = "isInPictureInPictureMode"
@@ -71,6 +74,22 @@ class PresentationManager(
         }
       }
     }
+
+    // Emit dimension updates when layout changes
+    // This makes sure a dimension update is sent after fullscreen immersive animations complete.
+    rootView?.addOnLayoutChangeListener { view, _, _, _, _, _, _, _, _ ->
+      val density = reactContext.resources.displayMetrics.density.toDouble()
+      val params = Arguments.createMap().apply {
+        putMap("window", Arguments.createMap().apply {
+          putDouble("width", (view.width) / density)
+          putDouble("height", (view.height) / density)
+        })
+      }
+      reactContext
+        .getJSModule(ReactContext.RCTDeviceEventEmitter::class.java)
+        .emit("didUpdateDimensions", params)
+    }
+
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       supportsPip =
         reactContext.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
@@ -269,12 +288,7 @@ class PresentationManager(
     get() = viewCtx.playerView.getClosestParentOfType()
 
   private val rootView: ReactRootView?
-    get() {
-      val activity = reactContext.currentActivity ?: return null
-      // Try to search in parents and as a fallback option from root to bottom using depth-first order
-      return reactPlayerGroup?.getClosestParentOfType()
-        ?: (activity.window.decorView.rootView as? ViewGroup)?.getClosestParentOfType(false)
-    }
+    get() = findReactRootView( reactContext, reactPlayerGroup)
 
   private fun reparentPlayerToRoot() {
     reactPlayerGroup?.let { playerGroup ->
@@ -283,10 +297,12 @@ class PresentationManager(
 
         // Re-parent the playerViewGroup to the root node
         parent.removeView(playerGroup)
-        rootView?.addView(playerGroup)
+        rootView?.let { root ->
+          root.addView(playerGroup)
 
-        // Attach an observer that overrides the react-native lay-out and forces fullscreen.
-        fullScreenLayoutObserver.attach(playerGroup)
+          // Attach an observer that overrides the react-native lay-out and forces fullscreen.
+          fullScreenLayoutObserver.attach(playerGroup, root)
+        }
       }
     }
   }
@@ -335,35 +351,6 @@ class PresentationManager(
   }
 }
 
-inline fun <reified T : View> ViewGroup.getClosestParentOfType(upward: Boolean = true): T? {
-  if (upward) {
-    // Search in the parent views of `this` view up to the root
-    var parent: ViewParent? = parent
-    while (parent != null && parent !is T) {
-      parent = parent.parent
-    }
-    return parent as? T
-  } else {
-    // Search in the children collection.
-    val viewStack = ArrayDeque(children.toList())
-    // Use Stack/LIFO instead of recursion
-    while (viewStack.isNotEmpty()) {
-      when (val view = viewStack.removeAt(0)) {
-        is T -> {
-          return view
-        }
-
-        is ViewGroup -> {
-          // Filling LIFO with all children of the ViewGroup: depth-first order
-          viewStack.addAll(0, view.children.toList())
-        }
-      }
-    }
-    // Found nothing
-    return null
-  }
-}
-
 private class PlayerGroupRestoreOptions {
   var childIndex: Int? = null
   var parentNode: ViewGroup? = null

package/android/src/main/java/com/theoplayer/source/SourceAdapter.kt

@@ -68,6 +68,7 @@ private const val PROP_CUSTOM_ASSET_KEY = "customAssetKey"
 private const val PROP_OVERRIDE_LAYOUT = "overrideLayout"
 private const val PROP_NETWORK_CODE = "networkCode"
 private const val PROP_USE_ID3 = "useId3"
+private const val PROP_USE_EMSG = "useEMSG"
 private const val PROP_RETRIEVE_POD_ID_URI = "retrievePodIdURI"
 private const val PROP_INITIALIZATION_DELAY = "initializationDelay"
 private const val PROP_SSE_ENDPOINT = "sseEndpoint"
@@ -360,6 +361,7 @@ class SourceAdapter {
       networkCode = jsonAdDescription.optString(PROP_NETWORK_CODE).takeIf { it.isNotEmpty() },
       overrideLayout = parseOverrideLayout(jsonAdDescription.optString(PROP_OVERRIDE_LAYOUT)),
       useId3 = jsonAdDescription.optBoolean(PROP_USE_ID3, false),
+      useEMSG = jsonAdDescription.optBoolean(PROP_USE_EMSG, false),
       retrievePodIdURI = jsonAdDescription.optString(PROP_RETRIEVE_POD_ID_URI).takeIf { it.isNotEmpty() },
       initializationDelay = jsonAdDescription.optDouble(PROP_INITIALIZATION_DELAY).takeIf { it.isFinite() },
       sseEndpoint = jsonAdDescription.optString(PROP_SSE_ENDPOINT).takeIf { it.isNotEmpty() },

package/android/src/main/java/com/theoplayer/util/ViewUtils.kt

@@ -0,0 +1,67 @@
+package com.theoplayer.util
+
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewParent
+import androidx.core.view.children
+import com.facebook.react.ReactRootView
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.views.view.ReactViewGroup
+import kotlin.sequences.forEach
+
+/**
+ * Conditionally apply an operation on each view in a hierarchy.
+ */
+fun applyOnViewTree(view: View, doOp: (View) -> Unit) {
+  doOp(view)
+  if (view is ViewGroup) {
+    view.children.forEach { ch -> applyOnViewTree(ch, doOp) }
+  }
+}
+
+/**
+ * Finds the closest ReactRootView either by searching upwards from the given ReactViewGroup
+ * or, if that fails, by searching downwards from the root view of the current activity.
+ */
+fun findReactRootView(reactContext: ReactContext, reactPlayerGroup: ReactViewGroup? = null): ReactRootView? {
+  val activity = reactContext.currentActivity ?: return null
+  // Try to search in parents and as a fallback option from root to bottom using depth-first order
+  return reactPlayerGroup?.getClosestParentOfType()
+    ?: (activity.window.decorView.rootView as? ViewGroup)?.getClosestParentOfType(false)
+}
+
+/**
+ * Finds the closest parent view of the specified type [T].
+ *
+ * @param upward If true, searches upwards in the view hierarchy (towards the root).
+ *                 If false, searches downwards in the view hierarchy (towards the children).
+ * @return The closest parent view of type [T], or null if none is found.
+ */
+inline fun <reified T : View> ViewGroup.getClosestParentOfType(upward: Boolean = true): T? {
+  if (upward) {
+    // Search in the parent views of `this` view up to the root
+    var parent: ViewParent? = parent
+    while (parent != null && parent !is T) {
+      parent = parent.parent
+    }
+    return parent as? T
+  } else {
+    // Search in the children collection.
+    val viewStack = ArrayDeque(children.toList())
+    // Use Stack/LIFO instead of recursion
+    while (viewStack.isNotEmpty()) {
+      when (val view = viewStack.removeAt(0)) {
+        is T -> {
+          return view
+        }
+
+        is ViewGroup -> {
+          // Filling LIFO with all children of the ViewGroup: depth-first order
+          viewStack.addAll(0, view.children.toList())
+        }
+      }
+    }
+    // Found nothing
+    return null
+  }
+}

package/ios/THEOplayerRCTDebug.swift

@@ -19,7 +19,7 @@ let DEBUG_CONTENT_PROTECTION_API = DEBUG && false
 let DEBUG_VIEW = DEBUG && false
 
 // Debug flag to monitor correct SourceDescription buildup
-let DEBUG_SOURCE_DESCRIPTION_BUIDER = DEBUG && false
+let DEBUG_SOURCE_DESCRIPTION_BUILDER = DEBUG && false
 
 // Debug flag to monitor ads API usage
 let DEBUG_ADS_API = DEBUG && false
@@ -51,5 +51,12 @@ let DEBUG_THEOLIVE_API = DEBUG && false
 // Debug flag to monitor THEOAds API usage
 let DEBUG_THEOADS_API = DEBUG && false
 
-// Debug flag to monitor AudioSession interruptions (e.g. phone cll)
+// Debug flag to monitor AudioSession interruptions (e.g. phone call)
 let DEBUG_INTERRUPTIONS = DEBUG && false
+
+// Debug flag to monitor Presentationmode changes
+let DEBUG_PRESENTATIONMODES = DEBUG && false
+
+// Debug flag to monitor App state changes
+let DEBUG_APPSTATE = DEBUG && false
+

package/ios/THEOplayerRCTMainEventHandler.swift

@@ -7,7 +7,7 @@ public class THEOplayerRCTMainEventHandler {
     // MARK: Members
     private weak var player: THEOplayer?
     private weak var presentationModeContext: THEOplayerRCTPresentationModeContext?
-    private var loadedMetadataAndChapterTracksInfo: [[String:Any]] = []
+    private(set) var loadedMetadataAndChapterTracksInfo: [[String:Any]] = []
         
     // MARK: Events
     var onNativePlay: RCTDirectEventBlock?
@@ -274,9 +274,9 @@ public class THEOplayerRCTMainEventHandler {
         self.loadedMetadataListener = player.addEventListener(type: PlayerEventTypes.LOADED_META_DATA) { [weak self, weak player] event in
             if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received LOADED_META_DATA event from THEOplayer") }
             if let wplayer = player,
-               let welf = self,
-               let forwardedLoadedMetadataEvent = self?.onNativeLoadedMetadata {
-              let metadata = THEOplayerRCTTrackMetadataAggregator.aggregateTrackMetadata(player: wplayer, metadataTracksInfo: welf.loadedMetadataAndChapterTracksInfo)
+               let self,
+               let forwardedLoadedMetadataEvent = self.onNativeLoadedMetadata {
+              let metadata = THEOplayerRCTTrackMetadataAggregator.aggregateTrackInfo(player: wplayer, metadataTracksInfo: self.loadedMetadataAndChapterTracksInfo)
                 forwardedLoadedMetadataEvent(metadata)
             }
         }

package/ios/THEOplayerRCTPlayerStateBuilder.swift

@@ -0,0 +1,100 @@
+import Foundation
+import THEOplayerSDK
+
+let STATE_SOURCE = "source"
+let STATE_CURRENT_TIME = "currentTime"
+let STATE_CURRENT_PROGRAM_DATE_TIME = "currentProgramDateTime"
+let STATE_PAUSED = "paused"
+let STATE_PLAYBACK_RATE = "playbackRate"
+let STATE_DURATION = "duration"
+let STATE_VOLUME = "volume"
+let STATE_MUTED = "muted"
+let STATE_SEEKABLE = "seekable"
+let STATE_BUFFERED = "buffered"
+let STATE_START = "start"
+let STATE_END = "end"
+
+class THEOplayerRCTPlayerStateBuilder {
+    private var playerState: [String: Any] = [:]
+    
+    func build() -> [String: Any] {
+        return playerState
+    }
+    
+    func source(_ sourceDescription: SourceDescription?) -> Self {
+        if let sourceDesc = sourceDescription {
+            playerState[STATE_SOURCE] = THEOplayerRCTSourceDescriptionAggregator.aggregateSourceDescription(sourceDescription: sourceDesc)
+        }
+        return self
+    }
+    
+    func currentTime(_ timeInSec: Double) -> Self {
+        playerState[STATE_CURRENT_TIME] = timeInSec * 1000 // sec -> msec
+        return self
+    }
+    
+    func currentProgramDateTime(_ programDataTime: Date?) -> Self {
+        if let date = programDataTime {
+            playerState[STATE_CURRENT_PROGRAM_DATE_TIME] = date.timeIntervalSince1970 * 1000 // sec -> msec
+        }
+        return self
+    }
+    
+    func paused(_ paused: Bool) -> Self {
+        playerState[STATE_PAUSED] = paused
+        return self
+    }
+    
+    func playbackRate(_ rate: Double) -> Self {
+        playerState[STATE_PLAYBACK_RATE] = rate
+        return self
+    }
+    
+    func duration(_ durationInSec: Double?) -> Self {
+        if let durationInSec = durationInSec {
+            playerState[PROP_DURATION] = THEOplayerRCTTypeUtils.encodeInfNan(durationInSec * 1000) // sec -> msec
+        }
+        return self
+    }
+    
+    func volume(_ volume: Float) -> Self {
+        playerState[STATE_VOLUME] = Double(volume)
+        return self
+    }
+    
+    func muted(_ muted: Bool) -> Self {
+        playerState[STATE_MUTED] = muted
+        return self
+    }
+    
+    func seekable(_ seekableRanges: [THEOplayerSDK.TimeRange]?) -> Self {
+        playerState[STATE_SEEKABLE] = fromTimeRanges(seekableRanges)
+        return self
+    }
+    
+    func buffered(_ bufferedRanges: [THEOplayerSDK.TimeRange]?) -> Self {
+        playerState[STATE_BUFFERED] = fromTimeRanges(bufferedRanges)
+        return self
+    }
+    
+    func trackInfo(_ trackInfo: [String: Any]) -> Self {
+        playerState.merge(trackInfo) { (current, _) in current }
+        return self
+    }
+    
+    private func fromTimeRanges(_ ranges: [THEOplayerSDK.TimeRange]?) -> [[String: Double]] {
+        guard let inRanges = ranges else { return [] }
+        
+        var outRanges: [[String:Double]] = []
+        inRanges.forEach({ timeRange in
+            outRanges.append(
+                [
+                    STATE_START: timeRange.start * 1000,            // sec -> msec
+                    STATE_END: timeRange.end * 1000                 // sec -> msec
+                ]
+            )
+        })
+        return outRanges
+    }
+}
+

package/ios/THEOplayerRCTSourceDescriptionAggregator.swift

@@ -4,24 +4,30 @@ import Foundation
 import THEOplayerSDK
 import UIKit
 
-#if os(iOS)
 class THEOplayerRCTSourceDescriptionAggregator {
-    class func aggregateCacheTaskSourceDescription(sourceDescription: SourceDescription, cachingTaskId: String) -> [String:Any]? {
+    class func aggregateSourceDescription(sourceDescription: SourceDescription) -> [String:Any]? {
         do {
             let jsonEncoder = JSONEncoder()
             let data = try jsonEncoder.encode(sourceDescription)
             if let result = try? JSONSerialization.jsonObject(with: data, options: []) as? [String:Any] {
-                let srcDescription = THEOplayerRCTSourceDescriptionAggregator.sanitiseSourceDescriptionMetadata(input: result)
-                let extendedSrcDescription = THEOplayerRCTSourceDescriptionAggregator.addCachingTaskIdToMetadata(input: srcDescription, cachingTaskId: cachingTaskId)
-                return extendedSrcDescription
+                return THEOplayerRCTSourceDescriptionAggregator.sanitiseSourceDescriptionMetadata(input: result)
             }
         } catch {
-            if DEBUG { PrintUtils.printLog(logText: "[NATIVE] Could not aggregate sourceDescription for caching task: \(error.localizedDescription)")}
+            if DEBUG { PrintUtils.printLog(logText: "[NATIVE] Could not aggregate sourceDescription: \(error.localizedDescription)")}
             return nil
         }
         return nil
     }
     
+    class func aggregateCacheTaskSourceDescription(sourceDescription: SourceDescription, cachingTaskId: String) -> [String:Any]? {
+        if let result = THEOplayerRCTSourceDescriptionAggregator.aggregateSourceDescription(sourceDescription: sourceDescription) {
+            let srcDescription = THEOplayerRCTSourceDescriptionAggregator.sanitiseSourceDescriptionMetadata(input: result)
+            let extendedSrcDescription = THEOplayerRCTSourceDescriptionAggregator.addCachingTaskIdToMetadata(input: srcDescription, cachingTaskId: cachingTaskId)
+            return extendedSrcDescription
+        }
+        return nil
+    }
+    
     private class func sanitiseSourceDescriptionMetadata(input: [String:Any]) -> [String:Any] {
         var output: [String:Any] = input
         if let metadata = output[SD_PROP_METADATA] as? [String:Any],
@@ -53,4 +59,3 @@ class THEOplayerRCTSourceDescriptionAggregator {
         return output
     }
 }
-#endif

package/ios/THEOplayerRCTSourceDescriptionBuilder.swift

@@ -111,7 +111,7 @@ class THEOplayerRCTSourceDescriptionBuilder {
                 if let typedSource = THEOplayerRCTSourceDescriptionBuilder.buildTypedSource(typedSourceData) {
                     typedSources.append(typedSource)
                 } else {
-                    if DEBUG_SOURCE_DESCRIPTION_BUIDER {
+                    if DEBUG_SOURCE_DESCRIPTION_BUILDER {
                         PrintUtils.printLog(logText: "[NATIVE] Could not create THEOplayer TypedSource from sourceData array")
                     }
                     return (nil, nil)
@@ -123,7 +123,7 @@ class THEOplayerRCTSourceDescriptionBuilder {
             if let typedSource = THEOplayerRCTSourceDescriptionBuilder.buildTypedSource(typedSourceData) {
                 typedSources.append(typedSource)
             } else {
-                if DEBUG_SOURCE_DESCRIPTION_BUIDER {
+                if DEBUG_SOURCE_DESCRIPTION_BUILDER {
                     PrintUtils.printLog(logText: "[NATIVE] Could not create THEOplayer TypedSource from sourceData")
                 }
                 return (nil, nil)
@@ -147,7 +147,7 @@ class THEOplayerRCTSourceDescriptionBuilder {
                         textTrackDescriptions?.append(textTrackDescription)
                     }
                 } else {
-                    if DEBUG_SOURCE_DESCRIPTION_BUIDER {
+                    if DEBUG_SOURCE_DESCRIPTION_BUILDER {
                         PrintUtils.printLog(logText: "[NATIVE] Could not create THEOplayer TextTrackDescription from textTrackData array")
                     }
                     return (nil, nil)
@@ -220,7 +220,7 @@ class THEOplayerRCTSourceDescriptionBuilder {
             return daiSource
         }
 
-        if DEBUG_SOURCE_DESCRIPTION_BUIDER {
+        if DEBUG_SOURCE_DESCRIPTION_BUILDER {
             PrintUtils.printLog(logText: "[NATIVE] THEOplayer TypedSource requires 'src' property in 'sources' description")
         }
         return nil
@@ -392,9 +392,11 @@ class THEOplayerRCTSourceDescriptionBuilder {
         
         // global query parameters
         let queryParameters = contentProtectionData[SD_PROP_QUERY_PARAMETERS] as? [String:String]
+        let integrationParameters = contentProtectionData[SD_PROP_INTEGRATION_PARAMETERS] as? [String:Any] ?? [:]
         
         return MultiplatformDRMConfiguration(
             customIntegrationId: customIntegrationId,
+            integrationParameters: integrationParameters,
             keySystemConfigurations: KeySystemConfigurationCollection(fairplay: fairplayKeySystem, widevine: widevineKeySystem),
             queryParameters: queryParameters
         )

package/ios/THEOplayerRCTTrackMetadataAggregator.swift

@@ -38,7 +38,7 @@ let PROP_END_ON_NEXT: String = "endOnNext"
 
 class THEOplayerRCTTrackMetadataAggregator {
 
-    class func aggregateTrackMetadata(player: THEOplayer, metadataTracksInfo: [[String:Any]]) -> [String:Any] {
+    class func aggregateTrackInfo(player: THEOplayer, metadataTracksInfo: [[String:Any]]) -> [String:Any] {
         let textTracks: TextTrackList = player.textTracks
         let audioTracks: AudioTrackList = player.audioTracks
         let videoTracks: VideoTrackList = player.videoTracks