@kaleyra/video-react-native-module 1.6.0 → 2.0.0

package/native-bridge/iOS/Podfile

@@ -1,12 +1,12 @@
 # Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
 # See LICENSE for licensing information
 
-platform :ios, '12.0'
+platform :ios, '15.0'
 
 target 'KaleyraVideoHybridNativeBridge' do
   use_frameworks!
 
-  pod 'Bandyer', '~> 3.12.1'
+  pod 'KaleyraVideoSDK', '~> 4.0.0'
 
   target 'KaleyraVideoHybridNativeBridgeTests' do
     use_frameworks!

package/native-bridge/iOS/Podfile.lock

@@ -1,24 +1,24 @@
 PODS:
-  - Bandyer (3.12.1):
-    - Bandyer/Core (= 3.12.1)
-    - Bandyer/WebRTC (= 3.12.1)
-  - Bandyer/Core (3.12.1)
-  - Bandyer/WebRTC (3.12.1)
+  - KaleyraVideoSDK (4.0.0):
+    - KaleyraVideoSDK/Core (= 4.0.0)
+    - KaleyraVideoSDK/WebRTC (= 4.0.0)
+  - KaleyraVideoSDK/Core (4.0.0)
+  - KaleyraVideoSDK/WebRTC (4.0.0)
   - SwiftHamcrest (2.2.4)
 
 DEPENDENCIES:
-  - Bandyer (~> 3.12.1)
+  - KaleyraVideoSDK (~> 4.0.0)
   - SwiftHamcrest (~> 2.2)
 
 SPEC REPOS:
   trunk:
-    - Bandyer
+    - KaleyraVideoSDK
     - SwiftHamcrest
 
 SPEC CHECKSUMS:
-  Bandyer: 85a49f0c6c3e2084075991dc05a37ae3b54ca9d8
+  KaleyraVideoSDK: 2350e37e969a0b69bc36f0ea77c4c580b1579fa9
   SwiftHamcrest: a45dd878978049c0953259aa01c34fd7258d0340
 
-PODFILE CHECKSUM: eec3e41640e9473d6444b76c82ece16fcb50757e
+PODFILE CHECKSUM: b048d01ca8b52521a6098cef14d564781e2b7242
 
 COCOAPODS: 1.15.2

package/native-bridge/iOS/Source/Abstractions/CallWindowProtocol.swift

@@ -2,17 +2,14 @@
 // See LICENSE for licensing information
 
 import Foundation
-import Bandyer
+import KaleyraVideoSDK
 
-@available(iOS 12.0, *)
 protocol CallWindowProtocol: AnyObject {
 
     var isHidden: Bool { get set }
-    var callDelegate: Bandyer.CallWindowDelegate? { get set }
 
-    func setConfiguration(_ configuration: Bandyer.CallViewControllerConfiguration?)
-    func presentCallViewController(for intent: Bandyer.Intent, completion: ((Error?) -> Void)?)
+    func makeKeyAndVisible()
+    func set(rootViewController controller: UIViewController?, animated: Bool, completion: ((Bool) -> Void)?)
 }
 
-@available(iOS 12.0, *)
 extension CallWindow: CallWindowProtocol {}

package/native-bridge/iOS/Source/Abstractions/KaleyraVideoSDKProtocol.swift

@@ -0,0 +1,20 @@
+// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
+// See LICENSE for licensing information
+
+import Foundation
+import KaleyraVideoSDK
+
+protocol KaleyraVideoSDKProtocol: AnyObject {
+
+    var config: KaleyraVideoSDK.Config? { get }
+    var userDetailsProvider: KaleyraVideoSDK.UserDetailsProvider? { get set }
+    var conversation: KaleyraVideoSDK.Conversation? { get }
+    var conference: KaleyraVideoSDK.Conference? { get }
+
+    func configure(_ config: KaleyraVideoSDK.Config) throws
+    func connect(userId: String, provider: AccessTokenProvider) throws
+    func disconnect()
+    func reset()
+}
+
+extension KaleyraVideo: KaleyraVideoSDKProtocol {}

package/native-bridge/iOS/Source/AccessToken/AccessTokenRequester.swift

@@ -3,7 +3,6 @@
 
 import Foundation
 
-@available(iOS 12.0, *)
 protocol AccessTokenRequester {
     func requestAccessToken(request: AccessTokenRequest) throws
 }

package/native-bridge/iOS/Source/AccessToken/TokenProvider.swift

@@ -2,9 +2,8 @@
 // See LICENSE for licensing information
 
 import Foundation
-import Bandyer
+import KaleyraVideoSDK
 
-@available(iOS 12.0, *)
 class TokenProvider: AccessTokenProvider {
 
     // MARK: - Nested Types

package/native-bridge/iOS/Source/Broadcast/BroadcastConfigurationPlistReader.swift

@@ -3,7 +3,6 @@
 
 import Foundation
 
-@available(iOS 12.0, *)
 struct BroadcastConfigurationPlistReader {
 
     struct BroadcastConfig {

package/native-bridge/iOS/Source/Concurrency/DispatchQueue+isMain.swift

@@ -4,7 +4,6 @@
 import Foundation
 import Dispatch
 
-@available(iOS 12.0, *)
 public extension DispatchQueue {
 
     private static var mainSpecificKey: DispatchSpecificKey<Void> = {

package/native-bridge/iOS/Source/Concurrency/MainQueueDispatcher.swift

@@ -3,7 +3,6 @@
 
 import Foundation
 
-@available(iOS 12.0, *)
 public enum MainQueueDispatcher {
 
     public static func perform(_ work: @escaping () -> Void) {

package/native-bridge/iOS/Source/Concurrency/MainQueueRelay.swift

@@ -3,7 +3,6 @@
 
 import Foundation
 
-@available(iOS 12.0, *)
 final class MainQueueRelay<Decoratee> {
 
     let decoratee: Decoratee

package/native-bridge/iOS/Source/DTOs/AudioCallOptions+Equatable.swift

@@ -3,7 +3,6 @@
 
 import Foundation
 
-@available(iOS 12.0, *)
 extension AudioCallOptions: Equatable {
 
     static func == (lhs: AudioCallOptions, rhs: AudioCallOptions) -> Bool {

package/native-bridge/iOS/Source/DTOs/AudioCallOptions+KaleyraVideoSDK.swift

@@ -0,0 +1,13 @@
+// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
+// See LICENSE for licensing information
+
+import Foundation
+import KaleyraVideoSDK
+
+extension AudioCallOptions {
+
+    var callOptions: KaleyraVideoSDK.CallOptions {
+        .init(type: type.callType,
+              recording: recordingType?.callRecordingType)
+    }
+}

package/native-bridge/iOS/Source/DTOs/{AudioCallType+Bandyer.swift → AudioCallType+KaleyraVideoSDK.swift}

@@ -2,12 +2,11 @@
 // See LICENSE for licensing information
 
 import Foundation
-import Bandyer
+import KaleyraVideoSDK
 
-@available(iOS 12.0, *)
 extension AudioCallType {
 
-    var callType: Bandyer.CallType {
+    var callType: KaleyraVideoSDK.CallOptions.CallType {
         switch self {
             case .audio:
                 return .audioOnly

package/native-bridge/iOS/Source/DTOs/CallOptions+Equatable.swift

@@ -3,7 +3,6 @@
 
 import Foundation
 
-@available(iOS 12.0, *)
 extension CallOptions: Equatable {
 
     static func == (lhs: CallOptions, rhs: CallOptions) -> Bool {

package/native-bridge/iOS/Source/DTOs/CallOptions+KaleyraVideoSDK.swift

@@ -0,0 +1,12 @@
+// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
+// See LICENSE for licensing information
+
+import Foundation
+import KaleyraVideoSDK
+
+extension CallOptions {
+
+    var callOptions: KaleyraVideoSDK.CallOptions {
+        .init(type: .audioVideo, recording: recordingType?.callRecordingType)
+    }
+}

package/native-bridge/iOS/Source/DTOs/{CallType+Bandyer.swift → CallType+KaleyraVideoSDK.swift}

@@ -2,12 +2,11 @@
 // See LICENSE for licensing information
 
 import Foundation
-import Bandyer
+import KaleyraVideoSDK
 
-@available(iOS 12.0, *)
 extension CallType {
 
-    var bandyerType: Bandyer.CallType {
+    var bandyerType: KaleyraVideoSDK.CallOptions.CallType {
         switch self {
             case .audio:
                 return .audioOnly

package/native-bridge/iOS/Source/DTOs/CreateCallOptions+KaleyraVideoSDK.swift

@@ -0,0 +1,12 @@
+// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
+// See LICENSE for licensing information
+
+import Foundation
+import KaleyraVideoSDK
+
+extension CreateCallOptions {
+
+    func makeCallOptions() -> KaleyraVideoSDK.CallOptions {
+        .init(type: callType.bandyerType, recording: recordingType?.callRecordingType)
+    }
+}

package/native-bridge/iOS/Source/DTOs/DTOs.swift

@@ -21,7 +21,6 @@
 //   let kaleyraVideoConfiguration = try KaleyraVideoConfiguration(json)
 //   let session = try Session(json)
 //   let userDetails = try UserDetails(json)
-//   let userDetailsFormat = try UserDetailsFormat(json)
 
 import Foundation
 
@@ -284,31 +283,10 @@ struct Session {
 /// This is used to define the user details in the call/chat UI
 // MARK: - UserDetails
 struct UserDetails {
-    /// Email of the user
-    let email: String?
-    /// First name of the user
-    let firstName: String?
-    /// Last name of the user
-    let lastName: String?
-    /// Nickname for the user
-    let nickName: String?
     /// Image url to use as placeholder for the user.
-    let profileImageURL: String?
+    let imageURL: String?
+    /// The user's display name.
+    let name: String?
     /// User identifier
     let userID: String
 }
-
-/// This is used to display the user details in the call/chat UI
-// MARK: - UserDetailsFormat
-struct UserDetailsFormat {
-    /// Format to be used when displaying an android notification
-    /// <br/>
-    /// <br/>
-    /// <b><font color="blue">default</font>: equals to UserDetailsFormatter.default</b>
-    let androidNotification: String?
-    /// Format to be used to display a user details on the call/chat UI
-    /// <br/>
-    /// <br/>
-    /// <b><font color="blue">default</font>: ${userAlias}</b>
-    let userDetailsFormatDefault: String
-}

package/native-bridge/iOS/Source/DTOs/{Environment+Bandyer.swift → Environment+KaleyraVideoSDK.swift}

@@ -2,12 +2,11 @@
 // See LICENSE for licensing information
 
 import Foundation
-import Bandyer
+import KaleyraVideoSDK
 
-@available(iOS 12.0, *)
 extension Environment {
 
-    var bandyerEnvironment: Bandyer.Environment? {
+    var kaleyraEnvironment: KaleyraVideoSDK.Environment? {
         switch name.lowercased() {
             case "production":
                 return .production

package/native-bridge/iOS/Source/DTOs/KaleyraVideoConfiguration+KaleyraVideoSDK.swift

@@ -0,0 +1,113 @@
+// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
+// See LICENSE for licensing information
+
+import Foundation
+import UIKit
+import KaleyraVideoSDK
+import PushKit
+
+extension KaleyraVideoConfiguration {
+
+    private enum ConfigurationError: Error {
+        case unsupportedEnvironment
+        case unsupportedRegion
+    }
+
+    var isCallkitEnabled: Bool {
+        iosConfig?.callkit?.enabled ?? true
+    }
+
+    var voipStrategy: VoipHandlingStrategy {
+        iosConfig?.voipHandlingStrategy ?? .automatic
+    }
+
+    func makeKaleyraVideoSDKConfig() throws -> KaleyraVideoSDK.Config {
+        guard let kaleyraEnv = environment.kaleyraEnvironment else {
+            throw ConfigurationError.unsupportedEnvironment
+        }
+
+        guard let kaleyraRegion = region.kaleyraRegion else {
+            throw ConfigurationError.unsupportedRegion
+        }
+
+        var config = KaleyraVideoSDK.Config(appID: appID, region: kaleyraRegion, environment: kaleyraEnv)
+        config.callKit = iosConfig?.makeCallKitConfiguration() ?? .enabled(.default)
+        config.voip = iosConfig?.makeVoIPConfiguration() ?? .manual
+        return config
+    }
+
+    func makeToolsConfig() -> KaleyraVideoSDK.ConferenceSettings.Tools {
+        var config = KaleyraVideoSDK.ConferenceSettings.Tools.default
+        config.chat = tools?.makeChatConfiguration() ?? .disabled
+        config.broadcastScreenSharing = tools?.makeBroadcastScreenSharingConfiguration() ?? .disabled
+        config.inAppScreenSharing = tools?.makeInAppScreenSharingConfiguration() ?? .disabled
+        config.fileshare = tools?.makeFileShareConfiguration() ?? .disabled
+        config.whiteboard = tools?.makeWhiteboardConfiguration() ?? .disabled
+        return config
+    }
+}
+
+private extension IosConfiguration {
+
+    func makeCallKitConfiguration() -> KaleyraVideoSDK.Config.CallKitIntegration {
+
+        guard let callkitConfig = callkit else {
+            return .enabled(.default)
+        }
+
+        if callkitConfig.enabled ?? true {
+            let image: UIImage? = if let iconName = callkitConfig.appIconName {
+                UIImage(named: iconName)
+            } else {
+                nil
+            }
+            return .enabled(.init(icon: image, ringtoneSound: callkitConfig.ringtoneSoundName))
+        } else {
+            return .disabled
+        }
+    }
+
+    func makeVoIPConfiguration() -> KaleyraVideoSDK.Config.VoIP {
+        if voipHandlingStrategy == nil || voipHandlingStrategy == .automatic {
+            return .automatic(listenForNotificationsInForeground: false)
+        } else {
+            return .manual
+        }
+    }
+}
+
+private extension Tools {
+
+    func makeChatConfiguration() -> KaleyraVideoSDK.ConferenceSettings.Tools.Chat {
+        guard chat != nil else { return .disabled }
+        return .enabled
+    }
+
+    func makeBroadcastScreenSharingConfiguration() -> KaleyraVideoSDK.ConferenceSettings.Tools.BroadcastScreenSharing {
+        guard let screenShare, 
+                screenShare.wholeDevice ?? false,
+                let configURL = Bundle.main.url(forResource: "KaleyraVideoConfig", withExtension: "plist") else { return .disabled }
+
+        let reader = BroadcastConfigurationPlistReader()
+        guard let broadcastConfig = try? reader.read(fileURL: configURL),
+                let appGroupIdentifier = try? AppGroupIdentifier(broadcastConfig.appGroupID) else { return .disabled }
+
+        return .enabled(appGroupIdentifier: appGroupIdentifier, extensionBundleIdentifier: broadcastConfig.extensionBundleID)
+
+    }
+
+    func makeInAppScreenSharingConfiguration() -> KaleyraVideoSDK.ConferenceSettings.Tools.InAppScreenSharing {
+        guard let screenShare, screenShare.inApp ?? false else { return .disabled }
+        return .enabled
+    }
+
+    func makeFileShareConfiguration() -> KaleyraVideoSDK.ConferenceSettings.Tools.Fileshare {
+        guard fileShare ?? false else { return .disabled }
+        return .enabled
+    }
+
+    func makeWhiteboardConfiguration() -> KaleyraVideoSDK.ConferenceSettings.Tools.Whiteboard {
+        guard whiteboard ?? false else { return .disabled }
+        return .enabled
+    }
+}

package/native-bridge/iOS/Source/DTOs/KaleyraVideoConfiguration+UserInterfacePresenterConfiguration.swift

@@ -3,7 +3,6 @@
 
 import Foundation
 
-@available(iOS 12.0, *)
 extension KaleyraVideoConfiguration {
 
     func uiPresenterConfiguration() -> UserInterfacePresenterConfiguration {

package/native-bridge/iOS/Source/DTOs/RecordingType+KaleyraVideoSDK.swift

@@ -0,0 +1,19 @@
+// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
+// See LICENSE for licensing information
+
+import Foundation
+import KaleyraVideoSDK
+
+extension RecordingType {
+
+    var callRecordingType: KaleyraVideoSDK.CallOptions.RecordingType? {
+        switch self {
+            case .automatic:
+                return .automatic
+            case .manual:
+                return .manual
+            case .none:
+                return nil
+        }
+    }
+}

package/native-bridge/iOS/Source/DTOs/{Region+Bandyer.swift → Region+KaleyraVideoSDK.swift}

@@ -2,12 +2,11 @@
 // See LICENSE for licensing information
 
 import Foundation
-import Bandyer
+import KaleyraVideoSDK
 
-@available(iOS 12.0, *)
 extension Region {
 
-    var bandyerRegion: Bandyer.Region? {
+    var kaleyraRegion: KaleyraVideoSDK.Region? {
         switch name.lowercased() {
             case "europe", "eu":
                 return .europe

package/native-bridge/iOS/Source/DTOs/UserDetails+Decodable.swift

@@ -7,21 +7,15 @@ extension UserDetails: Decodable {
 
     private enum CodingKeys: String, CodingKey {
         case userID
-        case firstName
-        case lastName
-        case email
-        case nickName
-        case profileImageURL
+        case name
+        case imageUrl
     }
 
     init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.userID = try container.decode(String.self, forKey: .userID)
-        self.firstName = try container.decodeIfPresent(String.self, forKey: .firstName)
-        self.lastName = try container.decodeIfPresent(String.self, forKey: .lastName)
-        self.email = try container.decodeIfPresent(String.self, forKey: .email)
-        self.nickName = try container.decodeIfPresent(String.self, forKey: .nickName)
-        self.profileImageURL = try container.decodeIfPresent(String.self, forKey: .profileImageURL)
+        self.name = try container.decodeIfPresent(String.self, forKey: .name)
+        self.imageURL = try container.decodeIfPresent(String.self, forKey: .imageUrl)
     }
 }
 

package/native-bridge/iOS/Source/DTOs/UserDetails+KaleyraVideoSDK.swift

@@ -0,0 +1,15 @@
+// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
+// See LICENSE for licensing information
+
+import Foundation
+import KaleyraVideoSDK
+
+extension UserDetails {
+
+    var bandyerDetails: KaleyraVideoSDK.UserDetails {
+        .init(userId: userID, 
+              name: name,
+              image: URL(string: imageURL ?? ""),
+              handle: .init(type: .generic, value: name ?? userID))
+    }
+}

package/native-bridge/iOS/Source/Events/Reporters/CallClientEventsReporter.swift

@@ -2,45 +2,70 @@
 // See LICENSE for licensing information
 
 import Foundation
-import Bandyer
+import Combine
+import KaleyraVideoSDK
 
-@available(iOS 12.0, *)
-class CallClientEventsReporter: NSObject, CallClientObserver {
+class CallClientEventsReporter: NSObject {
 
-    private let client: CallClient
+    private(set) var lastVoIPToken: String?
+    private let conference: Conference
     private let emitter: EventEmitter
-    private(set) var isRunning = false
+    private var cancellables = Set<AnyCancellable>()
 
-    init(client: CallClient, emitter: EventEmitter) {
-        self.client = client
+    var isRunning: Bool {
+        !cancellables.isEmpty
+    }
+
+    init(conference: Conference, emitter: EventEmitter) {
+        self.conference = conference
         self.emitter = emitter
         super.init()
     }
 
-    func start() {
+    func start<S: Scheduler>(scheduler: S = DispatchQueue.main) {
         guard !isRunning else { return }
 
-        isRunning = true
-        client.add(observer: self, queue: .main)
+        conference.statePublisher.dropFirst().receive(on: scheduler).sink { [weak self] _ in
+            self?.notifyNewClientState()
+        }.store(in: &cancellables)
+
+        conference.voipCredentialsPublisher.receive(on: scheduler).sink { [weak self] credentials in
+            self?.notifyNewCredentials(credentials)
+        }.store(in: &cancellables)
     }
 
     func stop() {
         guard isRunning else { return }
 
-        client.remove(observer: self)
-        isRunning = false
+        cancellables.removeAll()
     }
 
     // MARK: - Call client observer
 
-    func callClientDidChangeState(_ client: CallClient, oldState: CallClientState, newState: CallClientState) {
-        guard let clientState = ClientState(clientState: newState) else { return }
+    private func notifyNewClientState() {
+        notifyErrorIfNeeded()
 
+        guard let clientState = ClientState(state: conference.state) else { return }
         emitter.sendEvent(Events.callModuleStatusChanged, args: clientState.rawValue)
     }
 
-    func callClient(_ client: CallClient, didFailWithError error: Error) {
+    private func notifyErrorIfNeeded() {
+        guard case KaleyraVideoSDK.ClientState.disconnected(error: let error) = conference.state, let error else { return }
         emitter.sendEvent(Events.callError, args: error.localizedDescription)
-        emitter.sendEvent(Events.callModuleStatusChanged, args: ClientState.failed.rawValue)
+    }
+
+    // MARK: - VoIP Credentials
+
+    private func notifyNewCredentials(_ credentials: VoIPCredentials?) {
+        guard let credentials else {
+            guard lastVoIPToken != nil else { return }
+
+            emitter.sendEvent(.iOSVoipPushTokenInvalidated, args: nil)
+            lastVoIPToken = nil
+            return
+        }
+
+        emitter.sendEvent(.iOSVoipPushTokenUpdated, args: credentials.tokenAsString)
+        lastVoIPToken = credentials.tokenAsString
     }
 }

package/native-bridge/iOS/Source/Events/Reporters/ChatClientEventsReporter.swift

@@ -2,45 +2,50 @@
 // See LICENSE for licensing information
 
 import Foundation
-import Bandyer
+import Combine
+import KaleyraVideoSDK
 
-@available(iOS 12.0, *)
-class ChatClientEventsReporter: NSObject, ChatClientObserver {
+class ChatClientEventsReporter: NSObject {
 
-    private let client: ChatClient
+    private let conversation: Conversation
     private let emitter: EventEmitter
-    private(set) var isRunning = false
+    private var stateCancellable: AnyCancellable?
 
-    init(client: ChatClient, emitter: EventEmitter) {
-        self.client = client
+    var isRunning: Bool {
+        stateCancellable != nil
+    }
+
+    init(conversation: Conversation, emitter: EventEmitter) {
+        self.conversation = conversation
         self.emitter = emitter
         super.init()
     }
 
-    func start() {
+    func start<S: Scheduler>(scheduler: S = DispatchQueue.main) {
         guard !isRunning else { return }
 
-        isRunning = true
-        client.add(observer: self, queue: .main)
+        stateCancellable = conversation.statePublisher.dropFirst().receive(on: scheduler).sink { [weak self] _ in
+            self?.notifyNewClientState()
+        }
     }
 
     func stop() {
         guard isRunning else { return }
 
-        client.remove(observer: self)
-        isRunning = false
+        stateCancellable = nil
     }
 
-    // MARK: - Chat client observer
+    // MARK: - Events Notification
 
-    func chatClientDidChangeState(_ client: ChatClient, oldState: ChatClientState, newState: ChatClientState) {
-        guard let clientState = ClientState(clientState: newState) else { return }
+    private func notifyNewClientState() {
+        notifyErrorIfNeeded()
 
+        guard let clientState = ClientState(state: conversation.state) else { return }
         emitter.sendEvent(Events.chatModuleStatusChanged, args: clientState.rawValue)
     }
 
-    func chatClient(_ client: ChatClient, didFailWithError error: Error) {
+    private func notifyErrorIfNeeded() {
+        guard case KaleyraVideoSDK.ClientState.disconnected(error: let error) = conversation.state, let error else { return }
         emitter.sendEvent(Events.chatError, args: error.localizedDescription)
-        emitter.sendEvent(Events.chatModuleStatusChanged, args: ClientState.failed.rawValue)
     }
 }