react-native-theoplayer 7.6.0 → 7.7.1

package/CHANGELOG.md

@@ -5,6 +5,25 @@ 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).
 
+## [7.7.1] - 24-07-29
+
+### Fixed
+
+- Fixed an issue on tvOS where native cache functionality was not excluded correctly resulting in build errors.
+
+## [7.7.0] - 24-07-25
+
+### Added
+
+- Added ActiveQualityChanged event support for iOS.
+
+### Fixed
+
+- Fixed an issue where on iOS a cached asset would not play when setting the tasks's source on the player.
+- Fixed an issue where on iOS the createTask method (CacheAPI) was not returning the created task.
+- Fixed an issue where on iOS the Ad and AdBreak protocols where extended in the underlying native SDK and required some modifications.
+- Fixed an issue where on Android the native module preparation would fail due to a change in the Android SDK 7.8.0 on eventDispatching.
+
 ## [7.6.0] - 24-07-01
 
 ### Added

package/android/src/main/java/com/theoplayer/cache/CacheModule.kt

@@ -52,34 +52,36 @@ class CacheModule(private val context: ReactApplicationContext) :
 
   init {
     // Add cache event listeners
-    cache?.apply {
-      // Listen for cache state changes
-      addEventListener(CacheEventTypes.CACHE_STATE_CHANGE) { event ->
-        emit("onCacheStatusChange", Arguments.createMap().apply {
-          putString(PROP_STATUS, CacheAdapter.fromCacheStatus(event.status))
-        })
-      }
-      // Listen for add task events
-      tasks.addEventListener(CachingTaskListEventTypes.ADD_TASK) { event ->
-        event.task?.let { task ->
-          // Notify AddCachingTaskEvent event
-          emit("onAddCachingTaskEvent", Arguments.createMap().apply {
-            putMap(PROP_TASK, CacheAdapter.fromCachingTask(task))
+    handler.post {
+      cache?.apply {
+        // Listen for cache state changes
+        addEventListener(CacheEventTypes.CACHE_STATE_CHANGE) { event ->
+          emit("onCacheStatusChange", Arguments.createMap().apply {
+            putString(PROP_STATUS, CacheAdapter.fromCacheStatus(event.status))
           })
-          // Add CachingTask listeners
-          addCachingTaskListeners(task)
+       }
+        // Listen for add task events
+        tasks.addEventListener(CachingTaskListEventTypes.ADD_TASK) { event ->
+          event.task?.let { task ->
+            // Notify AddCachingTaskEvent event
+            emit("onAddCachingTaskEvent", Arguments.createMap().apply {
+              putMap(PROP_TASK, CacheAdapter.fromCachingTask(task))
+            })
+            // Add CachingTask listeners
+            addCachingTaskListeners(task)
+          }
         }
-      }
 
-      // Listen for task removal
-      tasks.addEventListener(CachingTaskListEventTypes.REMOVE_TASK) { event ->
-        event.task?.let { task ->
-          // Notify RemoveCachingTaskEvent event
-          emit("onRemoveCachingTaskEvent", Arguments.createMap().apply {
-            putMap(PROP_TASK, CacheAdapter.fromCachingTask(event.task))
-          })
-          // Remove CachingTask listeners
-          removeCachingTaskListeners(task)
+        // Listen for task removal
+        tasks.addEventListener(CachingTaskListEventTypes.REMOVE_TASK) { event ->
+          event.task?.let { task ->
+            // Notify RemoveCachingTaskEvent event
+            emit("onRemoveCachingTaskEvent", Arguments.createMap().apply {
+              putMap(PROP_TASK, CacheAdapter.fromCachingTask(event.task))
+            })
+            // Remove CachingTask listeners
+            removeCachingTaskListeners(task)
+          }
         }
       }
     }

package/ios/THEOplayerRCTBridge.m

@@ -228,7 +228,9 @@ RCT_EXTERN_METHOD(getInitialState:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(createTask:(NSDictionary)src
-                  params:(NSDictionary)params)
+                  params:(NSDictionary)params
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(startCachingTask:(nonnull NSString *)id)
 

package/ios/THEOplayerRCTMainEventHandler.swift

@@ -317,8 +317,8 @@ public class THEOplayerRCTMainEventHandler {
                let forwardedResizeEvent = self?.onNativeResize {
                 forwardedResizeEvent(
                     [
-                        "width": wplayer.videoWidth,
-                        "height": wplayer.videoHeight,
+                        "width": wplayer.frame.width,
+                        "height": wplayer.frame.height,
                     ]
                 )
             }

package/ios/THEOplayerRCTMediaTrackEventHandler.swift

@@ -20,8 +20,8 @@ class THEOplayerRCTMediaTrackEventHandler {
     private var videoChangeTrackListener: EventListener?
     
     // MARK: mediaTrack listeners (attached dynamically to new mediatracks)
-    private var audioChangeTrackListeners: [Int:EventListener] = [:]
-    private var videoChangeTrackListeners: [Int:EventListener] = [:]
+    private var videoQualityChangeListeners: [Int:EventListener] = [:]
+    private var audioQualityChangeListeners: [Int:EventListener] = [:]
     
     
     // MARK: - destruction
@@ -56,6 +56,10 @@ class THEOplayerRCTMediaTrackEventHandler {
                     "type" : TrackListEventType.ADD_TRACK.rawValue,
                     "trackType": MediaTrackType.AUDIO.rawValue
                 ])
+                
+                // start listening for qualityChange events on this track
+                welf.audioQualityChangeListeners[audioTrack.uid] = audioTrack.addEventListener(type: MediaTrackEventTypes.ACTIVE_QUALITY_CHANGED, listener: welf.addAudioQualityChangeListener(_:))
+                if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] QualityChange listener attached to THEOplayer audioTrack with uid \(audioTrack.uid)") }
             }
         }
         if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] AddTrack listener attached to THEOplayer audioTrack list") }
@@ -72,6 +76,12 @@ class THEOplayerRCTMediaTrackEventHandler {
                     "type" : TrackListEventType.REMOVE_TRACK.rawValue,
                     "trackType": MediaTrackType.AUDIO.rawValue
                 ])
+                
+                // stop listening for qualityChange events on this track
+                if let audioQualityChangeListener = welf.audioQualityChangeListeners.removeValue(forKey: audioTrack.uid) {
+                    audioTrack.removeEventListener(type: MediaTrackEventTypes.ACTIVE_QUALITY_CHANGED, listener: audioQualityChangeListener)
+                    if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] ActiveQuality listener removed from THEOplayer audioTrack with uid \(audioTrack.uid)") }
+                }
             }
         }
         if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] RemoveTrack listener attached to THEOplayer audioTrack list") }
@@ -104,6 +114,10 @@ class THEOplayerRCTMediaTrackEventHandler {
                     "type" : TrackListEventType.ADD_TRACK.rawValue,
                     "trackType": MediaTrackType.VIDEO.rawValue
                 ])
+                
+                // start listening for qualityChange events on this track
+                welf.videoQualityChangeListeners[videoTrack.uid] = videoTrack.addEventListener(type: MediaTrackEventTypes.ACTIVE_QUALITY_CHANGED, listener: welf.addVideoQualityChangeListener(_:))
+                if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] QualityChange listener attached to THEOplayer videoTrack with uid \(videoTrack.uid)") }
             }
         }
         if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] AddTrack listener attached to THEOplayer videoTrack list") }
@@ -120,6 +134,12 @@ class THEOplayerRCTMediaTrackEventHandler {
                     "type" : TrackListEventType.REMOVE_TRACK.rawValue,
                     "trackType": MediaTrackType.VIDEO.rawValue
                 ])
+                
+                // stop listening for qualityChange events on this track
+                if let videoQualityChangeListener = welf.videoQualityChangeListeners.removeValue(forKey: videoTrack.uid) {
+                    videoTrack.removeEventListener(type: MediaTrackEventTypes.ACTIVE_QUALITY_CHANGED, listener: videoQualityChangeListener)
+                    if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] ActiveQuality listener removed from THEOplayer videoTrack with uid \(videoTrack.uid)") }
+                }
             }
         }
         if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] RemoveTrack listener attached to THEOplayer videoTrack list") }
@@ -181,5 +201,112 @@ class THEOplayerRCTMediaTrackEventHandler {
             player.videoTracks.removeEventListener(type: VideoTrackListEventTypes.CHANGE, listener: videoChangeTrackListener)
             if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] ChangeTrack listener dettached from THEOplayer videoTrack list") }
         }
+        
+        // QUALITY CHANGE - AUDIO
+        let audioTrackCount = player.audioTracks.count
+        if audioTrackCount > 0 {
+            for i in 0..<audioTrackCount {
+                let audioTrack = player.audioTracks[i]
+                // stop listening for quality change events on this track
+                if let audioQualityChangeListener = self.audioQualityChangeListeners.removeValue(forKey: audioTrack.uid) {
+                    audioTrack.removeEventListener(type: MediaTrackEventTypes.ACTIVE_QUALITY_CHANGED, listener: audioQualityChangeListener)
+                    if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] ActiveQuality listener removed from THEOplayer audioTrack with uid \(audioTrack.uid)") }
+                }
+            }
+        }
+        
+        // QUALITY CHANGE - VIDEO
+        let videoTrackCount = player.videoTracks.count
+        if videoTrackCount > 0 {
+            for i in 0..<videoTrackCount {
+                let videoTrack = player.videoTracks[i]
+                // stop listening for quality change events on this track
+                if let videoQualityChangeListener = self.videoQualityChangeListeners.removeValue(forKey: videoTrack.uid) {
+                    videoTrack.removeEventListener(type: MediaTrackEventTypes.ACTIVE_QUALITY_CHANGED, listener: videoQualityChangeListener)
+                    if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] ActiveQuality listener removed from THEOplayer videoTrack with uid \(videoTrack.uid)") }
+                }
+            }
+        }
+    }
+    
+    // MARK: - dynamic mediaTrack Listeners
+    private func addVideoQualityChangeListener(_ event: ActiveQualityChangedEvent) {
+        if let forwardedMediaTrackEvent = self.onNativeMediaTrackEvent,
+           let player = self.player,
+           let track = self.activeTrack(tracks: player.videoTracks) {
+            if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received ACTIVE_QUALITY_CHANGED event for videoTrack") }
+            let identifier = String(track.activeQualityBandwidth)
+            let label = self.labelFromBandWidth(track.activeQualityBandwidth)
+            forwardedMediaTrackEvent([
+                "trackUid" : track.uid,
+                "type" : MediaTrackEventType.ACTIVE_QUALITY_CHANGED.rawValue,
+                "trackType": MediaTrackType.VIDEO.rawValue,
+                "qualities": [
+                    "bandwidth": track.activeQualityBandwidth,
+                    "codecs": "",
+                    "id": identifier,
+                    "uid": identifier,
+                    "name": label,
+                    "label": label,
+                    "available": true,
+                    "width": player.videoWidth,
+                    "height": player.videoHeight,
+                    //"frameRate": 0, // not available on iOS SDK
+                    //"firstFrame": 0 // not available on iOS SDK
+                        
+                ]
+            ])
+        }
+    }
+    
+    private func addAudioQualityChangeListener(_ event: ActiveQualityChangedEvent) {
+        if let forwardedMediaTrackEvent = self.onNativeMediaTrackEvent,
+           let player = self.player,
+           let track = self.activeTrack(tracks: player.audioTracks) {
+            if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received ACTIVE_QUALITY_CHANGED event for audioTrack") }
+            let identifier = String(track.activeQualityBandwidth)
+            let label = self.labelFromBandWidth(track.activeQualityBandwidth)
+            
+            forwardedMediaTrackEvent([
+                "trackUid" : track.uid,
+                "type" : MediaTrackEventType.ACTIVE_QUALITY_CHANGED.rawValue,
+                "trackType": MediaTrackType.AUDIO.rawValue,
+                "qualities": [
+                    "bandwidth": track.activeQualityBandwidth,
+                    "codecs": "",
+                    "id": identifier,
+                    "uid": identifier,
+                    "name": label,
+                    "label": label,
+                    "available": true,
+                    //"audioSamplingRate": 0 // not available on iOS SDK
+                ]
+            ])
+        }
+    }
+
+    // MARK: - Helpers
+    private func activeTrack(tracks: THEOplayerSDK.MediaTrackList) -> MediaTrack? {
+        guard tracks.count > 0 else {
+            return nil;
+        }
+        var track: MediaTrack?
+        for i in 0...tracks.count-1 {
+           track = tracks.get(i)
+            if (track != nil && track!.enabled) {
+                return track
+            }
+        }
+        return nil;
+    }
+    
+    private func labelFromBandWidth(_ bandWidth: Int) -> String {
+        if bandWidth > 1000000 {
+            return "\(Double(bandWidth / 1000) / 1000) Mbps"
+        } else if bandWidth > 1000 {
+            return "\(bandWidth / 1000) kbps"
+        } else {
+            return "No Label"
+        }
     }
 }

package/ios/THEOplayerRCTSourceDescriptionAggregator.swift

@@ -6,12 +6,14 @@ import UIKit
 
 #if os(iOS)
 class THEOplayerRCTSourceDescriptionAggregator {
-    class func aggregateCacheTaskSourceDescription(sourceDescription: SourceDescription) -> [String:Any]? {
+    class func aggregateCacheTaskSourceDescription(sourceDescription: SourceDescription, cachingTaskId: String) -> [String:Any]? {
         do {
             let jsonEncoder = JSONEncoder()
             let data = try jsonEncoder.encode(sourceDescription)
             if let result = try? JSONSerialization.jsonObject(with: data, options: []) as? [String:Any] {
-                return THEOplayerRCTSourceDescriptionAggregator.sanitiseSourceDescriptionMetadata(input: result)
+                let srcDescription = THEOplayerRCTSourceDescriptionAggregator.sanitiseSourceDescriptionMetadata(input: result)
+                let extendedSrcDescription = THEOplayerRCTSourceDescriptionAggregator.addCachingTaskIdToMetadata(input: srcDescription, cachingTaskId: cachingTaskId)
+                return extendedSrcDescription
             }
         } catch {
             if DEBUG { PrintUtils.printLog(logText: "[NATIVE] Could not aggregate sourceDescription for caching task: \(error.localizedDescription)")}
@@ -39,5 +41,16 @@ class THEOplayerRCTSourceDescriptionAggregator {
         }
         return output
     }
+    
+    private class func addCachingTaskIdToMetadata(input: [String:Any], cachingTaskId: String) -> [String:Any] {
+        var output: [String:Any] = input
+        if var metadata = output[SD_PROP_METADATA] as? [String:Any] {
+            metadata[SD_PROP_METADATA_CACHINGTASK_ID] = cachingTaskId
+            output[SD_PROP_METADATA] = metadata
+        } else {
+            output[SD_PROP_METADATA] = [SD_PROP_METADATA_CACHINGTASK_ID: cachingTaskId]
+        }
+        return output
+    }
 }
 #endif

package/ios/THEOplayerRCTSourceDescriptionBuilder.swift

@@ -12,6 +12,7 @@ let SD_PROP_SOURCES: String = "sources"
 let SD_PROP_POSTER: String = "poster"
 let SD_PROP_TEXTTRACKS: String = "textTracks"
 let SD_PROP_METADATA: String = "metadata"
+let SD_PROP_METADATA_CACHINGTASK_ID: String = "cachingTaskId"
 let SD_PROP_METADATAKEYS: String = "metadataKeys"
 let SD_PROP_SRC: String = "src"
 let SD_PROP_TYPE: String = "type"
@@ -73,6 +74,19 @@ class THEOplayerRCTSourceDescriptionBuilder {
         guard let sourcesData = sourceData[SD_PROP_SOURCES] else {
             return (nil, nil)
         }
+        
+#if os(iOS)
+        if let metadataData = sourceData[SD_PROP_METADATA] as? [String:Any],
+           let cachingTaskId = metadataData[SD_PROP_METADATA_CACHINGTASK_ID] as? String {
+            // this is a MediaCache src, so fetch the original SourceDescription from the MediaCache
+            let cachingTaskWithId = THEOplayer.cache.tasks.first { cachingTask in
+                cachingTask.id == cachingTaskId
+            }
+            if let foundTask = cachingTaskWithId {
+                return (foundTask.source, nil)
+            }
+        }
+#endif
 
         var typedSources: [TypedSource] = []
         // case: array of source objects

package/ios/THEOplayerRCTTrackEventTypes.swift

@@ -17,3 +17,7 @@ enum TrackCueEventType: Int {
     case ENTER_CUE = 2
     case EXIT_CUE = 3
 }
+
+enum MediaTrackEventType: Int {
+    case ACTIVE_QUALITY_CHANGED = 0
+}

package/ios/ads/THEOplayerRCTAdAdapter.swift

@@ -4,6 +4,7 @@ import Foundation
 import THEOplayerSDK
 
 let PROP_AD_INTEGRATION: String = "integration"
+let PROP_AD_CUSTOM_INTEGRATION: String = "customIntegration"
 let PROP_AD_TYPE: String = "type"
 let PROP_AD_ID: String = "id"
 let PROP_AD_BREAK: String = "adBreak"
@@ -31,6 +32,7 @@ let PROP_ADBREAK_TIME_OFFSET: String = "timeOffset"
 let PROP_ADBREAK_MAX_REMAINING_DURATION: String = "maxRemainingDuration"
 let PROP_ADBREAK_ADS: String = "ads"
 let PROP_ADBREAK_INTEGRATION: String = "integration"
+let PROP_ADBREAK_CUSTOM_INTEGRATION: String = "customIntegration"
 let PROP_COMPANION_AD_SLOT_ID: String = "adSlotId"
 let PROP_COMPANION_ALT_TEXT: String = "altText"
 let PROP_COMPANION_CLICK_THROUGH: String = "clickThrough"
@@ -43,6 +45,9 @@ class THEOplayerRCTAdAdapter {
     class func fromAd(ad: Ad, processAdBreak: Bool = true) -> [String:Any] {
         var adData: [String:Any] = [:]
         adData[PROP_AD_INTEGRATION] = ad.integration._rawValue
+        if let customIntegration = ad.customIntegration {
+            adData[PROP_AD_CUSTOM_INTEGRATION] = customIntegration
+        }
         adData[PROP_AD_TYPE] = ad.type
         if let adId = ad.id {
             adData[PROP_AD_ID] = adId
@@ -50,6 +55,9 @@ class THEOplayerRCTAdAdapter {
         if let resourceURI = ad.resourceURI {
             adData[PROP_AD_RESOURCE_URI] = resourceURI
         }
+        if let clickThrough = ad.clickThrough {
+            adData[PROP_AD_CLICK_THROUGH] = clickThrough
+        }
         if let skipOffset = ad.skipOffset {
             adData[PROP_AD_SKIP_OFFSET] = (skipOffset == -1) ? skipOffset : skipOffset
         }
@@ -65,20 +73,14 @@ class THEOplayerRCTAdAdapter {
         adData[PROP_AD_UNIVERSAL_AD_IDS] = []
         
         // Add additional properties for Linear Ads
-        if let linearAd = ad as? LinearAd {
-            if let adDuration = linearAd.duration {
-                adData[PROP_AD_DURATION] = adDuration
-            }
+        if let adDuration = ad.duration {
+            adData[PROP_AD_DURATION] = adDuration
         }
         
         // Add additional properties for NonLinear Ads
-#if os(iOS)
-        if let nonLinearAd = ad as? NonLinearAd {
-            if let adClickThrough = nonLinearAd.clickThrough {
-                adData[PROP_AD_CLICK_THROUGH] = adClickThrough
-            }
+        if let adClickThrough = ad.clickThrough {
+            adData[PROP_AD_CLICK_THROUGH] = adClickThrough
         }
-#endif
 
         // Add additional properties for GoogleIma Ads
         if let googleImaAd = ad as? GoogleImaAd {
@@ -142,6 +144,8 @@ class THEOplayerRCTAdAdapter {
                                        height: adData[PROP_GOOGLE_AD_HEIGHT] as? Int,
                                        integration: THEOplayerRCTTypeUtils.adIntegrationKind((adData[PROP_AD_INTEGRATION] as? String) ?? ""),
                                        duration: lround((adData[PROP_AD_DURATION] as? Double) ?? 0.0),
+                                       clickThrough: adData[PROP_AD_CLICK_THROUGH] as? String,
+                                       customIntegration: adData[PROP_AD_CUSTOM_INTEGRATION] as? String,
                                        mediaFiles: [], // TODO
                                        adSystem: adData[PROP_GOOGLE_AD_AD_SYSTEM] as? String,
                                        creativeId: adData[PROP_GOOGLE_AD_CREATIVE_ID] as? String,
@@ -173,6 +177,8 @@ class THEOplayerRCTAdAdapter {
         adBreakData[PROP_ADBREAK_MAX_DURATION] = adBreak.maxDuration
         adBreakData[PROP_ADBREAK_TIME_OFFSET] = adBreak.timeOffset
         adBreakData[PROP_ADBREAK_MAX_REMAINING_DURATION] = adBreak.maxRemainingDuration
+        adBreakData[PROP_ADBREAK_INTEGRATION] = adBreak.integration
+        adBreakData[PROP_ADBREAK_CUSTOM_INTEGRATION] = adBreak.customIntegration
         // process adds when adbreak contains them
         if !adBreak.ads.isEmpty {
             var adList: [[String:Any]] = []
@@ -180,10 +186,6 @@ class THEOplayerRCTAdAdapter {
                 adList.append(THEOplayerRCTAdAdapter.fromAd(ad: ad, processAdBreak: false))
             }
             adBreakData[PROP_ADBREAK_ADS] = adList
-            if adList.count > 0,
-               let integration = adList[0][PROP_AD_INTEGRATION] {
-                adBreakData[PROP_ADBREAK_INTEGRATION] = integration
-            }
         }
         return adBreakData
     }
@@ -205,7 +207,9 @@ class THEOplayerRCTAdAdapter {
         return NativeAdBreak(ads: ads,
                              maxDuration: lround((adBreakData[PROP_ADBREAK_MAX_DURATION] as? Double) ?? 0),
                              maxRemainingDuration: (adBreakData[PROP_ADBREAK_MAX_REMAINING_DURATION] as? Double) ?? 0,
-                             timeOffset: lround((adBreakData[PROP_ADBREAK_TIME_OFFSET] as? Double) ?? 0))
+                             timeOffset: lround((adBreakData[PROP_ADBREAK_TIME_OFFSET] as? Double) ?? 0),
+                             integration: THEOplayerRCTTypeUtils.adIntegrationKind((adBreakData[PROP_ADBREAK_INTEGRATION] as? String) ?? ""),
+                             customIntegration: adBreakData[PROP_ADBREAK_CUSTOM_INTEGRATION] as? String)
     }
     
     class private func fromCompanionAds(companionAds: [CompanionAd?]) -> [[String:Any]] {

package/ios/ads/THEOplayerRCTAdsNative.swift

@@ -22,8 +22,14 @@ class NativeAd: THEOplayerSDK.Ad {
     var height: Int? = nil
     /** The kind of the ad integration.*/
     var integration: THEOplayerSDK.AdIntegrationKind = THEOplayerSDK.AdIntegrationKind.defaultKind
+    /** The duration of the LinearAd, as provided by the VAST file, in seconds.*/
+    var duration: Int? = 0
+    /** The url that redirects to the website of the advertiser.*/
+    var clickThrough: String? = nil
+    /**The type of custom ad integration.*/
+    var customIntegration: String? = nil
     
-    init(adBreak: AdBreak? = nil, companions: [THEOplayerSDK.CompanionAd?], type: String, id: String? = nil, skipOffset: Int? = nil, resourceURI: String? = nil, width: Int? = nil, height: Int? = nil, integration: THEOplayerSDK.AdIntegrationKind) {
+    init(adBreak: AdBreak? = nil, companions: [THEOplayerSDK.CompanionAd?], type: String, id: String? = nil, skipOffset: Int? = nil, resourceURI: String? = nil, width: Int? = nil, height: Int? = nil, integration: THEOplayerSDK.AdIntegrationKind, duration: Int? = 0, clickThrough: String?, customIntegration: String?) {
         self.adBreak = adBreak
         self.companions = companions
         self.type = type
@@ -33,18 +39,18 @@ class NativeAd: THEOplayerSDK.Ad {
         self.width = width
         self.height = height
         self.integration = integration
+        self.duration = duration
+        self.clickThrough = clickThrough
+        self.customIntegration = customIntegration
     }
 }
 
 class NativeLinearAd: NativeAd, THEOplayerSDK.LinearAd {
-    /** The duration of the LinearAd, as provided by the VAST file, in seconds.*/
-    var duration: Int? = 0
     /** An array of mediafiles, which provides some meta data retrieved from the VAST file.*/
     var mediaFiles: [THEOplayerSDK.MediaFile] = []
     
-    init(adBreak: AdBreak? = nil, companions: [THEOplayerSDK.CompanionAd?], type: String, id: String? = nil, skipOffset: Int? = nil, resourceURI: String? = nil, width: Int? = nil, height: Int? = nil, integration: THEOplayerSDK.AdIntegrationKind, duration: Int? = 0, mediaFiles: [THEOplayerSDK.MediaFile] = []) {
+    init(adBreak: AdBreak? = nil, companions: [THEOplayerSDK.CompanionAd?], type: String, id: String? = nil, skipOffset: Int? = nil, resourceURI: String? = nil, width: Int? = nil, height: Int? = nil, integration: THEOplayerSDK.AdIntegrationKind, duration: Int? = 0, clickThrough: String? = nil, customIntegration: String? = nil, mediaFiles: [THEOplayerSDK.MediaFile] = []) {
         
-        self.duration = duration
         self.mediaFiles = mediaFiles
         
         super.init(adBreak:adBreak,
@@ -55,7 +61,10 @@ class NativeLinearAd: NativeAd, THEOplayerSDK.LinearAd {
                    resourceURI: resourceURI,
                    width: width,
                    height: height,
-                   integration: integration)
+                   integration: integration,
+                   duration: duration,
+                   clickThrough: clickThrough,
+                   customIntegration: customIntegration)
     }
 }
 
@@ -77,7 +86,7 @@ class NativeLinearGoogleImaAd: NativeLinearAd, THEOplayerSDK.GoogleImaAd {
     /** The String representing custom trafficking parameters from the VAST response.*/
     var traffickingParameters: String = ""
     
-    init(adBreak: AdBreak? = nil, companions: [THEOplayerSDK.CompanionAd?], type: String, id: String? = nil, skipOffset: Int? = nil, resourceURI: String? = nil, width: Int? = nil, height: Int? = nil, integration: THEOplayerSDK.AdIntegrationKind, duration: Int? = 0, mediaFiles: [THEOplayerSDK.MediaFile] = [], adSystem: String? = nil, creativeId: String? = nil, wrapperAdIds: [String], wrapperAdSystems: [String], wrapperCreativeIds: [String], vastMediaBitrate: Int, universalAdIds: [UniversalAdId], traffickingParameters: String) {
+    init(adBreak: AdBreak? = nil, companions: [THEOplayerSDK.CompanionAd?], type: String, id: String? = nil, skipOffset: Int? = nil, resourceURI: String? = nil, width: Int? = nil, height: Int? = nil, integration: THEOplayerSDK.AdIntegrationKind, duration: Int? = 0, clickThrough: String? = nil, customIntegration: String? = nil, mediaFiles: [THEOplayerSDK.MediaFile] = [], adSystem: String? = nil, creativeId: String? = nil, wrapperAdIds: [String], wrapperAdSystems: [String], wrapperCreativeIds: [String], vastMediaBitrate: Int, universalAdIds: [UniversalAdId], traffickingParameters: String) {
         self.adSystem = adSystem
         self.creativeId = creativeId
         self.wrapperAdIds = wrapperAdIds
@@ -97,6 +106,8 @@ class NativeLinearGoogleImaAd: NativeLinearAd, THEOplayerSDK.GoogleImaAd {
                    height: height,
                    integration:integration,
                    duration: duration,
+                   clickThrough: clickThrough,
+                   customIntegration: customIntegration,
                    mediaFiles: mediaFiles)
     }
 }
@@ -110,12 +121,18 @@ class NativeAdBreak: THEOplayerSDK.AdBreak {
     var maxRemainingDuration: Double = -1
     /** The time offset at which point the content will be paused to play the ad break, in seconds.*/
     var timeOffset: Int = 0
+    /** The kind of the ad integration.*/
+    var integration: THEOplayerSDK.AdIntegrationKind = THEOplayerSDK.AdIntegrationKind.defaultKind
+    /**The type of custom ad integration.*/
+    var customIntegration: String? = nil
     
-    init(ads: [Ad], maxDuration: Int, maxRemainingDuration: Double, timeOffset: Int) {
+    init(ads: [Ad], maxDuration: Int, maxRemainingDuration: Double, timeOffset: Int, integration: THEOplayerSDK.AdIntegrationKind, customIntegration: String? = nil) {
         self.ads = ads
         self.maxDuration = maxDuration
         self.maxRemainingDuration = maxRemainingDuration
         self.timeOffset = timeOffset
+        self.integration = integration
+        self.customIntegration = customIntegration
     }
 }
 

package/ios/cache/THEOplayerRCTCacheAPI.swift

@@ -17,6 +17,8 @@ let CACHE_EVENT_PROP_TASKS: String = "tasks"
 let CACHE_TAG: String = "[CacheAPI]"
 
 let ERROR_MESSAGE_CACHE_API_UNSUPPORTED_FEATURE = "Cache API is not supported for tvOS"
+let ERROR_CODE_CREATE_CACHINGTASK_FAILED = "create_cachingtask_failure"
+let ERROR_MESSAGE_CREATE_CACHINGTASK_FAILURE = "Creating a new cachingTask failed."
 
 @objc(THEOplayerRCTCacheAPI)
 class THEOplayerRCTCacheAPI: RCTEventEmitter {
@@ -140,15 +142,15 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
         ] as [String : Any])
     }
 
-    @objc(createTask:params:)
-    func createTask(_ src: NSDictionary, params: NSDictionary) -> Void {
+    @objc(createTask:params:resolver:rejecter:)
+    func createTask(_ src: NSDictionary, params: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         if DEBUG_CACHE_API { PrintUtils.printLog(logText: "[NATIVE] createTask triggered on Cache API.") }
 		let params = THEOplayerRCTCachingParametersBuilder.buildCachingParameters(params)
 		let (sourceDescription, _) = THEOplayerRCTSourceDescriptionBuilder.buildSourceDescription(src)
 		if let srcDescription = sourceDescription,
 		   let newTask = THEOplayer.cache.createTask(source: srcDescription, parameters: params) {
             if DEBUG_CACHE_API { PrintUtils.printLog(logText: "[NATIVE] New cache task created with id \(newTask.id)") }
-
+            resolve(THEOplayerRCTCacheAggregator.aggregateCacheTask(task: newTask))
             // emit onAddCachingTaskEvent
             self.sendEvent(withName: "onAddCachingTaskEvent", body: [
                 CACHE_EVENT_PROP_TASK: THEOplayerRCTCacheAggregator.aggregateCacheTask(task: newTask)
@@ -156,6 +158,8 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
 
             // attach the state and progress listeners to the new task
             self.attachTaskListenersToTask(newTask)
+        } else {
+            reject(ERROR_CODE_CREATE_CACHINGTASK_FAILED, ERROR_MESSAGE_CREATE_CACHINGTASK_FAILURE, nil)
         }
     }
 

package/ios/cache/THEOplayerRCTCacheAggregator.swift

@@ -41,7 +41,7 @@ class THEOplayerRCTCacheAggregator {
         aggregatedData[CACHETASK_PROP_ID] = task.id
         aggregatedData[CACHETASK_PROP_STATUS] = THEOplayerRCTTypeUtils.cachingTaskStatusToString(task.status)
         aggregatedData[CACHETASK_PROP_PARAMETERS] = THEOplayerRCTCacheAggregator.aggregateCacheTaskParameters(params: task.parameters)
-        aggregatedData[CACHETASK_PROP_SOURCE] = THEOplayerRCTSourceDescriptionAggregator.aggregateCacheTaskSourceDescription(sourceDescription: task.source)
+        aggregatedData[CACHETASK_PROP_SOURCE] = THEOplayerRCTSourceDescriptionAggregator.aggregateCacheTaskSourceDescription(sourceDescription: task.source, cachingTaskId: task.id)
         for (key, value) in THEOplayerRCTCacheAggregator.aggregateCacheTaskProgress(task: task) {
             aggregatedData[key] = value
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "7.6.0",
+  "version": "7.7.1",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-theoplayer.podspec

@@ -32,23 +32,23 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
   
   # THEOplayer core Dependency
-  s.dependency "THEOplayerSDK-core", "~> 7.4"
+  s.dependency "THEOplayerSDK-core", "~> 7.8"
   
   if theofeatures.include?("GOOGLE_IMA") 
 	puts "Adding THEOplayer-Integration-GoogleIMA"
-    s.dependency "THEOplayer-Integration-GoogleIMA/Base", "~> 7.4"
-	s.dependency "THEOplayer-Integration-GoogleIMA/Dependencies", "~> 7.4"
+    s.dependency "THEOplayer-Integration-GoogleIMA/Base", "~> 7.8"
+	s.dependency "THEOplayer-Integration-GoogleIMA/Dependencies", "~> 7.8"
   end
   
   if theofeatures.include?("CHROMECAST")
 	puts "Adding THEOplayer-Integration-GoogleCast"
-    s.ios.dependency "THEOplayer-Integration-GoogleCast/Base", "~> 7.4"
+    s.ios.dependency "THEOplayer-Integration-GoogleCast/Base", "~> 7.8"
 	s.ios.dependency "google-cast-sdk-dynamic-xcframework", "~> 4.8"
   end
   
   if theofeatures.include?("SIDELOADED_TEXTTRACKS") 
 	puts "Adding THEOplayer-Connector-SideloadedSubtitle"
-    s.dependency "THEOplayer-Connector-SideloadedSubtitle", "~> 7.4"
+    s.dependency "THEOplayer-Connector-SideloadedSubtitle", "~> 7.8"
   end
   
 end