edoctor-sendbird-calls 1.0.0 → 1.0.1-beta.10

package/ios/CXCallManager.swift

@@ -194,7 +194,7 @@ extension CXCallManager: CXProviderDelegate {
 extension DirectCallEndResult {
     var asCXCallEndedReason: CXCallEndedReason? {
         switch self {
-        case .connectionLost, .timedOut, .acceptFailed, .dialFailed, .unknown:
+        case .connectionLost, .timedOut, .acceptFailed, .dialFailed, .notConnected, .unknown:
             return .failed
         case .completed, .canceled:
             return .remoteEnded

package/ios/CXProvider.swift

@@ -11,7 +11,12 @@ import UIKit
 extension CXProviderConfiguration {
     // The app's provider configuration, representing its CallKit capabilities
     static var `default`: CXProviderConfiguration {
-        let providerConfiguration = CXProviderConfiguration(localizedName: "Sendbird Calls")
+        let providerConfiguration: CXProviderConfiguration
+        if #available(iOS 14.0, *) {
+            providerConfiguration = CXProviderConfiguration()
+        } else {
+            providerConfiguration = CXProviderConfiguration(localizedName: "eDoctor")
+        }
         if let image = UIImage(named: "icLogoSymbolInverse") {
             providerConfiguration.iconTemplateImageData = image.pngData()
         }

package/ios/RNSendBirdCalls.swift

@@ -43,25 +43,15 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
     }
     
     private func setupSendBird() {
-        let userDefaults = UserDefaults(suiteName: "edoctorStorage")
+        _ = UserDefaults(suiteName: "edoctorStorage")
         let appId = "0BEF9C57-BA3B-474E-A40F-62B027AA47F6"
 
         let config = SendBirdCall.configure(appId: appId)
-        if(config){
-            print(TAG + "CONFIG SUCCESS")
-        }else {
-            print(TAG + "CONFIG FAILED")
-        }
         SendBirdCall.addDelegate(self, identifier: "RNSendBirdCalls")
         SendBirdCall.setDirectCallDialingSoundOnWhenSilentMode(isEnabled: true)
         SendBirdCall.addRecordingDelegate(self, identifier: "RNSendBirdRecording")
     }
 
-    // MARK: - RCTEventEmitter overrides for RN 0.79.x
-    override static func requiresMainQueueSetup() -> Bool {
-        return true
-    }
-
     override func supportedEvents() -> [String]! {
         return [
             RNSendBirdCalls.onEnded,
@@ -130,6 +120,8 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
                 return
             }
 
+            print(self.TAG + "AUTHENTICATE SUCCESS \(user.userId)")
+
             resolve(["succeeded": true ,"userId": user.userId, "nickname": user.nickname ?? ""])
         }
     }
@@ -137,9 +129,9 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
     @objc func deAuthenticate(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) -> Void {
         SendBirdCall.unregisterAllVoIPPushTokens { error in
             guard error == nil else {
-                print("RNSendBirdCalls" + "Cerror deauthen")
+                print(self.TAG + "error deauthen")
                 let message = error?.localizedDescription ?? "Có lỗi xảy ra"
-                print("RNSendBirdCalls" + message)
+                print(self.TAG + message)
                 return
             }
         }
@@ -151,15 +143,16 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
                 return
             }
 
+            print(self.TAG + "DEAUTHENTICATE SUCCESS")
             resolve(["succeeded": true ])
         }
     }
 
     @objc func initSendBird(_ appId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         let config = SendBirdCall.configure(appId: appId)
-        if(config){
+        if (config != nil) {
             resolve(["succeeded": true ])
-        }else {
+        } else {
             resolve(["succeeded": false ])
         }
     }
@@ -181,6 +174,7 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
                 return
             }
 
+            print(self.TAG + "DIAL SUCCESS")
             resolve(["succeeded": true ,"callId": call.callId, "caller": call.caller?.userId ?? "", "callee": call.callee?.userId ?? ""])
         }
         CALL_ACTIVE = directCall;
@@ -197,6 +191,7 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
         CXCallManager.shared.endCXCall(call)
         let params = getParamFromDirectCall(call: call)
         params.setValue(true, forKey: "succeeded")
+        print(TAG + "END CALL SUCCESS")
         resolve(params)
     }
 
@@ -211,6 +206,7 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
         call.accept(with: acceptParams)
         let params = getParamFromDirectCall(call: call)
         params.setValue(true, forKey: "succeeded")
+        print(TAG + "ACCEPT CALL SUCCESS")
         resolve(params)
     }
 
@@ -245,54 +241,55 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
                 resultData.append(getParamFromDirectCall(call: directCall))
             })
         }
+        print(TAG + "getOngoingCalls SUCCESS")
         resolve(resultData)
     }
 
     @objc func muteMicrophone(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         print(TAG + "muteMicrophone")
-        if(CALL_ACTIVE != nil){
+        if (CALL_ACTIVE != nil) {
             CALL_ACTIVE?.muteMicrophone()
             resolve(["succeeded": true])
-        }else {
+        } else {
             resolve(["succeeded": false , "errorMessage": "Cuộc gọi không tồn tại"])
         }
     }
 
     @objc func unmuteMicrophone(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         print(TAG + "unmuteMicrophone")
-        if(CALL_ACTIVE != nil){
+        if (CALL_ACTIVE != nil) {
             CALL_ACTIVE?.unmuteMicrophone()
             resolve(["succeeded": true])
-        }else {
+        } else {
             resolve(["succeeded": false , "errorMessage": "Cuộc gọi không tồn tại"])
         }
     }
 
     @objc func startVideo(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         print(TAG + "startVideo")
-        if(CALL_ACTIVE != nil){
+        if (CALL_ACTIVE != nil) {
             CALL_ACTIVE?.startVideo()
             resolve(["succeeded": true])
-        }else {
+        } else {
             resolve(["succeeded": false , "errorMessage": "Cuộc gọi không tồn tại"])
         }
     }
 
     @objc func stopVideo(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         print(TAG + "stopVideo")
-        if(CALL_ACTIVE != nil){
+        if (CALL_ACTIVE != nil) {
             CALL_ACTIVE?.stopVideo()
             resolve(["succeeded": true])
-        }else {
+        } else {
             resolve(["succeeded": false , "errorMessage": "Cuộc gọi không tồn tại"])
         }
     }
 
     @objc func switchCamera(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         print(TAG + "switchCamera")
-        if(CALL_ACTIVE != nil){
+        if (CALL_ACTIVE != nil) {
             CALL_ACTIVE?.switchCamera { error in
-                if(error != nil){
+                if (error != nil) {
                     let code = "\(error?.errorCode.rawValue ?? 0)"
                     let message = error?.localizedDescription ?? "Có lỗi xảy ra"
                     resolve(["succeeded": false , "errorCode": code, "errorMessage": message])
@@ -313,9 +310,9 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
 
         let options = isRemote ? RecordingOptions(recordingType: .localAudioRemoteAudioAndVideo, directoryPath: documentsDirectory, fileName: fileName) : RecordingOptions(recordingType: .localAudioAndVideoRemoteAudio, directoryPath: documentsDirectory, fileName: fileName)
 
-        if(CALL_ACTIVE != nil){
+        if (CALL_ACTIVE != nil) {
             CALL_ACTIVE?.startRecording(options: options) { (recordingId, error) in
-                if(error == nil){
+                if (error == nil) {
                     let result: NSDictionary = [
                         "succeeded": true,
                         "recordingId": recordingId ?? "",
@@ -340,7 +337,7 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
 
     @objc func stopRecording(_ recordingId: String, isVideoCall: Bool, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock){
         print(TAG + "stopRecording")
-        if(CALL_ACTIVE != nil){
+        if (CALL_ACTIVE != nil) {
             let resultStop: Bool = ((CALL_ACTIVE?.stopRecording(recordingId: recordingId)) != nil)
             let result: NSDictionary = [
                 "succeeded": resultStop,
@@ -356,7 +353,7 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
 
     @objc func endAllCalls(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         let ongoingCalls = SendBirdCall.getOngoingCalls()
-        if(ongoingCalls.count > 0){
+        if (ongoingCalls.count > 0) {
             ongoingCalls.forEach({ directCall in
                 directCall.end()
                 CXCallManager.shared.endCXCall(directCall)
@@ -367,7 +364,7 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
 
     func endCalls() {
         let ongoingCalls = SendBirdCall.getOngoingCalls()
-        if(ongoingCalls.count > 0){
+        if (ongoingCalls.count > 0) {
             ongoingCalls.forEach({ directCall in
                 directCall.end()
                 CXCallManager.shared.endCXCall(directCall)
@@ -389,8 +386,8 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
 
     @available(iOS 10.0, *)
     func pushRegistry(_ registry: PKPushRegistry, didReceiveIncomingPushWith payload: PKPushPayload, for type: PKPushType, completion: @escaping () -> Void) {
-        print(TAG + "pushRegistry pushRegistry incoming call")
-        SendBirdCall.addDelegate(self, identifier: "RNSendBirdCalls")
+        print(TAG + "pushRegistry incoming call")
+        // SendBirdCall.addDelegate(self, identifier: "RNSendBirdCalls")
         SendBirdCall.pushRegistry(registry, didReceiveIncomingPushWith: payload, for: type) { uuid in
             guard uuid != nil else {
                 let update = CXCallUpdate()
@@ -429,9 +426,10 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
         let isLocalVideoEnabled = call.isLocalVideoEnabled
         let isLocalAudioEnabled = call.isLocalAudioEnabled
         let customItems = call.customItems
+        let endResult = call.endResult
 
         let params: NSMutableDictionary = [
-            "callId" : callId ?? "",
+            "callId" : callId,
             "duration": duration,
             "isRemoteAudioEnabled": isRemoteAudioEnabled,
             "isRemoteVideoEnabled": isRemoteVideoEnabled,
@@ -440,7 +438,8 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
             "isVideoCall": isVideoCall,
             "callee" : calleeMap,
             "caller" : callerMap,
-            "customItems": customItems ?? [:],
+            "customItems": customItems,
+            "endResult": endResult,
         ]
         return params
     }
@@ -469,6 +468,8 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
         update.hasVideo = directCall.isVideoCall
         update.localizedCallerName = "BS. \(directCall.caller?.nickname ?? "Chưa xác định")"
 
+        print(TAG + "call count: \(SendBirdCall.getOngoingCallCount())")
+
         if SendBirdCall.getOngoingCallCount() > 1 {
             CXCallManager.shared.reportIncomingCall(with: uuid, update: update) { _ in
                 CXCallManager.shared.endCall(for: uuid, endedAt: Date(), reason: .declined)
@@ -525,9 +526,10 @@ class RNSendBirdCalls: RCTEventEmitter, SendBirdCallDelegate, DirectCallDelegate
         print(TAG + "didEnd")
         CALL_ACTIVE = nil
         let params = getParamFromDirectCall(call: directCall)
+        print(self.TAG + "didEnd endResult: \(directCall.endResult.rawValue)")
         sendEventWithName(eventName: RNSendBirdCalls.onEnded, params: params)
         CXCallManager.shared.endCall(for: callId, endedAt: Date(), reason: directCall.endResult)
-        guard let callLog = directCall.callLog else { return }
+        guard directCall.callLog != nil else { return }
     }
 
     // MARK: - SendBirdRecordingDelegate

package/ios/RNVSendBirdCallsVideoManager.mm

@@ -1,6 +1,12 @@
 #import "React/RCTViewManager.h"
 @interface RCT_EXTERN_MODULE(RNVSendBirdCallsVideoManager, RCTViewManager)
-    RCT_EXPORT_VIEW_PROPERTY(callId, NSString)
-    RCT_EXPORT_VIEW_PROPERTY(local, BOOL)
-    RCT_EXPORT_VIEW_PROPERTY(scaleFit, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(callId, NSString)
+RCT_EXPORT_VIEW_PROPERTY(local, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(scaleFit, BOOL)
+
++ (BOOL)requiresMainQueueSetup
+{
+    return YES;
+}
+
 @end

package/ios/RNVSendBirdCallsVideoManager.swift

@@ -2,14 +2,8 @@ import SendBirdCalls
 
 @objc(RNVSendBirdCallsVideoManager)
 class RNVSendBirdCallsVideoManager: RCTViewManager {
-
-    override static func requiresMainQueueSetup() -> Bool{
-        return true
+    override func view() -> UIView! {
+        return RNVSendBirdCallsVideo()
     }
-
-  override func view() -> UIView! {
-      return RNVSendBirdCallsVideo()
-
-  }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edoctor-sendbird-calls",
-  "version": "1.0.0",
+  "version": "1.0.1-beta.10",
   "description": "edoctor-sendbird-calls",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",