@jwplayer/jwplayer-react-native 1.0.2 → 1.1.0

package/android/src/main/java/com/jwplayer/rnjwplayer/RNJWPlayerViewManager.java

@@ -1,4 +1,3 @@
-
 package com.jwplayer.rnjwplayer;
 
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -41,6 +40,9 @@ public class RNJWPlayerViewManager extends SimpleViewManager<RNJWPlayerView> {
 
   @ReactProp(name = "controls")
   public void setControls(RNJWPlayerView view, Boolean controls) {
+    if (view == null || view.mPlayerView == null) {
+      return;
+    }
     view.mPlayerView.getPlayer().setControls(controls);
   }
 
@@ -155,6 +157,14 @@ public class RNJWPlayerViewManager extends SimpleViewManager<RNJWPlayerView> {
                     MapBuilder.of(
                             "phasedRegistrationNames",
                             MapBuilder.of("bubbled", "onAudioTracks")))
+            .put("topCaptionsChanged",
+                    MapBuilder.of(
+                            "phasedRegistrationNames",
+                            MapBuilder.of("bubbled", "onCaptionsChanged")))
+            .put("topCaptionsList",
+                    MapBuilder.of(
+                            "phasedRegistrationNames",
+                            MapBuilder.of("bubbled", "onCaptionsList")))
             .put("topCasting",
                     MapBuilder.of(
                             "phasedRegistrationNames",
@@ -163,6 +173,10 @@ public class RNJWPlayerViewManager extends SimpleViewManager<RNJWPlayerView> {
                     MapBuilder.of(
                             "phasedRegistrationNames",
                             MapBuilder.of("bubbled", "onLoaded")))
+            .put("topBeforeNextPlaylistItem",
+                    MapBuilder.of(
+                            "phasedRegistrationNames",
+                            MapBuilder.of("bubbled", "onBeforeNextPlaylistItem")))
             .build();
   }
 

package/android/src/main/java/com/jwplayer/rnjwplayer/Util.java

@@ -2,17 +2,23 @@ package com.jwplayer.rnjwplayer;
 
 import static androidx.media3.common.util.Util.toByteArray;
 
+import android.util.Log;
 import android.util.Patterns;
 import android.webkit.URLUtil;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.jwplayer.pub.api.JsonHelper;
+import com.jwplayer.pub.api.configuration.ads.AdvertisingConfig;
+import com.jwplayer.pub.api.events.Event;
 import com.jwplayer.pub.api.media.ads.AdBreak;
 import com.jwplayer.pub.api.media.captions.Caption;
 import com.jwplayer.pub.api.media.captions.CaptionType;
 import com.jwplayer.pub.api.media.playlists.MediaSource;
 import com.jwplayer.pub.api.media.playlists.PlaylistItem;
 
+import org.json.JSONObject;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -20,8 +26,8 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Locale;
+import java.util.Map;
 
 public class Util {
 
@@ -62,7 +68,7 @@ public class Util {
         }
     }
 
-    public static boolean isValidURL(String url){
+    public static boolean isValidURL(String url) {
         return URLUtil.isValidUrl(url) && Patterns.WEB_URL.matcher(url).matches();
     }
 
@@ -75,14 +81,28 @@ public class Util {
         while (playlistItems.size() > j) {
             ReadableMap playlistItem = playlistItems.getMap(j);
 
-            PlaylistItem newPlayListItem = getPlaylistItem((playlistItem));
-            playlist.add(newPlayListItem);
+            JSONObject obj;
+            PlaylistItem item = null;
+            // Try since legacy config may or may not conform to this standard
+            try {
+                obj = MapUtil.toJSONObject(playlistItem);
+                item = JsonHelper.parsePlaylistItemJson(obj);
+            } catch (Exception ex) {
+                Log.e("createPlaylist", ex.toString());
+            }
+            if (item != null) {
+                playlist.add(item);
+            } else {
+                // Try to use the legacy format
+                PlaylistItem newPlayListItem = getPlaylistItem((playlistItem));
+                playlist.add(newPlayListItem);
+            }
             j++;
         }
         return playlist;
     }
 
-    public static PlaylistItem getPlaylistItem (ReadableMap playlistItem) {
+    public static PlaylistItem getPlaylistItem(ReadableMap playlistItem) {
         PlaylistItem.Builder itemBuilder = new PlaylistItem.Builder();
 
         if (playlistItem.hasKey("file")) {
@@ -194,11 +214,12 @@ public class Util {
 
     /**
      * Internal helper for parsing a caption type from a known string
+     *
      * @param type one of "CAPTIONS", "CHAPTERS", "THUMBNAILS"
      * @return the correct Enum CaptionType
      */
-    public static CaptionType getCaptionType(String type){
-        for (CaptionType captionType: CaptionType.values()) {
+    public static CaptionType getCaptionType(String type) {
+        for (CaptionType captionType : CaptionType.values()) {
             if (captionType.name().equals(type)) {
                 return CaptionType.valueOf(type);
             }
@@ -234,7 +255,42 @@ public class Util {
     }
 
     // Method to get the event type value
-    public static int getEventTypeValue(AdEventType eventType) {
+    public static int getAdEventTypeValue(AdEventType eventType) {
         return eventType.getValue();
     }
-}
+
+    public enum AdEventClient {
+        JWAdEventClientJWPlayer(0),
+        JWAdEventClientGoogleIMA(1),
+        JWAdEventClientGoogleIMADAI(2),
+        JWAdEventClientUnknown(3);
+
+        private final int value;
+
+        AdEventClient(int value) {
+            this.value = value;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
+    public static int getAdEventClientValue(Event adEvent) {
+        AdvertisingConfig adConfig = adEvent.getPlayer().getConfig().getAdvertisingConfig();
+        if (adConfig == null) {
+            return AdEventClient.JWAdEventClientUnknown.getValue();
+        }
+
+        switch (adConfig.getAdClient()) {
+            case IMA:
+                return AdEventClient.JWAdEventClientGoogleIMA.getValue();
+            case IMA_DAI:
+                return AdEventClient.JWAdEventClientGoogleIMADAI.getValue();
+            case VAST:
+                return AdEventClient.JWAdEventClientJWPlayer.getValue();
+            default:
+                return AdEventClient.JWAdEventClientUnknown.getValue();
+        }
+    }
+}

package/badges/version.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="20" role="img" aria-label="version: 1.0.2"><title>version: 1.0.2</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="90" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="51" height="20" fill="#555"/><rect x="51" width="39" height="20" fill="#007ec6"/><rect width="90" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="265" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">version</text><text x="265" y="140" transform="scale(.1)" fill="#fff" textLength="410">version</text><text aria-hidden="true" x="695" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="290">1.0.2</text><text x="695" y="140" transform="scale(.1)" fill="#fff" textLength="290">1.0.2</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="20" role="img" aria-label="version: 1.1.0"><title>version: 1.1.0</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="90" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="51" height="20" fill="#555"/><rect x="51" width="39" height="20" fill="#007ec6"/><rect width="90" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="265" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">version</text><text x="265" y="140" transform="scale(.1)" fill="#fff" textLength="410">version</text><text aria-hidden="true" x="695" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="290">1.1.0</text><text x="695" y="140" transform="scale(.1)" fill="#fff" textLength="290">1.1.0</text></g></svg>

package/index.d.ts

@@ -6,6 +6,10 @@ declare module "@jwplayer/jwplayer-react-native" {
     pid?: string;
     mute?: boolean;
     forceLegacyConfig?: boolean;
+    /**
+     * If true, `onBeforeNextPlaylistItem` MUST be impelemented with `player.resolveNextPlaylistItem()` called in the callback or content will hang
+     */
+    playlistItemCallbackEnabled?: boolean;
     useTextureView?: boolean;
     autostart?: boolean;
     nextupoffset?: string | number; // String with % or number
@@ -26,7 +30,13 @@ declare module "@jwplayer/jwplayer-react-native" {
     advertising?: JwAdvertisingConfig;
     playbackRates?: number[];
     playbackRateControls?: boolean;
+    // Non-Json Parsing props
     license: string;
+    playerInModal?: boolean;
+    fullScreenOnLandscape?: boolean;
+    landscapeOnFullScreen?: boolean;
+    portraitOnExitFullScreen?: boolean;
+    exitFullScreenOnPortrait?: boolean;
   }
 
   type JwThumbnailPreview = 101 | 102 | 103;
@@ -477,6 +487,15 @@ declare module "@jwplayer/jwplayer-react-native" {
     rate: number;
     at: number;
   }
+  interface PlayerSetupErrorProps {
+    errorMessage?: string;
+    errorCode?: number;
+  }
+  interface PlayerErrorProps {
+    error?: string;
+    errorCode?: number;
+    description?: string; // Android Only
+  }
   interface TimeEventProps {
     position: number;
     duration: number;
@@ -498,15 +517,26 @@ declare module "@jwplayer/jwplayer-react-native" {
     error: string;
   }
   interface PlayerWarningEventProps {
-    code: string;
-    warning: string;
+    code?: number;
+    warning?: string;
+    adErrorCode?: number; // Android only
   }
   interface AdEventProps {
-    client?: string;
+    client: number;
     reason?: string;
     type: number;
   }
-  type NativeError = (event: BaseEvent<PlayerErrorEventProps>) => void;
+  // Overloaded type to be used in multiple error events
+  interface CaptionsChangedEventProps {
+    index?: number;
+  }
+  interface CaptionsListEventProps {
+    index: number;
+    file?: string;
+    label: string;
+    default: string;
+  }
+  type NativeError = (event: BaseEvent<PlayerErrorEventProps> | BaseEvent<PlayerSetupErrorProps> | BaseEvent<PlayerErrorProps>) => void;
   type NativeWarning = (event: BaseEvent<PlayerWarningEventProps>) => void;
   interface PropsType {
     config: Config | JwConfig;
@@ -526,9 +556,9 @@ declare module "@jwplayer/jwplayer-react-native" {
     onRateChanged?: (event?: BaseEvent<RateChangedEventProps>) => void;
     onSetupPlayerError?: NativeError;
     onPlayerError?: NativeError;
-    onPlayerWarning?: NativeWarning;
-    onPlayerAdError?: NativeError;
-    onPlayerAdWarning?: NativeWarning;
+    onPlayerWarning?: NativeWarning; 
+    onPlayerAdError?: NativeError; 
+    onPlayerAdWarning?: NativeWarning; 
     onAdEvent?: (event: BaseEvent<AdEventProps>) => void;
     onAdTime?: (event: BaseEvent<TimeEventProps>) => void;
     onBuffer?: () => void;
@@ -540,8 +570,11 @@ declare module "@jwplayer/jwplayer-react-native" {
     onControlBarVisible?: (event: BaseEvent<ControlBarVisibleEventProps>) => void;
     onPlaylistComplete?: () => void;
     onPlaylistItem?: (event: BaseEvent<PlaylistItemEventProps>) => void;
+    onCaptionsChanged?: (event: BaseEvent<CaptionsChangedEventProps>) => void;
+    onCaptionsList?: (event: BaseEvent<CaptionsListEventProps>) => void;
     onAudioTracks?: () => void;
     shouldComponentUpdate?: (nextProps: any, nextState: any) => boolean;
+    onBeforeNextPlaylistItem?: (event: BaseEvent<PlaylistItemEventProps>) => void;
   }
 
   export default class JWPlayer extends React.Component<PropsType> {
@@ -558,7 +591,7 @@ declare module "@jwplayer/jwplayer-react-native" {
     setControls(show: boolean): void;
     setLockScreenControls(show: boolean): void;
     seekTo(time: number): void;
-    loadPlaylist(playlistItems: PlaylistItem[]): void;
+    loadPlaylist(playlistItems: PlaylistItem[] | JwPlaylistItem[] | string): void;
     setFullscreen(fullScreen: boolean): void;
     position(): Promise<number>;
     setUpCastController(): void;
@@ -571,6 +604,12 @@ declare module "@jwplayer/jwplayer-react-native" {
     getCurrentAudioTrack(): Promise<number | null>;
     setCurrentAudioTrack(index: number): void;
     setCurrentCaptions(index: number): void;
+    getCurrentCaptions(): Promise<number | null>; 
     setVisibility(visibility: boolean, controls: JWControlType[]): void;
+    /**
+     * Only called inside `onBeforeNextPlaylistItem` callback, and once per callback
+     * @param playlistItem  `PlaylistItem` or  `JwPlaylistItem`
+     */
+    resolveNextPlaylistItem(playlistItem: PlaylistItem | JwPlaylistItem): void;
   }
 }

package/index.js

@@ -174,6 +174,12 @@ export default class JWPlayer extends Component {
 		config: PropTypes.shape({
 			license: PropTypes.string.isRequired,
 			forceLegacyConfig: PropTypes.bool,
+			/**
+			 * Only enable if you are prepared to implement `onBeforeNextPlaylistItem` on the JS side
+			 * And resolve the promise with `resolveNextPlaylistItem` inside the callback
+			 * Otherwise, the player will not proceed to the next item
+			 */
+			playlistItemCallbackEnabled: PropTypes.bool,
 			backgroundAudioEnabled: PropTypes.bool,
 			category: PropTypes.oneOf([
 				'Ambient',
@@ -370,7 +376,20 @@ export default class JWPlayer extends Component {
 		getCurrentAudioTrack: PropTypes.func,
 		setCurrentAudioTrack: PropTypes.func,
 		setCurrentCaptions: PropTypes.func,
+		getCurrentCaptions: PropTypes.func,
+		onCaptionsChanged: PropTypes.func,
+		onCaptionsList: PropTypes.func,
 		onAudioTracks: PropTypes.func,
+		/**
+		 * Callback that is fired when the player is about to play the next playlist item.
+		 * Indented to be paired with `playlistItemCallbackEnabled` prop
+		 * 
+		 * Android will only fire after index 0 (starting at index 1) 
+	 	 * 
+	     * iOS will fire all playlist items (including index 0)
+		 */
+		onBeforeNextPlaylistItem: PropTypes.func,
+		resolveNextPlaylistItem: PropTypes.func
 	};
 
 	constructor(props) {
@@ -378,8 +397,7 @@ export default class JWPlayer extends Component {
 
 		this._playerId = playerId++;
 		this.ref_key = `${RCT_RNJWPLAYER_REF}-${this._playerId}`;
-
-		this.quite();
+	
 	}
 
 	shouldComponentUpdate(nextProps, nextState) {
@@ -688,6 +706,37 @@ export default class JWPlayer extends Component {
 			);
 		}
 	}
+	
+	async getCurrentCaptions() {
+		if (RNJWPlayerManager) {
+			try {
+				var currentCaptionTrack =
+					await RNJWPlayerManager.getCurrentCaptions(
+						this.getRNJWPlayerBridgeHandle()
+					);
+				return currentCaptionTrack;
+			} catch (e) {
+				console.error(e);
+				return null;
+			}
+		}
+	}
+
+	/**
+	 * Only to be called in the onBeforeNextPlaylistItem callback.
+	 * If called outside of the callback, it will not have any effect.
+	 * 
+	 * Can only be called once inside the onBeforeNextPlaylistItem callback.
+	 * @param {PlaylistItem | JwPlaylistItem} playlistItem 
+	 */
+	resolveNextPlaylistItem(playlistItem) { 
+		if (RNJWPlayerManager) {
+			RNJWPlayerManager.resolveNextPlaylistItem(
+				this.getRNJWPlayerBridgeHandle(),
+				playlistItem
+			);
+		}
+	}
 
 	getRNJWPlayerBridgeHandle() {
 		return findNodeHandle(this[this.ref_key]);

package/ios/RNJWPlayer/RNJWPlayerView.swift

@@ -41,6 +41,7 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
     var castController: JWCastController!
     var isCasting: Bool = false
     var availableDevices: [AnyObject]!
+    var onBeforeNextPlaylistItemCompletion: ((JWPlayerItem?) -> ())?
     
     @objc var onBuffer: RCTDirectEventBlock?
     @objc var onUpdateBuffer: RCTDirectEventBlock?
@@ -85,6 +86,9 @@ 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?
+    @objc var onBeforeNextPlaylistItem: RCTDirectEventBlock?
     
     init() {
         super.init(frame: CGRect(x: 20, y: 0, width: UIScreen.main.bounds.width - 40, height: 300))
@@ -281,6 +285,7 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
 
     func setNewConfig(config: [String : Any]) {
         let forceLegacyConfig = config["forceLegacyConfig"] as? Bool?
+        let playlistItemCallback = config["playlistItemCallbackEnabled"] as? Bool?
         let data:Data! = try? JSONSerialization.data(withJSONObject: config, options:.prettyPrinted)
         let jwConfig = try? JWJSONParser.config(from:data)
         
@@ -299,7 +304,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
 
@@ -346,6 +351,11 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
                         self.setupPlayerViewController(config: config, playerConfig: jwConfig!)
                     }
                 }
+                
+                if playlistItemCallback == true {
+                    self.setupPlaylistItemCallback()
+                }
+
             } catch {
                 print(error)
             }
@@ -360,6 +370,47 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
         }
     }
 
+    func setupPlaylistItemCallback() {
+        playerViewController.player.setPlaylistItemCallback { [weak self] item, index, completion in
+            print("setPlaylistItemCallback called with index \(index)")
+            guard let self = self else {
+                print("setPlaylistItemCallback: self is nil, resuming normally")
+                completion(item)
+                return
+            }
+            
+            if let onBeforeNextPlaylistItem = self.onBeforeNextPlaylistItem {
+                print("Storing completion handler and triggering onBeforeNextPlaylistItem")
+                // Store the completion handler first, before any other operations
+                self.onBeforeNextPlaylistItemCompletion = completion
+                print("Completion handler stored: \(self.onBeforeNextPlaylistItemCompletion != nil)")
+
+                do {
+                    let data = try JSONSerialization.data(withJSONObject: item.toJSONObject(), options: [.prettyPrinted])
+                    let jsonString = String(data: data, encoding: .utf8) ?? "{}"
+
+                    print("Triggering onBeforeNextPlaylistItem with index \(index)")
+                    print("Completion handler before event: \(self.onBeforeNextPlaylistItemCompletion != nil)")
+
+                    // Pass the playlist item to the React Native side
+                    onBeforeNextPlaylistItem([
+                        "playlistItem": jsonString,
+                        "index": index
+                    ])
+                    print("Completion handler after event: \(self.onBeforeNextPlaylistItemCompletion != nil)")
+                
+                } catch {
+                    print("Error serializing playlist item: \(error)")
+                    self.onBeforeNextPlaylistItemCompletion?(item) // Call completion handler directly on error
+                    self.onBeforeNextPlaylistItemCompletion = nil
+                }
+            } else {
+                print("No onBeforeNextPlaylistItem handler set, calling completion directly")
+                completion(item)
+            }
+        }
+    }
+
     // MARK: - RNJWPlayer styling
 
     func colorWithHexString(hex:String!) -> UIColor! {
@@ -960,12 +1011,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 +1030,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 +1230,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 +1280,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] = [:]
@@ -1382,7 +1433,7 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
     // MARK: - JWPlayer Ad Delegate
 
     func jwplayer(_ player:JWPlayer, adEvent event:JWAdEvent) {
-        self.onAdEvent?(["client": event.client, "type": event.type])
+        self.onAdEvent?(["client": event.client.rawValue, "type": event.type.rawValue])
     }
 
     // MARK: - JWPlayer AV Delegate
@@ -1400,7 +1451,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 +1467,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 +1577,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?([:])
@@ -491,7 +486,7 @@ class RNJWPlayerViewController : JWPlayerViewController, JWPlayerViewControllerD
 
     override func jwplayer(_ player: JWPlayer, adEvent event: JWAdEvent) {
         super.jwplayer(player, adEvent:event)
-        parentView?.onAdEvent?(["client": event.client, "type": event.type])
+        parentView?.onAdEvent?(["client": event.client.rawValue, "type": event.type.rawValue])
     }
 
     // MARK: - JWPlayer Cast Delegate
@@ -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) {