@jwplayer/jwplayer-react-native 1.0.2 → 1.0.3

package/ios/RNJWPlayer/RNJWPlayerView.swift

@@ -85,6 +85,8 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
     @objc var onCasting: RCTDirectEventBlock?
     @objc var onCastingEnded: RCTDirectEventBlock?
     @objc var onCastingFailed: RCTDirectEventBlock?
+    @objc var onCaptionsChanged: RCTDirectEventBlock?
+    @objc var onCaptionsList: RCTDirectEventBlock?
     
     init() {
         super.init(frame: CGRect(x: 20, y: 0, width: UIScreen.main.bounds.width - 40, height: 300))
@@ -299,7 +301,7 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
             }
             
             if backgroundAudioEnabled || pipEnabled {
-                let category = config["category"] as? String
+                let category = config["category"] != nil ? config["category"] as? String : "playback" // default category for playback
                 let categoryOptions = config["categoryOptions"] as? [String]
                 let mode = config["mode"] as? String
 
@@ -960,12 +962,12 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
     }
 
     func jwplayer(_ player:JWPlayer, failedWithError code:UInt, message:String) {
-        self.onPlayerError?(["error": message])
+        self.onPlayerError?(["error": message, "errorCode": code])
         playerFailed = true
     }
 
     func jwplayer(_ player:JWPlayer, failedWithSetupError code:UInt, message:String) {
-        self.onSetupPlayerError?(["error": message])
+        self.onSetupPlayerError?(["errorMessage": message, "errorCode": code])
         playerFailed = true
     }
 
@@ -979,7 +981,7 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
 
 
     func jwplayer(_ player:JWPlayer, encounteredAdWarning code:UInt, message:String) {
-        self.onPlayerAdWarning?(["warning": message])
+        self.onPlayerAdWarning?(["warning": message, "code": code])
     }
 
 
@@ -1179,10 +1181,6 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
 
     // MARK: - JWPlayer State Delegate
 
-    func jwplayerContentIsBuffering(_ player:JWPlayer) {
-        self.onBuffer?([:])
-    }
-
     func jwplayer(_ player:JWPlayer, isBufferingWithReason reason:JWBufferReason) {
         self.onBuffer?([:])
     }
@@ -1233,6 +1231,10 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
     func jwplayerContentDidComplete(_ player:JWPlayer) {
         self.onComplete?([:])
     }
+    
+    func jwplayerContentIsBuffering(_ player: any JWPlayerKit.JWPlayer) {
+
+    }
 
     func jwplayer(_ player:JWPlayer, didLoadPlaylistItem item:JWPlayerItem, at index:UInt) {
 //        var sourceDict: [String: Any] = [:]
@@ -1400,7 +1402,7 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
     }
 
     func jwplayer(_ player:JWPlayer, captionTrackChanged index:Int) {
-
+        self.onCaptionsChanged?(["index": index])
     }
 
     func jwplayer(_ player: JWPlayer, visualQualityChanged currentVisualQuality: JWVisualQuality) {
@@ -1416,7 +1418,15 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
     }
 
     func jwplayer(_ player:JWPlayer, updatedCaptionList options:[JWMediaSelectionOption]) {
-
+        var tracks: [[String: Any]] = []
+        for track in player.captionsTracks {
+            var dict: [String: Any] = [:]
+            dict["label"] = track.name
+            dict["default"] = track.defaultOption  
+            tracks.append(dict)
+        }
+        let currentIndex = player.currentCaptionsTrack
+        self.onCaptionsList?(["index": currentIndex, "tracks": tracks])
     }
 
     // MARK: - JWPlayer audio session && interruption handling
@@ -1518,29 +1528,32 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
         }
 
         var options: AVAudioSession.CategoryOptions = []
-        if categoryOptions.contains("MixWithOthers") {
-            options.insert(.mixWithOthers)
-        }
-        if categoryOptions.contains("DuckOthers") {
-            options.insert(.duckOthers)
-        }
-        if categoryOptions.contains("AllowBluetooth") {
-            options.insert(.allowBluetooth)
-        }
-        if categoryOptions.contains("InterruptSpokenAudioAndMix") {
-            options.insert(.interruptSpokenAudioAndMixWithOthers)
-        }
-        if categoryOptions.contains("AllowBluetoothA2DP") {
-            options.insert(.allowBluetoothA2DP)
-        }
-        if categoryOptions.contains("AllowAirPlay") {
-            options.insert(.allowAirPlay)
-        }
-        if categoryOptions.contains("OverrideMutedMicrophone") {
-            if #available(iOS 14.5, *) {
-                options.insert(.overrideMutedMicrophoneInterruption)
-            } else {
-                // Handle the case for earlier versions if needed
+        // If the user doesn't specify any options
+        if categoryOptions != nil {
+            if categoryOptions.contains("MixWithOthers") {
+                options.insert(.mixWithOthers)
+            }
+            if categoryOptions.contains("DuckOthers") {
+                options.insert(.duckOthers)
+            }
+            if categoryOptions.contains("AllowBluetooth") {
+                options.insert(.allowBluetooth)
+            }
+            if categoryOptions.contains("InterruptSpokenAudioAndMix") {
+                options.insert(.interruptSpokenAudioAndMixWithOthers)
+            }
+            if categoryOptions.contains("AllowBluetoothA2DP") {
+                options.insert(.allowBluetoothA2DP)
+            }
+            if categoryOptions.contains("AllowAirPlay") {
+                options.insert(.allowAirPlay)
+            }
+            if categoryOptions.contains("OverrideMutedMicrophone") {
+                if #available(iOS 14.5, *) {
+                    options.insert(.overrideMutedMicrophoneInterruption)
+                } else {
+                    // Handle the case for earlier versions if needed
+                }
             }
         }
         

package/ios/RNJWPlayer/RNJWPlayerViewController.swift

@@ -55,13 +55,13 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
 
     override func jwplayer(_ player:JWPlayer, failedWithError code:UInt, message:String) {
         super.jwplayer(player, failedWithError:code, message:message)
-        parentView?.onPlayerError?(["error": message])
+        parentView?.onPlayerError?(["error": message, "errorCode": code])
         parentView?.playerFailed = true
     }
 
     override func jwplayer(_ player:JWPlayer, failedWithSetupError code:UInt, message:String) {
         super.jwplayer(player, failedWithSetupError:code, message:message)
-        parentView?.onSetupPlayerError?(["error": message])
+        parentView?.onSetupPlayerError?(["errorMessage": message, "errorCode": code])
         parentView?.playerFailed = true
     }
 
@@ -78,7 +78,7 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
 
     override func jwplayer(_ player:JWPlayer, encounteredAdWarning code:UInt, message:String) {
         super.jwplayer(player, encounteredAdWarning:code, message:message)
-        parentView?.onPlayerAdWarning?(["warning": message])
+        parentView?.onPlayerAdWarning?(["warning": message, "code": code])
     }
 
 
@@ -263,11 +263,6 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
 
     // MARK: - JWPlayer State Delegate
 
-    override func jwplayerContentIsBuffering(_ player:JWPlayer) {
-        super.jwplayerContentIsBuffering(player)
-        parentView?.onBuffer?([:])
-    }
-
     override func jwplayer(_ player:JWPlayer, isBufferingWithReason reason:JWBufferReason) {
         super.jwplayer(player, isBufferingWithReason:reason)
         parentView?.onBuffer?([:])
@@ -588,6 +583,7 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
 
     override func jwplayer(_ player:JWPlayer, captionTrackChanged index:Int) {
         super.jwplayer(player, captionTrackChanged:index)
+        parentView.onCaptionsChanged?(["index": index])
     }
 
     override func jwplayer(_ player:JWPlayer, qualityLevelChanged currentLevel:Int) {
@@ -600,6 +596,16 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
 
     override func jwplayer(_ player:JWPlayer, updatedCaptionList options:[JWMediaSelectionOption]) {
         super.jwplayer(player, updatedCaptionList:options)
+
+        var tracks: [[String: Any]] = []
+        for track in player.captionsTracks {
+            var dict: [String: Any] = [:]
+            dict["label"] = track.name
+            dict["default"] = track.defaultOption  
+            tracks.append(dict)
+        }
+        let currentIndex = player.currentCaptionsTrack
+        parentView.onCaptionsList?(["index": currentIndex, "tracks": tracks])
     }
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {

package/ios/RNJWPlayer/RNJWPlayerViewManager.m

@@ -32,6 +32,8 @@ RCT_EXPORT_VIEW_PROPERTY(onPlaylistItem, RCTDirectEventBlock);
 
 /* av events */
 RCT_EXPORT_VIEW_PROPERTY(onAudioTracks, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onCaptionsChanged, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onCaptionsList, RCTDirectEventBlock);
 
 /* player events */
 RCT_EXPORT_VIEW_PROPERTY(onPlayerReady, RCTDirectEventBlock);
@@ -121,7 +123,7 @@ RCT_EXTERN_METHOD(setLockScreenControls: (nonnull NSNumber *)reactTag: (BOOL)sho
 
 RCT_EXTERN_METHOD(setCurrentCaptions: (nonnull NSNumber *)reactTag: (nonnull NSNumber *)index)
 
-RCT_EXTERN_METHOD(setCurrentCaptions: (nonnull NSNumber *)reactTag: (nonnull NSNumber *)index)
+RCT_EXTERN_METHOD(getCurrentCaptions: (nonnull NSNumber *)reactTag :(RCTPromiseResolveBlock)resolve :(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(setLicenseKey: (nonnull NSNumber *)reactTag: (nonnull NSString *)license)
 
@@ -131,6 +133,8 @@ RCT_EXTERN_METHOD(reset)
 
 RCT_EXTERN_METHOD(loadPlaylist: (nonnull NSNumber *)reactTag: (nonnull NSArray *)playlist)
 
+RCT_EXTERN_METHOD(loadPlaylist: (nonnull NSNumber *)reactTag: (nonnull NSString *)playlist)
+
 RCT_EXTERN_METHOD(setFullscreen: (nonnull NSNumber *)reactTag: (BOOL)fullscreen)
 
 @end

package/ios/RNJWPlayer/RNJWPlayerViewManager.swift

@@ -412,10 +412,33 @@ class RNJWPlayerViewManager: RCTViewManager {
                 return
             }
 
+            do {
+                if let playerView = view.playerView {
+                    try playerView.player.setCaptionTrack(index: index.intValue)
+                } else if let playerViewController = view.playerViewController {
+                    try playerViewController.player.setCaptionTrack(index: index.intValue)
+                }
+            } catch {
+                print("Error setting caption track: \(error)")
+            }
+        }
+    }
+
+    @objc func getCurrentCaptions(_ reactTag: NSNumber, _ resolve: @escaping RCTPromiseResolveBlock, _ reject: @escaping RCTPromiseRejectBlock) {
+        self.bridge.uiManager.addUIBlock { uiManager, viewRegistry in
+            guard let view = viewRegistry?[reactTag] as? RNJWPlayerView else {
+                let error = NSError(domain: "", code: 0, userInfo: [NSLocalizedDescriptionKey: "There is no player"])
+                reject("no_player", "Invalid view returned from registry, expecting RNJWPlayerView", error)
+                return
+            }
+
             if let playerView = view.playerView {
-                playerView.player.currentCaptionsTrack = index.intValue + 1
+                resolve(NSNumber(value: playerView.player.currentCaptionsTrack))
             } else if let playerViewController = view.playerViewController {
-                playerViewController.player.currentCaptionsTrack = index.intValue + 1
+                resolve(NSNumber(value: playerViewController.player.currentCaptionsTrack))
+            } else {
+                let error = NSError(domain: "", code: 0, userInfo: [NSLocalizedDescriptionKey: "There is no player"])
+                reject("no_player", "There is no player", error)
             }
         }
     }
@@ -457,7 +480,7 @@ class RNJWPlayerViewManager: RCTViewManager {
         }
     }
 
-    @objc func loadPlaylist(_ reactTag: NSNumber, _ playlist: [Any]) {
+    @objc func loadPlaylist(_ reactTag: NSNumber, _ playlist: Any) {
         self.bridge.uiManager.addUIBlock { uiManager, viewRegistry in
             guard let view = viewRegistry?[reactTag] as? RNJWPlayerView else {
                 print("Invalid view returned from registry, expecting RNJWPlayerView, got: \(String(describing: viewRegistry?[reactTag]))")
@@ -466,17 +489,28 @@ class RNJWPlayerViewManager: RCTViewManager {
 
             var playlistArray = [JWPlayerItem]()
 
-            for item in playlist {
-                if let playerItem = try? view.getPlayerItem(item: item as! [String: Any]) {
-                    playlistArray.append(playerItem)
+            if playlist is NSArray {
+                for item in playlist as! [Any] {
+                    // TODO Update this to better parse JWP Playlist Items:
+                    // awaiting JWP SDK exposure of JWJSONParser.playlist
+                    if let playerItem = try? view.getPlayerItem(item: item as! [String: Any]) {
+                        playlistArray.append(playerItem)
+                    }
+                }
+                
+                if let playerView = view.playerView {
+                    playerView.player.loadPlaylist(items: playlistArray)
+                } else if let playerViewController = view.playerViewController {
+                    playerViewController.player.loadPlaylist(items: playlistArray)
+                }
+            } else {
+                if let playerView = view.playerView {
+                    playerView.player.loadPlaylist(url: URL(string: playlist as! String)!)
+                } else if let playerViewController = view.playerViewController {
+                    playerViewController.player.loadPlaylist(url: URL(string: playlist as! String)!)
                 }
             }
-
-            if let playerView = view.playerView {
-                playerView.player.loadPlaylist(items: playlistArray)
-            } else if let playerViewController = view.playerViewController {
-                playerViewController.player.loadPlaylist(items: playlistArray)
-            }
+           
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwplayer/jwplayer-react-native",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "React-native Android/iOS plugin for JWPlayer SDK (https://www.jwplayer.com/)",
   "main": "index.js",
   "types": "./index.d.ts",