omikit-plugin 0.3.0 → 1.0.0

package/android/build.gradle

@@ -70,19 +70,6 @@ android {
 
 }
 
-repositories {
-  mavenCentral()
-  google()
-  jcenter() // Warning: this repository is going to shut down soon
-  maven {
-    url("https://vihatgroup.jfrog.io/artifactory/omi-voice/")
-    credentials {
-      username = "downloader"
-      password = "Omi@2022"
-    }
-  }
-}
-
 allprojects {
   repositories {
     google()
@@ -109,7 +96,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  api 'vn.vihat.omicall:omi-sdk:0.9.12'
+  api 'vn.vihat.omicall:omi-sdk:1.0.10'
 
   implementation 'androidx.core:core-ktx:1.7.0'
   implementation 'androidx.fragment:fragment-ktx:1.4.0'
@@ -124,6 +111,14 @@ dependencies {
   implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
   implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
   implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
+  implementation 'androidx.databinding:viewbinding:7.1.2'
+  implementation("com.squareup.retrofit2:retrofit:2.9.0") {
+    exclude module: 'okhttp'
+  }
+  implementation "com.squareup.retrofit2:converter-gson:2.9.0"
+  implementation "com.squareup.okhttp3:okhttp:4.9.1"
+  implementation "com.squareup.okhttp3:okhttp-urlconnection:4.9.1"
+  implementation "com.squareup.okhttp3:logging-interceptor:4.9.1"
 }
 
 if (isNewArchitectureEnabled()) {

package/android/src/main/java/com/omikitplugin/OmikitPluginModule.kt

@@ -1,46 +1,160 @@
 package com.omikitplugin
 
 import android.Manifest
+import android.content.Context
+import android.hardware.camera2.CameraManager
+import android.os.Build
+import android.util.Log
 import androidx.core.app.ActivityCompat
 import com.facebook.react.ReactActivity
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter
+import com.omikitplugin.constants.*
 import vn.vihat.omicall.omisdk.OmiClient
 import vn.vihat.omicall.omisdk.OmiListener
-import vn.vihat.omicall.omisdk.OmiSDKUtils
+import vn.vihat.omicall.omisdk.utils.OmiSDKUtils
 
 
 class OmikitPluginModule(reactContext: ReactApplicationContext?) :
-  ReactContextBaseJavaModule(reactContext), OmiListener {
+  ReactContextBaseJavaModule(reactContext) {
+
+
+  private var icSpeaker = false
+  private var isMute = false
+
+  private val callListener = object : OmiListener {
+
+    override fun incomingReceived(callerId: Int, phoneNumber: String?, isVideo: Boolean?) {
+      val map: WritableMap = WritableNativeMap()
+      map.putBoolean("isVideo", isVideo ?: true)
+      map.putString("callerNumber", phoneNumber)
+      sendEvent(INCOMING_RECEIVED, map)
+      Log.d("omikit", "incomingReceived: ")
+    }
+
+    override fun onCallEnd() {
+      sendEvent(CALL_END, null)
+    }
+
+    override fun onCallEstablished(
+      callerId: Int,
+      phoneNumber: String?,
+      isVideo: Boolean?,
+      startTime: Long,
+    ) {
+      val map: WritableMap = WritableNativeMap()
+      val sipNumber = OmiClient.instance.callUUID
+      map.putString("callerNumber", sipNumber)
+      map.putBoolean("isVideo", isVideo ?: true)
+      sendEvent(CALL_ESTABLISHED, map)
+    }
+
+    override fun onConnectionTimeout() {
+//      sendEvent("onConnectionTimeout", null)
+    }
+
+    override fun onHold(isHold: Boolean) {
+      val map: WritableMap = WritableNativeMap()
+      map.putBoolean("isHold", isHold)
+      sendEvent(HOLD, map)
+    }
+
+    override fun onMuted(isMuted: Boolean) {
+//      val map: WritableMap = WritableNativeMap()
+//      map.putBoolean("isMuted", isMuted)
+//      sendEvent(MUTED, map)
+    }
+
+    override fun onOutgoingStarted(callerId: Int, phoneNumber: String?, isVideo: Boolean?) {
+
+    }
+
+    override fun onRinging() {
+//      sendEvent("onRinging", null)
+    }
+
+    override fun onVideoSize(width: Int, height: Int) {
+
+    }
+  }
 
   override fun getName(): String {
     return NAME
   }
 
+  override fun initialize() {
+    super.initialize()
+    OmiClient(reactApplicationContext!!)
+    OmiClient.instance.setListener(callListener)
+  }
+
   @ReactMethod
   fun initCall(data: ReadableMap, promise: Promise) {
     currentActivity?.runOnUiThread {
-      val userName = data.getString("userName") as String
-      val password = data.getString("password") as String
-      val realm = data.getString("realm") as String
-      OmiClient.register(reactApplicationContext, userName, password, realm)
-      ActivityCompat.requestPermissions(
-        currentActivity!!,
-        arrayOf(
-          Manifest.permission.USE_SIP,
-          Manifest.permission.CALL_PHONE,
-          Manifest.permission.POST_NOTIFICATIONS,
-          Manifest.permission.CAMERA,
-          Manifest.permission.MODIFY_AUDIO_SETTINGS,
-          Manifest.permission.RECORD_AUDIO,
-        ),
-        0,
-      )
-      OmiClient.instance.setListener(this)
+      val userName = data.getString("userName")
+      val password = data.getString("password")
+      val realm = data.getString("realm")
+      val host = data.getString("host")
+      val isVideo = data.getBoolean("isVideo")
+      if (userName != null && password != null && realm != null && host != null) {
+        OmiClient.register(
+          reactApplicationContext!!,
+          userName,
+          password,
+          isVideo,
+          realm,
+          host = host,
+          customUI = true,
+          isTcp = true
+        )
+      }
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        ActivityCompat.requestPermissions(
+          currentActivity!!,
+          arrayOf(
+            Manifest.permission.USE_SIP,
+            Manifest.permission.CALL_PHONE,
+            Manifest.permission.CAMERA,
+            Manifest.permission.MODIFY_AUDIO_SETTINGS,
+            Manifest.permission.RECORD_AUDIO,
+            Manifest.permission.POST_NOTIFICATIONS,
+          ),
+          0,
+        )
+      } else {
+        ActivityCompat.requestPermissions(
+          currentActivity!!,
+          arrayOf(
+            Manifest.permission.USE_SIP,
+            Manifest.permission.CALL_PHONE,
+            Manifest.permission.CAMERA,
+            Manifest.permission.MODIFY_AUDIO_SETTINGS,
+            Manifest.permission.RECORD_AUDIO,
+          ),
+          0,
+        )
+      }
+      if (isVideo) {
+        val cm = currentActivity!!.getSystemService(Context.CAMERA_SERVICE) as CameraManager
+        OmiClient.instance.setCameraManager(cm)
+      }
       promise.resolve(true)
     }
   }
 
+  @ReactMethod
+  fun getInitialCall(promise: Promise) {
+    currentActivity?.runOnUiThread {
+      promise.resolve(false)
+    }
+  }
+
+  @ReactMethod
+  fun joinCall(promise: Promise) {
+    OmiClient.instance.pickUp(true)
+    promise.resolve(true)
+  }
+
   @ReactMethod
   fun updateToken(data: ReadableMap, promise: Promise) {
     currentActivity?.runOnUiThread {
@@ -51,21 +165,18 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         "",
         deviceTokenAndroid,
         deviceId,
-        appId
+        appId,
       )
       promise.resolve(true)
     }
   }
 
-
   @ReactMethod
   fun startCall(data: ReadableMap, promise: Promise) {
     val phoneNumber = data.getString("phoneNumber") as String
     val isVideo = data.getBoolean("isVideo")
-    if (!isVideo) {
-      OmiClient.instance.startCall(phoneNumber)
-      promise.resolve(true)
-    }
+    OmiClient.instance.startCall(phoneNumber, isVideo)
+    promise.resolve(true)
   }
 
   @ReactMethod
@@ -78,48 +189,16 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   fun toggleMute(promise: Promise) {
     OmiClient.instance.toggleMute()
     promise.resolve(true)
+    isMute = !isMute
+    sendEvent(MUTED, isMute)
   }
 
   @ReactMethod
-  fun toggleSpeak(data: ReadableMap, promise: Promise) {
-    val useSpeaker = data.getBoolean("useSpeaker")
-    OmiClient.instance.toggleSpeaker(useSpeaker)
-    promise.resolve(true)
-  }
-
-  @ReactMethod
-  fun decline(promise: Promise) {
-    OmiClient.instance.decline()
-    promise.resolve(true)
-  }
-
-  @ReactMethod
-  fun hangup(data: ReadableMap, promise: Promise) {
-    val callId = data.getInt("callId")
-    OmiClient.instance.hangUp(callId)
-    promise.resolve(true)
-  }
-
-
-  @ReactMethod
-  fun onCallStart(data: ReadableMap, promise: Promise) {
-    val callId = data.getInt("callId")
-    OmiClient.instance.onCallStarted(callId)
-    promise.resolve(true)
-  }
-
-  @ReactMethod
-  fun onHold(data: ReadableMap, promise: Promise) {
-    val isHold = data.getBoolean("isHold")
-    OmiClient.instance.onHold(isHold)
-    promise.resolve(true)
-  }
-
-  @ReactMethod
-  fun onMute(data: ReadableMap, promise: Promise) {
-    val isMute = data.getBoolean("isMute")
-    OmiClient.instance.onMuted(isMute)
+  fun toggleSpeak(promise: Promise) {
+    icSpeaker = !icSpeaker
+    OmiClient.instance.toggleSpeaker(icSpeaker)
     promise.resolve(true)
+    sendEvent(SPEAKER, icSpeaker)
   }
 
   @ReactMethod
@@ -141,7 +220,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   companion object {
     const val NAME = "OmikitPlugin"
     fun onDestroy() {
-      OmiClient.instance.disconnect()
+
     }
 
     fun onRequestPermissionsResult(
@@ -156,38 +235,6 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     }
   }
 
-  override fun incomingReceived(callerId: Int, phoneNumber: String?) {
-    val map: WritableMap = WritableNativeMap()
-    map.putInt("callerId", callerId)
-    sendEvent("phoneNumber", phoneNumber)
-  }
-
-  override fun onCallEnd() {
-    sendEvent("onCallEnd", false)
-  }
-
-  override fun onCallEstablished() {
-    sendEvent("onCallEstablished", null)
-  }
-
-  override fun onConnectionTimeout() {
-    sendEvent("onConnectionTimeout", null)
-  }
-
-  override fun onHold(isHold: Boolean) {
-    sendEvent("onHold", null)
-  }
-
-  override fun onMuted(isMuted: Boolean) {
-    val map: WritableMap = WritableNativeMap()
-    map.putBoolean("isMuted", isMuted)
-    sendEvent("onMuted", map)
-  }
-
-  override fun onRinging() {
-    sendEvent("onRinging", null)
-  }
-
   private fun sendEvent(eventName: String?, params: Any?) {
     currentActivity?.runOnUiThread {
       reactApplicationContext.getJSModule(RCTNativeAppEventEmitter::class.java)

package/android/src/main/java/com/omikitplugin/constants/constant.kt

@@ -3,29 +3,18 @@ package com.omikitplugin.constants
 //EVENT
 const val INIT_CALL = "INIT_CALL";
 const val UPDATE_TOKEN = "UPDATE_TOKEN";
-const val START_OMI_SERVICE = "START_OMI_SERVICE";
 const val START_CALL = "START_CALL";
 const val END_CALL = "END_CALL";
 const val TOGGLE_MUTE = "TOGGLE_MUTE";
 const val TOGGLE_SPEAK = "TOGGLE_SPEAK";
-const val CHECK_ON_GOING_CALL = "CHECK_ON_GOING_CALL";
-const val DECLINE = "DECLINE";
-const val FORWARD_CALL_TO = "FORWARD_CALL_TO";
-const val HANGUP = "HANGUP";
-const val ON_CALL_STARTED = "ON_CALL_STARTED";
-const val ON_HOLD = "ON_HOLD";
-const val ON_IN_COMING_RECEIVE = "ON_IN_COMING_RECEIVE";
-const val ON_MUTE = "ON_MUTE";
-const val ON_OUT_GOING = "ON_OUT_GOING";
 const val REGISTER = "REGISTER";
 const val SEND_DTMF = "SEND_DTMF";
 
 //LISTENER
-const val onCallEstablished = "CALL_ESTABLISHED"
-const val onCallEnd = "CALL_END"
-const val incomingReceived = "INCOMING_RECEIVED"
-const val onRinging = "RINGING"
-const val onConnectionTimeout = "CONNECTION_TIMEOUT"
-const val onHold = "HOLD"
-const val onMuted = "MUTED"
-
+const val CALL_ESTABLISHED = "CALL_ESTABLISHED"
+const val CALL_END = "CALL_END"
+const val INCOMING_RECEIVED = "INCOMING_RECEIVED"
+//const val CONNECTION_TIMEOUT = "CONNECTION_TIMEOUT"
+const val HOLD = "HOLD"
+const val MUTED = "MUTED"
+const val SPEAKER = "SPEAKER"

package/ios/CallProcess/CallManager.swift

@@ -15,15 +15,10 @@ import AVFoundation
 class CallManager {
     
     static private var instance: CallManager? = nil // Instance
-    var call: OMICall? // Call
-    private var numberRetry: Int = 0
-    var isCallError: Bool = false  // check when call error
     private let omiLib = OMISIPLib.sharedInstance()
-    private var isSpeaker = false
-    var currentConfirmedCall : OMICall?
+    var isSpeaker = false
     var videoManager: OMIVideoViewManager?
     
-    
     /// Get instance
     static func shareInstance() -> CallManager {
         if (instance == nil) {
@@ -32,6 +27,14 @@ class CallManager {
         return instance!
     }
     
+    func getAvailableCall() -> OMICall? {
+        var currentCall = omiLib.getCurrentConfirmCall()
+        if (currentCall == nil) {
+            currentCall = omiLib.getNewestCall()
+        }
+        return currentCall
+    }
+    
     func updateToken(params: [String: Any]) {
         if let apnsToken = params["apnsToken"] as? String {
             OmiClient.setUserPushNotificationToken(apnsToken)
@@ -39,19 +42,14 @@ class CallManager {
     }
     
     func initEndpoint(params: [String: Any]){
-        var isSupportVideoCall = false
         if let userName = params["userName"] as? String, let password = params["password"] as? String, let realm = params["realm"] as? String {
             OmiClient.initWithUsername(userName, password: password, realm: realm)
-            if let isVideoCall = params["isVideo"] as? Bool {
-                isSupportVideoCall = isVideoCall
-            }
-            OmiClient.startOmiService(isSupportVideoCall)
-            if (isSupportVideoCall) {
-                OmiClient.registerAccount()
-                videoManager = OMIVideoViewManager.init()
-            }
-            registerNotificationCenter()
         }
+        if let isVideoCall = params["isVideo"] as? Bool, isVideoCall == true {
+            OmiClient.startOmiService(true)
+            videoManager = OMIVideoViewManager.init()
+        }
+        registerNotificationCenter()
     }
     
     func registerNotificationCenter() {
@@ -70,7 +68,7 @@ class CallManager {
             )
         }
     }
-    
+
     @objc func callDealloc(_ notification: NSNotification) {
         guard let userInfo = notification.userInfo,
               let call     = userInfo[OMINotificationUserInfoCallKey] as? OMICall else {
@@ -79,7 +77,6 @@ class CallManager {
         if (call.callState == .disconnected) {
             DispatchQueue.main.async {
                 OmikitPlugin.instance.sendEvent(withName: onCallEnd, body: [:])
-                self.currentConfirmedCall = nil
             }
         }
     }
@@ -95,7 +92,6 @@ class CallManager {
         case .calling:
             if (!call.isIncoming) {
                 NSLog("Outgoing call, in CALLING state, with UUID \(call.uuid)")
-                OmikitPlugin.instance.sendEvent(withName: onRinging, body: [:])
             }
             break
         case .early:
@@ -109,19 +105,10 @@ class CallManager {
             }
             break
         case .confirmed:
-            DispatchQueue.main.async {
-                if (!call.isIncoming) {
-                    NSLog("Outgoing call, in CONFIRMED state, with UUID: \(call.uuid)")
-                    OmikitPlugin.instance.sendEvent(withName: onCallEstablished, body: [:])
-                    OmikitPlugin.instance.sendEvent(withName: onMuted, body: ["isMuted": call.muted])
-                    self.currentConfirmedCall = call
-                    return
-                }
-                NSLog("Outgoing call, in CONFIRMED state, with UUID: \(call.uuid)")
-                OmikitPlugin.instance.sendEvent(withName: onCallEstablished, body: [:])
-                OmikitPlugin.instance.sendEvent(withName: onMuted, body: ["isMuted": call.muted])
-                self.currentConfirmedCall = call
-            }
+            NSLog("Outgoing call, in CONFIRMED state, with UUID: \(call.uuid)")
+            OmikitPlugin.instance.sendEvent(withName: onCallEstablished, body: ["isVideo": call.isVideo, "callerNumber": call.callerNumber])
+            print(call.muted)
+            OmikitPlugin.instance.sendOnMuteStatus()
             break
         case .disconnected:
             if (!call.connected) {
@@ -129,36 +116,26 @@ class CallManager {
             } else if (!call.userDidHangUp) {
                 NSLog("Call remotly ended, in DISCONNECTED state, with UUID: \(call.uuid)")
             }
-            print(omiLib.getCurrentCall()?.uuid.uuidString)
             print(call.uuid.uuidString)
-            if let currentActiveCall = currentConfirmedCall, currentActiveCall.uuid.uuidString == call.uuid.uuidString {
-                OmikitPlugin.instance.sendEvent(withName: onCallEnd, body: [:])
-                currentConfirmedCall = nil
-                break
-            }
-            if currentConfirmedCall == nil {
-                OmikitPlugin.instance.sendEvent(withName: onCallEnd, body: [:])
-                break
-            }
-            print(omiLib.getNewestCall()?.uuid.uuidString)
+            OmikitPlugin.instance.sendEvent(withName: onCallEnd, body: [:])
             break
         case .incoming:
-            OmikitPlugin.instance.sendEvent(withName: incomingReceived, body: ["callerId": call.callId,"phoneNumber": call.callerNumber])
+            OmikitPlugin.instance.sendEvent(withName: incomingReceived, body: ["isVideo": call.isVideo, "callerNumber": call.callerNumber ?? ""])
             break
         case .muted:
-            OmikitPlugin.instance.sendEvent(withName: onMuted, body: ["isMuted": call.muted])
+            print("muteddddddd")
             break
         case .hold:
-            OmikitPlugin.instance.sendEvent(withName: onHold, body: ["isHold": call.onHold])
+            print("holdddddddd")
             break
-        @unknown default:
+        default:
             NSLog("Default call state")
+            break
         }
     }
     
     /// Start call
     func startCall(_ phoneNumber: String, isVideo: Bool) {
-        registerNotificationCenter()
         if (isVideo) {
             OmiClient.startVideoCall(phoneNumber)
             return
@@ -166,82 +143,49 @@ class CallManager {
         OmiClient.startCall(phoneNumber)
     }
     
-    /// End call
-    func endNewestCall() {
-        guard let call = omiLib.getNewestCall() else {
+    func endAvailableCall() {
+        guard let call = getAvailableCall() else {
+            OmikitPlugin.instance.sendEvent(withName: onCallEnd, body: [:])
             return
         }
-        omiLib.callManager.end(call) { error in
-            if error != nil {
-                NSLog("error hanging up call(\(call.uuid.uuidString)): \(error!)")
-            }
-        }
-        OmikitPlugin.instance.sendEvent(withName: onCallEnd, body: [:])
-        NotificationCenter.default.removeObserver(self)
-    }
-    
-    func endCurrentConfirmCall() {
-        guard let call = omiLib.getCurrentCall() else {
-            endNewestCall()
-            return
-        }
-        omiLib.callManager.end(call) { error in
-            if error != nil {
-                NSLog("error hanging up call(\(call.uuid.uuidString)): \(error!)")
-            }
-        }
-        OmikitPlugin.instance.sendEvent(withName: onCallEnd, body: [:])
-        NotificationCenter.default.removeObserver(self)
+        omiLib.callManager.end(call)
     }
     
     
     func endAllCalls() {
         omiLib.callManager.endAllCalls()
-        OmikitPlugin.instance.sendEvent(withName: onCallEnd, body: [:])
-        NotificationCenter.default.removeObserver(self)
+    }
+    
+    func joinCall() {
+        guard let call = getAvailableCall() else {
+            return
+        }
+        OmiClient.answerIncommingCall(call.uuid)
     }
     
     func sendDTMF(character: String) {
-        guard let call = omiLib.getCurrentCall() else {
+        guard let call = getAvailableCall() else {
             return
         }
         try? call.sendDTMF(character)
     }
     
-    
     /// Toogle mtue
-    func toggleMute(completion: @escaping () -> Void?) {
-        guard let omicall = OMISIPLib.sharedInstance().getCurrentCall() else {
-            return
-        }
-        
-        omiLib.callManager.toggleMute(for: omicall) { error in
-            if error != nil {
-                NSLog("toggle mute error:  \(error))")
-            }
+    func toggleMute() {
+        guard let call = getAvailableCall() else {
+            return 
         }
-        
+        try? call.toggleMute()
     }
     
     /// Toogle hold
-    func toggleHold(completion: @escaping () -> Void?) {
-        guard let omicall = OMISIPLib.sharedInstance().getCurrentCall() else {
+    func toggleHold() {
+        guard let call = getAvailableCall() else {
             return
         }
-        DispatchQueue.main.async {[weak self] in
-            guard let self = self else { return }
-            self.omiLib.callManager.toggleHold(for: omicall) { error in
-                if error != nil {
-                    NSLog("Error holding current call: \(error!)")
-                    return
-                } else {
-                    completion()
-                }
-            }
-        }
+        try? call.toggleHold()
     }
     
-    
     /// Toogle speaker
     func toogleSpeaker() {
         do {
@@ -255,22 +199,21 @@ class CallManager {
             }
         } catch (let error){
             NSLog("Error toogleSpeaker current call: \(error)")
-
+            
         }
     }
     
-    
     func inputs() -> [[String: String]] {
-          let inputs = AVAudioSession.sharedInstance().availableInputs ?? []
-          let results = inputs.map { item in
-              return [
-                  "name": item.portName,
-                  "id": item.uid,
-              ]
-          }
-          return results
+        let inputs = AVAudioSession.sharedInstance().availableInputs ?? []
+        let results = inputs.map { item in
+            return [
+                "name": item.portName,
+                "id": item.uid,
+            ]
+        }
+        return results
     }
-      
+    
     func setInput(id: String) {
         let inputs = AVAudioSession.sharedInstance().availableInputs ?? []
         if let newOutput = inputs.first(where: {$0.uid == id}) {
@@ -281,10 +224,10 @@ class CallManager {
     func outputs() -> [[String: String]] {
         let outputs = AVAudioSession.sharedInstance().currentRoute.outputs
         var results = outputs.map { item in
-           return [
-              "name": item.portName,
-              "id": item.uid,
-           ]
+            return [
+                "name": item.portName,
+                "id": item.uid,
+            ]
         }
         let hasSpeaker = results.contains{ $0["name"] == "Speaker" }
         if (!hasSpeaker) {
@@ -334,29 +277,29 @@ class CallManager {
         }
     }
     
-//    func getLocalPreviewView(callback: @escaping (UIView) -> Void) {
-//        guard let videoManager = videoManager  else { return }
-//        videoManager.localView {previewView in
-//            DispatchQueue.main.async {
-//                if (previewView != nil) {
-//                    previewView!.contentMode = .scaleAspectFill
-//                    callback(previewView!)
-//                }
-//            }
-//        }
-//    }
-//
-//    func getRemotePreviewView(callback: @escaping (UIView) -> Void) {
-//        guard let videoManager = videoManager  else { return }
-//        videoManager.remoteView { previewView in
-//            DispatchQueue.main.async {
-//                if (previewView != nil) {
-//                    previewView!.contentMode = .scaleAspectFill
-//                    callback(previewView!)
-//                }
-//            }
-//        }
-//    }
+    //    func getLocalPreviewView(callback: @escaping (UIView) -> Void) {
+    //        guard let videoManager = videoManager  else { return }
+    //        videoManager.localView {previewView in
+    //            DispatchQueue.main.async {
+    //                if (previewView != nil) {
+    //                    previewView!.contentMode = .scaleAspectFill
+    //                    callback(previewView!)
+    //                }
+    //            }
+    //        }
+    //    }
+    //
+    //    func getRemotePreviewView(callback: @escaping (UIView) -> Void) {
+    //        guard let videoManager = videoManager  else { return }
+    //        videoManager.remoteView { previewView in
+    //            DispatchQueue.main.async {
+    //                if (previewView != nil) {
+    //                    previewView!.contentMode = .scaleAspectFill
+    //                    callback(previewView!)
+    //                }
+    //            }
+    //        }
+    //    }
 }
 
 

package/ios/Constant/Constant.swift

@@ -10,21 +10,11 @@ import Foundation
 
 let INIT_CALL = "INIT_CALL"
 let UPDATE_TOKEN = "UPDATE_TOKEN"
-let START_OMI_SERVICE = "START_OMI_SERVICE"
 let START_CALL = "START_CALL"
+let JOIN_CALL = "JOIN_CALL"
 let END_CALL = "END_CALL"
 let TOGGLE_MUTE = "TOGGLE_MUTE"
 let TOGGLE_SPEAK = "TOGGLE_SPEAK"
-let CHECK_ON_GOING_CALL = "CHECK_ON_GOING_CALL"
-let DECLINE = "DECLINE"
-let FORWARD_CALL_TO = "FORWARD_CALL_TO"
-let HANGUP = "HANGUP"
-let ON_CALL_STARTED = "ON_CALL_STARTED"
-let ON_HOLD = "ON_HOLD"
-let ON_IN_COMING_RECEIVE = "ON_IN_COMING_RECEIVE"
-let ON_MUTE = "ON_MUTE"
-let ON_OUT_GOING = "ON_OUT_GOING"
-let ON_OUT_GOING_STARTED = "ON_OUT_GOING"
 let REGISTER = "REGISTER"
 let SEND_DTMF = "SEND_DTMF"
 let SWITCH_CAMERA = "SWITCH_CAMERA"
@@ -36,12 +26,11 @@ let SETINPUT = "SET_INPUT"
 let SETOUTPUT = "SET_OUTPUT"
 
 //LISTENER
-let onCallEstablished = "onCallEstablished"
-let onCallEnd = "onCallEnd"
-let incomingReceived = "incomingReceived"
-let onRinging = "onRinging"
-let onConnectionTimeout = "onConnectionTimeout"
-let onHold = "onHold"
-let onMuted = "onMuted"
+let onCallEstablished = "CALL_ESTABLISHED"
+let onCallEnd = "CALL_END"
+let incomingReceived = "INCOMING_RECEIVED"
+let onConnectionTimeout = "CONNECTION_TIMEOUT"
+let onSpeaker = "SPEAKER"
+let onMuted = "MUTED"
 
 

package/ios/OmikitPlugin.m

@@ -2,22 +2,28 @@
 
 @interface RCT_EXTERN_MODULE(OmikitPlugin, NSObject)
 
-RCT_EXTERN_METHOD(updateToken:(id)data
-                 withResolver:(RCTPromiseResolveBlock)resolve
+RCT_EXTERN_METHOD(getInitialCall:
+                 (RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(initCall:(id)data
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(updateToken:(id)data
+                 withResolver:(RCTPromiseResolveBlock)resolve
+                 withRejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(startCall:(id)data
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(joinCall:
+                 (RCTPromiseResolveBlock)resolve
+                 withRejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(endCall:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(toggleMute:
                  (RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(toggleSpeak:(id)data
-                 withResolver: (RCTPromiseResolveBlock)resolve
+RCT_EXTERN_METHOD(toggleSpeak:
+                 (RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(sendDTMF:(id)data
                   withResolver: (RCTPromiseResolveBlock)resolve

package/ios/OmikitPlugin.swift

@@ -1,5 +1,6 @@
 import Foundation
 import React
+import OmiKit
 
 @objc(OmikitPlugin)
 class OmikitPlugin: RCTEventEmitter {
@@ -10,7 +11,23 @@ class OmikitPlugin: RCTEventEmitter {
         super.init()
         OmikitPlugin.instance = self
     }
-
+    
+    @objc(getInitialCall:withRejecter:)
+    func getInitialCall(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+        if let call = CallManager.shareInstance().getAvailableCall() {
+            let callerNumber = call.callerNumber
+            let status = call.lastStatus
+            let muted = call.muted
+            let data : [String: Any] = [
+                "callerNumber" : callerNumber,
+                "status": status,
+                "muted": muted
+            ]
+            resolve(data)
+            return
+        }
+        resolve(false)
+    }
     
     @objc(initCall:withResolver:withRejecter:)
     func initCall(data: Any, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
@@ -32,32 +49,36 @@ class OmikitPlugin: RCTEventEmitter {
     func startCall(data: Any, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
         if let dataOmi = data as? [String: Any] {
             let phoneNumber = dataOmi["phoneNumber"] as! String
-            var isVideo = false
-            if let isVideoCall = dataOmi["isVideo"] as? Bool {
-                isVideo = isVideoCall
-            }
-            CallManager.shareInstance().startCall(phoneNumber, isVideo: isVideo)
+            let isVideo = dataOmi["isVideo"] as? Bool
+            CallManager.shareInstance().startCall(phoneNumber, isVideo: isVideo ?? false)
+            sendOnMuteStatus()
             resolve(true)
         }
     }
     
+    @objc(joinCall:withRejecter:)
+    func joinCall(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+        CallManager.shareInstance().joinCall()
+        resolve(true)
+    }
+    
     @objc(endCall:withRejecter:)
     func endCall(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
-        CallManager.shareInstance().endCurrentConfirmCall()
+        CallManager.shareInstance().endAvailableCall()
         resolve(true)
     }
     
     @objc(toggleMute:withRejecter:)
     func toggleMute(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        CallManager.shareInstance().toggleMute {
-            NSLog("done toggle mute")
-        }
+        CallManager.shareInstance().toggleMute()
+        sendOnMuteStatus()
         resolve(true)
     }
     
-    @objc(toggleSpeak:withResolver:withRejecter:)
-    func toggleSpeak(data: Any, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+    @objc(toggleSpeak:withRejecter:)
+    func toggleSpeak(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
         CallManager.shareInstance().toogleSpeaker()
+        sendOnSpeakerStatus()
         resolve(true)
     }
     
@@ -69,14 +90,26 @@ class OmikitPlugin: RCTEventEmitter {
         }
     }
     
+    func sendOnMuteStatus() {
+        if let call = CallManager.shareInstance().getAvailableCall() {
+            if let isMuted = call.muted as? Bool {
+                print("muteeeeed \(isMuted)")
+                sendEvent(withName: onMuted, body: isMuted)
+            }
+        }
+    }
+    
+    func sendOnSpeakerStatus() {
+        sendEvent(withName: onSpeaker, body: CallManager.shareInstance().isSpeaker)
+    }
+    
     override func supportedEvents() -> [String]! {
         return [
-            "incomingReceived",
-            "onCallEnd",
-            "onCallEstablished",
-            "onConnectionTimeout",
-            "onMuted",
-            "onRinging"
+            incomingReceived,
+            onCallEstablished,
+            onCallEnd,
+            onMuted,
+            onSpeaker
         ]
     }
 }

package/lib/commonjs/index.js

@@ -3,8 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.OmiCallEvent = void 0;
 exports.endCall = endCall;
+exports.getInitialCall = getInitialCall;
 exports.initCall = initCall;
+exports.joinCall = joinCall;
 exports.omiEmitter = void 0;
 exports.onHold = onHold;
 exports.sendDTMF = sendDTMF;
@@ -22,6 +25,9 @@ const OmikitPlugin = _reactNative.NativeModules.OmikitPlugin ? _reactNative.Nati
     throw new Error(LINKING_ERROR);
   }
 });
+function getInitialCall() {
+  return OmikitPlugin.getInitialCall();
+}
 function initCall(data) {
   console.log(data);
   return OmikitPlugin.initCall(data);
@@ -34,14 +40,17 @@ function startCall(data) {
   console.log(data);
   return OmikitPlugin.startCall(data);
 }
+function joinCall() {
+  return OmikitPlugin.joinCall();
+}
 function endCall() {
   return OmikitPlugin.endCall();
 }
 function toggleMute() {
   return OmikitPlugin.toggleMute();
 }
-function toggleSpeak(data) {
-  return OmikitPlugin.toggleSpeak(data);
+function toggleSpeak() {
+  return OmikitPlugin.toggleSpeak();
 }
 function onHold(data) {
   return OmikitPlugin.onHold(data);
@@ -51,4 +60,12 @@ function sendDTMF(data) {
 }
 const omiEmitter = new _reactNative.NativeEventEmitter(OmikitPlugin);
 exports.omiEmitter = omiEmitter;
+const OmiCallEvent = {
+  onCallEstablished: 'CALL_ESTABLISHED',
+  onCallEnd: 'CALL_END',
+  incomingReceived: 'INCOMING_RECEIVED',
+  onSpeaker: 'SPEAKER',
+  onMuted: 'MUTED'
+};
+exports.OmiCallEvent = OmiCallEvent;
 //# sourceMappingURL=index.js.map

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","OmikitPlugin","NativeModules","Proxy","get","Error","initCall","data","console","log","updateToken","startCall","endCall","toggleMute","toggleSpeak","onHold","sendDTMF","omiEmitter","NativeEventEmitter","exports"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,MAAMC,aAAa,GAChB,wEAAuE,GACxEC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,YAAY,GAAGC,0BAAa,CAACD,YAAY,GAC3CC,0BAAa,CAACD,YAAY,GAC1B,IAAIE,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACT,aAAa,CAAC;EAChC;AACF,CAAC,CACF;AAEE,SAASU,QAAQA,CAACC,IAAS,EAAoB;EACpDC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC;EACjB,OAAON,YAAY,CAACK,QAAQ,CAACC,IAAI,CAAC;AACpC;AAEO,SAASG,WAAWA,CAACH,IAAS,EAAiB;EACpDC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC;EACjB,OAAON,YAAY,CAACS,WAAW,CAACH,IAAI,CAAC;AACvC;AAEO,SAASI,SAASA,CAACJ,IAAS,EAAoB;EACrDC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC;EACjB,OAAON,YAAY,CAACU,SAAS,CAACJ,IAAI,CAAC;AACrC;AAEO,SAASK,OAAOA,CAAA,EAAqB;EAC1C,OAAOX,YAAY,CAACW,OAAO,EAAE;AAC/B;AAEO,SAASC,UAAUA,CAAA,EAAqB;EAC7C,OAAOZ,YAAY,CAACY,UAAU,EAAE;AAClC;AAEO,SAASC,WAAWA,CAACP,IAAS,EAAoB;EACvD,OAAON,YAAY,CAACa,WAAW,CAACP,IAAI,CAAC;AACvC;AAEO,SAASQ,MAAMA,CAACR,IAAS,EAAoB;EAClD,OAAON,YAAY,CAACc,MAAM,CAACR,IAAI,CAAC;AAClC;AAEO,SAASS,QAAQA,CAACT,IAAS,EAAoB;EACpD,OAAON,YAAY,CAACe,QAAQ,CAACT,IAAI,CAAC;AACpC;AAEO,MAAMU,UAAU,GAAG,IAAIC,+BAAkB,CAACjB,YAAY,CAAC;AAACkB,OAAA,CAAAF,UAAA,GAAAA,UAAA"}
+{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","OmikitPlugin","NativeModules","Proxy","get","Error","getInitialCall","initCall","data","console","log","updateToken","startCall","joinCall","endCall","toggleMute","toggleSpeak","onHold","sendDTMF","omiEmitter","NativeEventEmitter","exports","OmiCallEvent","onCallEstablished","onCallEnd","incomingReceived","onSpeaker","onMuted"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,MAAMC,aAAa,GAChB,wEAAuE,GACxEC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,YAAY,GAAGC,0BAAa,CAACD,YAAY,GAC3CC,0BAAa,CAACD,YAAY,GAC1B,IAAIE,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACT,aAAa,CAAC;EAChC;AACF,CAAC,CACF;AAEE,SAASU,cAAcA,CAAA,EAAiB;EAC7C,OAAOL,YAAY,CAACK,cAAc,EAAE;AACtC;AAEO,SAASC,QAAQA,CAACC,IAAS,EAAoB;EACpDC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC;EACjB,OAAOP,YAAY,CAACM,QAAQ,CAACC,IAAI,CAAC;AACpC;AAEO,SAASG,WAAWA,CAACH,IAAS,EAAiB;EACpDC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC;EACjB,OAAOP,YAAY,CAACU,WAAW,CAACH,IAAI,CAAC;AACvC;AAEO,SAASI,SAASA,CAACJ,IAAS,EAAoB;EACrDC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC;EACjB,OAAOP,YAAY,CAACW,SAAS,CAACJ,IAAI,CAAC;AACrC;AAEO,SAASK,QAAQA,CAAA,EAAqB;EAC3C,OAAOZ,YAAY,CAACY,QAAQ,EAAE;AAChC;AAEO,SAASC,OAAOA,CAAA,EAAqB;EAC1C,OAAOb,YAAY,CAACa,OAAO,EAAE;AAC/B;AAEO,SAASC,UAAUA,CAAA,EAAqB;EAC7C,OAAOd,YAAY,CAACc,UAAU,EAAE;AAClC;AAEO,SAASC,WAAWA,CAAA,EAAqB;EAC9C,OAAOf,YAAY,CAACe,WAAW,EAAE;AACnC;AAEO,SAASC,MAAMA,CAACT,IAAS,EAAoB;EAClD,OAAOP,YAAY,CAACgB,MAAM,CAACT,IAAI,CAAC;AAClC;AAEO,SAASU,QAAQA,CAACV,IAAS,EAAoB;EACpD,OAAOP,YAAY,CAACiB,QAAQ,CAACV,IAAI,CAAC;AACpC;AAEO,MAAMW,UAAU,GAAG,IAAIC,+BAAkB,CAACnB,YAAY,CAAC;AAACoB,OAAA,CAAAF,UAAA,GAAAA,UAAA;AAExD,MAAMG,YAAY,GAAG;EAC1BC,iBAAiB,EAAE,kBAAkB;EACrCC,SAAS,EAAE,UAAU;EACrBC,gBAAgB,EAAE,mBAAmB;EACrCC,SAAS,EAAE,SAAS;EACpBC,OAAO,EAAE;AACX,CAAC;AAACN,OAAA,CAAAC,YAAA,GAAAA,YAAA"}

package/lib/module/index.js

@@ -8,6 +8,9 @@ const OmikitPlugin = NativeModules.OmikitPlugin ? NativeModules.OmikitPlugin : n
     throw new Error(LINKING_ERROR);
   }
 });
+export function getInitialCall() {
+  return OmikitPlugin.getInitialCall();
+}
 export function initCall(data) {
   console.log(data);
   return OmikitPlugin.initCall(data);
@@ -20,14 +23,17 @@ export function startCall(data) {
   console.log(data);
   return OmikitPlugin.startCall(data);
 }
+export function joinCall() {
+  return OmikitPlugin.joinCall();
+}
 export function endCall() {
   return OmikitPlugin.endCall();
 }
 export function toggleMute() {
   return OmikitPlugin.toggleMute();
 }
-export function toggleSpeak(data) {
-  return OmikitPlugin.toggleSpeak(data);
+export function toggleSpeak() {
+  return OmikitPlugin.toggleSpeak();
 }
 export function onHold(data) {
   return OmikitPlugin.onHold(data);
@@ -36,4 +42,11 @@ export function sendDTMF(data) {
   return OmikitPlugin.sendDTMF(data);
 }
 export const omiEmitter = new NativeEventEmitter(OmikitPlugin);
+export const OmiCallEvent = {
+  onCallEstablished: 'CALL_ESTABLISHED',
+  onCallEnd: 'CALL_END',
+  incomingReceived: 'INCOMING_RECEIVED',
+  onSpeaker: 'SPEAKER',
+  onMuted: 'MUTED'
+};
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","Platform","NativeEventEmitter","LINKING_ERROR","select","ios","default","OmikitPlugin","Proxy","get","Error","initCall","data","console","log","updateToken","startCall","endCall","toggleMute","toggleSpeak","onHold","sendDTMF","omiEmitter"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA,SAASA,aAAa,EAAEC,QAAQ,EAAEC,kBAAkB,QAAQ,cAAc;AAE1E,MAAMC,aAAa,GAChB,wEAAuE,GACxEF,QAAQ,CAACG,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,YAAY,GAAGP,aAAa,CAACO,YAAY,GAC3CP,aAAa,CAACO,YAAY,GAC1B,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACP,aAAa,CAAC;EAChC;AACF,CAAC,CACF;AAEL,OAAO,SAASQ,QAAQA,CAACC,IAAS,EAAoB;EACpDC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC;EACjB,OAAOL,YAAY,CAACI,QAAQ,CAACC,IAAI,CAAC;AACpC;AAEA,OAAO,SAASG,WAAWA,CAACH,IAAS,EAAiB;EACpDC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC;EACjB,OAAOL,YAAY,CAACQ,WAAW,CAACH,IAAI,CAAC;AACvC;AAEA,OAAO,SAASI,SAASA,CAACJ,IAAS,EAAoB;EACrDC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC;EACjB,OAAOL,YAAY,CAACS,SAAS,CAACJ,IAAI,CAAC;AACrC;AAEA,OAAO,SAASK,OAAOA,CAAA,EAAqB;EAC1C,OAAOV,YAAY,CAACU,OAAO,EAAE;AAC/B;AAEA,OAAO,SAASC,UAAUA,CAAA,EAAqB;EAC7C,OAAOX,YAAY,CAACW,UAAU,EAAE;AAClC;AAEA,OAAO,SAASC,WAAWA,CAACP,IAAS,EAAoB;EACvD,OAAOL,YAAY,CAACY,WAAW,CAACP,IAAI,CAAC;AACvC;AAEA,OAAO,SAASQ,MAAMA,CAACR,IAAS,EAAoB;EAClD,OAAOL,YAAY,CAACa,MAAM,CAACR,IAAI,CAAC;AAClC;AAEA,OAAO,SAASS,QAAQA,CAACT,IAAS,EAAoB;EACpD,OAAOL,YAAY,CAACc,QAAQ,CAACT,IAAI,CAAC;AACpC;AAEA,OAAO,MAAMU,UAAU,GAAG,IAAIpB,kBAAkB,CAACK,YAAY,CAAC"}
+{"version":3,"names":["NativeModules","Platform","NativeEventEmitter","LINKING_ERROR","select","ios","default","OmikitPlugin","Proxy","get","Error","getInitialCall","initCall","data","console","log","updateToken","startCall","joinCall","endCall","toggleMute","toggleSpeak","onHold","sendDTMF","omiEmitter","OmiCallEvent","onCallEstablished","onCallEnd","incomingReceived","onSpeaker","onMuted"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA,SAASA,aAAa,EAAEC,QAAQ,EAAEC,kBAAkB,QAAQ,cAAc;AAE1E,MAAMC,aAAa,GAChB,wEAAuE,GACxEF,QAAQ,CAACG,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,YAAY,GAAGP,aAAa,CAACO,YAAY,GAC3CP,aAAa,CAACO,YAAY,GAC1B,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACP,aAAa,CAAC;EAChC;AACF,CAAC,CACF;AAEL,OAAO,SAASQ,cAAcA,CAAA,EAAiB;EAC7C,OAAOJ,YAAY,CAACI,cAAc,EAAE;AACtC;AAEA,OAAO,SAASC,QAAQA,CAACC,IAAS,EAAoB;EACpDC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC;EACjB,OAAON,YAAY,CAACK,QAAQ,CAACC,IAAI,CAAC;AACpC;AAEA,OAAO,SAASG,WAAWA,CAACH,IAAS,EAAiB;EACpDC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC;EACjB,OAAON,YAAY,CAACS,WAAW,CAACH,IAAI,CAAC;AACvC;AAEA,OAAO,SAASI,SAASA,CAACJ,IAAS,EAAoB;EACrDC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC;EACjB,OAAON,YAAY,CAACU,SAAS,CAACJ,IAAI,CAAC;AACrC;AAEA,OAAO,SAASK,QAAQA,CAAA,EAAqB;EAC3C,OAAOX,YAAY,CAACW,QAAQ,EAAE;AAChC;AAEA,OAAO,SAASC,OAAOA,CAAA,EAAqB;EAC1C,OAAOZ,YAAY,CAACY,OAAO,EAAE;AAC/B;AAEA,OAAO,SAASC,UAAUA,CAAA,EAAqB;EAC7C,OAAOb,YAAY,CAACa,UAAU,EAAE;AAClC;AAEA,OAAO,SAASC,WAAWA,CAAA,EAAqB;EAC9C,OAAOd,YAAY,CAACc,WAAW,EAAE;AACnC;AAEA,OAAO,SAASC,MAAMA,CAACT,IAAS,EAAoB;EAClD,OAAON,YAAY,CAACe,MAAM,CAACT,IAAI,CAAC;AAClC;AAEA,OAAO,SAASU,QAAQA,CAACV,IAAS,EAAoB;EACpD,OAAON,YAAY,CAACgB,QAAQ,CAACV,IAAI,CAAC;AACpC;AAEA,OAAO,MAAMW,UAAU,GAAG,IAAItB,kBAAkB,CAACK,YAAY,CAAC;AAE9D,OAAO,MAAMkB,YAAY,GAAG;EAC1BC,iBAAiB,EAAE,kBAAkB;EACrCC,SAAS,EAAE,UAAU;EACrBC,gBAAgB,EAAE,mBAAmB;EACrCC,SAAS,EAAE,SAAS;EACpBC,OAAO,EAAE;AACX,CAAC"}

package/lib/typescript/index.d.ts

@@ -1,11 +1,20 @@
 import { NativeEventEmitter } from 'react-native';
+export declare function getInitialCall(): Promise<any>;
 export declare function initCall(data: any): Promise<boolean>;
 export declare function updateToken(data: any): Promise<void>;
 export declare function startCall(data: any): Promise<boolean>;
+export declare function joinCall(): Promise<boolean>;
 export declare function endCall(): Promise<boolean>;
 export declare function toggleMute(): Promise<boolean>;
-export declare function toggleSpeak(data: any): Promise<boolean>;
+export declare function toggleSpeak(): Promise<boolean>;
 export declare function onHold(data: any): Promise<boolean>;
 export declare function sendDTMF(data: any): Promise<boolean>;
 export declare const omiEmitter: NativeEventEmitter;
+export declare const OmiCallEvent: {
+    onCallEstablished: string;
+    onCallEnd: string;
+    incomingReceived: string;
+    onSpeaker: string;
+    onMuted: string;
+};
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA2B,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAmB3E,wBAAgB,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAGpD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAGrD;AAED,wBAAgB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAE1C;AAED,wBAAgB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAE7C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAEvD;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAElD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpD;AAED,eAAO,MAAM,UAAU,oBAAuC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA2B,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAmB3E,wBAAgB,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,CAE7C;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAGpD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAGrD;AAED,wBAAgB,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAE3C;AAED,wBAAgB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAE1C;AAED,wBAAgB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAE7C;AAED,wBAAgB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAE9C;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAElD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpD;AAED,eAAO,MAAM,UAAU,oBAAuC,CAAC;AAE/D,eAAO,MAAM,YAAY;;;;;;CAMxB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omikit-plugin",
-  "version": "0.3.0",
+  "version": "1.0.0",
   "description": "Omikit Plugin by ViHAT",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/index.tsx

@@ -17,6 +17,10 @@ const OmikitPlugin = NativeModules.OmikitPlugin
       }
     );
 
+export function getInitialCall(): Promise<any> {
+  return OmikitPlugin.getInitialCall();
+}
+
 export function initCall(data: any): Promise<boolean> {
   console.log(data);
   return OmikitPlugin.initCall(data);
@@ -32,6 +36,10 @@ export function startCall(data: any): Promise<boolean> {
   return OmikitPlugin.startCall(data);
 }
 
+export function joinCall(): Promise<boolean> {
+  return OmikitPlugin.joinCall();
+}
+
 export function endCall(): Promise<boolean> {
   return OmikitPlugin.endCall();
 }
@@ -40,8 +48,8 @@ export function toggleMute(): Promise<boolean> {
   return OmikitPlugin.toggleMute();
 }
 
-export function toggleSpeak(data: any): Promise<boolean> {
-  return OmikitPlugin.toggleSpeak(data);
+export function toggleSpeak(): Promise<boolean> {
+  return OmikitPlugin.toggleSpeak();
 }
 
 export function onHold(data: any): Promise<boolean> {
@@ -53,3 +61,11 @@ export function sendDTMF(data: any): Promise<boolean> {
 }
 
 export const omiEmitter = new NativeEventEmitter(OmikitPlugin);
+
+export const OmiCallEvent = {
+  onCallEstablished: 'CALL_ESTABLISHED',
+  onCallEnd: 'CALL_END',
+  incomingReceived: 'INCOMING_RECEIVED',
+  onSpeaker: 'SPEAKER',
+  onMuted: 'MUTED',
+};

package/ios/CallProcess/NSUserActivity.swift

@@ -1,58 +0,0 @@
-//
-//  NSUserActivity.swift
-//  Runner
-//
-//  Created by Hien Nguyen on 20/02/2022.
-//
-
-import Foundation
-import Intents
-
-extension NSUserActivity: StartCallConvertible {
-
-    public var handle: String? {
-        guard
-          let interaction = interaction,
-          let startCallIntent = interaction.intent as? SupportedStartCallIntent,
-          let contact = startCallIntent.contacts?.first
-        else {
-            return nil
-        }
-        print(interaction.intent)
-        return contact.personHandle?.value
-    }
-
-    public var isVideo: Bool? {
-        guard
-          let interaction = interaction,
-          let startCallIntent = interaction.intent as? SupportedStartCallIntent
-        else {
-            return nil
-        }
-
-        return startCallIntent is INStartVideoCallIntent
-    }
-    
-}
-
-
-protocol StartCallConvertible {
-    var handle: String? { get }
-    var isVideo: Bool? { get }
-}
-
-extension StartCallConvertible {
-
-    var isVideo: Bool? {
-        return nil
-    }
-
-}
-
-
-protocol SupportedStartCallIntent {
-    var contacts: [INPerson]? { get }
-}
-
-extension INStartAudioCallIntent: SupportedStartCallIntent {}
-extension INStartVideoCallIntent: SupportedStartCallIntent {}

package/ios/CallProcess/StringUtils.swift

@@ -1,18 +0,0 @@
-
-import Foundation
-
-extension String {
-    
-    func fromBase64() -> String {
-        guard let data = Foundation.Data(base64Encoded: self) else {
-            return ""
-        }
-        
-        return String(data: data, encoding: .utf8)!
-    }
-    
-    func toBase64() -> String {
-        return Foundation.Data(self.utf8).base64EncodedString()
-    }
-
-}