omikit-plugin 3.2.49 → 3.2.51

package/ios/Library/OmikitNotification.m

@@ -6,7 +6,13 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <omikit_plugin-Swift.h>
+
+#if __has_include("omikit_plugin-Swift.h")
+#import "omikit_plugin-Swift.h"
+#else
+#import <omikit_plugin/omikit_plugin-Swift.h>
+#endif
+
 
 @implementation OmikitNotification : NSObject 
 + (void)didRecieve:(NSDictionary*) userInfo{

package/ios/Library/OmikitPlugin.swift

@@ -1,234 +1,116 @@
-import Foundation
-import React
-import OmiKit
-
 @objc(OmikitPlugin)
 public class OmikitPlugin: RCTEventEmitter {
     
-    @objc public static var instance : OmikitPlugin!
+    @objc public static var instance: OmikitPlugin!
 
     override init() {
         super.init()
         OmikitPlugin.instance = self
     }
-    
+
+    // MARK: - Helpers
+    private func validateString(_ value: Any?) -> String? {
+        guard let string = value as? String, !string.isEmpty else {
+            return nil
+        }
+        return string
+    }
+
+    private func validateDictionary(_ value: Any?) -> [String: Any]? {
+        return value as? [String: Any]
+    }
+
+    // MARK: - Native Methods
     @objc(startServices:withRejecter:)
-    func startServices(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+    func startServices(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         CallManager.shareInstance().registerNotificationCenter(showMissedCall: true)
         resolve(true)
     }
-    
-    @objc(configPushNotification:withResolver:withRejecter:)
-    func configPushNotification(data: Any, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        if let dataOmi = data as? [String: Any] {
-            CallManager.shareInstance().configNotification(data: dataOmi)
-        }
-        resolve(true)
-    }
-    
-    @objc(getInitialCall:withRejecter:)
-    func getInitialCall(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        if let call = CallManager.shareInstance().getAvailableCall() {
-            let data : [String: Any] = [
-                "callerNumber" : call.callerNumber,
-                "status": call.lastStatus,
-                "muted": call.muted,
-                "isVideo": call.isVideo,
-            ]
-            resolve(data)
-            return
-        }
-        resolve(nil)
-    }
-    
+
     @objc(initCallWithUserPassword:withResolver:withRejecter:)
-    func initCallWithUserPassword(data: Any, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        if let dataOmi = data as? [String: Any] {
-            let result = CallManager.shareInstance().initWithUserPasswordEndpoint(params: dataOmi)
-            resolve(result)
+    func initCallWithUserPassword(data: Any, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        guard let dataOmi = validateDictionary(data) else {
+            reject("E_INVALID_DATA", "Invalid data format", nil)
+            return
         }
+
+        let result = CallManager.shareInstance().initWithUserPasswordEndpoint(params: dataOmi)
+        resolve(result)
     }
-    
+
     @objc(initCallWithApiKey:withResolver:withRejecter:)
-    func initCallWithApiKey(data: Any, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        if let dataOmi = data as? [String: Any] {
-            let result = CallManager.shareInstance().initWithApiKeyEndpoint(params: dataOmi)
-            resolve(result)
-        }
-    }
-    
-    
-    @objc(startCall:withResolver:withRejecter:)
-    func startCall(data: Any, resolve: @escaping 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) { callResult in
-                resolve(callResult)
-            }
-        }
-    }
-    
-    @objc(startCallWithUuid:withResolver:withRejecter:)
-    func startCallWithUuid(data: Any, resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        if let dataOmi = data as? [String: Any] {
-            let uuid = dataOmi["usrUuid"] as! String
-            var isVideo = false
-            if let isVideoCall = dataOmi["isVideo"] as? Bool {
-                isVideo = isVideoCall
-            }
-            CallManager.shareInstance().startCallWithUuid(uuid, isVideo: isVideo) { callResult in
-                resolve(callResult)
-            }
-        }
-    }
-    
-    @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().endCall()
-        resolve(true)
-    }
-    
-    @objc(toggleMute:withRejecter:)
-    func toggleMute(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        CallManager.shareInstance().toggleMute()
-        if let call = CallManager.shareInstance().getAvailableCall() {
-            resolve(call.muted)
+    func initCallWithApiKey(data: Any, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        guard let dataOmi = validateDictionary(data) else {
+            reject("E_INVALID_DATA", "Invalid data format", nil)
+            return
         }
-        sendMuteStatus()
-    }
-    
-    @objc(toggleSpeaker:withRejecter:)
-    func toggleSpeaker(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        CallManager.shareInstance().toogleSpeaker() 
-        resolve(CallManager.shareInstance().isSpeaker)
+
+        let result = CallManager.shareInstance().initWithApiKeyEndpoint(params: dataOmi)
+        resolve(result)
     }
-    
-    @objc(sendDTMF:withResolver:withRejecter:)
-    func sendDTMF(data: Any, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        if let dataOmi = data as? [String: Any] {
-            CallManager.shareInstance().sendDTMF(character: dataOmi["character"] as! String)
-            resolve(true)
+
+    @objc(configPushNotification:withResolver:withRejecter:)
+    func configPushNotification(data: Any, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
+        guard let dataOmi = validateDictionary(data) else {
+            reject("E_INVALID_DATA", "Invalid data format", nil)
+            return
         }
-    }
-    
-    @objc(switchOmiCamera:withRejecter:)
-    func switchOmiCamera(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        CallManager.shareInstance().switchCamera()
-        resolve(true)
-    }
-    
-    @objc(toggleOmiVideo:withRejecter:)
-    func toggleOmiVideo(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        CallManager.shareInstance().toggleCamera()
-        resolve(true)
-    }
-    
-    @objc(logout:withRejecter:)
-    func logout(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        CallManager.shareInstance().logout()
-        resolve(true)
-    }
-    
-    @objc(registerVideoEvent:withRejecter:)
-    func registerVideoEvent(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        CallManager.shareInstance().registerVideoEvent()
-        resolve(true)
-    }
-    
-    @objc(removeVideoEvent:withRejecter:)
-    func removeVideoEvent(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        CallManager.shareInstance().removeVideoEvent()
+
+        CallManager.shareInstance().configNotification(data: dataOmi)
         resolve(true)
     }
-    
-    @objc(getCurrentUser:withRejecter:)
-    func getCurrentUser(resolve: @escaping RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
-        CallManager.shareInstance().getCurrentUser { user in
-            resolve(user)
+
+    @objc(startCall:withResolver:withRejecter:)
+    func startCall(data: Any, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        guard let dataOmi = validateDictionary(data),
+              let phoneNumber = validateString(dataOmi["phoneNumber"]),
+              let isVideo = dataOmi["isVideo"] as? Bool else {
+            reject("E_INVALID_DATA", "Invalid or missing call parameters", nil)
+            return
         }
-    }
 
-    @objc(getGuestUser:withRejecter:)
-    func getGuestUser(resolve: @escaping RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
-        CallManager.shareInstance().getGuestUser { user in
-            resolve(user)
+        CallManager.shareInstance().startCall(phoneNumber, isVideo: isVideo) { callResult in
+            resolve(callResult)
         }
     }
-    
-    @objc(getUserInfor:withResolver:withRejecter:)
-    func getUserInfor(data: Any, resolve: @escaping RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
-        CallManager.shareInstance().getUserInfo(phone: data as! String) { user in
-            resolve(user)
+
+    @objc(startCallWithUuid:withResolver:withRejecter:)
+    func startCallWithUuid(data: Any, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        guard let dataOmi = validateDictionary(data),
+              let uuid = validateString(dataOmi["usrUuid"]),
+              let isVideo = dataOmi["isVideo"] as? Bool else {
+            reject("E_INVALID_DATA", "Invalid or missing call parameters", nil)
+            return
         }
-    }
-    
-    @objc(getAudio:withRejecter:)
-    func getAudio(resolve: @escaping RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
-        let audios = CallManager.shareInstance().getAudioOutputs()
-        resolve(audios)
-    }
-    
-    @objc(setAudio:withResolver:withRejecter:)
-    func setAudio(data: Any, resolve: @escaping RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
-        if let dataOmi = data as? [String: Any] {
-            let portType = dataOmi["portType"] as! String
-            CallManager.shareInstance().setAudioOutputs(portType: portType)
+
+        CallManager.shareInstance().startCallWithUuid(uuid, isVideo: isVideo) { callResult in
+            resolve(callResult)
         }
     }
-    
-    @objc(getCurrentAudio:withRejecter:)
-    func getCurrentAudio(resolve: @escaping RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
-        let currentAudio = CallManager.shareInstance().getCurrentAudio()
-        resolve(currentAudio)
+
+    // MARK: - Utility Functions
+    public override func supportedEvents() -> [String]! {
+        return [
+            "CALL_STATE_CHANGED",
+            "MUTED",
+            "SPEAKER",
+            "REMOTE_VIDEO_READY",
+            "CLICK_MISSED_CALL",
+            "SWITCHBOARD_ANSWER",
+            "CALL_QUALITY",
+            "AUDIO_CHANGE"
+        ]
     }
-    
+
+    // Helper to send mute status
     func sendMuteStatus() {
         if let call = CallManager.shareInstance().getAvailableCall() {
-            sendEvent(withName: MUTED, body: call.muted)
-        }
-    }
-    
-    func sendSpeakerStatus() {
-        sendEvent(withName: SPEAKER, body: CallManager.shareInstance().isSpeaker)
-    }
-    
-    @objc public func didReceive(data: [String: Any]) {
-        if let callerNumber = data["omisdkCallerNumber"] as? String, let isVideo = data["omisdkIsVideo"] as? Bool {
-            sendEvent(withName: CLICK_MISSED_CALL, body: [
-                "callerNumber": callerNumber,
-                "isVideo": isVideo,
-            ])
+            sendEvent(withName: "MUTED", body: call.muted)
         }
     }
 
-    @objc(transferCall:withResolver:withRejecter:)
-    func transferCall(data: Any, resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        if let dataOmi = data as? [String: Any] {
-            let phoneNumber = dataOmi["phoneNumber"] as! String
-            CallManager.shareInstance().transferCall(phoneNumber)
-        }
-    }
-    
-    public override func supportedEvents() -> [String]! {
-        return [
-            CALL_STATE_CHANGED,
-            MUTED,
-            SPEAKER,
-            REMOTE_VIDEO_READY,
-            CLICK_MISSED_CALL,
-            SWITCHBOARD_ANSWER,
-            CALL_QUALITY,
-            AUDIO_CHANGE,
-        ]
+    // Helper to send speaker status
+    func sendSpeakerStatus() {
+        sendEvent(withName: "SPEAKER", body: CallManager.shareInstance().isSpeaker)
     }
 }

package/omikit-plugin.podspec

@@ -22,9 +22,13 @@ Pod::Spec.new do |s|
   # Định nghĩa module để tránh lỗi Swift bridging header
   s.static_framework = true
   s.pod_target_xcconfig = {
-    "DEFINES_MODULE" => "YES"
+    "DEFINES_MODULE" => "YES",
+    "SWIFT_VERSION" => "5.0"
   }
 
+  # Xác định module name
+  s.module_name = "omikit_plugin"
+
   # Thêm dependency bắt buộc
   s.dependency "React-Core"
   s.dependency "OmiKit", "1.8.1"

package/package.json

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