omikit-plugin 3.2.71 → 3.2.72

package/README.md

@@ -591,7 +591,7 @@ startServices();
   - The `initCallWithApiKey()` function is usually used for your client, who only has a certain function, calling a fixed number. For example, you can only call your hotline number 
 
 ```javascript
-import { initCallWithApiKey } from 'omikit-plugin';
+import { initCallWithApiKey, getCurrentUser } from 'omikit-plugin';
 import messaging from '@react-native-firebase/messaging';
 
 let token: String;
@@ -617,7 +617,18 @@ const loginInfo = {
 // Initialize call functionality using the provided API key
 const result = await initCallWithApiKey(loginInfo);
 
-// If result is true, the user has successfully logged in.
+/* ❌ ❌ NOTE: Please check the user information again, if the object is not empty then you have successfully logged in. 
+Otherwise, if you have not successfully logged in, you should not navigate to the call screen. When startCall with empty information, it may crash your application or not be clear when receiving the startCall error  ❌❌*/
+
+// Example:
+
+if (result){
+  const infoUser = await getCurrentUser()
+  if (infoUser != null && Object.keys(infoUser).length > 0) { 
+    // ✅ Login OMI Success 
+    // Can navigate to call screen or start call 🚀 🚀
+  }
+}
  ```
 
 📌 **initCallWithUserPassword()**
@@ -628,7 +639,7 @@ const result = await initCallWithApiKey(loginInfo);
   - The `initCallWithUserPassword()` function is for employees. They can call any telecommunications number allowed in your business on the OMI system.
   
 ```javascript
-import { initCallWithUserPassword } from 'omikit-plugin';
+import { initCallWithUserPassword, getCurrentUser } from 'omikit-plugin';
 import messaging from '@react-native-firebase/messaging';
 
 let token: String;
@@ -652,7 +663,20 @@ const loginInfo = {
 
 // Initialize call functionality using username and password authentication
 const result = await initCallWithUserPassword(loginInfo);
-// If result is true, the user has successfully logged in.
+
+
+/* ❌ ❌ NOTE: Please check the user information again, if the object is not empty then you have successfully logged in. 
+Otherwise, if you have not successfully logged in, you should not navigate to the call screen. When startCall with empty information, it may crash your application or not be clear when receiving the startCall error  ❌❌*/
+
+// Example:
+
+if (result){
+  const infoUser = await getCurrentUser()
+  if (infoUser != null && Object.keys(infoUser).length > 0) { 
+    // ✅ Login OMI Success 
+    // Can navigate to call screen or start call 🚀 🚀
+  }
+}
 ```
 
 📌 **configPushNotification()**
@@ -1062,6 +1086,20 @@ const result = await startCallWithUuid({
 ### 🚀🚀 Events listener 🚀🚀 
 
 ```javascript
+import { omiEmitter } from 'omikit-plugin';
+
+/*
+❌ ❌ With TypeScript, in android, it seems our omiEmitter is not working properly. Please use the following manual declaration, to ensure performance
+*/
+
+// 📌 For TypeScript, Android 
+import { NativeEventEmitter, NativeModules } from "react-native";
+const { OmikitPlugin } = NativeModules;
+const omiEmitter = new NativeEventEmitter(OmikitPlugin);
+
+
+
+
 useEffect(() => {
     omiEmitter.addListener(OmiCallEvent.onCallStateChanged, onCallStateChanged);
     omiEmitter.addListener(OmiCallEvent.onMuted, onMuted);
@@ -1151,6 +1189,7 @@ const onCallStateChanged = (data: any) => {
     - time_end, timeEnd: number (Timestamp when the call ended)
     - time_start_to_answer, timeStartToAnswer: number (Time taken to answer the call)
     - transaction_id, transactionId: string (OMI Call unique ID)
+    - typeNumber: string ("", "internal", "phone", "zalo")
   */
 };
 

package/android/build.gradle

@@ -120,7 +120,7 @@ dependencies {
   // use for OMISDK
   implementation("androidx.work:work-runtime:2.8.1")
   implementation "androidx.security:security-crypto:1.1.0-alpha06"
-  api 'vn.vihat.omicall:omi-sdk:2.3.20'
+  api 'vn.vihat.omicall:omi-sdk:2.3.22'
 
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

package/android/gradle.properties

@@ -4,4 +4,4 @@ OmikitPlugin_targetSdkVersion=33
 OmikitPlugin_compileSdkVersion=33
 OmikitPlugin_ndkversion=21.4.7075529
 OMI_USER=omicall
-OMI_TOKEN=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
+OMI_TOKEN=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

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

@@ -24,6 +24,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.delay
 import vn.vihat.omicall.omisdk.OmiAccountListener
 import vn.vihat.omicall.omisdk.OmiClient
 import vn.vihat.omicall.omisdk.OmiListener
@@ -38,85 +39,105 @@ import vn.vihat.omicall.omisdk.utils.Utils
 class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   ReactContextBaseJavaModule(reactContext), ActivityEventListener, OmiListener {
   private val mainScope = CoroutineScope(Dispatchers.Main)
-  private var isIncomming: Boolean = false
+  private var isIncoming: Boolean = false
   private var isAnserCall: Boolean = false
 
   override fun getName(): String {
     return NAME
   }
 
+
+    private val handler = Handler(Looper.getMainLooper())
+
   override fun incomingReceived(callerId: Int?, phoneNumber: String?, isVideo: Boolean?) {
-    isIncomming = true;
+    isIncoming = true;
     Log.d("OMISDK", "=>> START INCOMING CALL REVICED => ")
-    val map: WritableMap = WritableNativeMap()
-    map.putBoolean("isVideo", isVideo ?: true)
-    map.putBoolean("incoming", isIncomming)
-    map.putString("callerNumber", phoneNumber)
-    map.putString("_id", "")
-    map.putInt("status", CallState.incoming.value)
+
+    val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber ?: "")
+
+    val map: WritableMap = WritableNativeMap().apply {
+        putBoolean("isVideo", isVideo ?: true)
+        putBoolean("incoming", isIncoming)
+        putString("callerNumber", phoneNumber ?: "")
+        putString("_id", "")
+        putInt("status", CallState.incoming.value)
+        putString("typeNumber", typeNumber)
+    }
+
     sendEvent(CALL_STATE_CHANGED, map)
   }
 
   override fun onCallEstablished(
-    callerId: Int,
-    phoneNumber: String?,
-    isVideo: Boolean?,
-    startTime: Long,
-    transactionId: String?,
+      callerId: Int,
+      phoneNumber: String?,
+      isVideo: Boolean?,
+      startTime: Long,
+      transactionId: String?,
   ) {
-    isAnserCall = true
-    Log.d("OMISDK", "=>> ON CALL ESTABLISHED => ")
-    Handler(Looper.getMainLooper()).postDelayed({
-      Log.d("OmikitReactNative", "onCallEstablished")
-      val map: WritableMap = WritableNativeMap()
-      map.putString("callerNumber", phoneNumber)
-      map.putBoolean("isVideo", isVideo ?: true)
-      map.putBoolean("incoming", isIncomming)
-      map.putString("transactionId", transactionId)
-      map.putInt("status", CallState.confirmed.value)
-      sendEvent(CALL_STATE_CHANGED, map)
-    }, 200)
+      isAnserCall = true
+      Log.d("OMISDK", "=>> ON CALL ESTABLISHED => ")
+
+      Handler(Looper.getMainLooper()).postDelayed({
+          Log.d("OmikitReactNative", "onCallEstablished")
+
+          val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber ?: "")
+
+          val map: WritableMap = WritableNativeMap().apply {
+              putString("callerNumber", phoneNumber ?: "")
+              putBoolean("isVideo", isVideo ?: true)
+              putBoolean("incoming", isIncoming) // 🔹 Kiểm tra lỗi chính tả biến này
+              putString("transactionId", transactionId ?: "")
+              putInt("status", CallState.confirmed.value)
+              putString("typeNumber", typeNumber)
+          }
+
+          sendEvent(CALL_STATE_CHANGED, map)
+      }, 200)
   }
 
   override fun onCallEnd(callInfo: MutableMap<String, Any?>, statusCode: Int) {
-    Log.d("OMISDK RN", "=>> onCallEnd 0000 => $callInfo")
-    val call = callInfo as Map<*, *>
-    val map: WritableMap = WritableNativeMap()
-    val timeStartToAnswer = call["time_start_to_answer"] as Long?
-    val timeEnd = call["time_end"] as Long
-    map.putString("direction", call["direction"] as String)
-    map.putString("transaction_id", call["transaction_id"] as String?)
-    map.putString("source_number", call["source_number"] as String)
-    map.putString("destination_number", call["destination_number"] as String)
-    map.putDouble("time_start_to_answer", (timeStartToAnswer ?: 0).toDouble())
-    map.putDouble("time_end", timeEnd.toDouble())
-    map.putString("sip_user", call["sip_user"] as String)
-    map.putInt("code_end_call", statusCode as Int)
-    map.putString("disposition", call["disposition"] as String)
-    map.putInt("status", CallState.disconnected.value)
-
-    map.putString("transactionId", call["transaction_id"] as String?)
-    map.putString("sourceNumber", call["source_number"] as String)
-    map.putString("destinationNumber", call["destination_number"] as String)
-    map.putDouble("timeStartToAnswer", (timeStartToAnswer ?: 0).toDouble())
-    map.putDouble("timeEnd", timeEnd.toDouble())
-    map.putString("sipUser", call["sip_user"] as String)
-    map.putInt("codeEndCall", statusCode as Int)
-
-    Log.d("OMISDK RN", "=>> onCallEnd  => $map")
-    sendEvent(CALL_STATE_CHANGED, map)
+      Log.d("OMISDK RN", "=>> onCallEnd 0000 => $callInfo")
+
+      // Kiểm tra kiểu dữ liệu trước khi ép kiểu để tránh lỗi
+      val call = callInfo ?: mutableMapOf()
+
+      val timeStartToAnswer = (call["time_start_to_answer"] as? Long) ?: 0L
+      val timeEnd = (call["time_end"] as? Long) ?: 0L
+      val phoneNumber = (call["destination_number"] as? String) ?: (call["source_number"] as? String) ?: ""
+      val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber)
+
+      val map: WritableMap = WritableNativeMap().apply {
+          putString("direction", call["direction"] as? String ?: "")
+          putString("transactionId", call["transaction_id"] as? String ?: "")
+          putString("sourceNumber", call["source_number"] as? String ?: "")
+          putString("destinationNumber", call["destination_number"] as? String ?: "")
+          putDouble("timeStartToAnswer", timeStartToAnswer.toDouble())
+          putDouble("timeEnd", timeEnd.toDouble())
+          putString("sipUser", call["sip_user"] as? String ?: "")
+          putInt("codeEndCall", statusCode)
+          putString("disposition", call["disposition"] as? String ?: "")
+          putInt("status", CallState.disconnected.value)
+          putString("typeNumber", typeNumber)
+      }
+
+      Log.d("OMISDK RN", "=>> onCallEnd  => $map")
+      sendEvent(CALL_STATE_CHANGED, map)
   }
 
   override fun onConnecting() {
-    Log.d("OMISDK", "=>> ON CONNECTING CALL => ")
-    val map: WritableMap = WritableNativeMap()
-    map.putString("callerNumber", "")
-    map.putBoolean("isVideo", NotificationService.isVideo)
-    map.putBoolean("incoming", isIncomming)
-    map.putString("transactionId", "")
-    map.putString("_id", "")
-    map.putInt("status", CallState.connecting.value)
-    sendEvent(CALL_STATE_CHANGED, map)
+      Log.d("OMISDK", "=>> ON CONNECTING CALL => ")
+
+      val map: WritableMap = WritableNativeMap().apply {
+          putString("callerNumber", "")
+          putBoolean("isVideo", NotificationService.isVideo)
+          putBoolean("incoming", isIncoming ?: false)
+          putString("transactionId", "")
+          putString("_id", "")
+          putInt("status", CallState.connecting.value)
+          putString("typeNumber", "")
+      }
+
+      sendEvent(CALL_STATE_CHANGED, map)
   }
 
   override fun onDescriptionError() {
@@ -126,25 +147,21 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onRinging(callerId: Int, transactionId: String?) {
-    var callDirection = OmiClient.callDirection
-    val map: WritableMap = WritableNativeMap()
+      val callDirection = OmiClient.callDirection
+      val prePhoneNumber = OmiClient.prePhoneNumber ?: ""
+      val typeNumber = OmiKitUtils().checkTypeNumber(prePhoneNumber)
+
+      val map: WritableMap = WritableNativeMap().apply {
+          putString("callerNumber", if (callDirection == "inbound") prePhoneNumber else "")
+          putBoolean("isVideo", NotificationService.isVideo)
+          putString("transactionId", transactionId ?: "")
+          putInt("status", if (callDirection == "inbound") CallState.incoming.value else CallState.early.value)
+          putBoolean("incoming", callDirection == "inbound")
+          putString("typeNumber", typeNumber)
+      }
 
-    if (callDirection == "inbound") {
-      Log.d("OMISDK", "=>> ON IN COMMING CALL => ")
-      map.putString("callerNumber", OmiClient.prePhoneNumber)
-      map.putBoolean("isVideo", NotificationService.isVideo)
-      map.putBoolean("incoming", true)
-      map.putString("transactionId", transactionId ?: "")
-      map.putInt("status", CallState.incoming.value)
-    } else {
-      map.putString("callerNumber", "")
-      map.putBoolean("isVideo", NotificationService.isVideo)
-      map.putString("transactionId", transactionId ?: "")
-      map.putInt("status", CallState.early.value)
-      map.putBoolean("incoming", false)
-      Log.d("OMISDK", "=>> ON RINGING CALL => ")
-    }
-    sendEvent(CALL_STATE_CHANGED, map)
+      Log.d("OMISDK", if (callDirection == "inbound") "=>> ON INCOMING CALL => " else "=>> ON RINGING CALL => ")
+      sendEvent(CALL_STATE_CHANGED, map)
   }
 
 
@@ -175,15 +192,21 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onOutgoingStarted(callerId: Int, phoneNumber: String?, isVideo: Boolean?) {
-    Log.d("OMISDK", "=>> ON OUT GOING STARTED CALL => ")
-    val map: WritableMap = WritableNativeMap()
-    map.putString("callerNumber", "")
-    map.putBoolean("isVideo", NotificationService.isVideo)
-    map.putString("transactionId", "")
-    map.putInt("status", CallState.calling.value)
-    map.putString("_id", "")
-    map.putBoolean("incoming", isIncomming)
-    sendEvent(CALL_STATE_CHANGED, map)
+      Log.d("OMISDK", "=>> ON OUTGOING STARTED CALL => ")
+
+      val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber ?: "")
+
+      val map: WritableMap = WritableNativeMap().apply {
+          putString("callerNumber", phoneNumber ?: "")
+          putBoolean("isVideo", NotificationService.isVideo)
+          putString("transactionId", "")
+          putInt("status", CallState.calling.value)
+          putString("_id", "")
+          putBoolean("incoming", isIncoming) // 🔹 Kiểm tra lỗi chính tả của biến này
+          putString("typeNumber", typeNumber)
+      }
+
+      sendEvent(CALL_STATE_CHANGED, map)
   }
 
   override fun onSwitchBoardAnswer(sip: String) {
@@ -196,14 +219,18 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     Log.d("OMISDK", "=> ON REGISTER COMPLETED => status code: $statusCode")
 
     if (statusCode != 200) {
+      val normalizedStatusCode = if (statusCode == 403) 853 else statusCode
+      val typeNumber = ""
+
       val mapObject = WritableNativeMap().apply {
-        putBoolean("isVideo", false)
-        putBoolean("incoming", true)
-        putString("callerNumber", "")
-        putString("_id", "")
-        putInt("status", 6)
-        putInt("code_end_call", if (statusCode == 403) 853 else statusCode)
-        putInt("codeEndCall", if (statusCode == 403) 853 else statusCode)
+          putBoolean("isVideo", false)
+          putBoolean("incoming", true)
+          putString("callerNumber", "")
+          putString("_id", "")
+          putInt("status", 6)
+          putInt("code_end_call", normalizedStatusCode)
+          putInt("codeEndCall", normalizedStatusCode)
+          putString("typeNumber", typeNumber)
       }
       sendEvent(CALL_STATE_CHANGED, mapObject)
     }
@@ -405,51 +432,68 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   @ReactMethod
-  fun getInitialCall(counter: Int = 4, promise: Promise) {
-    currentActivity?.runOnUiThread {
-      if (reactApplicationContext != null) {
-        val call = Utils.getActiveCall(reactApplicationContext!!)
-        Log.d("getInitialCall RN", "getInitialCall abc $call")
-        if (call == null) {
+  fun getInitialCall(counter: Int = 1, promise: Promise) {
+      val context = reactApplicationContext ?: run {
+          Log.e("getInitialCall", "❌ React context is null")
+          promise.resolve(false)
+          return
+      }
+
+      val call = Utils.getActiveCall(context)
+      Log.d("getInitialCall RN", "📞 Active call: $call")
+
+      if (call == null) {
           if (counter <= 0) {
-            promise.resolve(false);
+              promise.resolve(false)
           } else {
-            thread {
-              Thread.sleep(5000) // Chờ 5 giây
-              getInitialCall(counter - 1, promise); // Gọi lại hàm đệ quy
-            }
-          }
-        } else {
-          val phoneNumberTemp: String = call.remoteNumber as String
-          if (phoneNumberTemp.isNotEmpty()) {
-            val map: WritableMap = WritableNativeMap()
-            map.putString("callerNumber", phoneNumberTemp)
-            val statusPendingCall = OmiKitUtils().getStatusPendingCall(reactApplicationContext)
-            if (call.state == 3) {
-              if (statusPendingCall != 0) {
-                call.state = statusPendingCall
+              mainScope.launch {
+                  Log.d("getInitialCall RN", "🔄 Retrying in 2s... (Attempts left: $counter)")
+                  delay(1000) // Chờ 2 giây
+                  getInitialCall(counter - 1, promise) // Gọi lại hàm đệ quy
               }
-            }
-            map.putBoolean("incoming", call.direction == "inbound")
-            map.putInt("_id", call.id)
-            map.putInt("status", call.state)
-            map.putBoolean("muted", false)
-            map.putBoolean("isVideo", call.isVideo ?: false)
-            promise.resolve(map)
-            if (statusPendingCall == 2 && call.state != 5) {
-              Log.d("getInitialCall RN", "incomingReceive $statusPendingCall")
-              val map2: WritableMap = WritableNativeMap()
-              map2.putBoolean("isVideo", call.isVideo ?: false)
-              map2.putBoolean("incoming", true)
-              map2.putString("callerNumber", phoneNumberTemp)
-              map2.putString("_id", "")
-              map2.putInt("status", 2)
-              sendEvent(CALL_STATE_CHANGED, map2)
-            }
           }
-        }
+          return
+      }
+
+      val phoneNumber = call.remoteNumber as? String ?: ""
+      if (phoneNumber.isEmpty()) {
+          promise.resolve(false)
+          return
+      }
+
+      val typeNumber = OmiKitUtils().checkTypeNumber(phoneNumber ?: "")
+
+      val map: WritableMap = WritableNativeMap().apply {
+          putString("callerNumber", phoneNumber)
+          putBoolean("incoming", call.direction == "inbound")
+          putInt("_id", call.id)
+          putInt("status", call.state)
+          putBoolean("muted", false)
+          putBoolean("isVideo", call.isVideo ?: false)
+          putString("typeNumber", typeNumber)
+      }
+
+      val statusPendingCall = OmiKitUtils().getStatusPendingCall(context)
+      if (call.state == 3 && statusPendingCall != 0) {
+          call.state = statusPendingCall
+      }
+
+      promise.resolve(map)
+
+      if (statusPendingCall == 2 && call.state != 5) {
+          Log.d("getInitialCall RN", "🚀 Incoming Receive Triggered ($statusPendingCall)")
+
+
+          val eventMap: WritableMap = WritableNativeMap().apply {
+              putBoolean("isVideo", call.isVideo ?: false)
+              putBoolean("incoming", true)
+              putString("callerNumber", phoneNumber)
+              putString("_id", "")
+              putInt("status", 2)
+              putString("typeNumber", typeNumber)
+          }
+          sendEvent(CALL_STATE_CHANGED, eventMap)
       }
-    }
   }
 
 
@@ -540,7 +584,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun endCall(promise: Promise) {
-    if (isIncomming && !isAnserCall) {
+    if (isIncoming && !isAnserCall) {
       OmiClient.getInstance(reactApplicationContext!!).decline()
     } else {
       OmiClient.getInstance(reactApplicationContext!!).hangUp()
@@ -551,7 +595,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   @ReactMethod
   fun rejectCall(promise: Promise) {
-    if (isIncomming && !isAnserCall) {
+    if (isIncoming && !isAnserCall) {
       OmiClient.getInstance(reactApplicationContext!!).decline()
     }
     promise.resolve(true)
@@ -842,18 +886,19 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     }
   }
 
-  fun sendEvent(eventName: String?, params: Any?) {
-    if (eventName == null) {
-      Log.e("OmikitPlugin", "eventName is null. Event cannot be emitted.")
-      return
-    }
-    if (currentActivity != null) {
-      currentActivity!!.runOnUiThread {
-        reactApplicationContext.getJSModule(RCTNativeAppEventEmitter::class.java)
-          .emit(eventName, params)
+    fun sendEvent(eventName: String?, params: Any?) {
+      if (eventName == null) {
+        Log.e("OmikitPlugin", "❌ eventName is null or empty. Không thể gửi event.")
+        return
+      }
+      if (currentActivity != null) {
+        currentActivity!!.runOnUiThread {
+          reactApplicationContext.getJSModule(RCTNativeAppEventEmitter::class.java)
+            .emit(eventName, params)
+             Log.d("OmikitPlugin", "✅ Event $eventName đã được gửi thành công!")
+        }
       }
     }
-  }
 
   private fun requestPermission(isVideo: Boolean) {
     var permissions = arrayOf(

package/android/src/main/java/com/omikitplugin/utils/OmiKitUtils.kt

@@ -38,4 +38,15 @@ class OmiKitUtils {
     clearStatusPendingCall(context)
     return status
   }
+
+  fun checkTypeNumber(phoneNumber: String?): String {
+      if (phoneNumber.isNullOrBlank()) return "" // 
+
+      return when {
+          phoneNumber.length < 8 -> "internal"
+          phoneNumber.any { it.isLetter() } && phoneNumber.any { it.isDigit() } -> "zalo"
+          else -> "phone"
+      }
+  }
+
 }

package/ios/CallProcess/CallManager.swift

@@ -41,7 +41,7 @@ class CallManager {
   func transferCall(_ phoneNumber: String)-> Bool {
     var result = false;
     do {
-      if let callInfo = self.omiLib.getCurrentConfirmCall() {
+      if let callInfo = omiLib.getCurrentConfirmCall() {
         if callInfo.callState != .disconnected {
           callInfo.blindTransferCall(withNumber: phoneNumber);
           result = true
@@ -58,7 +58,7 @@ class CallManager {
     do {
       if let callInfo = omiLib.getCurrentCall() {
         if callInfo.callState != .disconnected {
-          self.omiLib.callManager.end(callInfo) { error in
+          omiLib.callManager.end(callInfo) { error in
             if error != nil {
             }
           }
@@ -93,42 +93,6 @@ class CallManager {
     }
   }
   
-  func convertDictionaryToJson(dictionary: [String: Any]) -> String? {
-    do {
-      let jsonData = try JSONSerialization.data(withJSONObject: dictionary, options: [])
-      if let jsonString = String(data: jsonData, encoding: .utf8) {
-        return jsonString
-      }
-    } catch {
-      print("Error converting dictionary to JSON: \(error.localizedDescription)")
-    }
-    return nil
-  }
-  
-  private func messageCall(type: Int) -> String {
-    switch(type){
-    case 0:
-      return "INVALID_UUID"
-    case 1:
-      return "INVALID_PHONE_NUMBER"
-    case 2:
-      return "SAME_PHONE_NUMBER_WITH_PHONE_REGISTER"
-    case 3:
-      return "MAX_RETRY"
-    case 4:
-      return "PERMISSION_DENIED"
-    case 5:
-      return "COULD_NOT_FIND_END_POINT"
-    case 6:
-      return "REGISTER_ACCOUNT_FAIL"
-    case 7:
-      return "START_CALL_FAIL"
-    case 9:
-      return "HAVE_ANOTHER_CALL"
-    default:
-      return "START_CALL_SUCCESS"
-    }
-  }
   
   private func requestPermission(isVideo: Bool) {
     AVCaptureDevice.requestAccess(for: .audio) { _ in
@@ -160,18 +124,45 @@ class CallManager {
   
   
   func initWithUserPasswordEndpoint(params: [String: Any]) -> Bool {
-    var result = false
-    if let userName = params["userName"] as? String, let password = params["password"] as? String, let realm = params["realm"] as? String, let token = params["fcmToken"] as? String {
-      if let projectID =  params["projectId"] as? String, !projectID.isEmpty {
-        OmiClient.setFcmProjectId(projectID)
+      // Kiểm tra thông tin đầu vào
+      guard let userName = params["userName"] as? String,
+            let password = params["password"] as? String,
+            let realm = params["realm"] as? String,
+            let token = params["fcmToken"] as? String else {
+          print("🚨 Lỗi: Thiếu thông tin đăng nhập!")
+          return false
+      }
+
+
+      // Nếu `projectId` có giá trị, thiết lập Project ID cho FCM
+      if let projectID = params["projectId"] as? String, !projectID.isEmpty {
+          OmiClient.setFcmProjectId(projectID)
       }
-      OmiClient.initWithUsername(userName, password: password, realm: realm, proxy: "")
+
+      // Thử khởi tạo OmiClient với username & password
+      do {
+          try OmiClient.initWithUsername(userName, password: password, realm: realm, proxy: "")
+      } catch {
+          print("🚨 Lỗi khởi tạo OmiClient: \(error.localizedDescription)")
+          return false
+      }
+
+      // Thiết lập FCM Token cho user
       OmiClient.setUserPushNotificationToken(token)
-      result = true
-    }
-    let isVideo = (params["isVideo"] as? Bool) ?? true
-    requestPermission(isVideo: isVideo)
-    return result
+
+      // Đảm bảo requestPermission chạy trên main thread
+      let isVideo = (params["isVideo"] as? Bool) ?? false
+      if isVideo {
+        DispatchQueue.main.async { [weak self] in
+            guard let strongSelf = self else {
+                print("⚠️ Không thể gọi requestPermission vì self đã bị giải phóng!")
+                return
+            }
+            strongSelf.requestPermission(isVideo: isVideo)
+        }
+      }
+
+      return true
   }
   
   func showMissedCall() {
@@ -232,7 +223,7 @@ class CallManager {
   }
   
   func registerVideoEvent() {
-    DispatchQueue.main.async {
+    DispatchQueue.main.async { 
       NotificationCenter.default.addObserver(CallManager.instance!,
                                              selector: #selector(self.videoUpdate(_:)),
                                              name: NSNotification.Name.OMICallVideoInfo,
@@ -268,7 +259,7 @@ class CallManager {
   
   @objc func videoUpdate(_ notification: NSNotification) {
     guard let userInfo = notification.userInfo,
-          let state     = userInfo[OMIVideoInfoState] as? Int else {
+          let state = userInfo[OMIVideoInfoState] as? Int else {
       return;
     }
     switch (state) {
@@ -310,7 +301,8 @@ class CallManager {
       "callerNumber": "",
       "isVideo": false,
       "transactionId": "",
-      "_id": ""
+      "_id": "",
+      "typeNumber": ""
     ]
 
     if(call != nil){
@@ -322,6 +314,7 @@ class CallManager {
       dataToSend["callerNumber"] = call.callerNumber
       dataToSend["isVideo"] = call.isVideo
       dataToSend["transactionId"] =   call.omiId
+      dataToSend["typeNumber"] = OmiUtils.checkTypeNumber(phoneNumber: call.callerNumber ?? "")
     }
     
     if (callState != OMICallState.disconnected.rawValue) {
@@ -392,49 +385,59 @@ class CallManager {
   
   /// Start call
   func startCall(_ phoneNumber: String, isVideo: Bool, completion: @escaping (_ : String) -> Void) {
-    let secondsSinceCurrentTime = lastTimeCall.timeIntervalSinceNow
-    guestPhone = phoneNumber
-    OmiClient.startCall(phoneNumber, isVideo: isVideo) { status in
-      DispatchQueue.main.async {
-        let callCurrent = self.omiLib.getCurrentCall()
-        var dataToSend: [String: Any] = [
-          "status": status.rawValue,
-          "_id": "",
-          "message": self.messageCall(type: status.rawValue)
-        ]
-        
-        if(callCurrent != nil){
-          dataToSend["_id"] = String(describing: OmiCallModel(omiCall: callCurrent!).uuid)
-        }
-        
-        if let jsonString = self.convertDictionaryToJson(dictionary: dataToSend) {
-          completion(jsonString)
-        } else {
-          completion("Conversion to JSON failed")
-        }
-        return
+      let secondsSinceCurrentTime = lastTimeCall.timeIntervalSinceNow
+      guestPhone = phoneNumber
+      var completionCalled = false  // 🔥 Biến kiểm soát callback đã gọi chưa
+
+      OmiClient.startCall(phoneNumber, isVideo: isVideo) { status in
+          DispatchQueue.main.async {
+              guard let callCurrent = self.omiLib.getCurrentCall() else {
+                  if !completionCalled {
+                      completion("{\"status\": \"6\", \"message\": \"REGISTER_ACCOUNT_FAIL\"}")
+                      completionCalled = true
+                  }
+                  return
+              }
+
+              let dataToSend: [String: Any] = [
+                  "status": status.rawValue,
+                  "_id": String(describing: OmiCallModel(omiCall: callCurrent).uuid),
+                  "message": OmiUtils.messageCall(type: status.rawValue)
+              ]
+
+              if let jsonString = OmiUtils.convertDictionaryToJson(dictionary: dataToSend) {
+                  if !completionCalled {
+                      completion(jsonString)
+                      completionCalled = true
+                  }
+              } else {
+                  if !completionCalled {
+                      completion("{\"status\": \"error\", \"message\": \"JSON conversion failed\"}")
+                      completionCalled = true
+                  }
+              }
+          }
       }
-    }
   }
   
+  
   /// Start call
   func startCallWithUuid(_ uuid: String, isVideo: Bool, completion: @escaping (_ : String) -> Void) {
     let phoneNumber = OmiClient.getPhone(uuid)
     if let phone = phoneNumber {
       guestPhone = phoneNumber ?? ""
-      DispatchQueue.main.async {
-        OmiClient.startCall(phone, isVideo: isVideo) { statusCall in
+        OmiClient.startCall(phone, isVideo: isVideo) {  statusCall in
           let callCurrent = self.omiLib.getCurrentCall()
           // completion(status.rawValue)
           var dataToSend: [String: Any] = [
             "status": statusCall.rawValue,
             "_id": "",
-            "message": self.messageCall(type: statusCall.rawValue)
+            "message": OmiUtils.messageCall(type: statusCall.rawValue)
           ]
           if(callCurrent != nil){
             dataToSend["_id"] = String(describing: OmiCallModel(omiCall: callCurrent!).uuid)
           }
-          if let jsonString = self.convertDictionaryToJson(dictionary: dataToSend) {
+          if let jsonString = OmiUtils.convertDictionaryToJson(dictionary: dataToSend) {
             completion(jsonString)
           } else {
             completion("Conversion to JSON failed")
@@ -442,7 +445,7 @@ class CallManager {
           return
           
         }
-      }
+      
       return
     }
   }
@@ -503,8 +506,8 @@ class CallManager {
   
   /// Toogle speaker
   func toogleSpeaker() {
-    let result = self.omiLib.callManager.audioController.toggleSpeaker();
-    self.isSpeaker = result
+    let result = omiLib.callManager.audioController.toggleSpeaker();
+    isSpeaker = result
     OmikitPlugin.instance.sendSpeakerStatus()
   }
   

package/ios/CallProcess/OmiUtils.swift

@@ -2,6 +2,7 @@ import Foundation
 import AVFoundation
 import SwiftUI
 import OmiKit
+import Combine
 
 public class OmiUtils {
 
@@ -14,18 +15,6 @@ public class OmiUtils {
         return instance!
     }
 
-    func convertDictionaryToJson(dictionary: [String: Any]) -> String? {
-        do {
-            let jsonData = try JSONSerialization.data(withJSONObject: dictionary, options: [])
-            if let jsonString = String(data: jsonData, encoding: .utf8) {
-                return jsonString
-            }
-        } catch {
-            print("Error converting dictionary to JSON: \(error)")
-        }
-        return nil
-    }
-
     func messageCall(type: Int) -> String {
         switch(type){
             case 0:
@@ -50,4 +39,46 @@ public class OmiUtils {
                 return "START_CALL_SUCCESS"
         }
     }
+  
+  
+  /// Chuyển đổi Dictionary thành JSON String
+    static func convertDictionaryToJson(dictionary: [String: Any]) -> String? {
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: dictionary, options: [])
+            return String(data: jsonData, encoding: .utf8)
+        } catch {
+            print("⚠️ Lỗi khi chuyển đổi dictionary sang JSON: \(error.localizedDescription)")
+            return nil
+        }
+    }
+  
+  /// Trả về thông điệp lỗi tương ứng với mã lỗi của cuộc gọi
+    static func messageCall(type: Int) -> String {
+        switch type {
+        case 0: return "INVALID_UUID"
+        case 1: return "INVALID_PHONE_NUMBER"
+        case 2: return "SAME_PHONE_NUMBER_WITH_PHONE_REGISTER"
+        case 3: return "MAX_RETRY"
+        case 4: return "PERMISSION_DENIED"
+        case 5: return "COULD_NOT_FIND_END_POINT"
+        case 6: return "REGISTER_ACCOUNT_FAIL"
+        case 7: return "START_CALL_FAIL"
+        case 9: return "HAVE_ANOTHER_CALL"
+        default: return "START_CALL_SUCCESS"
+        }
+    }
+
+    static func checkTypeNumber(phoneNumber: String) -> String {
+        var result = "phone"
+
+        if phoneNumber.count < 8 {
+            result = "internal"
+        } else if phoneNumber.rangeOfCharacter(from: CharacterSet.letters) != nil &&
+                    phoneNumber.rangeOfCharacter(from: CharacterSet.decimalDigits) != nil {
+            result = "zalo"
+        }
+
+        return result
+    }
+
 }

package/ios/Library/OmikitPlugin.swift

@@ -49,15 +49,20 @@ public class OmikitPlugin: RCTEventEmitter {
   // MARK: - Call Methods
   @objc(initCallWithUserPassword:resolver:rejecter:)
   func initCallWithUserPassword(data: Any, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-    guard let dataOmi = data as? [String: Any] else {
-      reject("INVALID_DATA", "Expected a dictionary with user credentials.", nil)
-      return
-    }
-    let result = CallManager.shareInstance().initWithUserPasswordEndpoint(params: dataOmi)
-    resolve(result)
+      // ✅ Bước 1: Kiểm tra dữ liệu đầu vào có đúng định dạng không
+      guard let dataOmi = data as? [String: Any] else {
+        reject("INVALID_DATA", "Expected a dictionary with user credentials.", nil)
+        return
+      }
+      // ✅ Bước 2: Gọi initWithUserPasswordEndpoint() và kiểm tra kết quả
+      let result = CallManager.shareInstance().initWithUserPasswordEndpoint(params: dataOmi)
+      if result {
+          resolve(true)
+      } else {
+          reject("INIT_FAILED", "Không thể login vào OMI.", nil)
+      }
   }
   
-  
   @objc(initCallWithApiKey:resolver:rejecter:)
   func initCallWithApiKey(data: Any, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
     guard let dataOmi = data as? [String: Any] else {
@@ -70,17 +75,24 @@ public class OmikitPlugin: RCTEventEmitter {
   
   
   @objc(startCall:resolver:rejecter:)
-  func startCall(data: Any, resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-    guard let dataOmi = data as? [String: Any],
-          let phoneNumber = dataOmi["phoneNumber"] as? String else {
-      reject("INVALID_DATA", "Expected a dictionary with phone number.", nil)
-      return
-    }
-    
-    let isVideo = dataOmi["isVideo"] as? Bool ?? false
-    CallManager.shareInstance().startCall(phoneNumber, isVideo: isVideo) { callResult in
-      resolve(callResult)
-    }
+  func startCall(data: Any, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+      guard let dataOmi = data as? [String: Any],
+            let phoneNumber = dataOmi["phoneNumber"] as? String else {
+          reject("INVALID_DATA", "Expected a dictionary with phone number.", nil)
+          return
+      }
+
+      let isVideo = dataOmi["isVideo"] as? Bool ?? false
+
+      CallManager.shareInstance().startCall(phoneNumber, isVideo: isVideo) { callResult in
+          DispatchQueue.main.async {
+              if let result = callResult as? String, !result.isEmpty {
+                  resolve(result)
+              } else {
+                  reject("CALL_FAILED", "You have not logged into OMI", nil)
+              }
+          }
+      }
   }
   
   @objc(startCallWithUuid:resolver:rejecter:)

package/lib/commonjs/omikit.js

@@ -38,11 +38,20 @@ const LINKING_ERROR = `The package 'omikit-plugin' doesn't seem to be linked. Ma
   ios: "- You have run 'pod install'\n",
   default: ''
 }) + '- You rebuilt the app after installing the package\n' + '- You are not using Expo Go\n';
-const OmikitPlugin = _reactNative.NativeModules.OmikitPlugin ? _reactNative.NativeModules.OmikitPlugin : new Proxy({}, {
-  get() {
-    throw new Error(LINKING_ERROR);
-  }
-});
+const {
+  OmikitPlugin
+} = _reactNative.NativeModules;
+// ✅ Khai báo chính xác Native Module
+// const OmikitPlugin = NativeModules.OmikitPlugin
+//   ? NativeModules.OmikitPlugin
+//   : new Proxy(
+//       {},
+//       {
+//         get() {
+//           throw new Error(LINKING_ERROR);
+//         },
+//       }
+//     );
 
 /**
  * Starts the Omikit services.
@@ -282,7 +291,7 @@ function transferCall(data) {
 function rejectCall() {
   return OmikitPlugin.rejectCall();
 }
-const omiEmitter = new _reactNative.NativeEventEmitter(OmikitPlugin);
+const omiEmitter = _reactNative.Platform.OS === 'ios' ? new _reactNative.NativeEventEmitter(OmikitPlugin) : new _reactNative.NativeEventEmitter();
 exports.omiEmitter = omiEmitter;
 const OmiCallEvent = {
   onCallStateChanged: 'CALL_STATE_CHANGED',

package/lib/commonjs/omikit.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","OmikitPlugin","NativeModules","Proxy","get","Error","startServices","configPushNotification","data","getInitialCall","OS","initCallWithUserPassword","initCallWithApiKey","startCall","startCallWithUuid","joinCall","endCall","toggleMute","toggleSpeaker","toggleHold","onHold","sendDTMF","switchOmiCamera","toggleOmiVideo","logout","registerVideoEvent","removeVideoEvent","getCurrentUser","getGuestUser","systemAlertWindow","openSystemAlertSetting","getAudio","setAudio","getCurrentAudio","transferCall","rejectCall","omiEmitter","NativeEventEmitter","exports","OmiCallEvent","onCallStateChanged","onSpeaker","onMuted","onRemoteVideoReady","onClickMissedCall","onSwitchboardAnswer","onCallQuality","onAudioChange","onRequestPermissionAndroid"],"sourceRoot":"../../src","sources":["omikit.tsx"],"mappings":"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"}
+{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","OmikitPlugin","NativeModules","startServices","configPushNotification","data","getInitialCall","OS","initCallWithUserPassword","initCallWithApiKey","startCall","startCallWithUuid","joinCall","endCall","toggleMute","toggleSpeaker","toggleHold","onHold","sendDTMF","switchOmiCamera","toggleOmiVideo","logout","registerVideoEvent","removeVideoEvent","getCurrentUser","getGuestUser","systemAlertWindow","openSystemAlertSetting","getAudio","setAudio","getCurrentAudio","transferCall","rejectCall","omiEmitter","NativeEventEmitter","exports","OmiCallEvent","onCallStateChanged","onSpeaker","onMuted","onRemoteVideoReady","onClickMissedCall","onSwitchboardAnswer","onCallQuality","onAudioChange","onRequestPermissionAndroid"],"sourceRoot":"../../src","sources":["omikit.tsx"],"mappings":"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"}

package/lib/module/omikit.js

@@ -3,11 +3,20 @@ const LINKING_ERROR = `The package 'omikit-plugin' doesn't seem to be linked. Ma
   ios: "- You have run 'pod install'\n",
   default: ''
 }) + '- You rebuilt the app after installing the package\n' + '- You are not using Expo Go\n';
-const OmikitPlugin = NativeModules.OmikitPlugin ? NativeModules.OmikitPlugin : new Proxy({}, {
-  get() {
-    throw new Error(LINKING_ERROR);
-  }
-});
+const {
+  OmikitPlugin
+} = NativeModules;
+// ✅ Khai báo chính xác Native Module
+// const OmikitPlugin = NativeModules.OmikitPlugin
+//   ? NativeModules.OmikitPlugin
+//   : new Proxy(
+//       {},
+//       {
+//         get() {
+//           throw new Error(LINKING_ERROR);
+//         },
+//       }
+//     );
 
 /**
  * Starts the Omikit services.
@@ -247,7 +256,7 @@ export function transferCall(data) {
 export function rejectCall() {
   return OmikitPlugin.rejectCall();
 }
-export const omiEmitter = new NativeEventEmitter(OmikitPlugin);
+export const omiEmitter = Platform.OS === 'ios' ? new NativeEventEmitter(OmikitPlugin) : new NativeEventEmitter();
 export const OmiCallEvent = {
   onCallStateChanged: 'CALL_STATE_CHANGED',
   onSpeaker: 'SPEAKER',

package/lib/module/omikit.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","Platform","NativeEventEmitter","LINKING_ERROR","select","ios","default","OmikitPlugin","Proxy","get","Error","startServices","configPushNotification","data","getInitialCall","OS","initCallWithUserPassword","initCallWithApiKey","startCall","startCallWithUuid","joinCall","endCall","toggleMute","toggleSpeaker","toggleHold","onHold","sendDTMF","switchOmiCamera","toggleOmiVideo","logout","registerVideoEvent","removeVideoEvent","getCurrentUser","getGuestUser","systemAlertWindow","openSystemAlertSetting","getAudio","setAudio","getCurrentAudio","transferCall","rejectCall","omiEmitter","OmiCallEvent","onCallStateChanged","onSpeaker","onMuted","onRemoteVideoReady","onClickMissedCall","onSwitchboardAnswer","onCallQuality","onAudioChange","onRequestPermissionAndroid"],"sourceRoot":"../../src","sources":["omikit.tsx"],"mappings":"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"}
+{"version":3,"names":["NativeModules","Platform","NativeEventEmitter","LINKING_ERROR","select","ios","default","OmikitPlugin","startServices","configPushNotification","data","getInitialCall","OS","initCallWithUserPassword","initCallWithApiKey","startCall","startCallWithUuid","joinCall","endCall","toggleMute","toggleSpeaker","toggleHold","onHold","sendDTMF","switchOmiCamera","toggleOmiVideo","logout","registerVideoEvent","removeVideoEvent","getCurrentUser","getGuestUser","systemAlertWindow","openSystemAlertSetting","getAudio","setAudio","getCurrentAudio","transferCall","rejectCall","omiEmitter","OmiCallEvent","onCallStateChanged","onSpeaker","onMuted","onRemoteVideoReady","onClickMissedCall","onSwitchboardAnswer","onCallQuality","onAudioChange","onRequestPermissionAndroid"],"sourceRoot":"../../src","sources":["omikit.tsx"],"mappings":"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"}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "omikit-plugin",
-  "version": "3.2.71",
+  "version": "3.2.72",
   "description": "Omikit Plugin by ViHAT",
-  "main": "lib/commonjs/index",
+  "main": "src/commonjs/index",
   "module": "lib/module/index",
   "types": "src/types/index.d.ts",
   "react-native": "src/index",

package/src/index.tsx

@@ -2,4 +2,4 @@ export * from './omikit';
 export * from './omi_local_camera';
 export * from './omi_remote_camera';
 export * from './omi_call_state';
-export * from './omi_start_call_status';
+export * from './omi_start_call_status';

package/src/omikit.tsx

@@ -6,16 +6,19 @@ const LINKING_ERROR =
   '- You rebuilt the app after installing the package\n' +
   '- You are not using Expo Go\n';
 
-const OmikitPlugin = NativeModules.OmikitPlugin
-  ? NativeModules.OmikitPlugin
-  : new Proxy(
-      {},
-      {
-        get() {
-          throw new Error(LINKING_ERROR);
-        },
-      }
-    );
+  const { OmikitPlugin } = NativeModules;
+// ✅ Khai báo chính xác Native Module
+// const OmikitPlugin = NativeModules.OmikitPlugin
+//   ? NativeModules.OmikitPlugin
+//   : new Proxy(
+//       {},
+//       {
+//         get() {
+//           throw new Error(LINKING_ERROR);
+//         },
+//       }
+//     );
+
 
 /**
  * Starts the Omikit services.
@@ -265,7 +268,7 @@ export function rejectCall(): Promise<boolean> {
 }
 
 
-export const omiEmitter = new NativeEventEmitter(OmikitPlugin);
+export const omiEmitter = Platform.OS === 'ios' ? new NativeEventEmitter(OmikitPlugin) : new NativeEventEmitter();     
 
 export const OmiCallEvent = {
   onCallStateChanged: 'CALL_STATE_CHANGED',

package/src/types/index.d.ts

@@ -1,6 +1,6 @@
 declare module 'omikit-plugin' {
     import { NativeEventEmitter } from 'react-native';
-  
+
     export function startServices(): Promise<any>;
     export function configPushNotification(data: any): Promise<any>;
     export function getInitialCall(): Promise<any>;
@@ -30,8 +30,6 @@ declare module 'omikit-plugin' {
     export function transferCall(data: any): Promise<boolean>;
     export function rejectCall(): Promise<boolean>;
   
-    export const omiEmitter: NativeEventEmitter;
-    
     export enum OmiCallState {
       unknown,
       calling,
@@ -42,9 +40,6 @@ declare module 'omikit-plugin' {
       disconnected,
       hold
     }
-
-
-      
   
     export const OmiCallEvent: {
       onCallStateChanged: string;
@@ -58,4 +53,27 @@ declare module 'omikit-plugin' {
       onAudioChange: string;
       onRequestPermissionAndroid: string;
     };
-  }
+
+
+
+  //   // ✅ Định nghĩa omiEmitter để luôn listen được event
+  // export const omiEmitter: NativeEventEmitter;
+
+  // ✅ Định nghĩa lại `addListener`, `removeListener`, `removeAllListeners`
+  export interface OmiEmitterInterface extends NativeEventEmitter {
+    addListener(
+      eventType: string,
+      listener: (event: any) => void
+    ): void;
+
+    removeListener(
+      eventType: string,
+      listener: (event: any) => void
+    ): void;
+
+    removeAllListeners(eventType?: string): void;
+  }
+
+  export const omiEmitter: OmiEmitterInterface;
+}
+