omikit-plugin 3.2.70 → 3.2.72

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) {
@@ -377,56 +370,74 @@ class CallManager {
       "time_end" : timeEnd,
       "sip_user": user,
       "disposition" : lastStatusCall == nil ? "no_answered" : "answered",
-      "code_end_call" : call.lastStatus
+      "code_end_call" : call.lastStatus,
+
+      "transactionId" : call.omiId,
+      "sourceNumber" : user,
+      "destinationNumber" : guestPhone,
+      "timeStartToAnswer" : call.createDate,
+      "timeEnd" : timeEnd,
+      "sipUser": user,
+      "codeEndCall" : call.lastStatus
     ]
   }
   
   
   /// 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")
@@ -434,7 +445,7 @@ class CallManager {
           return
           
         }
-      }
+      
       return
     }
   }
@@ -495,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/omikit-plugin.podspec

@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
 
   # Thêm dependency bắt buộc
   s.dependency "React-Core"
-  s.dependency "OmiKit", "1.8.8"
+  s.dependency "OmiKit", "1.8.9"
 
   # Đảm bảo Swift bridging header được tự động tạo
   # s.requires_arc = true

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "omikit-plugin",
-  "version": "3.2.70",
+  "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;
+}
+