@100mslive/react-native-hms 1.10.3 → 1.10.5

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)
@@ -206,7 +339,10 @@ class HMSHLSPlayer: UIView {
         attachPlayerPlaybackListeners()
 
         hmsHLSPlayerViewController?.showsPlaybackControls = false
-        hmsHLSPlayerViewController?.allowsPictureInPicturePlayback = false
+        hmsHLSPlayerViewController?.allowsPictureInPicturePlayback = true
+        if #available(iOS 14.2, *) {
+            hmsHLSPlayerViewController?.canStartPictureInPictureAutomaticallyFromInline = true
+        }
     }
 
     required init?(coder: NSCoder) {
@@ -234,6 +370,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/HMSInteractivityDecoder.swift

@@ -270,4 +270,45 @@ class HMSInteractivityDecoder {
 
         return result
     }
+
+    static func getHMSWhiteboard(_ hmsWhiteboard: HMSWhiteboard) -> [String: Any] {
+        var result: [String: Any] = [
+            "id": hmsWhiteboard.id,
+            "state": getWhiteboardState(hmsWhiteboard.state)
+        ]
+        if let owner = hmsWhiteboard.owner {
+            result["owner"] = HMSDecoder.getHmsPeerSubset(owner)
+        }
+        if let title = hmsWhiteboard.title {
+            result["title"] = title
+        }
+        if let urlString = hmsWhiteboard.url?.absoluteString {
+            result["url"] = urlString
+        }
+        return result
+    }
+
+    static func getWhiteboardState(_ state: HMSWhiteboard.WhiteboardState) -> String {
+        switch state {
+        case .started:
+            return "STARTED"
+        case .stopped:
+            return "STOPPED"
+        @unknown default:
+            print("@unknown default case: Invalid HMSWhiteboardUpdateType")
+            return "STOPPED"
+        }
+    }
+
+    static func getWhiteboardUpdateType(_ type: HMSWhiteboardUpdateType) -> String {
+        switch type {
+        case .started:
+            return "STARTED"
+        case .stopped:
+            return "STOPPED"
+        @unknown default:
+            print("@unknown default case: Invalid HMSWhiteboardUpdateType")
+            return "STOPPED"
+        }
+    }
 }

package/ios/HMSManager.m

@@ -353,4 +353,16 @@ RCT_EXTERN_METHOD(isNoiseCancellationPluginAvailable
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject)
 
+#pragma mark - Interactivity Center - Whiteboard
+
+RCT_EXTERN_METHOD(startWhiteboard
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(stopWhiteboard
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
+
 @end

package/ios/HMSManager.swift

@@ -37,7 +37,7 @@ class HMSManager: RCTEventEmitter {
     }
 
     override func supportedEvents() -> [String]! {
-        return [ON_JOIN, ON_PREVIEW, ON_ROOM_UPDATE, ON_PEER_UPDATE, ON_TRACK_UPDATE, ON_ERROR, ON_MESSAGE, ON_SPEAKER, RECONNECTING, RECONNECTED, ON_ROLE_CHANGE_REQUEST, ON_CHANGE_TRACK_STATE_REQUEST, ON_REMOVED_FROM_ROOM, ON_RTC_STATS, ON_LOCAL_AUDIO_STATS, ON_LOCAL_VIDEO_STATS, ON_REMOTE_AUDIO_STATS, ON_REMOTE_VIDEO_STATS, ON_AUDIO_DEVICE_CHANGED, HMSConstants.ON_SESSION_STORE_AVAILABLE, HMSConstants.ON_SESSION_STORE_CHANGED, HMSConstants.ON_PEER_LIST_UPDATED, HMSConstants.ON_POLL_UPDATE]
+        return [ON_JOIN, ON_PREVIEW, ON_ROOM_UPDATE, ON_PEER_UPDATE, ON_TRACK_UPDATE, ON_ERROR, ON_MESSAGE, ON_SPEAKER, RECONNECTING, RECONNECTED, ON_ROLE_CHANGE_REQUEST, ON_CHANGE_TRACK_STATE_REQUEST, ON_REMOVED_FROM_ROOM, ON_RTC_STATS, ON_LOCAL_AUDIO_STATS, ON_LOCAL_VIDEO_STATS, ON_REMOTE_AUDIO_STATS, ON_REMOTE_VIDEO_STATS, ON_AUDIO_DEVICE_CHANGED, HMSConstants.ON_SESSION_STORE_AVAILABLE, HMSConstants.ON_SESSION_STORE_CHANGED, HMSConstants.ON_PEER_LIST_UPDATED, HMSConstants.ON_POLL_UPDATE, HMSConstants.ON_WHITEBOARD_UPDATE]
     }
 
     // MARK: - HMS SDK Delegate Callbacks
@@ -762,4 +762,23 @@ class HMSManager: RCTEventEmitter {
         }
         rnsdk.isNoiseCancellationPluginAvailable(data, resolve, reject)
     }
+
+    // MARK: - Interactivity Center - Whiteboard
+    @objc
+    func startWhiteboard(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        guard let rnsdk = HMSHelper.getHms(data, hmsCollection), let interactivity = rnsdk.interactivity else {
+            reject?("6004", "HMSRNSDK instance not found!", nil)
+            return
+        }
+        interactivity.startWhiteboard(resolve, reject)
+    }
+
+    @objc
+    func stopWhiteboard(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        guard let rnsdk = HMSHelper.getHms(data, hmsCollection), let interactivity = rnsdk.interactivity else {
+            reject?("6004", "HMSRNSDK instance not found!", nil)
+            return
+        }
+        interactivity.stopWhiteboard(resolve, reject)
+    }
 }

package/ios/HMSRNInteractivityCenter.swift

@@ -27,8 +27,27 @@ class HMSRNInteractivityCenter {
                 ["update": update.rawValue, "updatedPoll": HMSInteractivityDecoder.getHMSPoll(updatedPoll)]
             )
       }
+
+        hmssdk.interactivityCenter.addWhiteboardUpdateListener { [weak self] hmsWhiteboard, hmsWhiteboardUpdateType in
+            guard let self = self else { return }
+            guard let enabledEvents = self.hmsrnsdk?.eventsEnableStatus, enabledEvents[HMSConstants.ON_WHITEBOARD_UPDATE] == true else {
+                print("HMSConstants.ON_WHITEBOARD_UPDATE event is not enabled")
+                return
+            }
+            var hmsWhiteboardDict = HMSInteractivityDecoder.getHMSWhiteboard(hmsWhiteboard)
+            hmsWhiteboardDict["isOwner"] = hmsWhiteboard.owner?.peerID == self.hmssdk?.localPeer?.peerID
+
+            self.hmsrnsdk?.delegate?.emitEvent(
+                HMSConstants.ON_WHITEBOARD_UPDATE,
+                [
+                    "hmsWhiteboard": hmsWhiteboardDict,
+                    "updateType": HMSInteractivityDecoder.getWhiteboardUpdateType(hmsWhiteboardUpdateType)
+                ]
+            )
+        }
     }
 
+    // MARK: Poll Methods
     func quickStartPoll(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let pollBuilder = HMSInteractivityHelper.getPollBuilderFromDict(data, sdkRoles: hmssdk?.roles)
 
@@ -117,4 +136,26 @@ class HMSRNInteractivityCenter {
             }
         }
     }
+
+    // MARK: - Whiteboard Methods
+    
+    func startWhiteboard(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        self.hmssdk?.interactivityCenter.startWhiteboard { success, error in
+            if let error = error {
+                reject?("6004", error.localizedDescription, nil)
+                return
+            }
+            resolve?(success)
+        }
+    }
+
+    func stopWhiteboard(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        self.hmssdk?.interactivityCenter.stopWhiteboard { success, error in
+            if let error = error {
+                reject?("6004", error.localizedDescription, nil)
+                return
+            }
+            resolve?(success)
+        }
+    }
 }

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({