@100mslive/react-native-hms 0.8.0 → 0.8.1

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

@@ -88,7 +88,10 @@ class HmsView(context: ReactContext) : FrameLayout(context) {
           val auxiliaryTracks = peer.auxiliaryTracks
           for (track in auxiliaryTracks) {
             val auxTrackId = track.trackId
-            if (trackId == auxTrackId && track.source == HMSTrackSource.SCREEN && track.type == HMSTrackType.VIDEO && !track.isMute) {
+            if (trackId == auxTrackId &&
+                    track.type == HMSTrackType.VIDEO &&
+                    !track.isMute
+            ) {
               videoTrack = track as HMSVideoTrack
               return
             }

package/ios/HmsDecoder.swift

@@ -9,13 +9,16 @@ class HmsDecoder: NSObject {
         let id = room.roomID ?? ""
         let name = room.name ?? ""
         let metaData = room.metaData ?? ""
+        let browserRecordingState = HmsDecoder.getHMSBrowserRecordingState(hmsRoom?.browserRecordingState)
+        let rtmpStreamingState = HmsDecoder.getHMSRtmpStreamingState(hmsRoom?.rtmpStreamingState)
+        let serverRecordingState = HmsDecoder.getHMSServerRecordingState(hmsRoom?.serverRecordingState)
         var peers = [[String: Any]]()
         
         for peer in room.peers {
             peers.append(getHmsPeer(peer))
         }
         
-        return ["id": id, "name": name, "metaData": metaData, "peers": peers]
+        return ["id": id, "name": name, "metaData": metaData, "peers": peers, "browserRecordingState": browserRecordingState, "rtmpHMSRtmpStreamingState": rtmpStreamingState, "serverRecordingState": serverRecordingState]
     }
     
     static func getHmsPeer (_ peer: HMSPeer) -> [String: Any] {
@@ -25,6 +28,7 @@ class HmsDecoder: NSObject {
         let isLocal = peer.isLocal
         let customerUserID = peer.customerUserID ?? ""
         let customerDescription = peer.metadata ?? ""
+        let metadata = peer.metadata ?? ""
         let audioTrack = getHmsAudioTrack(peer.audioTrack)
         let videoTrack = getHmsVideoTrack(peer.videoTrack)
         let role = getHmsRole(peer.role)
@@ -40,6 +44,7 @@ class HmsDecoder: NSObject {
                 "isLocal": isLocal,
                 "customerUserID": customerUserID,
                 "customerDescription": customerDescription,
+                "metadata": metadata,
                 "audioTrack": audioTrack,
                 "videoTrack": videoTrack,
                 "auxiliaryTracks": auxiliaryTracks,
@@ -93,6 +98,7 @@ class HmsDecoder: NSObject {
         let isLocal = peer.isLocal
         let customerUserID = peer.customerUserID ?? ""
         let customerDescription = peer.metadata ?? ""
+        let metadata = peer.metadata ?? ""
         let audioTrack = getHmsAudioTrack(peer.audioTrack)
         let videoTrack = getHmsVideoTrack(peer.videoTrack)
         let role = getHmsRole(peer.role)
@@ -115,7 +121,7 @@ class HmsDecoder: NSObject {
             localVideoTrackData = ["trackId": localVideo.trackId, "source": localVideo.source, "trackDescription": localVideo.trackDescription, "settings": getHmsVideoTrackSettings(localVideo.settings), "isMute":localAudioTrack?.isMute() ?? false]
         }
         
-        return ["peerID": peerID, "name": name, "isLocal": isLocal, "customerUserID": customerUserID, "customerDescription": customerDescription, "audioTrack": audioTrack, "videoTrack": videoTrack, "auxiliaryTracks": auxiliaryTracks, "localAudioTrackData": localAudioTrackData, "localVideoTrackData": localVideoTrackData, "role": role]
+        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]
     }
     
     static func getHmsAudioTrackSettings(_ hmsAudioTrackSettings: HMSAudioTrackSettings?) -> [String: Any] {
@@ -132,11 +138,11 @@ class HmsDecoder: NSObject {
         
         guard let settings = hmsVideoTrackSettings else { return [:] }
         
-        let codec = settings.codec.rawValue
-        let resolution = settings.resolution
+        let codec = getHmsVideoTrackCodec(settings.codec)
+        let resolution = getHmsVideoResolution(settings.resolution)
         let maxBitrate = settings.maxBitrate
         let maxFrameRate = settings.maxFrameRate
-        let cameraFacing = settings.cameraFacing.rawValue
+        let cameraFacing = getHmsVideoTrackCameraFacing(settings.cameraFacing)
         let trackDescription = settings.trackDescription ?? ""
         
         var simulcastSettingsData = [[String: Any]]()
@@ -153,6 +159,34 @@ class HmsDecoder: NSObject {
         return ["codec": codec, "resolution": resolution, "maxBitrate": maxBitrate, "maxFrameRate": maxFrameRate, "cameraFacing": cameraFacing, "trackDescription": trackDescription, "simulcastSettings": simulcastSettingsData]
     }
     
+    static func getHmsVideoTrackCodec(_ codec : HMSCodec) -> String {
+        switch(codec) {
+        case HMSCodec.VP8:
+            return "vp8"
+        case HMSCodec.H264:
+            return "h264"
+        default:
+            return "h264"
+        }
+    }
+    
+    static func getHmsVideoTrackCameraFacing(_ cameraFacing : HMSCameraFacing) -> String {
+        switch(cameraFacing) {
+        case HMSCameraFacing.front:
+            return "FRONT"
+        case HMSCameraFacing.back:
+            return "BACK"
+        default:
+            return "FRONT"
+        }
+    }
+ 
+    static func getHmsVideoResolution(_ hmsVideoResolution: HMSVideoResolution?) -> [String: Any] {
+        guard let resolution = hmsVideoResolution else { return [:] }
+        
+        return ["width": resolution.width, "height": resolution.height]
+    }
+    
     static func getHmsRemotePeers (_ remotePeers: [HMSRemotePeer]?) -> [[String: Any]] {
         guard let remotePeers = remotePeers else { return [[:]] }
         
@@ -172,6 +206,7 @@ class HmsDecoder: NSObject {
         let isLocal = hmsRemotePeer.isLocal
         let customerUserID = hmsRemotePeer.customerUserID ?? ""
         let customerDescription = hmsRemotePeer.metadata ?? ""
+        let metadata = hmsRemotePeer.metadata ?? ""
         let audioTrack = getHmsAudioTrack(hmsRemotePeer.audioTrack)
         let videoTrack = getHmsVideoTrack(hmsRemotePeer.videoTrack)
         let role = getHmsRole(hmsRemotePeer.role)
@@ -195,7 +230,7 @@ class HmsDecoder: NSObject {
             remoteVideoTrackData = ["trackId": remoteVideo.trackId, "source": remoteVideo.source, "trackDescription": remoteVideo.trackDescription, "layer": remoteVideo.layer.rawValue, "playbackAllowed": remoteVideo.isPlaybackAllowed(), "isMute": remoteVideo.isMute()]
         }
         
-        return ["peerID": peerID, "name": name, "isLocal": isLocal, "customerUserID": customerUserID, "customerDescription": customerDescription, "audioTrack": audioTrack, "videoTrack": videoTrack, "auxiliaryTracks": auxiliaryTracks, "remoteAudioTrackData": remoteAudioTrackData, "remoteVideoTrackData": remoteVideoTrackData, "role": role]
+        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]
     }
     
     static func getPreviewTracks(_ tracks: [HMSTrack]) -> [String: Any] {
@@ -267,7 +302,12 @@ class HmsDecoder: NSObject {
         let screen = getHmsVideoSettings(publishSettings.screen)
         let videoSimulcastLayers = getHmsSimulcastLayers(publishSettings.videoSimulcastLayers)
         let screenSimulcastLayers = getHmsSimulcastLayers(publishSettings.screenSimulcastLayers)
-        let allowed = publishSettings.allowed ?? []
+        var allowed = publishSettings.allowed ?? []
+        if((publishSettings.allowed) != nil) {
+            allowed = getWriteableArray(publishSettings.allowed)
+        }else {
+            allowed = []
+        }
         
         return ["audio": audio,
                 "video": video,
@@ -276,6 +316,16 @@ class HmsDecoder: NSObject {
                 "screenSimulcastLayers": screenSimulcastLayers,
                 "allowed": allowed]
     }
+
+    static func getWriteableArray(_ array: [String]?) -> [String] {
+        var decodedArray = [String]()
+        if let extractedArray = array {
+            for value in extractedArray {
+                decodedArray.append(value)
+            }
+        }
+        return decodedArray
+    }
     
     static func getHmsAudioSettings(_ audioSettings: HMSAudioSettings) -> [String: Any] {
         let bitRate = audioSettings.bitRate
@@ -362,16 +412,53 @@ class HmsDecoder: NSObject {
         return request
     }
     
-    static func getError(_ error: HMSError) -> [String: Any] {
-        let code = error.code
-        let description = error.description
-        let localizedDescription = error.localizedDescription
-        let debugDescription = error.debugDescription
-        let message = error.message
-        let name = error.id
-        let id = error.id
-        let action = error.action
-        
-        return ["code": code, "description": description, "localizedDescription":localizedDescription, "debugDescription":debugDescription, "message":message, "name":name, "action":action, "id": id]
+    static func getError(_ errorObj: HMSError?) -> [String: Any] {
+        if let error = errorObj {
+            let code = error.code
+            let description = error.description
+            let localizedDescription = error.localizedDescription
+            let debugDescription = error.debugDescription
+            let message = error.message
+            let name = error.id
+            let id = error.id
+            let action = error.action
+            
+            return ["code": code, "description": description, "localizedDescription":localizedDescription, "debugDescription":debugDescription, "message":message, "name":name, "action":action, "id": id]
+        } else {
+            return [:]
+        }
+    }
+    
+    static func getHMSBrowserRecordingState(_ data: HMSBrowserRecordingState?) -> [String: Any] {
+        if let recordingState = data {
+            let running = recordingState.running
+            let error = HmsDecoder.getError(recordingState.error)
+            
+            return ["running": running, "error": error]
+        } else {
+            return  [:]
+        }
+    }
+    
+    static func getHMSRtmpStreamingState(_ data: HMSRTMPStreamingState?) -> [String: Any] {
+        if let streamingState = data {
+            let running = streamingState.running
+            let error = HmsDecoder.getError(streamingState.error)
+            
+            return ["running": running, "error": error]
+        } else {
+            return [:]
+        }
+    }
+    
+    static func getHMSServerRecordingState(_ data: HMSServerRecordingState?) -> [String: Any] {
+        if let recordingState = data {
+            let running = recordingState.running
+            let error = HmsDecoder.getError(recordingState.error)
+            
+            return ["running": running, "error": error]
+        } else {
+            return [:]
+        }
     }
 }

package/ios/HmsHelper.swift

@@ -53,6 +53,22 @@ class HmsHelper: NSObject {
         return nil
     }
     
+    static func getRemoteAudioAuxiliaryTrackFromTrackId(_ trackID: String?, _ remotePeers: [HMSRemotePeer]?) -> HMSRemoteAudioTrack? {
+        for peer in remotePeers ?? [] {
+            if peer.audioTrack?.trackId == trackID {
+                return peer.audioTrack as? HMSRemoteAudioTrack
+            }
+            let auxTracks = peer.auxiliaryTracks
+            
+            for track in auxTracks ?? [] {
+                if (track.kind == HMSTrackKind.audio && track.trackId == trackID) {
+                    return track as? HMSRemoteAudioTrack
+                }
+            }
+        }
+        return nil
+    }
+    
     static func getRemoteVideoTrackFromTrackId(_ trackID: String?, _ remotePeers: [HMSRemotePeer]?) -> HMSRemoteVideoTrack? {
         for peer in remotePeers ?? [] {
             if peer.videoTrack?.trackId == trackID {
@@ -98,4 +114,80 @@ class HmsHelper: NSObject {
         }
         return hms
     }
+    
+    static func getLocalVideoSettings(_ settings: NSDictionary?) -> HMSVideoTrackSettings? {
+        guard let data = settings,
+              let codec = data.value(forKey: "codec") as? String,
+              let resolution = data.value(forKey: "resolution") as? [String : Double]?,
+              let maxBitrate = data.value(forKey: "maxBitrate") as? Int,
+              let maxFrameRate = data.value(forKey: "maxFrameRate") as? Int,
+              let cameraFacing = data.value(forKey: "cameraFacing") as? String,
+              let trackDescription = data.value(forKey: "trackDescription") as? String?,
+              let resolutionObj = HmsHelper.getVideoResolution(resolution ?? [:])
+        else {
+            return nil
+        }
+        let codecEncoded = HmsHelper.getVideoCodec(codec)
+        let cameraFacingEncoded = HmsHelper.getCameraFacing(cameraFacing)
+        let hmsTrackSettings = HMSVideoTrackSettings(codec: codecEncoded, resolution: resolutionObj, maxBitrate: maxBitrate, maxFrameRate: maxFrameRate, cameraFacing: cameraFacingEncoded, trackDescription: trackDescription)
+        return hmsTrackSettings
+    }
+    
+    static func getLocalAudioSettings(_ settings: NSDictionary?) -> HMSAudioTrackSettings? {
+        guard let data = settings,
+              let maxBitrate = data.value(forKey: "maxBitrate") as? Int,
+              let trackDescription = data.value(forKey: "trackDescription") as? String?
+        else {
+            return nil
+        }
+        let hmsTrackSettings = HMSAudioTrackSettings(maxBitrate: maxBitrate, trackDescription: trackDescription)
+        return hmsTrackSettings
+    }
+    
+    static func getVideoResolution(_ data: [String : Double]) -> HMSVideoResolution? {
+        guard let width = data["width"],
+              let height = data["height"]
+        else {
+            return nil
+        }
+        
+        return HMSVideoResolution.init(width: width, height: height)
+    }
+    
+    static func getVideoCodec(_ codecString: String?) -> HMSCodec {
+        switch codecString {
+        case "h264":
+            return HMSCodec.H264
+        case "vp8":
+            return HMSCodec.VP8
+        default:
+            return HMSCodec.H264
+        }
+    }
+    
+    static func getCameraFacing(_ cameraFacing: String) -> HMSCameraFacing {
+        switch cameraFacing {
+        case "FRONT":
+            return HMSCameraFacing.front
+        case "BACK":
+            return HMSCameraFacing.back
+        default:
+            return HMSCameraFacing.front
+        }
+    }
+    
+    static func getRtmpUrls(_ strings: [String]?) -> [URL]? {
+        if let extractedStrings = strings {
+            var arr: [URL] = []
+            for urlString in extractedStrings {
+                let urlInstance = URL(string: urlString)
+                if let urlExtracted = urlInstance {
+                    arr.append(urlExtracted)
+                }
+            }
+            return arr
+        } else {
+            return nil
+        }
+    }
 }

package/ios/HmsManager.m

@@ -20,8 +20,12 @@ RCT_EXTERN_METHOD(acceptRoleChange: (NSDictionary) data)
 RCT_EXTERN_METHOD(isMute: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 RCT_EXTERN_METHOD(getRoom: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 RCT_EXTERN_METHOD(switchCamera: (NSDictionary) data)
-RCT_EXTERN_METHOD(build :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(setVolume: (NSDictionary) data)
+RCT_EXTERN_METHOD(build : (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 RCT_EXTERN_METHOD(leave: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 RCT_EXTERN_METHOD(muteAllPeersAudio: (NSDictionary) mute)
 RCT_EXTERN_METHOD(isPlaybackAllowed: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(changeMetadata: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(startRTMPOrRecording: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(stopRtmpAndRecording: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 @end

package/ios/HmsManager.swift

@@ -26,9 +26,9 @@ class HmsManager: RCTEventEmitter{
         super.init()
     }
     
-    override class func requiresMainQueueSetup() -> Bool {
-        true
-    }
+//    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]
@@ -38,19 +38,19 @@ class HmsManager: RCTEventEmitter{
     // MARK: - HMS SDK Actions
     
     @objc
-    func build(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+    func build(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         DispatchQueue.main.async { [weak self] in
             let hasItem = self?.hmsCollection.index(forKey: "12345")
             
             if let _ = hasItem {
                 let id = UUID().uuidString
-                let hms = HmsSDK(delegate: self, uid: id)
+                let hms = HmsSDK(data: data, delegate: self, uid: id)
                 self?.hmsCollection[id] = hms
                 
                 resolve?(id)
             } else {
                 let id = "12345"
-                let hms = HmsSDK(delegate: self, uid: id)
+                let hms = HmsSDK(data: data, delegate: self, uid: id)
                 self?.hmsCollection[id] = hms
                 
                 resolve?(id)
@@ -208,4 +208,39 @@ class HmsManager: RCTEventEmitter{
         
         hms?.muteAllPeersAudio(data)
     }
+    
+    @objc
+    func changeMetadata(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HmsHelper.getHms(data, hmsCollection)
+        
+        hms?.changeMetadata(data, resolve, reject)
+    }
+
+    @objc
+    func setVolume(_ data: NSDictionary) {
+        let hms = HmsHelper.getHms(data, hmsCollection)
+        
+        hms?.setVolume(data)
+    }
+    
+    @objc
+    func startRTMPOrRecording(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HmsHelper.getHms(data, hmsCollection)
+        
+        hms?.startRTMPOrRecording(data, resolve, reject)
+    }
+    
+    @objc
+    func stopRtmpAndRecording(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HmsHelper.getHms(data, hmsCollection)
+        
+        hms?.stopRtmpAndRecording(resolve, reject)
+    }
+    
+//    @objc
+//    func setLocalVideoSettings(_ data: NSDictionary) {
+//        let hms = HmsHelper.getHms(data, hmsCollection)
+//
+//        hms?.setLocalVideoSettings(data)
+//    }
 }