@100mslive/react-native-hms 1.10.2 → 1.10.4

package/android/local.properties

@@ -1 +1,8 @@
-sdk.dir=/Users/yogesh/Library/Android/sdk
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Nov 14 20:51:00 IST 2022
+sdk.dir=/Users/jatinnagar/Library/Android/sdk

package/android/src/main/java/com/reactnativehmssdk/HMSDecoder.kt

@@ -747,6 +747,9 @@ object HMSDecoder {
         variant.startedAt?.let {
           input.putString("startedAt", it.toString())
         }
+        variant.playlistType?.let {
+          input.putString("playlistType", it.name.uppercase())
+        }
         variants.pushMap(input)
       }
     }

package/android/src/main/java/com/reactnativehmssdk/HMSHLSPlayer.kt

@@ -3,12 +3,16 @@ package com.reactnativehmssdk
 import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
+import android.view.View
 import android.widget.FrameLayout
 import androidx.media3.common.Player
 import androidx.media3.common.VideoSize
+import androidx.media3.common.text.CueGroup
 import androidx.media3.ui.PlayerView
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.RCTEventEmitter
 import live.hms.hls_player.*
@@ -25,6 +29,7 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
   private var hmsHlsPlayer: HmsHlsPlayer? = null // 100ms HLS Player
   private var hmssdkInstance: HMSSDK? = null
   private var statsMonitorAttached = false
+  private var shouldSendCaptionsToJS = false
   private val hmsHlsPlaybackEventsObject =
     object : HmsHlsPlaybackEvents {
       override fun onCue(cue: HmsHlsCue) {
@@ -115,6 +120,7 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
     val localPlayerView = view.findViewById<PlayerView>(R.id.hls_view)
     playerView = localPlayerView
     localPlayerView.useController = false
+    localPlayerView.subtitleView?.visibility = View.GONE
 
     val hmssdkCollection = context.getNativeModule(HMSManager::class.java)?.getHmsInstance()
     hmssdkInstance = hmssdkCollection?.get("12345")?.hmsSDK
@@ -144,6 +150,13 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
             sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_RESOLUTION_CHANGE_EVENT, data)
           }
         }
+
+        override fun onCues(cueGroup: CueGroup) {
+          super.onCues(cueGroup)
+          if (!shouldSendCaptionsToJS) return
+          val ccText = cueGroup.cues.firstOrNull()?.text?.toString()
+          sendHLSPlayerCuesEventToJS(ccText)
+        }
       },
     )
   }
@@ -204,6 +217,38 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
     hmsHlsPlayer?.volume = level
   }
 
+  fun areClosedCaptionSupported(requestId: Int) {
+    hmsHlsPlayer.let {
+      if (it == null) {
+        sendHLSDataRequestEventToJS(requestId, false)
+      } else {
+        sendHLSDataRequestEventToJS(requestId, it.areClosedCaptionsSupported())
+      }
+    }
+  }
+
+  fun isClosedCaptionEnabled(requestId: Int) {
+    sendHLSDataRequestEventToJS(requestId, shouldSendCaptionsToJS)
+  }
+
+  fun enableClosedCaption() {
+    shouldSendCaptionsToJS = true
+  }
+
+  fun disableClosedCaption() {
+    shouldSendCaptionsToJS = false
+    sendHLSPlayerCuesEventToJS(null)
+  }
+
+  fun getPlayerDurationDetails(requestId: Int) {
+    val data: WritableMap = Arguments.createMap()
+    hmsHlsPlayer?.getNativePlayer()?.let { exoPlayer ->
+      data.putInt("rollingWindowTime", exoPlayer.seekParameters.toleranceAfterUs.div(1000).toInt())
+      data.putInt("streamDuration", exoPlayer.duration.toInt())
+    }
+    sendHLSDataRequestEventToJS(requestId, data)
+  }
+
   fun enableStats(enable: Boolean) {
     if (enable) {
       attachStatsMonitor()
@@ -215,11 +260,13 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
   fun enableControls(show: Boolean) {
     playerView?.let {
       if (show) {
+        it.subtitleView?.visibility = View.VISIBLE
         it.useController = true
         it.showController()
       } else {
         it.hideController()
         it.useController = false
+        it.subtitleView?.visibility = View.GONE
       }
     }
   }
@@ -263,6 +310,46 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
     val reactContext = context as ReactContext
     reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, HMSHLSPlayerConstants.HMS_HLS_STATS_EVENT, event)
   }
+
+  private fun sendHLSDataRequestEventToJS(
+    requestId: Int,
+    data: Any,
+  ) {
+    val event: WritableMap = Arguments.createMap()
+    event.putInt("requestId", requestId)
+
+    if (data is Boolean) {
+      event.putBoolean("data", data)
+    } else if (data is String) {
+      event.putString("data", data)
+    } else if (data is Int) {
+      event.putInt("data", data)
+    } else if (data is Double) {
+      event.putDouble("data", data)
+    } else if (data is ReadableMap) {
+      event.putMap("data", data)
+    } else if (data is ReadableArray) {
+      event.putArray("data", data)
+    } else {
+      event.putNull("data")
+    }
+
+    val reactContext = context as ReactContext
+    reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, HMSHLSPlayerConstants.HLS_DATA_REQUEST_EVENT, event)
+  }
+
+  private fun sendHLSPlayerCuesEventToJS(ccText: String?) {
+    val event: WritableMap = Arguments.createMap()
+    event.putString("event", HMSHLSPlayerConstants.ON_CLOSED_CAPTION_UPDATE)
+
+    if (ccText is String) {
+      event.putString("data", ccText)
+    } else {
+      event.putNull("data")
+    }
+    val reactContext = context as ReactContext
+    reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, HMSHLSPlayerConstants.HLS_PLAYER_CUES_EVENT, event)
+  }
 }
 
 object HMSHLSPlayerConstants {
@@ -277,4 +364,11 @@ object HMSHLSPlayerConstants {
   const val HMS_HLS_STATS_EVENT = "hmsHlsStatsEvent"
   const val ON_STATS_EVENT_UPDATE = "ON_STATS_EVENT_UPDATE"
   const val ON_STATS_EVENT_ERROR = "ON_STATS_EVENT_ERROR"
+
+  // HLS Requested Data Returned
+  const val HLS_DATA_REQUEST_EVENT = "hlsDataRequestEvent"
+
+  // HLS Player Cues Events
+  const val HLS_PLAYER_CUES_EVENT = "hlsPlayerCuesEvent"
+  const val ON_CLOSED_CAPTION_UPDATE = "ON_CLOSED_CAPTION_UPDATE"
 }

package/android/src/main/java/com/reactnativehmssdk/HMSHLSPlayerManager.kt

@@ -31,6 +31,10 @@ class HMSHLSPlayerManager : SimpleViewManager<HMSHLSPlayer>() {
       MapBuilder.of("registrationName", "onHmsHlsPlaybackEvent"),
       HMSHLSPlayerConstants.HMS_HLS_STATS_EVENT,
       MapBuilder.of("registrationName", "onHmsHlsStatsEvent"),
+      HMSHLSPlayerConstants.HLS_DATA_REQUEST_EVENT,
+      MapBuilder.of("registrationName", "onDataReturned"),
+      HMSHLSPlayerConstants.HLS_PLAYER_CUES_EVENT,
+      MapBuilder.of("registrationName", "onHlsPlayerCuesEvent"),
     )
   }
 
@@ -68,6 +72,29 @@ class HMSHLSPlayerManager : SimpleViewManager<HMSHLSPlayer>() {
           }
         }
       }
+      90 -> {
+        args.let {
+          if (it != null) {
+            root.areClosedCaptionSupported(it.getInt(0))
+          }
+        }
+      }
+      100 -> {
+        args.let {
+          if (it != null) {
+            root.isClosedCaptionEnabled(it.getInt(0))
+          }
+        }
+      }
+      110 -> root.enableClosedCaption()
+      120 -> root.disableClosedCaption()
+      130 -> {
+        args.let {
+          if (it != null) {
+            root.getPlayerDurationDetails(it.getInt(0))
+          }
+        }
+      }
     }
   }
 
@@ -81,6 +108,11 @@ class HMSHLSPlayerManager : SimpleViewManager<HMSHLSPlayer>() {
       .put("seekForward", 60)
       .put("seekBackward", 70)
       .put("setVolume", 80)
+      .put("areClosedCaptionSupported", 90)
+      .put("isClosedCaptionEnabled", 100)
+      .put("enableClosedCaption", 110)
+      .put("disableClosedCaption", 120)
+      .put("getPlayerDurationDetails", 130)
       .build()
   }
 

package/ios/HMSDecoder.swift

@@ -811,12 +811,24 @@ class HMSDecoder: NSObject {
                 if let startedAt = variant.startedAt?.timeIntervalSince1970 {
                     decodedVariant["startedAt"] = startedAt * 1000
                 }
+                if let type = variant.playlistType {
+                    decodedVariant["playlistType"] = getHLSVariantPlaylistType(from: type)
+                }
                 variants.append(decodedVariant)
             }
         }
         return variants
     }
 
+    static func getHLSVariantPlaylistType(from type: HMSHLSPlaylistType) -> String {
+        switch type {
+        case .dvr:
+            return "DVR"
+        default:
+            return "NODVR"
+        }
+    }
+
     static func getHMSRTCStats(_ data: HMSRTCStats) -> [Any] {
         // [bitrateReceived, bitrateSent, bytesReceived, bytesSent, packetsLost, packetsReceived, roundTripTime]
         return [

package/ios/HMSHLSPlayerManager.m

@@ -7,6 +7,7 @@
 RCT_EXPORT_VIEW_PROPERTY(url, NSString);
 RCT_EXPORT_VIEW_PROPERTY(enableStats, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(enableControls, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(onDataReturned, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onHmsHlsPlaybackEvent, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onHmsHlsStatsEvent, RCTDirectEventBlock);
 
@@ -18,5 +19,10 @@ RCT_EXTERN_METHOD(seekToLivePosition:(nonnull NSNumber *)node)
 RCT_EXTERN_METHOD(seekForward:(nonnull NSNumber *)node seconds:(nonnull NSNumber *)seconds)
 RCT_EXTERN_METHOD(seekBackward:(nonnull NSNumber *)node seconds:(nonnull NSNumber *)seconds)
 RCT_EXTERN_METHOD(setVolume:(nonnull NSNumber *)node level:(nonnull NSNumber *)level)
+RCT_EXTERN_METHOD(areClosedCaptionSupported:(nonnull NSNumber *)node requestId:(nonnull NSNumber *)requestId)
+RCT_EXTERN_METHOD(isClosedCaptionEnabled:(nonnull NSNumber *)node requestId:(nonnull NSNumber *)requestId)
+RCT_EXTERN_METHOD(enableClosedCaption:(nonnull NSNumber *)node)
+RCT_EXTERN_METHOD(disableClosedCaption:(nonnull NSNumber *)node)
+RCT_EXTERN_METHOD(getPlayerDurationDetails:(nonnull NSNumber *)node requestId:(nonnull NSNumber *)requestId)
 
 @end

package/ios/HMSHLSPlayerManager.swift

@@ -87,6 +87,46 @@ class HMSHLSPlayerManager: RCTViewManager {
             }
         }
     }
+
+    @objc func areClosedCaptionSupported(_ node: NSNumber, requestId: NSNumber) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.areClosedCaptionSupported(requestId: UInt(truncating: requestId))
+            }
+        }
+    }
+
+    @objc func isClosedCaptionEnabled(_ node: NSNumber, requestId: NSNumber) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.isClosedCaptionEnabled(requestId: UInt(truncating: requestId))
+            }
+        }
+    }
+
+    @objc func enableClosedCaption(_ node: NSNumber) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.enableClosedCaption()
+            }
+        }
+    }
+
+    @objc func disableClosedCaption(_ node: NSNumber) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.disableClosedCaption()
+            }
+        }
+    }
+
+    @objc func getPlayerDurationDetails(_ node: NSNumber, requestId: NSNumber) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.getPlayerDurationDetails(requestId: UInt(truncating: requestId))
+            }
+        }
+    }
 }
 
 class HMSHLSPlayer: UIView {
@@ -105,6 +145,8 @@ class HMSHLSPlayer: UIView {
 
     // MARK: Handle HMSHLSPlayer RN Component props
 
+    @objc var onDataReturned: RCTDirectEventBlock?
+
     @objc var onHmsHlsPlaybackEvent: RCTDirectEventBlock?
 
     @objc var onHmsHlsStatsEvent: RCTDirectEventBlock?
@@ -158,6 +200,97 @@ class HMSHLSPlayer: UIView {
         hmsHLSPlayer.stop()
     }
 
+    private func isCCSupported() -> Bool {
+        guard let playerItem = hmsHLSPlayer._nativePlayer.currentItem else {
+            return false
+        }
+        guard let mediaSelectionGroup = playerItem.asset.mediaSelectionGroup(forMediaCharacteristic: .legible) else {
+            return false
+        }
+        guard let firstMediaSelectionGroupOption = mediaSelectionGroup.options.first else {
+            return false
+        }
+        return firstMediaSelectionGroupOption.mediaType == .subtitle
+    }
+
+    private func isCCEnabled() -> Bool {
+        guard let playerItem = hmsHLSPlayer._nativePlayer.currentItem else {
+            return false
+        }
+        guard let subtitle = playerItem.asset.mediaSelectionGroup(forMediaCharacteristic: .legible) else {
+            return false
+        }
+        let selectedOption = playerItem.currentMediaSelection.selectedMediaOption(in: subtitle)
+        return selectedOption != nil
+    }
+
+    @objc func areClosedCaptionSupported(requestId: UInt) {
+        let supported = isCCSupported()
+
+        sendRequestedDataToJS(requestId, supported)
+    }
+
+    @objc func isClosedCaptionEnabled(requestId: UInt) {
+        let enabled = isCCEnabled()
+
+        sendRequestedDataToJS(requestId, enabled)
+    }
+
+    @objc func enableClosedCaption() {
+        if !isCCSupported() {
+            print("#func Closed Caption is not supported")
+            return
+        }
+        if isCCEnabled() {
+            print("#func Closed Caption already enabled!")
+            return
+        }
+        guard let playerItem = hmsHLSPlayer._nativePlayer.currentItem else {
+            return
+        }
+        guard let subtitle = playerItem.asset.mediaSelectionGroup(forMediaCharacteristic: .legible) else {
+            return
+        }
+        guard let firstSubtitleTrack = subtitle.options.first(where: {$0.mediaType == .subtitle}) else {
+            return
+        }
+        playerItem.select(firstSubtitleTrack, in: subtitle)
+    }
+
+    @objc func disableClosedCaption() {
+        if !isCCSupported() {
+            print("#func Closed Caption is not supported")
+            return
+        }
+        if !isCCEnabled() {
+            print("#func Closed Caption already disabled!")
+            return
+        }
+        guard let playerItem = hmsHLSPlayer._nativePlayer.currentItem else {
+            return
+        }
+        guard let subtitle = playerItem.asset.mediaSelectionGroup(forMediaCharacteristic: .legible) else {
+            return
+        }
+        playerItem.select(nil, in: subtitle)
+    }
+
+    @objc func getPlayerDurationDetails(requestId: UInt) {
+        var map = [String: Any?]()
+        guard let playerItem = hmsHLSPlayer._nativePlayer.currentItem else {
+          sendRequestedDataToJS(requestId, map)
+          return
+        }
+        // If duration is known
+        if !playerItem.duration.isIndefinite {
+            map["streamDuration"] = playerItem.duration.seconds
+        }
+        if let timeRange = playerItem.seekableTimeRanges.last as? CMTimeRange {
+            map["rollingWindowTime"] = timeRange.duration.seconds * 1000
+        }
+        sendRequestedDataToJS(requestId, map)
+    }
+
     @objc func pause() {
         hmsHLSPlayer.pause()
     }
@@ -182,7 +315,7 @@ class HMSHLSPlayer: UIView {
         hmsHLSPlayer.volume = level
     }
 
-    // MARK: Constructor & Deconstructor
+    // MARK: Lifecycle methods
 
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -234,6 +367,12 @@ class HMSHLSPlayer: UIView {
         onHmsHlsPlaybackEvent(["event": eventName, "data": data])
     }
 
+    private func sendRequestedDataToJS(_ requestId: UInt, _ data: Any) {
+        guard let onDataReturned = onDataReturned else { return }
+
+        onDataReturned(["requestId": requestId, "data": data])
+    }
+
     private func sendHLSStatsEventToJS(_ eventName: String, _ data: [String: Any]) {
         guard let onHmsHlsStatsEvent = onHmsHlsStatsEvent else { return }
 

package/ios/Hmssdk.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/Hmssdk.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/ios/Hmssdk.xcodeproj/xcuserdata/jatinnagar.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Hmssdk.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/lib/commonjs/classes/HMSEncoder.js

@@ -45,6 +45,7 @@ var _HMSLayer = require("./HMSLayer");
 var _HMSSimulcastLayerDefinition = require("./HMSSimulcastLayerDefinition");
 var _HMSQualityLimitationReasons = require("./HMSQualityLimitationReasons");
 var _HMSTrackType = require("./HMSTrackType");
+var _HMSHLSPlaylistType = require("./HMSHLSPlaylistType");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
@@ -420,12 +421,21 @@ class HMSEncoder {
         hlsStreamUrl: item.hlsStreamUrl,
         meetingUrl: item.meetingUrl,
         metadata: item !== null && item !== void 0 && item.metaData ? item === null || item === void 0 ? void 0 : item.metadata : undefined,
-        startedAt: HMSEncoder.encodeDate(item === null || item === void 0 ? void 0 : item.startedAt)
+        startedAt: HMSEncoder.encodeDate(item === null || item === void 0 ? void 0 : item.startedAt),
+        playlistType: item !== null && item !== void 0 && item.playlistType ? this.getHLSVariantPlaylistType(item.playlistType.toUpperCase()) : undefined
       });
       variants.push(variant);
     });
     return variants;
   }
+  static getHLSVariantPlaylistType(type) {
+    switch (type) {
+      case 'DVR':
+        return _HMSHLSPlaylistType.HMSHLSPlaylistType.DVR;
+      default:
+        return _HMSHLSPlaylistType.HMSHLSPlaylistType.noDVR;
+    }
+  }
   static encodeHMSNetworkQuality(data) {
     if (data) {
       return new _HMSNetworkQuality.HMSNetworkQuality({