react-native-theoplayer 9.9.1 → 10.0.0

package/ios/THEOplayerRCTBridge.m

@@ -49,6 +49,7 @@ RCT_EXPORT_VIEW_PROPERTY(onNativePresentationModeChange, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onNativeResize, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onNativeAdEvent, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onNativeTHEOliveEvent, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onNativeTHEOadsEvent, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onNativeCastEvent, RCTDirectEventBlock);
 
 @end
@@ -285,3 +286,21 @@ RCT_EXTERN_METHOD(setAuthToken:(nonnull NSNumber *)node
 
 @end
 
+// ----------------------------------------------------------------------------
+// THEOAds Module
+// ----------------------------------------------------------------------------
+@interface RCT_EXTERN_REMAP_MODULE(THEORCTTHEOAdsModule, THEOplayerRCTTHEOAdsAPI, NSObject)
+
+RCT_EXTERN_METHOD(currentInterstitials:(nonnull NSNumber *)node
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(scheduledInterstitials:(nonnull NSNumber *)node
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(replaceAdTagParameters:(nonnull NSNumber *)node
+                  adTagParameters:(nullable NSDictionary *)adTagParameters)
+
+@end
+

package/ios/THEOplayerRCTDebug.swift

@@ -45,8 +45,11 @@ let DEBUG_CACHE_EVENTS = DEBUG && false
 // Debug flag to monitor cache API usage
 let DEBUG_CACHE_API = DEBUG && false
 
-// Debug flag to monitor theolive API usage
+// Debug flag to monitor THEOLive API usage
 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)
 let DEBUG_INTERRUPTIONS = DEBUG && false

package/ios/THEOplayerRCTMainEventHandler.swift

@@ -224,7 +224,7 @@ public class THEOplayerRCTMainEventHandler {
         if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] Seeking listener attached to THEOplayer") }
         
         // SEEKED
-        self.timeUpdateListener = player.addEventListener(type: PlayerEventTypes.SEEKED) { [weak self] event in
+        self.seekedListener = player.addEventListener(type: PlayerEventTypes.SEEKED) { [weak self] event in
             if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received SEEKED event from THEOplayer") }
             if let forwardedSeekedEvent = self?.onNativeSeeked {
                 forwardedSeekedEvent(["currentTime": 1e3 * event.currentTime])

package/ios/THEOplayerRCTPlayerAPI.swift

@@ -276,7 +276,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                 }
                 if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Showing textTrack \(uidValue) on TheoPlayer") }
                 for i in 0...textTracks.count-1 {
-                    var textTrack: TextTrack = textTracks.get(i)
+                    let textTrack: TextTrack = textTracks.get(i)
                     if textTrack.uid == uidValue {
                         textTrack.mode = TextTrackMode.showing
                     } else if textTrack.mode == TextTrackMode.showing {
@@ -299,7 +299,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                 }
                 if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Enabling audioTrack \(uidValue) on TheoPlayer") }
                 for i in 0...audioTracks.count-1 {
-                    var audioTrack: MediaTrack = audioTracks.get(i)
+                    let audioTrack: MediaTrack = audioTracks.get(i)
                     audioTrack.enabled = (audioTrack.uid == uidValue)
                 }
             }
@@ -318,7 +318,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                 }
                 if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Enabling videoTrack \(uidValue) on TheoPlayer") }
                 for i in 0...videoTracks.count-1 {
-                    var videoTrack: MediaTrack = videoTracks.get(i)
+                    let videoTrack: MediaTrack = videoTracks.get(i)
                     videoTrack.enabled = (videoTrack.uid == uidValue)
                 }
             }

package/ios/THEOplayerRCTSourceDescriptionBuilder.swift

@@ -162,7 +162,8 @@ class THEOplayerRCTSourceDescriptionBuilder {
         }
       
         // 6. configure CMCD
-        if let cmcd = sourceData[SD_PROP_CMCD] as? [String:Any] {
+        let cmcd = sourceData[SD_PROP_CMCD] as? [String:Any]
+        if cmcd != nil {
           typedSources.forEach { typedSource in
             typedSource.cmcd = true;
           }

package/ios/THEOplayerRCTView.swift

@@ -32,6 +32,7 @@ public class THEOplayerRCTView: UIView {
     var metadataTrackEventHandler: THEOplayerRCTSideloadedMetadataTrackEventHandler
     var adEventHandler: THEOplayerRCTAdsEventHandler
     var theoliveEventHandler: THEOplayerRCTTHEOliveEventHandler
+    var theoadsEventHandler: THEOplayerRCTTHEOadsEventHandler
     var castEventHandler: THEOplayerRCTCastEventHandler
     var presentationModeManager: THEOplayerRCTPresentationModeManager
     var backgroundAudioManager: THEOplayerRCTBackgroundAudioManager
@@ -99,6 +100,7 @@ public class THEOplayerRCTView: UIView {
         self.metadataTrackEventHandler = THEOplayerRCTSideloadedMetadataTrackEventHandler()
         self.adEventHandler = THEOplayerRCTAdsEventHandler()
         self.theoliveEventHandler = THEOplayerRCTTHEOliveEventHandler()
+        self.theoadsEventHandler = THEOplayerRCTTHEOadsEventHandler()
         self.castEventHandler = THEOplayerRCTCastEventHandler()
         self.presentationModeManager = THEOplayerRCTPresentationModeManager()
         self.backgroundAudioManager = THEOplayerRCTBackgroundAudioManager()
@@ -121,6 +123,7 @@ public class THEOplayerRCTView: UIView {
         self.deviceEventHandler.destroy()
         self.adEventHandler.destroy()
         self.theoliveEventHandler.destroy()
+        self.theoadsEventHandler.destroy()
         self.castEventHandler.destroy()
         self.nowPlayingManager.destroy()
         self.remoteCommandsManager.destroy()
@@ -156,6 +159,7 @@ public class THEOplayerRCTView: UIView {
             self.mediaTrackEventHandler.setPlayer(player)
             self.adEventHandler.setPlayer(player)
             self.theoliveEventHandler.setPlayer(player)
+            self.theoadsEventHandler.setPlayer(player)
             self.castEventHandler.setPlayer(player)
             self.nowPlayingManager.setPlayer(player)
             self.remoteCommandsManager.setPlayer(player)
@@ -427,4 +431,12 @@ public class THEOplayerRCTView: UIView {
         self.theoliveEventHandler.onNativeTHEOliveEvent = nativeTHEOliveEvent
         if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeTHEOliveEvent prop set.") }
     }
+    
+    // MARK: - Listener based THEOADS event bridging
+    
+    @objc(setOnNativeTHEOadsEvent:)
+    func setOnNativeTHEOadsEvent(nativeTHEOadsEvent: @escaping RCTDirectEventBlock) {
+        self.theoadsEventHandler.onNativeTHEOadsEvent = nativeTHEOadsEvent
+        if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeTHEOadsEvent prop set.") }
+    }
 }

package/ios/theoAds/THEOplayerRCTTHEOAdsAPI.swift

@@ -0,0 +1,101 @@
+//
+//  THEOplayerRCTTHEOAdsAPI.swift
+//  Theoplayer
+//
+import Foundation
+
+#if canImport(THEOplayerTHEOadsIntegration)
+import THEOplayerTHEOadsIntegration
+#endif
+
+let ERROR_MESSAGE_THEOADS_UNSUPPORTED_FEATURE = "This functionality is not supported by the provided iOS SDKs"
+let ERROR_CODE_THEOADS_ACCESS_FAILURE = "theoads_access_failure"
+let ERROR_MESSAGE_THEOADS_ACCESS_FAILURE = "Could not access THEOplayer THEOAds Module"
+
+@objc(THEOplayerRCTTHEOAdsAPI)
+class THEOplayerRCTTHEOAdsAPI: NSObject, RCTBridgeModule {
+    @objc var bridge: RCTBridge!
+
+    static func moduleName() -> String! {
+        return "THEORCTTHEOAdsModule"
+    }
+
+    static func requiresMainQueueSetup() -> Bool {
+        return false
+    }
+
+#if canImport(THEOplayerTHEOadsIntegration)
+    @objc(currentInterstitials:resolver:rejecter:)
+    func currentInterstitials(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        DispatchQueue.main.async {
+            if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
+               let player = theView.player,
+               let theoAds = player.ads.theoAds {
+                var currentInterstitials: [[String:Any]] = []
+                for interstitial in theoAds.currentInterstitials {
+                    currentInterstitials.append(THEOplayerRCTTHEOadsEventAdapter.fromInterstitial(interstitial))
+                }
+                resolve(currentInterstitials)
+            } else {
+                if DEBUG_THEOADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not get currentInterstitials (THEOAds module unavailable).") }
+                reject(ERROR_CODE_THEOADS_ACCESS_FAILURE, ERROR_MESSAGE_THEOADS_ACCESS_FAILURE, nil)
+            }
+        }
+    }
+    
+    @objc(scheduledInterstitials:resolver:rejecter:)
+    func scheduledInterstitials(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        DispatchQueue.main.async {
+            if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
+               let player = theView.player,
+               let theoAds = player.ads.theoAds {
+                var scheduledInterstitials: [[String:Any]] = []
+                for interstitial in theoAds.scheduledInterstitials {
+                    scheduledInterstitials.append(THEOplayerRCTTHEOadsEventAdapter.fromInterstitial(interstitial))
+                }
+                resolve(scheduledInterstitials)
+            } else {
+                if DEBUG_THEOADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not get scheduledInterstitials (THEOAds module unavailable).") }
+                reject(ERROR_CODE_THEOADS_ACCESS_FAILURE, ERROR_MESSAGE_THEOADS_ACCESS_FAILURE, nil)
+            }
+        }
+    }
+    
+    @objc(replaceAdTagParameters:adTagParameters:)
+    func replaceAdTagParameters(_ node: NSNumber, adTagParameters: [String:Any]?) -> Void {
+        DispatchQueue.main.async {
+            if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
+               let player = theView.player,
+               let theoAds = player.ads.theoAds {
+                if let newParams = adTagParameters as? [String: String] {
+                    theoAds.replaceAdTagParams(params: newParams)
+                    if DEBUG_THEOADS_API { PrintUtils.printLog(logText: "[NATIVE] THEOAds adTagParameters replaced.") }
+                } else {
+                    if DEBUG_THEOADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not replace THEOAds adTagParameters.") }
+                }
+            }
+        }
+    }
+
+#else
+
+    @objc(currentInterstitials:resolver:rejecter:)
+    func currentInterstitials(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        if DEBUG_THEOADS_API { print(ERROR_MESSAGE_THEOADS_UNSUPPORTED_FEATURE) }
+        reject(ERROR_CODE_THEOADS_ACCESS_FAILURE, ERROR_MESSAGE_THEOADS_ACCESS_FAILURE, nil)
+    }
+
+    @objc(scheduledInterstitials:resolver:rejecter:)
+    func scheduledInterstitials(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        if DEBUG_THEOADS_API { print(ERROR_MESSAGE_THEOADS_UNSUPPORTED_FEATURE) }
+        reject(ERROR_CODE_THEOADS_ACCESS_FAILURE, ERROR_MESSAGE_THEOADS_ACCESS_FAILURE, nil)
+    }
+    
+    @objc(replaceAdTagParameters:token:)
+    func replaceAdTagParameters(_ node: NSNumber, adTagParameters: [String:Any]?) -> Void {
+        if DEBUG_THEOADS_API { print(ERROR_MESSAGE_THEOADS_UNSUPPORTED_FEATURE) }
+    }
+
+#endif
+
+}

package/ios/theoAds/THEOplayerRCTTHEOAdsEventAdapter.swift

@@ -0,0 +1,118 @@
+// THEOplayerRCTTHEOadsEventAdapter.swift
+
+import Foundation
+import THEOplayerSDK
+
+#if canImport(THEOplayerTHEOadsIntegration)
+@_spi(Core) import THEOplayerTHEOadsIntegration
+#endif
+
+// general
+let PROP_INTERSTITIAL_ID: String = "id"
+let PROP_INTERSTITIAL_TYPE: String = "type"
+let PROP_INTERSTITIAL_START_TIME: String = "startTime"
+let PROP_INTERSTITIAL_DURATION: String = "duration"
+
+// adbreak specific
+let PROP_ADBREAK_INTERSTITIAL_LAYOUT: String = "layout"
+let PROP_ADBREAK_INTERSTITIAL_BACKDROPURI: String = "backdropUri"
+let PROP_ADBREAK_INTERSTITIAL_ADS: String = "ads"
+
+// overlay specific
+let PROP_OVERLAY_INTERSTITIAL_IMAGE_URL: String = "imageUrl"
+let PROP_OVERLAY_INTERSTITIAL_CLICKTHROUGH: String = "clickThrough"
+let PROP_OVERLAY_INTERSTITIAL_POSITION: String = "position"
+let PROP_OVERLAY_INTERSTITIAL_SIZE: String = "size"
+
+class THEOplayerRCTTHEOadsEventAdapter {
+
+#if canImport(THEOplayerTHEOadsIntegration)
+    class func fromInterstitial(_ interstitial: THEOplayerTHEOadsIntegration.Interstitial?) -> [String:Any] {
+        guard let interstitial = interstitial else {
+            return [:]
+        }
+        
+        var interstitialData: [String:Any] = [:]
+        interstitialData[PROP_INTERSTITIAL_ID] = interstitial.id
+        interstitialData[PROP_INTERSTITIAL_TYPE] = THEOplayerRCTTHEOadsEventAdapter.fromInterstitialType(interstitial.type)
+        interstitialData[PROP_INTERSTITIAL_START_TIME] = interstitial.startTime
+        if let duration = interstitial.duration {
+            interstitialData[PROP_INTERSTITIAL_DURATION] = duration
+        }
+        
+        // ADBREAK-INTERSTITIAL SPECIFIC:
+        if let adBreakInterstitial = interstitial as? THEOplayerTHEOadsIntegration.AdBreakInterstitial {
+            interstitialData[PROP_ADBREAK_INTERSTITIAL_LAYOUT] = THEOplayerRCTTHEOadsEventAdapter.fromInterstitialLayout(adBreakInterstitial.layout)
+            if let backdropUri = adBreakInterstitial.backdropUri {
+                interstitialData[PROP_ADBREAK_INTERSTITIAL_BACKDROPURI] = backdropUri
+            }
+            let interstitialAds = adBreakInterstitial.ads
+            var ads: [[String:Any]] = []
+            for ad in interstitialAds {
+                ads.append(THEOplayerRCTAdAdapter.fromAd(ad: ad))
+            }
+            interstitialData[PROP_ADBREAK_INTERSTITIAL_ADS] = ads
+        }
+        
+        // OVERLAY-INTERSTITIAL SPECIFIC
+        if let overlayInterstitial = interstitial as? THEOplayerTHEOadsIntegration.OverlayInterstitial {
+            if let imageUrl = overlayInterstitial.imageUrl {
+                interstitialData[PROP_OVERLAY_INTERSTITIAL_IMAGE_URL] = imageUrl
+            }
+            if let clickThrough = overlayInterstitial.clickThrough {
+                interstitialData[PROP_OVERLAY_INTERSTITIAL_CLICKTHROUGH] = clickThrough
+            }
+            interstitialData[PROP_OVERLAY_INTERSTITIAL_POSITION] = THEOplayerRCTTHEOadsEventAdapter.fromOverlayPosition(overlayInterstitial.position)
+            interstitialData[PROP_OVERLAY_INTERSTITIAL_SIZE] = THEOplayerRCTTHEOadsEventAdapter.fromOverlaySize(overlayInterstitial.size)
+        }
+        
+        return interstitialData
+    }
+    
+    class func fromInterstitialType(_ interstitialType: THEOplayerTHEOadsIntegration.InterstitialType) -> String {
+        switch interstitialType {
+        case InterstitialType.adbreak:
+            return "adbreak"
+        default:
+            return "overlay"
+        }
+    }
+    
+    class func fromInterstitialLayout(_ interstitialLayout: THEOplayerTHEOadsIntegration.THEOadsLayout) -> String {
+        switch interstitialLayout {
+        case THEOadsLayout.single:
+            return "single"
+        case THEOadsLayout.double:
+            return "double"
+        default:
+            return "l-shape"
+        }
+    }
+    
+    class func fromOverlayPosition(_ overlayPosition: THEOplayerTHEOadsIntegration.OverlayPosition) -> [String:Any] {
+        var overlayPositionData: [String:Any] = [:]
+        if let left = overlayPosition.left {
+            overlayPositionData["left"] = left
+        }
+        if let right = overlayPosition.right {
+            overlayPositionData["right"] = right
+        }
+        if let top = overlayPosition.top {
+            overlayPositionData["top"] = top
+        }
+        if let bottom = overlayPosition.bottom {
+            overlayPositionData["bottom"] = bottom
+        }
+        return overlayPositionData
+    }
+    
+    class func fromOverlaySize(_ overlaySize: THEOplayerTHEOadsIntegration.OverlaySize) -> [String:Any] {
+        var overlaySizeData: [String:Any] = [:]
+        overlaySizeData["width"] = overlaySize.width
+        overlaySizeData["height"] = overlaySize.height
+        return overlaySizeData
+    }
+
+#endif
+    
+}

package/ios/theoAds/THEOplayerRCTTHEOAdsEventHandler.swift

@@ -0,0 +1,174 @@
+// THEOplayerRCTTHEOadsEventHandler.swift
+
+import Foundation
+import THEOplayerSDK
+
+#if canImport(THEOplayerTHEOadsIntegration)
+import THEOplayerTHEOadsIntegration
+#endif
+
+let EVENT_TYPE_ADD_INTERSTITIAL: String = "addinterstitial"
+let EVENT_TYPE_INTERSTITIAL_BEGIN: String = "interstitialbegin"
+let EVENT_TYPE_INTERSTITIAL_END: String = "interstitialend"
+let EVENT_TYPE_INTERSTITIAL_UPDATE: String = "interstitialupdate"
+let EVENT_TYPE_INTERSTITIAL_ERROR: String = "interstitialerror"
+
+let THEOADS_EVENT_PROP_TYPE: String = "type"
+let THEOADS_EVENT_PROP_INTERSTITIAL: String = "interstitial"
+let THEOADS_EVENT_PROP_MESSAGE: String = "message"
+
+class THEOplayerRCTTHEOadsEventHandler {
+    // MARK: Members
+    private weak var player: THEOplayer?
+
+    // MARK: Events
+    var onNativeTHEOadsEvent: RCTDirectEventBlock?
+
+    // MARK: THEOAds Listeners
+    private var addInterstitialListener: EventListener?
+    private var interstitialBeginListener: EventListener?
+    private var interstitialEndListener: EventListener?
+    private var interstitialUpdateListener: EventListener?
+    private var interstitialErrorListener: EventListener?
+
+    // MARK: - destruction
+    func destroy() {
+        // dettach listeners
+        self.dettachListeners()
+    }
+
+    // MARK: - player setup / breakdown
+    func setPlayer(_ player: THEOplayer) {
+        self.player = player;
+
+        // attach listeners
+        self.attachListeners()
+    }
+
+    // MARK: - attach/dettach Listeners
+    private func attachListeners() {
+        guard let player = self.player else {
+            return
+        }
+
+#if canImport(THEOplayerTHEOadsIntegration)
+        // ADD_INTERSTITIAL
+        self.addInterstitialListener = player.ads.theoAds?.addEventListener(type: THEOadsEventTypes.ADD_INTERSTITIAL) { [weak self] event in
+            if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received AddInterstitial event from THEOplayer.ads.theoAds") }
+            if let forwardedTHEOadsEvent = self?.onNativeTHEOadsEvent {
+                forwardedTHEOadsEvent([
+                    THEOADS_EVENT_PROP_TYPE: EVENT_TYPE_ADD_INTERSTITIAL,
+                    THEOADS_EVENT_PROP_INTERSTITIAL: THEOplayerRCTTHEOadsEventAdapter.fromInterstitial(event.interstitial)
+                ])
+            }
+        }
+        if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] AddInterstitial listener attached to THEOplayer.ads.theoAds") }
+        
+        // INTERSTITIAL_BEGIN
+        self.interstitialBeginListener = player.ads.theoAds?.addEventListener(type: THEOadsEventTypes.INTERSTITIAL_BEGIN) { [weak self] event in
+            if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received InterstitialBegin event from THEOplayer.ads.theoAds") }
+            if let forwardedTHEOadsEvent = self?.onNativeTHEOadsEvent {
+                forwardedTHEOadsEvent([
+                    THEOADS_EVENT_PROP_TYPE: EVENT_TYPE_INTERSTITIAL_BEGIN,
+                    THEOADS_EVENT_PROP_INTERSTITIAL: THEOplayerRCTTHEOadsEventAdapter.fromInterstitial(event.interstitial)
+                ])
+            }
+        }
+        if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] InterstitialBegin listener attached to THEOplayer.ads.theoAds") }
+        
+        // INTERSTITIAL_END
+        self.interstitialEndListener = player.ads.theoAds?.addEventListener(type: THEOadsEventTypes.INTERSTITIAL_END) { [weak self] event in
+            if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received InterstitialEnd event from THEOplayer.ads.theoAds") }
+            if let forwardedTHEOadsEvent = self?.onNativeTHEOadsEvent {
+                forwardedTHEOadsEvent([
+                    THEOADS_EVENT_PROP_TYPE: EVENT_TYPE_INTERSTITIAL_END,
+                    THEOADS_EVENT_PROP_INTERSTITIAL: THEOplayerRCTTHEOadsEventAdapter.fromInterstitial(event.interstitial)
+                ])
+            }
+        }
+        if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] InterstitialEnd listener attached to THEOplayer.ads.theoAds") }
+        
+        // INTERSTITIAL_UPDATE
+        self.interstitialUpdateListener = player.ads.theoAds?.addEventListener(type: THEOadsEventTypes.INTERSTITIAL_UPDATE) { [weak self] event in
+            if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received InterstitialUpdate event from THEOplayer.ads.theoAds") }
+            if let forwardedTHEOadsEvent = self?.onNativeTHEOadsEvent {
+                forwardedTHEOadsEvent([
+                    THEOADS_EVENT_PROP_TYPE: EVENT_TYPE_INTERSTITIAL_UPDATE,
+                    THEOADS_EVENT_PROP_INTERSTITIAL: THEOplayerRCTTHEOadsEventAdapter.fromInterstitial(event.interstitial)
+                ])
+            }
+        }
+        if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] InterstitialUpdate listener attached to THEOplayer.ads.theoAds") }
+        
+        // INTERSTITIAL_ERROR
+        self.interstitialErrorListener = player.ads.theoAds?.addEventListener(type: THEOadsEventTypes.INTERSTITIAL_ERROR) { [weak self] event in
+            if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received InterstitialError event from THEOplayer.ads.theoAds") }
+            if let forwardedTHEOadsEvent = self?.onNativeTHEOadsEvent {
+                var interstitialData: [String: Any] = [:]
+                interstitialData[THEOADS_EVENT_PROP_TYPE] = EVENT_TYPE_INTERSTITIAL_ERROR
+                interstitialData[THEOADS_EVENT_PROP_INTERSTITIAL] = THEOplayerRCTTHEOadsEventAdapter.fromInterstitial(event.interstitial)
+                if let errorMessage = event.message {
+                    interstitialData[THEOADS_EVENT_PROP_MESSAGE] = errorMessage
+                }
+                forwardedTHEOadsEvent(interstitialData)
+            }
+        }
+        if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] InterstitialError listener attached to THEOplayer.ads.theoAds") }
+        
+#endif
+    }
+
+    private func dettachListeners() {
+        guard let player = self.player else {
+            return
+        }
+
+#if canImport(THEOplayerTHEOadsIntegration)
+        // ADD_INTERSTITIAL
+        if let addInterstitialListener = self.addInterstitialListener {
+            player.ads.theoAds?.removeEventListener(
+                type: THEOadsEventTypes.ADD_INTERSTITIAL,
+                listener: addInterstitialListener
+            )
+            if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] AddInterstitial listener detached from THEOplayer.ads.theoAds") }
+        }
+        
+        // INTERSTITIAL_BEGIN
+        if let interstitialBeginListener = self.interstitialBeginListener {
+            player.ads.theoAds?.removeEventListener(
+                type: THEOadsEventTypes.INTERSTITIAL_BEGIN,
+                listener: interstitialBeginListener
+            )
+            if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] InterstitialBegin listener detached from THEOplayer.ads.theoAds") }
+        }
+        
+        // INTERSTITIAL_END
+        if let interstitialEndListener = self.interstitialEndListener {
+            player.ads.theoAds?.removeEventListener(
+                type: THEOadsEventTypes.INTERSTITIAL_END,
+                listener: interstitialEndListener
+            )
+            if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] InterstitialEnd listener detached from THEOplayer.ads.theoAds") }
+        }
+        
+        // INTERSTITIAL_UPDATE
+        if let interstitialUpdateListener = self.interstitialUpdateListener {
+            player.ads.theoAds?.removeEventListener(
+                type: THEOadsEventTypes.INTERSTITIAL_UPDATE,
+                listener: interstitialUpdateListener
+            )
+            if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] InterstitialUpdate listener detached from THEOplayer.ads.theoAds") }
+        }
+        
+        // INTERSTITIAL_ERROR
+        if let interstitialErrorListener = self.interstitialErrorListener {
+            player.ads.theoAds?.removeEventListener(
+                type: THEOadsEventTypes.INTERSTITIAL_ERROR,
+                listener: interstitialErrorListener
+            )
+            if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] InterstitialError listener detached from THEOplayer.ads.theoAds") }
+        }
+#endif
+
+    }
+}

package/ios/theolive/THEOplayerRCTSourceDescriptionBuilder+Theolive.swift

@@ -17,7 +17,6 @@ extension THEOplayerRCTSourceDescriptionBuilder {
     static func buildTHEOliveDescription(_ theoliveData: [String:Any]) -> TypedSource? {
 #if canImport(THEOplayerTHEOliveIntegration)
       if let src = theoliveData[SD_PROP_SRC] as? String {
-          //let headers = typedSourceData[SD_PROP_HEADERS] as? [String:String]
           return TheoLiveSource(channelId: src)
       }
 #endif

package/ios/theolive/THEOplayerRCTTHEOliveEventHandler.swift

@@ -24,7 +24,7 @@ class THEOplayerRCTTHEOliveEventHandler {
     // MARK: Events
     var onNativeTHEOliveEvent: RCTDirectEventBlock?
 
-    // MARK: Ad Listeners
+    // MARK: THEOlive Listeners
     private var distributionLoadStartListener: EventListener?
     private var distributionOfflineListener: EventListener?
     private var endPointLoadedListener: EventListener?

package/ios/theolive/THEOplayerRCTView+THEOlive.swift

@@ -4,7 +4,7 @@ import Foundation
 import THEOplayerSDK
 
 #if canImport(THEOplayerTHEOliveIntegration)
-@_spi(Experimental) import THEOplayerTHEOliveIntegration
+import THEOplayerTHEOliveIntegration
 #endif
 
 extension THEOplayerRCTView {
@@ -15,11 +15,7 @@ extension THEOplayerRCTView {
         
 #if canImport(THEOplayerTHEOliveIntegration)
         let THEOliveConfig = THEOliveConfiguration(externalSessionId: self.theoliveConfig.externalSessionId,
-                                                   experimentalHespContentPlayer: !self.theoliveConfig.useLegacyTHEOlive,
                                                    discoveryUrl: self.theoliveConfig.discoveryUrl)
-        if DEBUG_THEOLIVE_API {
-            PrintUtils.printLog(logText: "[NATIVE] Using \(self.theoliveConfig.useLegacyTHEOlive ? "legacy" : "new") theolive pipeline.")
-        }
         
         self.THEOliveIntegration = THEOliveIntegrationFactory.createIntegration(with: THEOliveConfig)
         player.addIntegration(self.THEOliveIntegration!)

package/ios/theolive/THEOplayerRCTView+THEOliveConfig.swift

@@ -6,7 +6,6 @@ import THEOplayerSDK
 struct THEOliveConfig {
     var externalSessionId: String?
     var discoveryUrl: String?
-    var useLegacyTHEOlive: Bool = false
 }
 
 extension THEOplayerRCTView {
@@ -15,7 +14,6 @@ extension THEOplayerRCTView {
         if let theoLiveConfig = configDict["theoLive"] as? NSDictionary {
             self.theoliveConfig.externalSessionId = theoLiveConfig["externalSessionId"] as? String
             self.theoliveConfig.discoveryUrl = theoLiveConfig["discoveryUrl"] as? String
-            self.theoliveConfig.useLegacyTHEOlive = theoLiveConfig["useLegacyTHEOlive"] as? Bool ?? false
         }
     }
 }