react-native-theoplayer 3.7.1 → 3.9.0

package/ios/THEOplayerRCTPlayerAPI.swift

@@ -28,15 +28,15 @@ let TTS_PROP_COLOR_A = "a"
 @objc(THEOplayerRCTPlayerAPI)
 class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
     @objc var bridge: RCTBridge!
-    
+
     static func moduleName() -> String! {
-        return "PlayerModule"
+        return "THEORCTPlayerModule"
     }
-    
+
     static func requiresMainQueueSetup() -> Bool {
         return false
     }
-    
+
     @objc(setPaused:paused:)
     func setPaused(_ node: NSNumber, paused: Bool) -> Void {
         DispatchQueue.main.async {
@@ -52,7 +52,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(setSource:src:)
     func setSource(_ node: NSNumber, src: NSDictionary) -> Void {
         DispatchQueue.main.async {
@@ -71,7 +71,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     private func setNewSourceDescription(player: THEOplayer, srcDescription: SourceDescription) {
         if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Setting new source on TheoPlayer") }
 #if canImport(THEOplayerConnectorSideloadedSubtitle)
@@ -80,12 +80,12 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
         player.source = srcDescription
 #endif
     }
-    
+
     @objc(setABRConfig:abrConfig:)
     func setABRConfig(_ node: NSNumber, setABRConfig: NSDictionary) -> Void {
         if DEBUG_PLAYER_API { print(ERROR_MESSAGE_PLAYER_ABR_UNSUPPORTED_FEATURE) }
     }
-    
+
     @objc(setCurrentTime:time:)
     func setCurrentTime(_ node: NSNumber, time: NSNumber) -> Void {
         DispatchQueue.main.async {
@@ -97,7 +97,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(setMuted:muted:)
     func setMuted(_ node: NSNumber, muted: Bool) -> Void {
         DispatchQueue.main.async {
@@ -110,12 +110,12 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(setVolume:volume:)
     func setVolume(_ node: NSNumber, volume: NSNumber) -> Void {
         if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Setting volume: TheoPlayer does not handle volume changes for iOS. This is handled by the device.") }
     }
-    
+
     @objc(setPlaybackRate:playbackRate:)
     func setPlaybackRate(_ node: NSNumber, playbackRate: NSNumber) -> Void {
         DispatchQueue.main.async {
@@ -129,7 +129,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(setPresentationMode:presentationMode:)
     func setPresentationMode(_ node: NSNumber, presentationMode: String) -> Void {
         DispatchQueue.main.async {
@@ -139,7 +139,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(setAspectRatio:ratio:)
         func setAspectRatio(_ node: NSNumber, ratio: String) -> Void {
             DispatchQueue.main.async {
@@ -153,7 +153,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                 }
             }
         }
-    
+
     @objc(setPipConfig:pipConfig:)
     func setPipConfig(_ node: NSNumber, pipConfig: NSDictionary) -> Void {
         DispatchQueue.main.async {
@@ -163,13 +163,13 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     private func parsePipConfig(configDict: NSDictionary) -> PipConfig {
         var pipConfig = PipConfig()
         pipConfig.canStartPictureInPictureAutomaticallyFromInline = configDict["startsAutomatically"] as? Bool ?? false
         return pipConfig
     }
-    
+
     @objc(setBackgroundAudioConfig:backgroundAudioConfig:)
     func setBackgroundAudioConfig(_ node: NSNumber, backgroundAudioConfig: NSDictionary) -> Void {
         DispatchQueue.main.async {
@@ -179,13 +179,13 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     private func parseBackgroundAudioConfig(configDict: NSDictionary) -> BackgroundAudioConfig {
         var backgroundAudio = BackgroundAudioConfig()
         backgroundAudio.enabled = configDict["enabled"] as? Bool ?? false
         return backgroundAudio
     }
-    
+
     @objc(setSelectedTextTrack:uid:)
     func setSelectedTextTrack(_ node: NSNumber, uid: NSNumber) -> Void {
         DispatchQueue.main.async {
@@ -203,12 +203,12 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                         textTrack.mode = TextTrackMode.showing
                     } else if textTrack.mode == TextTrackMode.showing {
                         textTrack.mode = TextTrackMode.disabled
-                    } 
+                    }
                 }
             }
         }
     }
-    
+
     @objc(setSelectedAudioTrack:uid:)
     func setSelectedAudioTrack(_ node: NSNumber, uid: NSNumber) -> Void {
         DispatchQueue.main.async {
@@ -227,7 +227,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(setSelectedVideoTrack:uid:)
     func setSelectedVideoTrack(_ node: NSNumber, uid: NSNumber) -> Void {
         DispatchQueue.main.async {
@@ -246,13 +246,13 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(setTargetVideoQuality:uid:)
     func setTargetVideoQuality(_ node: NSNumber, uid: [NSNumber]) -> Void {
         if DEBUG_PLAYER_API { print(ERROR_MESSAGE_PLAYER_QUALITY_UNSUPPORTED_FEATURE) }
         return
     }
-    
+
     @objc(setPreload:type:)
     func setPreload(_ node: NSNumber, type: String) -> Void {
         DispatchQueue.main.async {
@@ -266,7 +266,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(setTextTrackStyle:textTrackStyle:)
     func setTextTrackStyle(_ node: NSNumber, textTrackStyle: NSDictionary) -> Void {
         DispatchQueue.main.async {
@@ -306,5 +306,5 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
 }

package/ios/ads/THEOplayerRCTAdsAPI.swift

@@ -25,11 +25,11 @@ let ERROR_MESSAGE_ADS_GET_SCHEDULED_ADBREAKS_UNDEFINED = "Undefined adbreaks arr
 @objc(THEOplayerRCTAdsAPI)
 class THEOplayerRCTAdsAPI: NSObject, RCTBridgeModule {
     @objc var bridge: RCTBridge!
-    
+
     static func moduleName() -> String! {
-        return "AdsModule"
+        return "THEORCTAdsModule"
     }
-    
+
     static func requiresMainQueueSetup() -> Bool {
         return false
     }
@@ -37,7 +37,7 @@ class THEOplayerRCTAdsAPI: NSObject, RCTBridgeModule {
 #if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
     @objc(skip:)
     func skip(_ node: NSNumber) -> Void {
-        
+
         DispatchQueue.main.async {
             let theView = self.bridge.uiManager.view(forReactTag: node) as! THEOplayerRCTView
             if let ads = theView.ads() {
@@ -47,7 +47,7 @@ class THEOplayerRCTAdsAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(playing:resolver:rejecter:)
     func playing(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         DispatchQueue.main.async {
@@ -60,7 +60,7 @@ class THEOplayerRCTAdsAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(currentAdBreak:resolver:rejecter:)
     func currentAdBreak(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         DispatchQueue.main.async {
@@ -74,7 +74,7 @@ class THEOplayerRCTAdsAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(currentAds:resolver:rejecter:)
     func currentAds(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         DispatchQueue.main.async {
@@ -92,7 +92,7 @@ class THEOplayerRCTAdsAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(scheduledAdBreaks:resolver:rejecter:)
     func scheduledAdBreaks(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         DispatchQueue.main.async {
@@ -110,7 +110,7 @@ class THEOplayerRCTAdsAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
     @objc(schedule:ad:)
     func schedule(_ node: NSNumber, adDict: NSDictionary) -> Void {
         DispatchQueue.main.async {
@@ -124,46 +124,46 @@ class THEOplayerRCTAdsAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
 #else
-    
+
     @objc(skip:)
     func skip(_ node: NSNumber) -> Void {
         if DEBUG_ADS_API { print(ERROR_MESSAGE_ADS_UNSUPPORTED_FEATURE) }
         return
     }
-    
+
     @objc(playing:resolver:rejecter:)
     func playing(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         if DEBUG_ADS_API { print(ERROR_MESSAGE_ADS_UNSUPPORTED_FEATURE) }
         resolve(false)
     }
-    
+
     @objc(currentAdBreak:resolver:rejecter:)
     func currentAdBreak(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         if DEBUG_ADS_API { print(ERROR_MESSAGE_ADS_UNSUPPORTED_FEATURE) }
         resolve([:])
     }
-    
+
     @objc(currentAds:resolver:rejecter:)
     func currentAds(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         if DEBUG_ADS_API { print(ERROR_MESSAGE_ADS_UNSUPPORTED_FEATURE) }
         resolve([])
     }
-    
+
     @objc(scheduledAdBreaks:resolver:rejecter:)
     func scheduledAdBreaks(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         if DEBUG_ADS_API { print(ERROR_MESSAGE_ADS_UNSUPPORTED_FEATURE) }
         resolve([])
         // TODO: handle request for scheduled adbreaks. Awaiting iOS SDK implementation
     }
-    
+
     @objc(schedule:ad:)
     func schedule(_ node: NSNumber, adDict: NSDictionary) -> Void {
         if DEBUG_ADS_API { print(ERROR_MESSAGE_ADS_UNSUPPORTED_FEATURE) }
         return
     }
-    
+
 #endif
 
 }

package/ios/backgroundAudio/THEOplayerRCTNowPlayingManager.swift

@@ -21,6 +21,10 @@ class THEOplayerRCTNowPlayingManager {
     func destroy() {
         // dettach listeners
         self.dettachListeners()
+        
+        // clear nowPlayingInfo
+        self.nowPlayingInfo = [:]
+        self.clearNowPlayingOnInfoCenter()
     }
     
     // MARK: - player setup / breakdown

package/ios/cache/THEOplayerRCTCacheAPI.swift

@@ -22,19 +22,19 @@ let ERROR_MESSAGE_CACHE_API_UNSUPPORTED_FEATURE = "Cache API is not supported fo
 class THEOplayerRCTCacheAPI: RCTEventEmitter {
     // MARK: Cache Listeners
     private var cacheStatusListener: EventListener?
-    
+
     // MARK: CacheTask listeners (attached dynamically to new tasks)
     private var taskStateChangeListeners: [String:EventListener] = [:] // key is CacheTask.id
     private var taskProgressListeners: [String:EventListener] = [:] // key is CacheTask.id
-    
+
     override static func moduleName() -> String! {
-        return "CacheModule"
+        return "THEORCTCacheModule"
     }
-    
+
     override static func requiresMainQueueSetup() -> Bool {
         return false
     }
-    
+
     override func supportedEvents() -> [String]! {
         return [
             "onCacheStatusChange",
@@ -44,18 +44,18 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
             "onCachingTaskStatusChangeEvent"
         ]
     }
-    
+
     override init() {
         super.init()
-        
+
         // attach listeners
         self.attachCacheListeners()
     }
-    
+
     deinit {
         self.detachCacheListeners()
     }
-    
+
     // MARK: - attach/dettach cache Listeners
     private func attachCacheListeners() {
 #if os(iOS)
@@ -67,14 +67,14 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
             ])
         }
         if DEBUG_CACHE_EVENTS { PrintUtils.printLog(logText: "[NATIVE] StateChange listener attached to THEOplayer.cache") }
-        
+
         // Attach listeners to all task currently known to cache
         for cachingTask in THEOplayer.cache.tasks {
             self.attachTaskListenersToTask(cachingTask)
         }
 #endif
     }
-    
+
     private func detachCacheListeners() {
 #if os(iOS)
         // STATE_CHANGE
@@ -84,7 +84,7 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
         }
 #endif
     }
-    
+
 #if os(iOS)
     private func attachTaskListenersToTask(_ newTask: CachingTask) {
         // add STATE_CHANGE listeners to newly created task
@@ -94,7 +94,7 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
                 CACHETASK_PROP_ID: newTask.id,
                 CACHE_EVENT_PROP_STATUS: THEOplayerRCTTypeUtils.cachingTaskStatusToString(newTask.status)
             ])
-            
+
             if let errorEvent = event as? CachingTaskErrorStateChangeEvent,
                let error = errorEvent.error {
                 if DEBUG_CACHE_EVENTS { PrintUtils.printLog(logText: "[NATIVE] STATE_CHANGE_ERROR event for task with id \(newTask.id): [error] \(error.code):\(error.category) - \(error.message)") }
@@ -103,7 +103,7 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
             }
         }
         if DEBUG_CACHE_EVENTS { PrintUtils.printLog(logText: "[NATIVE] StateChange listener attached to task with id \(newTask.id).") }
-        
+
         // add PROGRESS listeners to newly created task
         self.taskProgressListeners[newTask.id] = newTask.addEventListener(type: CachingTaskEventTypes.PROGRESS) { [weak self] event in
             if DEBUG_CACHE_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received PROGRESS event from task with id \(newTask.id): progress is \(newTask.percentageCached * 100.0)% of \(newTask.duration) sec.") }
@@ -114,7 +114,7 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
         }
         if DEBUG_CACHE_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Progress listener attached to task with id \(newTask.id).") }
     }
-    
+
     private func detachTaskListenersFromTask(_ task: CachingTask) {
         // STATE_CHANGE
         if let taskStateChangeListener = self.taskStateChangeListeners[task.id] {
@@ -128,7 +128,7 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
         }
     }
 #endif
-    
+
     // MARK: API
 
 #if os(iOS)
@@ -139,7 +139,7 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
             CACHE_EVENT_PROP_TASKS: THEOplayerRCTCacheAggregator.aggregateCacheTasks(tasks: THEOplayer.cache.tasks)
         ] as [String : Any])
     }
-    
+
     @objc(createTask:params:)
     func createTask(_ src: NSDictionary, params: NSDictionary) -> Void {
         if DEBUG_CACHE_API { PrintUtils.printLog(logText: "[NATIVE] createTask triggered on Cache API.") }
@@ -148,17 +148,17 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
 		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)") }
-            
+
             // emit onAddCachingTaskEvent
             self.sendEvent(withName: "onAddCachingTaskEvent", body: [
                 CACHE_EVENT_PROP_TASK: THEOplayerRCTCacheAggregator.aggregateCacheTask(task: newTask)
             ])
-            
+
             // attach the state and progress listeners to the new task
             self.attachTaskListenersToTask(newTask)
         }
     }
-    
+
     @objc(startCachingTask:)
     func startCachingTask(_ id: NSString) -> Void {
         if DEBUG_CACHE_API { PrintUtils.printLog(logText: "[NATIVE] Start task triggered on Cache API for task with id \(id).") }
@@ -166,7 +166,7 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
             task.start()
         }
     }
-    
+
     @objc(pauseCachingTask:)
     func pauseCachingTask(_ id: NSString) -> Void {
         if DEBUG_CACHE_API { PrintUtils.printLog(logText: "[NATIVE] Pause task triggered on Cache API for task with id \(id).") }
@@ -174,7 +174,7 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
             task.pause()
         }
     }
-    
+
     @objc(removeCachingTask:)
     func removeCachingTask(_ id: NSString) -> Void {
         if DEBUG_CACHE_API { PrintUtils.printLog(logText: "[NATIVE] Remove task triggered on Cache API for task with id \(id).") }
@@ -185,7 +185,7 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
             self.detachTaskListenersFromTask(task)
         }
     }
-    
+
     @objc(renewLicense:drmConfig:)
     func renewLicense(_ id: NSString, drmConfig: NSDictionary) -> Void {
         if DEBUG_CACHE_API { PrintUtils.printLog(logText: "[NATIVE] Renew license triggered on Cache API for task with id \(id).") }
@@ -203,7 +203,7 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
             }
         }
     }
-    
+
     private func taskById(_ id: String) -> CachingTask? {
         return THEOplayer.cache.tasks.first {
             cachingTask in cachingTask.id == id
@@ -218,27 +218,27 @@ class THEOplayerRCTCacheAPI: RCTEventEmitter {
             CACHE_EVENT_PROP_TASKS: []
         ] as [String : Any])
     }
-    
+
     @objc(createTask:params:)
     func createTask(_ src: NSDictionary, params: NSDictionary) -> Void {
         if DEBUG_CACHE_API { print(ERROR_MESSAGE_CACHE_API_UNSUPPORTED_FEATURE) }
     }
-    
+
     @objc(startCachingTask:)
     func startCachingTask(_ id: NSString) -> Void {
         if DEBUG_CACHE_API { print(ERROR_MESSAGE_CACHE_API_UNSUPPORTED_FEATURE) }
     }
-    
+
     @objc(pauseCachingTask:)
     func pauseCachingTask(_ id: NSString) -> Void {
         if DEBUG_CACHE_API { print(ERROR_MESSAGE_CACHE_API_UNSUPPORTED_FEATURE) }
     }
-    
+
     @objc(removeCachingTask:)
     func removeCachingTask(_ id: NSString) -> Void {
         if DEBUG_CACHE_API { print(ERROR_MESSAGE_CACHE_API_UNSUPPORTED_FEATURE) }
     }
-    
+
     @objc(renewLicense:drmConfig:)
     func renewLicense(_ id: NSString, drmConfig: NSDictionary) -> Void {
         if DEBUG_CACHE_API { print(ERROR_MESSAGE_CACHE_API_UNSUPPORTED_FEATURE) }

package/ios/casting/THEOplayerRCTCastAPI.swift

@@ -12,18 +12,18 @@ let ERROR_MESSAGE_CAST_ACCESS_FAILURE = "Could not access THEOplayer Cast Module
 @objc(THEOplayerRCTCastAPI)
 class THEOplayerRCTCastAPI: NSObject, RCTBridgeModule {
     @objc var bridge: RCTBridge!
-    
+
     static func moduleName() -> String! {
-        return "CastModule"
+        return "THEORCTCastModule"
     }
-    
+
     static func requiresMainQueueSetup() -> Bool {
         return false
     }
-    
+
     // MARK: CHROMECAST AND AIRPLAY
 #if os(iOS)
-    
+
     @objc(casting:resolver:rejecter:)
     func casting(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         DispatchQueue.main.async {
@@ -36,15 +36,15 @@ class THEOplayerRCTCastAPI: NSObject, RCTBridgeModule {
             }
         }
     }
-    
+
 #else
-    
+
     @objc(casting:resolver:rejecter:)
     func casting(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         if DEBUG_CAST_API { print(ERROR_MESSAGE_CASTING_UNSUPPORTED_FEATURE) }
         resolve(false)
     }
-    
+
 #endif
-    
+
 }