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

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

@@ -1,21 +1,21 @@
 package com.reactnativehmssdk
 
+import android.annotation.SuppressLint
 import android.widget.FrameLayout
 import com.facebook.react.bridge.ReactContext
-import live.hms.video.media.tracks.HMSTrackSource
 import live.hms.video.media.tracks.HMSTrackType
 import live.hms.video.media.tracks.HMSVideoTrack
 import live.hms.video.utils.SharedEglContext
 import org.webrtc.RendererCommon
 import org.webrtc.SurfaceViewRenderer
 
+@SuppressLint("ViewConstructor")
 class HmsView(context: ReactContext) : FrameLayout(context) {
-  private var surfaceView: SurfaceViewRenderer
+  private var surfaceView: SurfaceViewRenderer = SurfaceViewRenderer(context)
   private var videoTrack: HMSVideoTrack? = null
   private var localTrack: String? = null
 
   init {
-    surfaceView = SurfaceViewRenderer(context)
     surfaceView.setEnableHardwareScaler(true)
     surfaceView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT)
     addView(surfaceView)
@@ -58,11 +58,10 @@ class HmsView(context: ReactContext) : FrameLayout(context) {
   fun setData(
       id: String?,
       trackId: String?,
-      sink: Boolean?,
       hmsCollection: MutableMap<String, HmsSDK>,
       mirror: Boolean?
   ) {
-    var sdkId: String = "12345"
+    var sdkId = "12345"
 
     if (id != null) {
       sdkId = id
@@ -81,26 +80,21 @@ class HmsView(context: ReactContext) : FrameLayout(context) {
       }
 
       val remotePeers = hms.getRemotePeers()
-      if (remotePeers !== null) {
-        for (peer in remotePeers) {
-          val videoTrackId = peer.videoTrack?.trackId
+      for (peer in remotePeers) {
+        val videoTrackId = peer.videoTrack?.trackId
 
-          val auxiliaryTracks = peer.auxiliaryTracks
-          for (track in auxiliaryTracks) {
-            val auxTrackId = track.trackId
-            if (trackId == auxTrackId &&
-                    track.type == HMSTrackType.VIDEO &&
-                    !track.isMute
-            ) {
-              videoTrack = track as HMSVideoTrack
-              return
-            }
-          }
-          if (videoTrackId == localTrack) {
-            videoTrack = peer.videoTrack
+        val auxiliaryTracks = peer.auxiliaryTracks
+        for (track in auxiliaryTracks) {
+          val auxTrackId = track.trackId
+          if (trackId == auxTrackId && track.type == HMSTrackType.VIDEO && !track.isMute) {
+            videoTrack = track as HMSVideoTrack
             return
           }
         }
+        if (videoTrackId == localTrack) {
+          videoTrack = peer.videoTrack
+          return
+        }
       }
     }
   }

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

@@ -4,7 +4,6 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
-import java.util.*
 
 class HmssdkPackage : ReactPackage {
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
@@ -12,6 +11,6 @@ class HmssdkPackage : ReactPackage {
   }
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return Arrays.asList<ViewManager<*, *>>(HmssdkViewManager())
+    return listOf<ViewManager<*, *>>(HmssdkViewManager())
   }
 }

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

@@ -13,26 +13,21 @@ class HmssdkViewManager : SimpleViewManager<HmsView>() {
     return REACT_CLASS
   }
 
-  override fun onDropViewInstance(view: HmsView) {
-    super.onDropViewInstance(view)
-  }
-
   public override fun createViewInstance(reactContext: ThemedReactContext): HmsView {
     this.reactContext = reactContext
-    val view = HmsView(reactContext)
-    return view
+    return HmsView(reactContext)
   }
 
   @ReactProp(name = "data")
   fun setData(view: HmsView, data: ReadableMap) {
     val trackId = data.getString("trackId")
-    val sink = data.getBoolean("sink")
+    //    val sink = data.getBoolean("sink")
     val id = data.getString("id")
     val mirror = data.getBoolean("mirror")
 
     val hmsCollection = getHms()
     if (hmsCollection != null) {
-      view.setData(id, trackId, sink, hmsCollection, mirror)
+      view.setData(id, trackId, hmsCollection, mirror)
     }
     // do the processing here
   }
@@ -43,8 +38,7 @@ class HmssdkViewManager : SimpleViewManager<HmsView>() {
   }
 
   private fun getHms(): MutableMap<String, HmsSDK>? {
-    val hmsCollection = reactContext?.getNativeModule(HmsModule::class.java)?.getHmsInstance()
-    return hmsCollection
+    return reactContext?.getNativeModule(HmsModule::class.java)?.getHmsInstance()
   }
 
   companion object {

package/ios/HmsDecoder.swift

@@ -33,11 +33,7 @@ class HmsDecoder: NSObject {
         let videoTrack = getHmsVideoTrack(peer.videoTrack)
         let role = getHmsRole(peer.role)
         
-        var auxiliaryTracks = [[String: Any]]()
-        
-        for track in peer.auxiliaryTracks ?? [] {
-            auxiliaryTracks.append(getHmsTrack(track))
-        }
+        let auxiliaryTracks = getAllTracks(peer.auxiliaryTracks ?? [] )
         
         return ["peerID": peerID,
                 "name": name,
@@ -51,6 +47,15 @@ class HmsDecoder: NSObject {
                 "role": role]
     }
     
+    static func getAllTracks (_ tracks: [HMSTrack]) -> [[String: Any]] {
+        var auxiliaryTracks = [[String: Any]]()
+        
+        for track in tracks {
+            auxiliaryTracks.append(getHmsTrack(track))
+        }
+        return auxiliaryTracks
+    }
+    
     static func getHmsTrack (_ track: HMSTrack?) -> [String: Any] {
         
         guard let hmsTrack = track else { return [:] }
@@ -59,9 +64,9 @@ class HmsDecoder: NSObject {
         let source = hmsTrack.source
         let trackDescription = hmsTrack.trackDescription
         let isMute = hmsTrack.isMute()
-        let type = HmsHelper.getHmsTrackType(hmsTrack.kind)
+        let type = HmsHelper.getHmsTrackType(hmsTrack.kind) ?? ""
         
-        return ["trackId": trackId, "source": source, "trackDescription": trackDescription, "isMute": isMute, "type": type]
+        return ["trackId": trackId, "source": source, "trackDescription": trackDescription, "isMute": isMute, "type": type, "kind": type]
     }
     
     static func getHmsAudioTrack (_ hmsAudioTrack: HMSAudioTrack?) -> [String: Any] {
@@ -72,8 +77,9 @@ class HmsDecoder: NSObject {
         let source: String = hmsTrack.source
         let trackDescription: String = hmsTrack.trackDescription
         let isMute: Bool = hmsTrack.isMute()
+        let kind: String = HmsHelper.getHmsTrackType(hmsTrack.kind) ?? ""
         
-        return ["trackId": trackId, "source": source, "trackDescription": trackDescription, "isMute": isMute]
+        return ["trackId": trackId, "source": source, "trackDescription": trackDescription, "isMute": isMute, "type": kind, "kind": kind]
     }
     
     static func getHmsVideoTrack (_ hmsVideoTrack: HMSVideoTrack?) -> [String: Any] {
@@ -85,8 +91,9 @@ class HmsDecoder: NSObject {
         let trackDescription = hmsTrack.trackDescription
         let isMute = hmsTrack.isMute()
         let isDegraded = hmsTrack.isDegraded()
+        let kind: String = HmsHelper.getHmsTrackType(hmsTrack.kind) ?? ""
         
-        return ["trackId": trackId, "source": source, "trackDescription": trackDescription, "isMute": isMute, "isDegraded": isDegraded]
+        return ["trackId": trackId, "source": source, "trackDescription": trackDescription, "isMute": isMute, "isDegraded": isDegraded, "type": kind, "kind": kind]
     }
     
     static func getHmsLocalPeer(_ hmsLocalPeer: HMSLocalPeer?) -> [String: Any] {
@@ -113,12 +120,14 @@ class HmsDecoder: NSObject {
         
         var localAudioTrackData = [String: Any]()
         if let localAudio = localAudioTrack {
-            localAudioTrackData = ["trackId": localAudio.trackId, "source": localAudio.source, "trackDescription": localAudio.trackDescription, "settings": getHmsAudioTrackSettings(localAudio.settings), "isMute": localAudioTrack?.isMute() ?? false]
+            let type = HmsHelper.getHmsTrackType(localAudio.kind) ?? ""
+            localAudioTrackData = ["trackId": localAudio.trackId, "source": localAudio.source, "trackDescription": localAudio.trackDescription, "settings": getHmsAudioTrackSettings(localAudio.settings), "isMute": localAudioTrack?.isMute() ?? false, "type": type, "kind": type]
         }
         
         var localVideoTrackData = [String: Any]()
         if let localVideo = localVideoTrack {
-            localVideoTrackData = ["trackId": localVideo.trackId, "source": localVideo.source, "trackDescription": localVideo.trackDescription, "settings": getHmsVideoTrackSettings(localVideo.settings), "isMute":localAudioTrack?.isMute() ?? false]
+            let type = HmsHelper.getHmsTrackType(localVideo.kind) ?? ""
+            localVideoTrackData = ["trackId": localVideo.trackId, "source": localVideo.source, "trackDescription": localVideo.trackDescription, "settings": getHmsVideoTrackSettings(localVideo.settings), "isMute":localAudioTrack?.isMute() ?? false, "type": type, "kind": type]
         }
         
         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]
@@ -162,11 +171,11 @@ class HmsDecoder: NSObject {
     static func getHmsVideoTrackCodec(_ codec : HMSCodec) -> String {
         switch(codec) {
         case HMSCodec.VP8:
-            return "vp8"
+            return "VP8"
         case HMSCodec.H264:
-            return "h264"
+            return "H264"
         default:
-            return "h264"
+            return "H264"
         }
     }
     
@@ -222,12 +231,14 @@ class HmsDecoder: NSObject {
         
         var remoteAudioTrackData = [String: Any]()
         if let remoteAudio = remoteAudioTrack {
-            remoteAudioTrackData = ["trackId": remoteAudio.trackId, "source": remoteAudio.source, "trackDescription": remoteAudio.trackDescription, "playbackAllowed": remoteAudio.isPlaybackAllowed(), "isMute": remoteAudio.isMute()]
+            let type = HmsHelper.getHmsTrackType(remoteAudio.kind) ?? ""
+            remoteAudioTrackData = ["trackId": remoteAudio.trackId, "source": remoteAudio.source, "trackDescription": remoteAudio.trackDescription, "playbackAllowed": remoteAudio.isPlaybackAllowed(), "isMute": remoteAudio.isMute(), "type": type, "kind": type]
         }
         
         var remoteVideoTrackData = [String: Any]()
         if let remoteVideo = remoteVideoTrack {
-            remoteVideoTrackData = ["trackId": remoteVideo.trackId, "source": remoteVideo.source, "trackDescription": remoteVideo.trackDescription, "layer": remoteVideo.layer.rawValue, "playbackAllowed": remoteVideo.isPlaybackAllowed(), "isMute": remoteVideo.isMute()]
+            let type = HmsHelper.getHmsTrackType(remoteVideo.kind) ?? ""
+            remoteVideoTrackData = ["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]
         }
         
         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]
@@ -239,12 +250,14 @@ class HmsDecoder: NSObject {
         
         for track in tracks {
             if let localVideo = track as? HMSLocalVideoTrack {
-                let localVideoTrackData: [String : Any] = ["trackId": localVideo.trackId, "source": localVideo.source, "trackDescription": localVideo.trackDescription, "settings": getHmsVideoTrackSettings(localVideo.settings), "isMute": localVideo.isMute()]
+                let type = HmsHelper.getHmsTrackType(localVideo.kind) ?? ""
+                let localVideoTrackData: [String : Any] = ["trackId": localVideo.trackId, "source": localVideo.source, "trackDescription": localVideo.trackDescription, "settings": getHmsVideoTrackSettings(localVideo.settings), "isMute": localVideo.isMute(), "kind": type, "type": type]
                 hmsTracks["videoTrack"] = localVideoTrackData
             }
             
             if let localAudio = track as? HMSLocalAudioTrack {
-                let localAudioTrackData: [String : Any]  = ["trackId": localAudio.trackId, "source": localAudio.source, "trackDescription": localAudio.trackDescription, "settings": getHmsAudioTrackSettings(localAudio.settings), "isMute": localAudio.isMute()]
+                let type = HmsHelper.getHmsTrackType(localAudio.kind) ?? ""
+                let localAudioTrackData: [String : Any]  = ["trackId": localAudio.trackId, "source": localAudio.source, "trackDescription": localAudio.trackDescription, "settings": getHmsAudioTrackSettings(localAudio.settings), "isMute": localAudio.isMute(), "kind": type, "type": type]
                 hmsTracks["audioTrack"] = localAudioTrackData
             }
         }
@@ -397,14 +410,14 @@ class HmsDecoder: NSObject {
         return [:]
     }
     
-    static func getHmsChangeTrackStateRequest(_ changeTrackStateRequest: HMSChangeTrackStateRequest) -> [String: Any] {
+    static func getHmsChangeTrackStateRequest(_ changeTrackStateRequest: HMSChangeTrackStateRequest, _ id: String) -> [String: Any] {
         var requestedBy: [String: Any]?
         if let peer = changeTrackStateRequest.requestedBy {
             requestedBy = getHmsPeer(peer)
         }
         let trackType = changeTrackStateRequest.track.kind == .video ? "video" : "audio"
         
-        var request = ["trackType": trackType] as [String: Any]
+        var request = ["trackType": trackType, "id": id] as [String: Any]
         if let requestedBy = requestedBy {
             request["requestedBy"] = requestedBy
         }

package/ios/HmsHelper.swift

@@ -3,7 +3,17 @@ import Foundation
 
 class HmsHelper: NSObject {
     
-    static func getPeerFromPeerId(_ peerID: String?, remotePeers: [HMSRemotePeer]?) -> HMSPeer? {
+    static func getPeerFromPeerId(_ peerID: String?, remotePeers: [HMSRemotePeer]?, localPeer: HMSLocalPeer?) -> HMSPeer? {
+
+        guard let peerID = peerID, let peers = remotePeers else { return nil }
+        if(peerID == localPeer?.peerID) {
+            return localPeer
+        }
+        return peers.first { $0.peerID == peerID }
+    }
+
+
+    static func getRemotePeerFromPeerId(_ peerID: String?, remotePeers: [HMSRemotePeer]?) -> HMSPeer? {
         
         guard let peerID = peerID, let peers = remotePeers else { return nil }
 
@@ -156,9 +166,9 @@ class HmsHelper: NSObject {
     
     static func getVideoCodec(_ codecString: String?) -> HMSCodec {
         switch codecString {
-        case "h264":
+        case "H264":
             return HMSCodec.H264
-        case "vp8":
+        case "VP8":
             return HMSCodec.VP8
         default:
             return HMSCodec.H264

package/ios/HmsManager.m

@@ -7,15 +7,15 @@ RCT_EXTERN_METHOD(join: (NSDictionary) credentials)
 RCT_EXTERN_METHOD(preview: (NSDictionary) credentials)
 RCT_EXTERN_METHOD(setLocalMute: (NSDictionary) isMute)
 RCT_EXTERN_METHOD(setLocalVideoMute: (NSDictionary) isMute)
-RCT_EXTERN_METHOD(sendBroadcastMessage: (NSDictionary) data)
-RCT_EXTERN_METHOD(sendGroupMessage: (NSDictionary) data)
-RCT_EXTERN_METHOD(sendDirectMessage: (NSDictionary) data)
+RCT_EXTERN_METHOD(sendBroadcastMessage: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(sendGroupMessage: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(sendDirectMessage: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 RCT_EXTERN_METHOD(setPlaybackAllowed: (NSDictionary) data)
-RCT_EXTERN_METHOD(removePeer: (NSDictionary) data)
-RCT_EXTERN_METHOD(endRoom: (NSDictionary) data)
-RCT_EXTERN_METHOD(changeRole: (NSDictionary) data)
-RCT_EXTERN_METHOD(changeTrackState: (NSDictionary) data)
-RCT_EXTERN_METHOD(changeTrackStateRoles: (NSDictionary) data)
+RCT_EXTERN_METHOD(removePeer: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(endRoom: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(changeRole: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(changeTrackState: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(changeTrackStateRoles: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 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)

package/ios/HmsManager.swift

@@ -99,24 +99,24 @@ class HmsManager: RCTEventEmitter{
     }
     
     @objc
-    func sendBroadcastMessage(_ data: NSDictionary) {
+    func sendBroadcastMessage(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.sendBroadcastMessage(data)
+        hms?.sendBroadcastMessage(data, resolve, reject)
     }
     
     @objc
-    func sendGroupMessage(_ data: NSDictionary) {
+    func sendGroupMessage(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.sendGroupMessage(data)
+        hms?.sendGroupMessage(data, resolve, reject)
     }
     
     @objc
-    func sendDirectMessage(_ data: NSDictionary) {
+    func sendDirectMessage(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.sendDirectMessage(data)
+        hms?.sendDirectMessage(data, resolve, reject)
     }
     
     @objc
@@ -127,24 +127,24 @@ class HmsManager: RCTEventEmitter{
     }
     
     @objc
-    func changeRole(_ data: NSDictionary) {
+    func changeRole(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.changeRole(data)
+        hms?.changeRole(data, resolve, reject)
     }
     
     @objc
-    func changeTrackState(_ data: NSDictionary) {
+    func changeTrackState(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.changeTrackState(data)
+        hms?.changeTrackState(data, resolve, reject)
     }
     
     @objc
-    func changeTrackStateRoles(_ data: NSDictionary) {
+    func changeTrackStateRoles(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.changeTrackStateRoles(data)
+        hms?.changeTrackStateRoles(data, resolve, reject)
     }
     
     @objc
@@ -160,18 +160,18 @@ class HmsManager: RCTEventEmitter{
     
     
     @objc
-    func removePeer(_ data: NSDictionary) {
+    func removePeer(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.removePeer(data)
+        hms?.removePeer(data, resolve, reject)
     }
     
     
     @objc
-    func endRoom(_ data: NSDictionary) {
+    func endRoom(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.endRoom(data)
+        hms?.endRoom(data, resolve, reject)
     }
 
     @objc