@100mslive/react-native-hms 0.9.91 → 0.9.93

package/README.md

@@ -50,10 +50,10 @@ Add following lines in `Info.plist` file
 ```xml
 <key>NSCameraUsageDescription</key>
 <string>Please allow access to Camera to enable video conferencing</string>
-<key>NSLocalNetworkUsageDescription</key>
-<string>Please allow access to network usage to enable video conferencing</string>
 <key>NSMicrophoneUsageDescription</key>
 <string>Please allow access to Microphone to enable video conferencing</string>
+<key>NSLocalNetworkUsageDescription</key>
+<string>Please allow access to network usage to enable video conferencing</string>
 ```
 
 ### For Android Permissions
@@ -61,9 +61,15 @@ Add following lines in `Info.plist` file
 Add following permissions in `AndroidManifest.xml`
 
 ```xml
-<uses-permission android:name="android.permission.CAMERA" />
-<uses-permission android:name="android.permission.RECORD_AUDIO" />
-<uses-permission android:name="android.permission.INTERNET" />
+<uses-feature android:name="android.hardware.camera.autofocus"/>
+<uses-permission android:name="android.permission.CAMERA"/>
+<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+<uses-permission android:name="android.permission.RECORD_AUDIO"/>
+<uses-permission android:name="android.permission.BLUETOOTH"/>
+<uses-permission android:name="android.permission.INTERNET"/>
+<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 ```
 
 You will also need to request Camera and Record Audio permissions at runtime before you join a call or display a preview. Please follow [Android Documentation](https://developer.android.com/training/permissions/requesting#request-permission) for runtime permissions.
@@ -152,7 +158,7 @@ hmsInstance?.localPeer?.localVideoTrack()?.switchCamera();
 await hmsInstance?.leave();
 ```
 
-## Viewing the video of a peer
+## [Viewing the video of a peer](https://www.100ms.live/docs/react-native/v2/features/render-video)
 
 To display a video on screen the package provide a UI component named HmsView that takes the video track ID and displays the video in that component, this component requires on _width_ and _height_ in _style_ prop to set bounds of the tile that will show the video stream
 
@@ -408,7 +414,7 @@ const track: HMSTrack = remotePeer.audioTrack as HMSTrack;
 hmsInstance?.setVolume(track, volume);
 ```
 
-## [Change name](https://www.100ms.live/docs/react-native/v2/features/change-name)
+## [Change Name](https://www.100ms.live/docs/react-native/v2/features/change-name)
 
 ```js
 const newName: string = 'new name';

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

@@ -41,7 +41,7 @@ class HMSRNSDK(
   private var self = this
 
   init {
-    val trackSettings = HMSHelper.getTrackSettings(data)
+    val trackSettings = HMSHelper.getTrackSettings(data?.getMap("trackSettings"))
     if (trackSettings == null) {
       this.hmsSDK = HMSSDK.Builder(reactApplicationContext).build()
     } else {

package/ios/HMSDecoder.swift

@@ -139,12 +139,12 @@ class HMSDecoder: NSObject {
 
         return ["peerID": peerID, "name": name, "isLocal": isLocal, "customerUserID": customerUserID, "customerDescription": customerDescription, "metadata": metadata, "audioTrack": audioTrack, "videoTrack": videoTrack, "auxiliaryTracks": auxiliaryTracks, "localAudioTrackData": localAudioTrackData, "localVideoTrackData": localVideoTrackData, "role": role, "networkQuality": networkQuality]
     }
-    
+
     static func getHmsLocalAudioTrack(_ localAudio: HMSLocalAudioTrack) -> [String: Any] {
         let type = HMSHelper.getHmsTrackType(localAudio.kind) ?? ""
         return ["trackId": localAudio.trackId, "source": localAudio.source, "trackDescription": localAudio.trackDescription, "settings": getHmsAudioTrackSettings(localAudio.settings), "isMute": localAudio.isMute(), "type": type, "kind": type]
     }
-    
+
     static func getHmsLocalVideoTrack(_ localVideo: HMSLocalVideoTrack) -> [String: Any] {
         let type = HMSHelper.getHmsTrackType(localVideo.kind) ?? ""
         return ["trackId": localVideo.trackId, "source": localVideo.source, "trackDescription": localVideo.trackDescription, "settings": getHmsVideoTrackSettings(localVideo.settings), "isMute": localVideo.isMute(), "type": type, "kind": type]
@@ -259,12 +259,12 @@ class HMSDecoder: NSObject {
 
         return ["peerID": peerID, "name": name, "isLocal": isLocal, "customerUserID": customerUserID, "customerDescription": customerDescription, "metadata": metadata, "audioTrack": audioTrack, "videoTrack": videoTrack, "auxiliaryTracks": auxiliaryTracks, "remoteAudioTrackData": remoteAudioTrackData, "remoteVideoTrackData": remoteVideoTrackData, "role": role, "networkQuality": networkQuality]
     }
-    
+
     static func getHMSRemoteAudioTrack(_ remoteAudio: HMSRemoteAudioTrack) -> [String: Any] {
         let type = HMSHelper.getHmsTrackType(remoteAudio.kind) ?? ""
         return ["trackId": remoteAudio.trackId, "source": remoteAudio.source, "trackDescription": remoteAudio.trackDescription, "playbackAllowed": remoteAudio.isPlaybackAllowed(), "isMute": remoteAudio.isMute(), "type": type, "kind": type]
     }
-    
+
     static func getHMSRemoteVideoTrack(_ remoteVideo: HMSRemoteVideoTrack) -> [String: Any] {
         let type = HMSHelper.getHmsTrackType(remoteVideo.kind) ?? ""
         return ["trackId": remoteVideo.trackId, "source": remoteVideo.source, "trackDescription": remoteVideo.trackDescription, "layer": remoteVideo.layer.rawValue, "playbackAllowed": remoteVideo.isPlaybackAllowed(), "isMute": remoteVideo.isMute(), "isDegraded": remoteVideo.isDegraded(), "type": type, "kind": type]
@@ -478,17 +478,14 @@ class HMSDecoder: NSObject {
         return request
     }
 
-    static func getError(_ errorObj: HMSError?) -> [String: Any]? {
-        if let error = errorObj {
-            let code = error.code.rawValue
-            let description = error.description
-            let message = error.message
-            let name = error.id
-            let id = error.id
-            let action = error.action
-            let isTerminal = false
+    static func getError(_ errorObj: Error?) -> [String: Any]? {
+        if let error = errorObj as? HMSError {
+            let code = error.errorCode
+            let description = error.localizedDescription
+            let isTerminal = error.userInfo[HMSIsTerminalUserInfoKey] as? Bool ?? false
+            let canRetry = error.userInfo[HMSCanRetryUserInfoKey] as? Bool ?? false
 
-            return ["code": code, "description": description, "message": message, "name": name, "action": action, "id": id, "isTerminal": isTerminal]
+            return ["code": code, "description": description, "isTerminal": isTerminal, "canRetry": canRetry]
         } else {
             return nil
         }
@@ -540,7 +537,7 @@ class HMSDecoder: NSObject {
             return [:]
         }
     }
-    
+
     static func getHlsRecordingState(_ data: HMSHLSRecordingState?) -> [String: Any] {
         if let recordingState = data {
             let running = recordingState.running
@@ -570,37 +567,37 @@ class HMSDecoder: NSObject {
         }
         return variants
     }
-    
+
     static func getHMSRTCStats(_ data: HMSRTCStats) -> [String: Any] {
         return ["bitrateReceived": data.bitrateReceived, "bitrateSent": data.bitrateSent, "bytesReceived": data.bytesReceived, "bytesSent": data.bytesSent, "packetsLost": data.packetsLost, "packetsReceived": data.packetsReceived, "roundTripTime": data.roundTripTime]
     }
-    
+
     static func getLocalAudioStats(_ data: HMSLocalAudioStats) -> [String: Any] {
         return ["roundTripTime": data.roundTripTime, "bytesSent": data.bytesSent, "bitrate": data.bitrate]
     }
-    
+
     static func getLocalVideoStats(_ data: HMSLocalVideoStats) -> [String: Any] {
         return ["roundTripTime": data.roundTripTime, "bytesSent": data.bytesSent, "bitrate": data.bitrate, "resolution": HMSDecoder.getHmsVideoResolution(data.resolution), "frameRate": data.frameRate]
     }
-    
+
     static func getRemoteAudioStats(_ data: HMSRemoteAudioStats) -> [String: Any] {
         return ["bitrate": data.bitrate, "packetsReceived": data.packetsReceived, "packetsLost": data.packetsLost, "bytesReceived": data.bytesReceived, "jitter": data.jitter]
     }
-    
+
     static func getRemoteVideoStats(_ data: HMSRemoteVideoStats) -> [String: Any] {
         return ["bitrate": data.bitrate, "packetsReceived": data.packetsReceived, "packetsLost": data.packetsLost, "bytesReceived": data.bytesReceived, "jitter": data.jitter, "resolution": HMSDecoder.getHmsVideoResolution(data.resolution), "frameRate": data.frameRate]
     }
-    
+
     static func getHmsMessageRecipient(_ recipient: HMSMessageRecipient) -> [String: Any] {
         return ["recipientPeer": getHmsPeer(recipient.peerRecipient), "recipientRoles": getAllRoles(recipient.rolesRecipient), "recipientType": self.getRecipientType(from: recipient.type)]
     }
-    
+
     static func getHmsNetworkQuality(_ hmsNetworkQuality: HMSNetworkQuality?) -> [String: Any] {
         guard let networkQuality = hmsNetworkQuality else { return [:] }
-        
+
         return ["downlinkQuality": networkQuality.downlinkQuality]
     }
-    
+
     static private func getRecipientType(from recipientType: HMSMessageRecipientType) -> String {
         switch recipientType {
         case .broadcast:

package/ios/HMSHelper.swift

@@ -2,14 +2,15 @@ import HMSSDK
 import Foundation
 
 class HMSHelper: NSObject {
+    static var audioMixerSourceHashMap: [String: HMSAudioNode]?
 
     static func getUnavailableRequiredKey(_ data: NSDictionary, _ requiredKeys: [String]) -> String {
         for (key) in requiredKeys {
             let value = data.object(forKey: key)
-            if (value == nil) {
+            if value == nil {
                 return key + "_Is_Required"
             }
-            if (value is NSNull) {
+            if value is NSNull {
                 return key + "_Is_Null"
             }
         }
@@ -159,15 +160,48 @@ class HMSHelper: NSObject {
         return hmsTrackSettings
     }
 
-    static func getLocalAudioSettings(_ settings: NSDictionary?) -> HMSAudioTrackSettings? {
+    static func getLocalAudioSettings(_ settings: NSDictionary?, _ hms: HMSSDK?, _ delegate: HMSManager?, _ id: String) -> HMSAudioTrackSettings? {
         guard let data = settings,
-              let maxBitrate = data.value(forKey: "maxBitrate") as? Int,
-              let trackDescription = data.value(forKey: "trackDescription") as? String?
+              let maxBitrate = data.value(forKey: "maxBitrate") as? Int
         else {
             return nil
         }
+        let trackDescription = data.value(forKey: "trackDescription") as? String
         let hmsTrackSettings = HMSAudioTrackSettings(maxBitrate: maxBitrate, trackDescription: trackDescription)
-        return hmsTrackSettings
+        if #available(iOS 13.0, *) {
+            var audioMixerSourceMap = [String: HMSAudioNode]()
+            if let playerNode = settings?.value(forKey: "audioSource") as? [String] {
+                for node in playerNode {
+                    if audioMixerSourceMap[node] == nil {
+                        if node == "mic_node" {
+                            audioMixerSourceMap["mic_node"] = HMSMicNode()
+                        } else if node == "screen_broadcast_audio_receiver_node" {
+                            do {
+                                audioMixerSourceMap["screen_broadcast_audio_receiver_node"] = try hms?.screenBroadcastAudioReceiverNode()
+                            } catch {
+                                delegate?.emitEvent("ON_ERROR", ["error": ["code": 6002, "description": error.localizedDescription, "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+                            }
+                        } else {
+                            audioMixerSourceMap[node] = HMSAudioFilePlayerNode()
+                        }
+                    }
+                }
+            }
+            do {
+                self.audioMixerSourceHashMap = audioMixerSourceMap
+                let audioMixerSource = try HMSAudioMixerSource(nodes: audioMixerSourceMap.values.map {$0})
+                return HMSAudioTrackSettings(maxBitrate: maxBitrate, trackDescription: trackDescription, audioSource: audioMixerSource)
+            } catch {
+                delegate?.emitEvent("ON_ERROR", ["error": ["code": 6002, "description": error.localizedDescription, "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+                return hmsTrackSettings
+            }
+        } else {
+            return hmsTrackSettings
+        }
+    }
+
+    static func getAudioMixerSourceMap() -> [String: HMSAudioNode]? {
+        return self.audioMixerSourceHashMap
     }
 
     static func getVideoResolution(_ data: [String: Double]) -> HMSVideoResolution? {
@@ -227,7 +261,7 @@ class HMSHelper: NSObject {
         }
         return hlsVariants
     }
-    
+
     static func getHlsRecordingConfig(_ config: NSDictionary?) -> HMSHLSRecordingConfig? {
         guard let hlsRecordingConfig = config
         else {
@@ -235,7 +269,7 @@ class HMSHelper: NSObject {
         }
         let singleFilePerLayer = hlsRecordingConfig.value(forKey: "singleFilePerLayer") as? Bool
         let videoOnDemand = hlsRecordingConfig.value(forKey: "videoOnDemand") as? Bool
-        
+
         return HMSHLSRecordingConfig(singleFilePerLayer: singleFilePerLayer ?? false, enableVOD: videoOnDemand ?? false)
     }
 

package/ios/HMSManager.m

@@ -37,4 +37,15 @@ RCT_EXTERN_METHOD(changeName: (NSDictionary) data :(RCTPromiseResolveBlock) reso
 RCT_EXTERN_METHOD(enableRTCStats: (NSDictionary) data)
 RCT_EXTERN_METHOD(disableRTCStats: (NSDictionary) data)
 RCT_EXTERN_METHOD(destroy: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(startScreenshare: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(stopScreenshare: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(isScreenShared: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(playAudioShare: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(setAudioShareVolume: (NSDictionary) data)
+RCT_EXTERN_METHOD(stopAudioShare: (NSDictionary) data)
+RCT_EXTERN_METHOD(resumeAudioShare: (NSDictionary) data)
+RCT_EXTERN_METHOD(pauseAudioShare: (NSDictionary) data)
+RCT_EXTERN_METHOD(audioShareIsPlaying: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(audioShareCurrentTime: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(audioShareDuration: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 @end

package/ios/HMSManager.swift

@@ -30,11 +30,11 @@ class HMSManager: RCTEventEmitter {
     override init() {
         super.init()
     }
-    
+
     override class func requiresMainQueueSetup() -> Bool {
         true
     }
-    
+
     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]
     }
@@ -67,18 +67,18 @@ class HMSManager: RCTEventEmitter {
         let hms = HMSHelper.getHms(credentials, hmsCollection)
         hms?.preview(credentials)
     }
-    
+
     @objc
     func previewForRole(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
 
         hms?.previewForRole(data, resolve, reject)
     }
-    
+
     @objc
     func cancelPreview(_ data: NSDictionary) {
         let hms = HMSHelper.getHms(data, hmsCollection)
-        
+
         hms?.cancelPreview()
     }
 
@@ -224,7 +224,7 @@ class HMSManager: RCTEventEmitter {
 
         hms?.setPlaybackForAllAudio(data)
     }
-    
+
     @objc
     func remoteMuteAllAudio(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
@@ -273,25 +273,25 @@ class HMSManager: RCTEventEmitter {
 
         hms?.stopHLSStreaming(resolve, reject)
     }
-    
+
     @objc
     func changeName(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
 
         hms?.changeName(data, resolve, reject)
     }
-    
+
     @objc
     func enableRTCStats(_ data: NSDictionary) {
         let hms = HMSHelper.getHms(data, hmsCollection)
-        
+
         hms?.enableRTCStats()
     }
-    
+
     @objc
     func disableRTCStats(_ data: NSDictionary) {
         let hms = HMSHelper.getHms(data, hmsCollection)
-        
+
         hms?.disableRTCStats()
     }
 
@@ -302,11 +302,80 @@ class HMSManager: RCTEventEmitter {
         resolve?(["success": id + " removed"])
     }
 
-//    @objc
-//    func setLocalVideoSettings(_ data: NSDictionary) {
-//        let hms = HMSHelper.getHms(data, hmsCollection)
-//
-//        hms?.setLocalVideoSettings(data)
-//    }
-}
+    @objc
+    func startScreenshare(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.startScreenshare(resolve, reject)
+    }
+
+    @objc
+    func stopScreenshare(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.stopScreenshare(resolve, reject)
+    }
+
+    @objc
+    func isScreenShared(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.isScreenShared(resolve, reject)
+    }
+
+    @objc
+    func playAudioShare(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.playAudioShare(data, resolve, reject)
+    }
+
+    @objc
+    func setAudioShareVolume(_ data: NSDictionary) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.setAudioShareVolume(data)
+    }
 
+    @objc
+    func stopAudioShare(_ data: NSDictionary) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.stopAudioShare(data)
+    }
+
+    @objc
+    func resumeAudioShare(_ data: NSDictionary) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.resumeAudioShare(data)
+    }
+
+    @objc
+    func pauseAudioShare(_ data: NSDictionary) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.pauseAudioShare(data)
+    }
+
+    @objc
+    func audioShareIsPlaying(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.audioShareIsPlaying(data, resolve, reject)
+    }
+
+    @objc
+    func audioShareCurrentTime(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.audioShareCurrentTime(data, resolve, reject)
+    }
+
+    @objc
+    func audioShareDuration(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.audioShareDuration(data, resolve, reject)
+    }
+}