react-native-theoplayer 11.2.1 → 11.4.0

package/CHANGELOG.md

@@ -5,6 +5,33 @@ 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).
 
+## [Unreleased]
+
+## [11.4.0] - 26-07-06
+
+### Fixed
+
+- Fixed an issue on iOS where the `volumeChange` listener was not correctly removed on player desctruction.
+
+### Added
+
+- Added `externalId` property to `TheoLiveDistribution` on Android and iOS.
+- Added `hlsMpegTsSrc` and `daiAssetKey` properties to `TheoLiveEndpoint` on Android and iOS.
+- Added `targetLatency` property to `TheoLiveEndpoint` on Android.
+- Added V3 discovery response properties (`src`, `srcType`, `provider`, `distribution`) to `TheoLiveEndpoint` on Web.
+
+## [11.3.0] - 26-06-18
+
+### Added
+
+- Added Android support for `ABRConfiguration.preferredMaximumResolution`, mirroring the existing iOS behaviour. Set to `(0,0)` to remove the cap.
+- Added basic support for CMCD event mode reporting of DRM and ad events.
+- Added bridging of the `hlsDateRange` property from `PlayerConfiguration` to Android's `THEOplayerConfig`.
+
+### Fixed
+
+- Fixed an issue on Android where `GoogleImaConfiguration.sessionId` was not properly passed.
+
 ## [11.2.1] - 26-06-09
 
 ### Fixed

package/android/build.gradle

@@ -126,8 +126,8 @@ repositories {
     mavenLocal()
 }
 
-// The minimum supported THEOplayer version is 11.4.0
-def theoVersion = safeExtGet('THEOplayer_sdk', '[11.4.0, 12.0.0)')
+// The minimum supported THEOplayer version is 11.5.0
+def theoVersion = safeExtGet('THEOplayer_sdk', '[11.5.0, 12.0.0)')
 def theoMediaSessionVersion = safeExtGet('THEOplayer_mediasession', '[11.0.0, 12.0.0)')
 def theoAdsWrapperVersion = "11.0.0"
 def coroutinesVersion = safeExtGet('coroutinesVersion', '1.10.2')

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

@@ -8,6 +8,8 @@ import com.theoplayer.android.api.THEOplayerConfig
 import com.theoplayer.android.api.THEOplayerGlobal
 import com.theoplayer.android.api.cast.CastStrategy
 import com.theoplayer.android.api.cast.CastConfiguration
+import com.theoplayer.android.api.cmcd.CMCDConfiguration
+import com.theoplayer.android.api.cmcd.CMCDEndpointConfiguration
 import com.theoplayer.android.api.pip.PipConfiguration
 import com.theoplayer.android.api.player.NetworkConfiguration
 import com.theoplayer.android.api.theolive.THEOLiveConfig
@@ -42,9 +44,15 @@ private const val PROP_THEOLIVE_CONFIG = "theoLive"
 private const val PROP_THEOLIVE_EXTERNAL_SESSION_ID = "externalSessionId"
 private const val PROP_THEOLIVE_ANALYTICS_DISABLED = "analyticsDisabled"
 private const val PROP_THEOLIVE_DISCOVERY_URL = "discoveryUrl"
+private const val PROP_HLS_DATERANGE = "hlsDateRange"
 private const val PROP_MULTIMEDIA_TUNNELING_ENABLED = "tunnelingEnabled"
 private const val PROP_DEBUG_LOGS_ENABLED = "debugLogsEnabled"
 private const val PROP_SYSTEM_CAPTION_STYLE = "useSystemCaptionStyle"
+private const val PROP_CMCD = "cmcd"
+private const val PROP_CMCD_EXTERNAL_SESSION_ID = "externalSessionId"
+private const val PROP_CMCD_USER_ID = "userId"
+private const val PROP_CMCD_EVENT_ENDPOINTS = "eventEndpoints"
+private const val PROP_CMCD_ENDPOINT_URL = "url"
 
 
 class PlayerConfigAdapter(private val configProps: ReadableMap?) {
@@ -82,12 +90,18 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
         pip(PipConfiguration.Builder().build())
         // Opt-out for auto-integrations for now
         autoIntegrations(false)
+        if (hasKey(PROP_HLS_DATERANGE)) {
+          hlsDateRange(getBoolean(PROP_HLS_DATERANGE))
+        }
         if (hasKey(PROP_MULTIMEDIA_TUNNELING_ENABLED)) {
           tunnelingEnabled(getBoolean(PROP_MULTIMEDIA_TUNNELING_ENABLED))
         }
         if (hasKey(PROP_SYSTEM_CAPTION_STYLE)) {
           useSystemCaptionStyle(getBoolean(PROP_SYSTEM_CAPTION_STYLE))
         }
+        if (hasKey(PROP_CMCD)) {
+          cmcd(cmcdConfig())
+        }
       }
     }.build()
   }
@@ -241,6 +255,22 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
     return MediaSessionConfigAdapter.fromProps(configProps?.getMap(PROP_MEDIA_CONTROL))
   }
 
+  private fun cmcdConfig(): CMCDConfiguration {
+    val config = configProps?.getMap(PROP_CMCD)
+    val endpoints = config?.getArray(PROP_CMCD_EVENT_ENDPOINTS)?.let { arr ->
+      (0 until arr.size()).mapNotNull { i ->
+        arr.getMap(i)?.getString(PROP_CMCD_ENDPOINT_URL)?.let { url ->
+          CMCDEndpointConfiguration(url = url)
+        }
+      }
+    }
+    return CMCDConfiguration(
+      externalSessionId = config?.getString(PROP_CMCD_EXTERNAL_SESSION_ID),
+      userId = config?.getString(PROP_CMCD_USER_ID),
+      eventEndpoints = endpoints
+    )
+  }
+
   private fun theoLiveConfig (): THEOLiveConfig {
     val config = configProps?.getMap(PROP_THEOLIVE_CONFIG)
     return THEOLiveConfig.Builder(

package/android/src/main/java/com/theoplayer/abr/ABRConfigurationAdapter.kt

@@ -1,5 +1,6 @@
 package com.theoplayer.abr
 
+import android.util.Size
 import com.facebook.react.bridge.ReadableMap
 import com.theoplayer.android.api.abr.AbrStrategyConfiguration
 import com.theoplayer.android.api.abr.AbrStrategyMetadata
@@ -12,6 +13,9 @@ object ABRConfigurationAdapter {
   private const val PROP_METADATA = "metadata"
   private const val PROP_TYPE = "type"
   private const val PROP_BITRATE = "bitrate"
+  private const val PROP_PREFERRED_MAXIMUM_RESOLUTION = "preferredMaximumResolution"
+  private const val PROP_WIDTH = "width"
+  private const val PROP_HEIGHT = "height"
 
   fun applyABRConfigurationFromProps(player: Player?, abrProps: ReadableMap?) {
     if (abrProps == null || player == null) {
@@ -20,6 +24,11 @@ object ABRConfigurationAdapter {
     if (abrProps.hasKey(PROP_TARGET_BUFFER)) {
       player.abr.targetBuffer = abrProps.getInt(PROP_TARGET_BUFFER)
     }
+    // (0,0) is the documented sentinel for "no cap" and maps to a null Size on the native SDK.
+    val preferredMaximumResolutionProps = abrProps.getMap(PROP_PREFERRED_MAXIMUM_RESOLUTION)
+    if (preferredMaximumResolutionProps != null) {
+      player.abr.preferredMaximumResolution = preferredMaximumResolutionFromProps(preferredMaximumResolutionProps)
+    }
     // Strategy can be either a string or an object
     try {
       val abrStrategyPropsString = abrProps.getString(PROP_STRATEGY)
@@ -50,6 +59,18 @@ object ABRConfigurationAdapter {
     }
   }
 
+  private fun preferredMaximumResolutionFromProps(props: ReadableMap?): Size? {
+    if (props == null || !props.hasKey(PROP_WIDTH) || !props.hasKey(PROP_HEIGHT)) {
+      return null
+    }
+    val width = props.getDouble(PROP_WIDTH).toInt()
+    val height = props.getDouble(PROP_HEIGHT).toInt()
+    if (width <= 0 || height <= 0) {
+      return null
+    }
+    return Size(width, height)
+  }
+
   private fun abrMetadataFromProps(props: ReadableMap?): AbrStrategyMetadata? {
     if (props == null) {
       return null

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

@@ -20,6 +20,8 @@ import com.theoplayer.android.api.player.track.texttrack.TextTrackKind
 import com.theoplayer.android.api.source.metadata.ChromecastMetadataImage
 import com.theoplayer.BuildConfig
 import com.theoplayer.android.api.ads.theoads.TheoAdsLayoutOverride
+import com.theoplayer.android.api.cmcd.CMCDEndpointConfiguration
+import com.theoplayer.android.api.cmcd.CMCDSourceConfiguration
 import com.theoplayer.android.api.cmcd.CMCDTransmissionMode
 import com.theoplayer.android.api.error.ErrorCode
 import com.theoplayer.android.api.source.AdIntegration
@@ -94,6 +96,11 @@ private const val TYPE_MILLICAST = "millicast"
 
 private const val PROP_CMCD = "cmcd"
 private const val CMCD_TRANSMISSION_MODE = "transmissionMode"
+private const val CMCD_SESSION_ID = "sessionID"
+private const val CMCD_EXTERNAL_SESSION_ID = "externalSessionId"
+private const val CMCD_USER_ID = "userId"
+private const val CMCD_EVENT_ENDPOINTS = "eventEndpoints"
+private const val CMCD_ENDPOINT_URL = "url"
 
 class SourceAdapter {
   private val gson = Gson()
@@ -175,6 +182,11 @@ class SourceAdapter {
       if (metadataDescription != null) {
         builder.metadata(metadataDescription)
       }
+      if (jsonSourceObject.has(PROP_CMCD)) {
+        parseCmcdSourceConfiguration(jsonSourceObject.getJSONObject(PROP_CMCD))?.let {
+          builder.cmcd(it)
+        }
+      }
       return builder.build()
     } catch (e: JSONException) {
       e.printStackTrace()
@@ -464,7 +476,10 @@ class SourceAdapter {
     return BridgeUtils.fromJSONObjectToBridge(JSONObject(gson.toJson(typedSource)))
   }
 
-  private fun parseCmcdTransmissionMode(cmcdConfiguration : JSONObject) : CMCDTransmissionMode {
+  private fun parseCmcdTransmissionMode(cmcdConfiguration : JSONObject) : CMCDTransmissionMode? {
+    if (!cmcdConfiguration.has(CMCD_TRANSMISSION_MODE)) {
+      return null
+    }
     try {
       val transmissionMode = cmcdConfiguration.optInt(CMCD_TRANSMISSION_MODE)
       if (transmissionMode == CmcdTransmissionMode.QUERY_ARGUMENT.ordinal) {
@@ -476,4 +491,26 @@ class SourceAdapter {
       return CMCDTransmissionMode.HTTP_HEADER
     }
   }
+
+  private fun parseCmcdSourceConfiguration(cmcdJson: JSONObject): CMCDSourceConfiguration? {
+    val sessionId = cmcdJson.optString(CMCD_SESSION_ID, null)
+    val externalSessionId = cmcdJson.optString(CMCD_EXTERNAL_SESSION_ID, null)
+    val userId = cmcdJson.optString(CMCD_USER_ID, null)
+    val endpoints = cmcdJson.optJSONArray(CMCD_EVENT_ENDPOINTS)?.let { arr ->
+      (0 until arr.length()).mapNotNull { i ->
+        arr.optJSONObject(i)?.optString(CMCD_ENDPOINT_URL)?.let { url ->
+          CMCDEndpointConfiguration(url = url)
+        }
+      }
+    }
+    if (sessionId == null && externalSessionId == null && userId == null && endpoints == null) {
+      return null
+    }
+    return CMCDSourceConfiguration(
+      sessionId = sessionId,
+      externalSessionId = externalSessionId,
+      userId = userId,
+      eventEndpoints = endpoints
+    )
+  }
 }

package/android/src/main/java/com/theoplayer/theolive/EndpointAdapter.kt

@@ -15,7 +15,9 @@ private const val PROP_MILLICAST_SUBSCRIBER_TOKEN ="subscriberToken"
 private const val PROP_MILLICAST_DIRECTOR_URL = "directorUrl"
 private const val PROP_HESP_SRC = "hespSrc"
 private const val PROP_HLS_SRC = "hlsSrc"
+private const val PROP_HLS_MPEG_TS_SRC = "hlsMpegTsSrc"
 private const val PROP_AD_SRC = "adSrc"
+private const val PROP_DAI_ASSET_KEY = "daiAssetKey"
 private const val PROP_CDN = "cdn"
 private const val PROP_TARGET_LATENCY = "targetLatency"
 private const val PROP_WEIGHT = "weight"
@@ -44,7 +46,9 @@ object EndpointAdapter {
       endPoint.millicastSrc?.let { putMap(PROP_MILLICAST_SRC, fromEndPointMillicastSource(it)) }
       endPoint.hespSrc?.let { putString(PROP_HESP_SRC, it) }
       endPoint.hlsSrc?.let { putString(PROP_HLS_SRC, it) }
+      endPoint.hlsMpegTsSrc?.let { putString(PROP_HLS_MPEG_TS_SRC, it) }
       endPoint.adSrc?.let { putString(PROP_AD_SRC, it) }
+      endPoint.daiAssetKey?.let { putString(PROP_DAI_ASSET_KEY, it) }
       endPoint.cdn?.let { putString(PROP_CDN, it) }
       endPoint.targetLatency?.let { putDouble(PROP_TARGET_LATENCY, it) }
       putInt(PROP_WEIGHT, endPoint.weight)

package/android/src/main/java/com/theoplayer/theolive/THEOliveEventAdapter.kt

@@ -19,6 +19,7 @@ private const val EVENT_PROP_ENDPOINT = "endpoint"
 private const val EVENT_PROP_REASON = "reason"
 private const val EVENT_PROP_NAME = "name"
 private const val EVENT_PROP_ID = "id"
+private const val EVENT_PROP_EXTERNAL_ID = "externalId"
 
 class THEOliveEventAdapter(private val theoLiveApi: TheoLive, private val emitter: Emitter) {
 
@@ -68,6 +69,7 @@ class THEOliveEventAdapter(private val theoLiveApi: TheoLive, private val emitte
       putString(EVENT_PROP_TYPE, "distributionloaded")
       putMap(EVENT_PROP_DISTRIBUTION, Arguments.createMap().apply {
         putString(EVENT_PROP_ID, event.getDistribution().id)
+        event.getDistribution().externalId?.let { putString(EVENT_PROP_EXTERNAL_ID, it) }
         putString(EVENT_PROP_NAME, event.getDistribution().name)
       })
     })

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

@@ -26,6 +26,7 @@ private const val PROP_NAME = "name"
 private const val PROP_ENABLED = "enabled"
 private const val PROP_SRC = "src"
 private const val PROP_FORCED = "forced"
+private const val PROP_IN_BAND_METADATA_TRACK_DISPATCH_TYPE = "inBandMetadataTrackDispatchType"
 private const val PROP_CAPTION_CHANNEL = "captionChannel"
 private const val PROP_AUDIO_SAMPLING_RATE = "audioSamplingRate"
 private const val PROP_BANDWIDTH = "bandwidth"
@@ -71,6 +72,7 @@ object TrackListAdapter {
     textTrackPayload.putBoolean(PROP_FORCED, textTrack.isForced)
 
     // THEOplayer v10.13+
+    textTrackPayload.putString(PROP_IN_BAND_METADATA_TRACK_DISPATCH_TYPE, textTrack.inBandMetadataTrackDispatchType ?: "")
     textTrack.captionChannel?.let { textTrackPayload.putInt(PROP_CAPTION_CHANNEL, it) }
 
     // Optionally pass cue list.

package/ios/THEOplayerRCTMainEventHandler.swift

@@ -403,6 +403,12 @@ public class THEOplayerRCTMainEventHandler {
             if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] DurationChange listener dettached from THEOplayer") }
         }
         
+        // VOLUME_CHANGE
+        if let volumeChangeListener = self.volumeChangeListener {
+            player.removeEventListener(type: PlayerEventTypes.VOLUME_CHANGE, listener: volumeChangeListener)
+            if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] VolumeChange listener dettached from THEOplayer") }
+        }
+        
         // PROGRESS
         if let progressListener = self.progressListener {
             player.removeEventListener(type: PlayerEventTypes.PROGRESS, listener: progressListener)

package/ios/THEOplayerRCTSourceDescriptionBuilder.swift

@@ -64,6 +64,7 @@ let SD_PROP_INITIALIZATION_DELAY: String = "initializationDelay"
 let SD_PROP_HLS_DATE_RANGE: String = "hlsDateRange"
 let SD_PROP_BREAK_MANIFEST_URL: String = "breakManifestUrl"
 let SD_PROP_CMCD: String = "cmcd"
+let SD_PROP_TRANSMISSION_MODE: String = "transmissionMode"
 let SD_PROP_QUERY_PARAMETERS: String = "queryParameters"
 
 let EXTENSION_HLS: String = ".m3u8"
@@ -167,11 +168,15 @@ class THEOplayerRCTSourceDescriptionBuilder {
         }
 
         // 6. configure CMCD
-        let cmcd = sourceData[SD_PROP_CMCD] as? [String:Any]
-        if cmcd != nil {
-          typedSources.forEach { typedSource in
-            typedSource.cmcd = true;
+        var cmcdSourceConfig: CMCDSourceConfiguration? = nil
+        if let cmcd = sourceData[SD_PROP_CMCD] as? [String:Any] {
+          let requestModeEnabled = cmcd[SD_PROP_TRANSMISSION_MODE] != nil
+          if requestModeEnabled {
+            typedSources.forEach { typedSource in
+              typedSource.cmcd = true
+            }
           }
+          cmcdSourceConfig = THEOplayerRCTSourceDescriptionBuilder.buildCmcdSourceConfiguration(cmcd)
         }
 
         // 7. construct the SourceDescription
@@ -179,13 +184,33 @@ class THEOplayerRCTSourceDescriptionBuilder {
                                  textTracks: textTrackDescriptions,
                                  ads: adsDescriptions,
                                  poster: poster,
-                                 metadata: metadataDescription)
-
+                                 metadata: metadataDescription,
+                                 cmcdConfiguration: cmcdSourceConfig)
+        
         return (sourceDescription, metadataAndChapterTrackDescriptions)
     }
 
     // MARK: Private build methods
 
+    private static func buildCmcdSourceConfiguration(_ cmcdData: [String:Any]) -> CMCDSourceConfiguration? {
+        let sessionId = cmcdData["sessionID"] as? String
+        let externalSessionId = cmcdData["externalSessionId"] as? String
+        let userId = cmcdData["userId"] as? String
+        let endpoints: [CMCDEndpointConfiguration]? = (cmcdData["eventEndpoints"] as? [[String: Any]])?.compactMap { dict in
+            guard let url = dict["url"] as? String else { return nil }
+            return CMCDEndpointConfiguration(url: url)
+        }
+        if sessionId == nil && externalSessionId == nil && userId == nil && endpoints == nil {
+            return nil
+        }
+        return CMCDSourceConfiguration(
+            sessionId: sessionId,
+            externalSessionId: externalSessionId,
+            userId: userId,
+            eventEndpoints: endpoints
+        )
+    }
+
     /**
      Creates a THEOplayer TypedSource. This requires a source property for non SSAI strreams (either as a string or as an object contiaining a src property). For SSAI streams the TypeSource can be created from the ssai property.
      - returns: a THEOplayer TypedSource. In case of SSAI we  support GoogleDAITypedSource with GoogleDAIVodConfiguration or GoogleDAILiveConfiguration

package/ios/THEOplayerRCTTrackMetadataAggregator.swift

@@ -29,6 +29,7 @@ let PROP_CUE_CONTENT: String = "content"
 let PROP_CUE_CUSTOM_ATTRIBUTES: String = "customAttributes"
 let PROP_SRC: String = "src"
 let PROP_FORCED: String = "forced"
+let PROP_IN_BAND_METADATA_TRACK_DISPATCH_TYPE: String = "inBandMetadataTrackDispatchType"
 let PROP_START_DATE: String = "startDate"
 let PROP_END_DATE: String = "endDate"
 let PROP_ATTRIBUTE_CLASS: String = "class"
@@ -80,6 +81,7 @@ class THEOplayerRCTTrackMetadataAggregator {
         entry[PROP_TYPE] = textTrack.type
         entry[PROP_SRC] = textTrack.src
         entry[PROP_FORCED] = textTrack.forced
+        entry[PROP_IN_BAND_METADATA_TRACK_DISPATCH_TYPE] = textTrack.inBandMetadataTrackDispatchType
         // process cues when texttrack contains them
         if !textTrack.cues.isEmpty {
             var cueList: [[String:Any]] = []
@@ -327,6 +329,7 @@ class THEOplayerRCTTrackMetadataAggregator {
                     track[PROP_LABEL] = trackDescription.label ?? "no label"
                     track[PROP_TYPE] = "webvtt"
                     track[PROP_SRC] = trackDescription.src.absoluteString
+                    track[PROP_IN_BAND_METADATA_TRACK_DISPATCH_TYPE] = ""
                     var cueList: [[String:Any]] = []
                     var cueIndex = 0
                     for c in cues {

package/ios/THEOplayerRCTView.swift

@@ -48,6 +48,7 @@ public class THEOplayerRCTView: UIView {
     var castConfig = CastConfig()
     var uiConfig = UIConfig()
     var theoliveConfig = THEOliveConfig()
+    var cmcdConfig = CmcdConfig()
     
     public var bypassDropInstanceOnReactLifecycle = false // controls superView detaching behaviour
     
@@ -232,6 +233,7 @@ public class THEOplayerRCTView: UIView {
         config.hlsDateRange = self.hlsDateRange
         config.license = self.license
         config.licenseUrl = self.licenseUrl
+        config.cmcd = self.playerCmcdConfiguration()
         self.player = THEOplayer(configuration: config.build())
         
         self.initAdsIntegration()
@@ -322,6 +324,7 @@ public class THEOplayerRCTView: UIView {
         self.parseUIConfig(configDict: configDict)
         self.parseMediaControlConfig(configDict: configDict)
         self.parseTHEOliveConfig(configDict: configDict)
+        self.parseCmcdConfig(configDict: configDict)
         if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] config prop updated.") }
         
         // Given the bridged config, create the initial THEOplayer instance

package/ios/cmcd/THEOplayerRCTView+CmcdConfig.swift

@@ -0,0 +1,36 @@
+// THEOplayerRCTView+CmcdConfig.swift
+
+import Foundation
+import THEOplayerSDK
+
+struct CmcdConfig {
+    var externalSessionId: String?
+    var userId: String?
+    var eventEndpoints: [CMCDEndpointConfiguration]?
+}
+
+extension THEOplayerRCTView {
+
+    func parseCmcdConfig(configDict: NSDictionary) {
+        if let cmcdDict = configDict["cmcd"] as? NSDictionary {
+            self.cmcdConfig.externalSessionId = cmcdDict["externalSessionId"] as? String
+            self.cmcdConfig.userId = cmcdDict["userId"] as? String
+            self.cmcdConfig.eventEndpoints = (cmcdDict["eventEndpoints"] as? [[String: Any]])?.compactMap { dict -> CMCDEndpointConfiguration? in
+                guard let url = dict["url"] as? String else { return nil }
+                return CMCDEndpointConfiguration(url: url)
+            }
+        }
+    }
+
+    func playerCmcdConfiguration() -> CMCDConfiguration? {
+        let config = self.cmcdConfig
+        if config.externalSessionId == nil && config.userId == nil && config.eventEndpoints == nil {
+            return nil
+        }
+        return CMCDConfiguration(
+            externalSessionId: config.externalSessionId,
+            userId: config.userId,
+            eventEndpoints: config.eventEndpoints
+        )
+    }
+}

package/ios/theolive/THEOplayerRCTTHEOliveEventAdapter.swift

@@ -9,15 +9,18 @@ import THEOplayerTHEOliveIntegration
 
 let PROP_ENDPOINT_HESP_SRC: String = "hespSrc"
 let PROP_ENDPOINT_HLS_SRC: String = "hlsSrc"
+let PROP_ENDPOINT_HLS_MPEG_TS_SRC: String = "hlsMpegTsSrc"
 let PROP_ENDPOINT_MILLICAST_SRC: String = "millicastSrc"
 let PROP_ENDPOINT_CDN: String = "cdn"
 let PROP_ENDPOINT_AD_SRC: String = "adSrc"
+let PROP_ENDPOINT_DAI_ASSET_KEY: String = "daiAssetKey"
 let PROP_ENDPOINT_WEIGHT: String = "weight"
 let PROP_ENDPOINT_PRIORITY: String = "priority"
 let PROP_ENDPOINT_CONTENT_PROTECTION: String = "contentProtection"
 let PROP_REASON_ERROR_CODE: String = "errorCode"
 let PROP_REASON_ERROR_MESSAGE: String = "errorMessage"
 let PROP_DISTRIBUTION_ID: String = "id"
+let PROP_DISTRIBUTION_EXTERNAL_ID: String = "externalId"
 let PROP_DISTRIBUTION_NAME: String = "name"
 
 let PROP_CONTENTPROTECTION_INTEGRATION: String = "integration"
@@ -46,6 +49,9 @@ class THEOplayerRCTTHEOliveEventAdapter {
         if let hlsSrc = endpoint.hlsSrc {
             endpointData[PROP_ENDPOINT_HLS_SRC] = hlsSrc
         }
+        if let hlsMpegTsSrc = endpoint.hlsMpegTsSrc {
+            endpointData[PROP_ENDPOINT_HLS_MPEG_TS_SRC] = hlsMpegTsSrc
+        }
         if let millicastSrc = endpoint.millicastSrc {
             endpointData[PROP_ENDPOINT_MILLICAST_SRC] = millicastSrc.toJSONEncodableDictionary()
         }
@@ -55,6 +61,9 @@ class THEOplayerRCTTHEOliveEventAdapter {
         if let adSrc = endpoint.adSrc {
             endpointData[PROP_ENDPOINT_AD_SRC] = adSrc
         }
+        if let daiAssetKey = endpoint.daiAssetKey {
+            endpointData[PROP_ENDPOINT_DAI_ASSET_KEY] = daiAssetKey
+        }
         if let contentProtection = endpoint.channelContentProtection {
             endpointData[PROP_ENDPOINT_CONTENT_PROTECTION] = THEOplayerRCTTHEOliveEventAdapter.fromContentProtection(contentProtection: contentProtection)
         }
@@ -122,6 +131,9 @@ class THEOplayerRCTTHEOliveEventAdapter {
         
         var distributionData: [String:Any] = [:]
         distributionData[PROP_DISTRIBUTION_ID] = distribution.id
+        if let externalId = distribution.externalId {
+            distributionData[PROP_DISTRIBUTION_EXTERNAL_ID] = externalId
+        }
         distributionData[PROP_DISTRIBUTION_NAME] = distribution.name
 
         return distributionData