@fishjam-cloud/react-native-client 0.4.1 → 0.6.0

package/build/utils/errorListener.js

@@ -1,12 +1,11 @@
-import { ReceivableEvents } from '../hooks/useFishjamEvent';
-import { nativeModuleEventEmitter } from '../RNFishjamClientModule';
+import nativeModule, { ReceivableEvents } from '../RNFishjamClientModule';
 export const initializeWarningListener = () => {
     if (!__DEV__) {
         return;
     }
     try {
-        nativeModuleEventEmitter.addListener(ReceivableEvents.Warning, ({ message }) => {
-            console.warn(message);
+        nativeModule.addListener(ReceivableEvents.Warning, (event) => {
+            console.warn(event[ReceivableEvents.Warning]);
         });
     }
     catch (error) {

package/build/utils/errorListener.js.map

@@ -1 +1 @@
-{"version":3,"file":"errorListener.js","sourceRoot":"","sources":["../../src/utils/errorListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,EAAE;IAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IACD,IAAI,CAAC;QACH,wBAAwB,CAAC,WAAW,CAClC,gBAAgB,CAAC,OAAO,EACxB,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE;YACnC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC,CACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,qCAAqC,KAAK,EAAE,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7E,CAAC;AACH,CAAC,CAAC","sourcesContent":["import { ReceivableEvents } from '../hooks/useFishjamEvent';\nimport { nativeModuleEventEmitter } from '../RNFishjamClientModule';\n\nexport const initializeWarningListener = () => {\n  if (!__DEV__) {\n    return;\n  }\n  try {\n    nativeModuleEventEmitter.addListener(\n      ReceivableEvents.Warning,\n      ({ message }: { message: string }) => {\n        console.warn(message);\n      },\n    );\n  } catch (error) {\n    console.error(`Failed to start warning listener: ${error?.message ?? ''}`);\n  }\n};\n"]}
+{"version":3,"file":"errorListener.js","sourceRoot":"","sources":["../../src/utils/errorListener.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,EAAE,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE1E,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,EAAE;IAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IACD,IAAI,CAAC;QACH,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC3D,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,qCAAqC,KAAK,EAAE,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7E,CAAC;AACH,CAAC,CAAC","sourcesContent":["import nativeModule, { ReceivableEvents } from '../RNFishjamClientModule';\n\nexport const initializeWarningListener = () => {\n  if (!__DEV__) {\n    return;\n  }\n  try {\n    nativeModule.addListener(ReceivableEvents.Warning, (event) => {\n      console.warn(event[ReceivableEvents.Warning]);\n    });\n  } catch (error) {\n    console.error(`Failed to start warning listener: ${error?.message ?? ''}`);\n  }\n};\n"]}

package/ios/Events.swift

@@ -1,3 +1,6 @@
+import AVKit
+import FishjamCloudClient
+
 enum PeerStatus: String {
     case connecting
     case connected
@@ -5,27 +8,99 @@ enum PeerStatus: String {
     case idle
 }
 
-enum EmitableEvents: String, CaseIterable {
-    case IsCameraOn
-    case IsMicrophoneOn
-    case IsScreenShareOn
-    case IsAppScreenShareOn
-    case SimulcastConfigUpdate
-    case PeersUpdate
-    case AudioDeviceUpdate
-    case SendMediaEvent
-    case BandwidthEstimation
-    case ReconnectionRetriesLimitReached
-    case ReconnectionStarted
-    case Reconnected
-    case Warning
-    case PeerStatusChanged
-
-    var name: String {
-        rawValue
+class EmitableEvent {
+    enum EventName: String, CaseIterable {
+        case IsMicrophoneOn
+        case IsScreenShareOn
+        case IsAppScreenShareOn
+        case SimulcastConfigUpdate
+        case PeersUpdate
+        case AudioDeviceUpdate
+        case BandwidthEstimation
+        case Warning
+        case PeerStatusChanged
+        case ReconnectionStatusChanged
+        case CurrentCameraChanged
+
+        var name: String {
+            rawValue
+        }
+    }
+
+    let event: EventName
+    let eventContent: Any?
+
+    var data: [String: Any?] {
+        [event.name: eventContent]
+    }
+
+    private init(event: EventName, eventContent: Any? = nil) {
+        self.event = event
+        self.eventContent = eventContent
+    }
+
+    static func isMicrophoneOn(enabled: Bool) -> EmitableEvent { .init(event: .IsMicrophoneOn, eventContent: enabled) }
+    static func isScreenShareOn(enabled: Bool) -> EmitableEvent {
+        .init(event: .IsScreenShareOn, eventContent: enabled)
+    }
+    static func isAppScreenShareOn(enabled: Bool) -> EmitableEvent {
+        .init(event: .IsAppScreenShareOn, eventContent: enabled)
+    }
+    static func bandwidthEstimation(estimation: Int) -> EmitableEvent {
+        .init(event: .BandwidthEstimation, eventContent: estimation)
+    }
+    static func warning(message: String) -> EmitableEvent { .init(event: .Warning, eventContent: message) }
+    static func peerStatusChanged(peerStatus: PeerStatus) -> EmitableEvent {
+        .init(event: .PeerStatusChanged, eventContent: peerStatus.rawValue)
+    }
+    static func reconnectionStatusChanged(reconnectionStatus: ReconnectionStatus) -> EmitableEvent {
+        .init(event: .ReconnectionStatusChanged, eventContent: reconnectionStatus.rawValue)
+    }
+
+    static func currentCameraChanged(localCamera: LocalCamera?, isCameraOn: Bool) -> EmitableEvent {
+        return .init(
+            event: .CurrentCameraChanged,
+            eventContent: [
+                "currentCamera": localCamera as Any,
+                "isCameraOn": isCameraOn,
+            ])
+    }
+
+    static func simulcastConfigUpdate(simulcastConfig: SimulcastConfig) -> EmitableEvent {
+        return .init(
+            event: .SimulcastConfigUpdate,
+            eventContent: [
+                "enabled": simulcastConfig.enabled,
+                "activeEncodings": simulcastConfig.activeEncodings.map { e in e.description },
+            ])
+    }
+
+    static func peersUpdate(peersData: [[String: Any?]]) -> EmitableEvent {
+        return .init(event: .PeersUpdate, eventContent: peersData)
+    }
+
+    static func audioDeviceUpdate(currentRoute: AVAudioSessionRouteDescription) -> EmitableEvent {
+        let output = currentRoute.outputs[0]
+        let deviceType = output.portType
+
+        let deviceTypeString =
+            switch deviceType {
+            case .bluetoothA2DP, .bluetoothLE, .bluetoothHFP: "bluetooth"
+            case .builtInSpeaker: "speaker"
+            case .builtInReceiver: "earpiece"
+            case .headphones: "headphones"
+            default: deviceType.rawValue
+            }
+
+        return .init(
+            event: .AudioDeviceUpdate,
+            eventContent: [
+                "selectedDevice": ["name": output.portName, "type": deviceTypeString],
+                "availableDevices": [],
+            ])
     }
 
     static var allEvents: [String] {
-        EmitableEvents.allCases.map(\.name)
+        EventName.allCases.map(\.name)
     }
 }

package/ios/RNFishjamClient.podspec

@@ -25,6 +25,6 @@ Pod::Spec.new do |s|
 
   s.source_files = '**/*.{h,m,swift}'
 
-  s.dependency 'FishjamCloudClient', '0.4.1'
+  s.dependency 'FishjamCloudClient', '0.6.0'
 
 end

package/ios/RNFishjamClient.swift

@@ -19,29 +19,35 @@ class RNFishjamClient: FishjamClientListener {
     var connectPromise: Promise? = nil
 
     var videoSimulcastConfig: SimulcastConfig = SimulcastConfig()
-    var localUserMetadata: Metadata = .init()
 
     var screenShareSimulcastConfig: SimulcastConfig = SimulcastConfig()
     var screenShareMaxBandwidth: TrackBandwidthLimit = .BandwidthLimit(0)
 
     var cameraId: String? = nil
 
-    var audioSessionMode: AVAudioSession.Mode = AVAudioSession.Mode.videoChat
+    var audioSessionMode: AVAudioSession.Mode = .videoChat
     var errorMessage: String?
 
+    var currentCamera: LocalCamera? { getLocalCameraTrack()?.currentCaptureDevice?.toLocalCamera() }
+
     private(set) var peerStatus: PeerStatus = .idle {
         didSet {
-            let event = EmitableEvents.PeerStatusChanged
-            emit(event: event, data: [event.name: peerStatus.rawValue])
+            emit(event: .peerStatusChanged(peerStatus: peerStatus))
+        }
+    }
+
+    private(set) var reconnectionStatus: ReconnectionStatus = .idle {
+        didSet {
+            emit(event: .reconnectionStatusChanged(reconnectionStatus: reconnectionStatus))
         }
     }
 
-    let sendEvent: (_ eventName: String, _ data: [String: Any]) -> Void
+    let sendEvent: (_ eventName: String, _ data: [String: Any?]) -> Void
 
     static var tracksUpdateListenersManager = TracksUpdateListenersManager()
     static var localCameraTracksChangedListenersManager = LocalCameraTracksChangedListenersManager()
 
-    init(sendEvent: @escaping (_ eventName: String, _ data: [String: Any]) -> Void) {
+    init(sendEvent: @escaping (_ eventName: String, _ data: [String: Any?]) -> Void) {
         self.sendEvent = sendEvent
         NotificationCenter.default.addObserver(
             self,
@@ -206,7 +212,6 @@ class RNFishjamClient: FishjamClientListener {
     ) {
         peerStatus = .connecting
         connectPromise = promise
-        localUserMetadata = ["server": [:], "peer": peerMetadata].toMetadata()
 
         let reconnectConfig = FishjamCloudClient.ReconnectConfig(
             maxAttempts: config.reconnectConfig.maxAttempts, initialDelayMs: config.reconnectConfig.initialDelayMs,
@@ -214,7 +219,7 @@ class RNFishjamClient: FishjamClientListener {
 
         RNFishjamClient.fishjamClient?.connect(
             config: FishjamCloudClient.ConnectConfig(
-                websocketUrl: url, token: peerToken, peerMetadata: localUserMetadata,
+                websocketUrl: url, token: peerToken, peerMetadata: peerMetadata.toMetadata(),
                 reconnectConfig: reconnectConfig
             ))
 
@@ -239,23 +244,36 @@ class RNFishjamClient: FishjamClientListener {
         }
     }
 
-    func startCamera(config: CameraConfig) async throws {
-        try ensureCreated()
+    func startCamera(config: CameraConfig) async throws -> Bool {
+        #if targetEnvironment(simulator)
+            emit(
+                event: .warning(
+                    message: "Camera is not supported on simulator."))
+            return false
+        #else
+            try ensureCreated()
 
-        guard !isCameraInitialized else {
-            emit(warning: "Camera already started. You may only call startCamera once before leaveRoom is called.")
-            return
-        }
+            guard !isCameraInitialized else {
+                emit(
+                    event: .warning(
+                        message:
+                            "Camera already started. You may only call startCamera once before leaveRoom is called."))
 
-        guard await PermissionUtils.requestCameraPermission() else {
-            emit(warning: "Camera permission not granted.")
-            return
-        }
+                return true
+            }
 
-        let cameraTrack = try createCameraTrack(config: config)
-        setCameraTrackState(cameraTrack, enabled: config.cameraEnabled)
-        emitEndpoints()
-        isCameraInitialized = true
+            guard await PermissionUtils.requestCameraPermission() else {
+                emit(event: .warning(message: "Camera permission not granted."))
+                return false
+            }
+
+            let cameraTrack = try createCameraTrack(config: config)
+            cameraTrack.captureDeviceChangedListener = self
+            setCameraTrackState(cameraTrack, enabled: config.cameraEnabled)
+            emitEndpoints()
+            isCameraInitialized = true
+            return true
+        #endif
     }
 
     private func createCameraTrack(config: CameraConfig) throws -> LocalCameraTrack {
@@ -272,9 +290,9 @@ class RNFishjamClient: FishjamClientListener {
     private func setCameraTrackState(_ cameraTrack: LocalCameraTrack, enabled: Bool) {
         cameraTrack.enabled = enabled
         isCameraOn = enabled
-        let event = EmitableEvents.IsCameraOn
-        let isCameraEnabledMap = [event.name: enabled]
-        emit(event: event, data: isCameraEnabledMap)
+        emit(
+            event: .currentCameraChanged(
+                localCamera: cameraTrack.currentCaptureDevice?.toLocalCamera(), isCameraOn: enabled))
         RNFishjamClient.localCameraTracksChangedListenersManager.notifyListeners()
     }
 
@@ -301,12 +319,19 @@ class RNFishjamClient: FishjamClientListener {
         } else {
             try await startMicrophone()
         }
+
+        try updateLocalAudioTrackMetadata(metadata: [
+            "active": isMicrophoneOn,
+            "paused": !isMicrophoneOn,  //TODO: FCE-711
+            "type": "microphone",
+        ])
+
         return isMicrophoneOn
     }
 
     func startMicrophone() async throws {
         guard await PermissionUtils.requestMicrophonePermission() else {
-            emit(warning: "Microphone permission not granted.")
+            emit(event: .warning(message: "Microphone permission not granted."))
             return
         }
         let microphoneTrack = RNFishjamClient.fishjamClient!.createAudioTrack(metadata: Metadata())
@@ -318,9 +343,7 @@ class RNFishjamClient: FishjamClientListener {
     private func setMicrophoneTrackState(_ microphoneTrack: LocalAudioTrack, enabled: Bool) {
         microphoneTrack.enabled = enabled
         isMicrophoneOn = enabled
-        let event = EmitableEvents.IsMicrophoneOn
-        let isMicrophoneOnMap = [event.name: enabled]
-        emit(event: event, data: isMicrophoneOnMap)
+        emit(event: .isMicrophoneOn(enabled: enabled))
     }
 
     func setAudioSessionMode() {
@@ -345,7 +368,7 @@ class RNFishjamClient: FishjamClientListener {
         try ensureCreated()
         try ensureConnected()
         guard isAppScreenShareOn == false else {
-            emit(warning: "Screensharing screen not available during screensharing app.")
+            emit(event: .warning(message: "Screensharing screen not available during screensharing app."))
             return
         }
         guard let screenShareExtensionBundleId = Bundle.main.infoDictionary?["ScreenShareExtensionBundleId"] as? String
@@ -383,7 +406,7 @@ class RNFishjamClient: FishjamClientListener {
             metadata: screenShareMetadata,
             canStart: {
                 if self.isAppScreenShareOn {
-                    self.emit(warning: "Screensharing screen not available during screensharing app.")
+                    self.emit(event: .warning(message: "Screensharing screen not available during screensharing app."))
                 }
                 return !self.isAppScreenShareOn
             },
@@ -418,9 +441,7 @@ class RNFishjamClient: FishjamClientListener {
 
     private func setScreenShareTrackState(enabled: Bool) throws {
         isScreenShareOn = enabled
-        let event = EmitableEvents.IsScreenShareOn
-        let isScreenShareEnabled = [event.name: enabled]
-        emit(event: event, data: isScreenShareEnabled)
+        emit(event: .isScreenShareOn(enabled: enabled))
     }
 
     func startScreenAppShare(screenShareOptions: ScreenShareOptions) throws {
@@ -449,7 +470,7 @@ class RNFishjamClient: FishjamClientListener {
 
     func toggleAppScreenShare(screenShareOptions: ScreenShareOptions) throws {
         guard isScreenShareOn == false else {
-            emit(warning: "App screensharing not available during screensharing.")
+            emit(event: .warning(message: "App screensharing not available during screensharing."))
             return
         }
         if getLocalScreenAppTrack() != nil {
@@ -462,9 +483,7 @@ class RNFishjamClient: FishjamClientListener {
     private func setScreenAppTrackState(_ track: LocalAppScreenShareTrack, enabled: Bool) {
         track.enabled = enabled
         isAppScreenShareOn = enabled
-        let event = EmitableEvents.IsAppScreenShareOn
-        let eventMap = [event.name: enabled]
-        emit(event: event, data: eventMap)
+        emit(event: .isAppScreenShareOn(enabled: enabled))
     }
 
     //returns local endpoint and remote endpoints
@@ -474,13 +493,12 @@ class RNFishjamClient: FishjamClientListener {
         return [localEndpoint] + remoteEndpoints
     }
 
-    func getPeers() throws -> [[String: Any?]] {
+    func getPeers() -> [[String: Any?]] {
         let endpoints = RNFishjamClient.getLocalAndRemoteEndpoints()
         return endpoints.compactMap { endpoint in
             [
                 "id": endpoint.id,
                 "isLocal": endpoint.id == RNFishjamClient.fishjamClient!.getLocalEndpoint().id,
-                "type": endpoint.type,
                 "metadata": endpoint.metadata.toDict(),
                 "tracks": endpoint.tracks.values.compactMap { track -> [String: Any?]? in
                     switch track {
@@ -498,7 +516,7 @@ class RNFishjamClient: FishjamClientListener {
                             "id": track.id,
                             "type": "Audio",
                             "metadata": track.metadata.toDict(),
-                            "vadStatus": track.vadStatus.rawValue,
+                            "vadStatus": track.vadStatus == .speech ? "speech" : "silence",
                         ]
 
                     case let track as LocalCameraTrack:
@@ -539,19 +557,7 @@ class RNFishjamClient: FishjamClientListener {
 
     func getCaptureDevices() -> [[String: Any]] {
         let devices = LocalCameraTrack.getCaptureDevices()
-        return devices.map { device -> [String: Any] in
-            let facingDirection =
-                switch device.position {
-                case .front: "front"
-                case .back: "back"
-                default: "unspecified"
-                }
-            return [
-                "id": device.uniqueID,
-                "name": device.localizedName,
-                "facingDirection": facingDirection,
-            ]
-        }
+        return devices.map { $0.toLocalCamera() }
     }
 
     func updatePeerMetadata(metadata: [String: Any]) throws {
@@ -571,7 +577,7 @@ class RNFishjamClient: FishjamClientListener {
         }
     }
 
-    func updateLocalAudioTrackMetadata(metadata: [String: Any]) throws {
+    private func updateLocalAudioTrackMetadata(metadata: [String: Any]) throws {
         try ensureAudioTrack()
         if let track = getLocalAudioTrack() {
             updateTrackMetadata(trackId: track.id, metadata: metadata)
@@ -604,13 +610,14 @@ class RNFishjamClient: FishjamClientListener {
         return SimulcastConfig(enabled: true, activeEncodings: updatedEncodings)
     }
 
-    func toggleScreenShareTrackEncoding(encoding: String) throws -> [String: Any] {
+    func toggleScreenShareTrackEncoding(encoding: String) throws -> [String: Any?] {
         try ensureScreenBroadcastTrack()
         if let track = getLocalScreenBroadcastTrack() {
             screenShareSimulcastConfig = try toggleTrackEncoding(
                 encoding: encoding, trackId: track.id, simulcastConfig: screenShareSimulcastConfig)
         }
-        return getSimulcastConfigAsRNMap(screenShareSimulcastConfig)
+
+        return EmitableEvent.simulcastConfigUpdate(simulcastConfig: screenShareSimulcastConfig).data
     }
 
     func setScreenShareTrackBandwidth(bandwidth: Int) throws {
@@ -634,7 +641,7 @@ class RNFishjamClient: FishjamClientListener {
         RNFishjamClient.fishjamClient?.setTargetTrackEncoding(trackId: trackId, encoding: trackEncoding)
     }
 
-    func toggleVideoTrackEncoding(encoding: String) throws -> [String: Any] {
+    func toggleVideoTrackEncoding(encoding: String) throws -> [String: Any?] {
         try ensureCameraTrack()
         try ensureConnected()
 
@@ -642,11 +649,10 @@ class RNFishjamClient: FishjamClientListener {
         videoSimulcastConfig = try toggleTrackEncoding(
             encoding: encoding, trackId: track.id, simulcastConfig: videoSimulcastConfig)
 
-        let event = EmitableEvents.SimulcastConfigUpdate
-        let simulcastConfigAsRNMap = getSimulcastConfigAsRNMap(videoSimulcastConfig)
-        emit(event: event, data: simulcastConfigAsRNMap)
+        let event = EmitableEvent.simulcastConfigUpdate(simulcastConfig: videoSimulcastConfig)
+        emit(event: event)
 
-        return simulcastConfigAsRNMap
+        return event.data
     }
 
     func setVideoTrackEncodingBandwidth(encoding: String, bandwidth: Int) throws {
@@ -759,20 +765,14 @@ class RNFishjamClient: FishjamClientListener {
         )
     }
 
-    func emit(event: EmitableEvents, data: [String: Any] = [:]) {
+    func emit(event: EmitableEvent) {
         DispatchQueue.main.async { [weak self] in
-            self?.sendEvent(event.name, data)
+            self?.sendEvent(event.event.name, event.data)
         }
     }
 
-    func emit(warning: String) {
-        emit(event: .Warning, data: ["message": warning])
-    }
-
     func emitEndpoints() {
-        let event = EmitableEvents.PeersUpdate
-        let EndpointsUpdateMap = [event.name: (try? getPeers()) ?? []]
-        emit(event: event, data: EndpointsUpdateMap)
+        emit(event: .peersUpdate(peersData: getPeers()))
     }
 
     func onJoined(peerID: String, peersInRoom: [String: Endpoint]) {
@@ -840,7 +840,7 @@ class RNFishjamClient: FishjamClientListener {
                 "E_MEMBRANE_CONNECT", "Failed to connect: socket close, code: \(code), reason: \(reason)")
         }
         connectPromise = nil
-        peerStatus = .error
+        peerStatus = .idle
     }
 
     func onSocketError() {
@@ -848,6 +848,7 @@ class RNFishjamClient: FishjamClientListener {
             connectPromise.reject("E_MEMBRANE_CONNECT", "Failed to connect: socket error")
         }
         connectPromise = nil
+        peerStatus = .error
     }
 
     func onSocketOpen() {}
@@ -856,13 +857,6 @@ class RNFishjamClient: FishjamClientListener {
         peerStatus = .idle
     }
 
-    func getSimulcastConfigAsRNMap(_ simulcastConfig: SimulcastConfig) -> [String: Any] {
-        return [
-            "enabled": simulcastConfig.enabled,
-            "activeEncodings": simulcastConfig.activeEncodings.map { e in e.description },
-        ]
-    }
-
     func selectAudioSessionMode(sessionMode: String) throws {
         switch sessionMode {
         case "videoChat":
@@ -895,53 +889,29 @@ class RNFishjamClient: FishjamClientListener {
     }
 
     @objc func onRouteChangeNotification() {
-        let currentRoute = AVAudioSession.sharedInstance().currentRoute
-        let output = currentRoute.outputs[0]
-        let deviceType = output.portType
-        var deviceTypeString: String = ""
-
-        switch deviceType {
-        case .bluetoothA2DP, .bluetoothLE, .bluetoothHFP:
-            deviceTypeString = "bluetooth"
-            break
-        case .builtInSpeaker:
-            deviceTypeString = "speaker"
-            break
-        case .builtInReceiver:
-            deviceTypeString = "earpiece"
-            break
-        case .headphones:
-            deviceTypeString = "headphones"
-            break
-        default:
-            deviceTypeString = deviceType.rawValue
-        }
-        let event = EmitableEvents.AudioDeviceUpdate
-        emit(
-            event: event,
-            data: [
-                event.name: [
-                    "selectedDevice": ["name": output.portName, "type": deviceTypeString],
-                    "availableDevices": [],
-                ]
-            ] as [String: [String: Any]])
+        emit(event: .audioDeviceUpdate(currentRoute: AVAudioSession.sharedInstance().currentRoute))
     }
 
     func onBandwidthEstimationChanged(estimation: Int) {
-        let event = EmitableEvents.BandwidthEstimation
-        emit(event: event, data: [event.name: estimation])
+        emit(event: .bandwidthEstimation(estimation: estimation))
     }
 
     func onReconnectionStarted() {
-        emit(event: .ReconnectionStarted)
+        reconnectionStatus = .reconnecting
     }
 
     func onReconnected() {
-        emit(event: .Reconnected)
+        reconnectionStatus = .idle
     }
 
     func onReconnectionRetriesLimitReached() {
-        emit(event: .ReconnectionRetriesLimitReached)
+        reconnectionStatus = .error
     }
 
 }
+
+extension RNFishjamClient: CameraCapturerDeviceChangedListener {
+    func onCaptureDeviceChanged(_ device: AVCaptureDevice?) {
+        emit(event: .currentCameraChanged(localCamera: device?.toLocalCamera(), isCameraOn: isCameraOn))
+    }
+}

package/ios/RNFishjamClientModule.swift

@@ -75,7 +75,7 @@ public class RNFishjamClientModule: Module {
     public func definition() -> ModuleDefinition {
         let rnFishjamClient: RNFishjamClient = {
             let client = RNFishjamClient {
-                (eventName: String, data: [String: Any]) in
+                (eventName: String, data: [String: Any?]) in
                 self.sendEvent(eventName, data)
             }
             client.create()
@@ -84,12 +84,16 @@ public class RNFishjamClientModule: Module {
 
         Name("RNFishjamClient")
 
-        Events(EmitableEvents.allEvents)
+        Events(EmitableEvent.allEvents)
 
         Property("peerStatus") {
             return rnFishjamClient.peerStatus.rawValue
         }
 
+        Property("reconnectionStatus") {
+            return rnFishjamClient.reconnectionStatus.rawValue
+        }
+
         Property("isMicrophoneOn") {
             return rnFishjamClient.isMicrophoneOn
         }
@@ -102,6 +106,10 @@ public class RNFishjamClientModule: Module {
             return rnFishjamClient.getCaptureDevices()
         }
 
+        Property("currentCamera") {
+            return rnFishjamClient.currentCamera
+        }
+
         Property("isScreenShareOn") {
             return rnFishjamClient.isScreenShareOn
         }
@@ -110,6 +118,10 @@ public class RNFishjamClientModule: Module {
             return rnFishjamClient.isAppScreenShareOn
         }
 
+        Function("getPeers") {
+            return rnFishjamClient.getPeers()
+        }
+
         AsyncFunction("joinRoom") {
             (
                 url: String, peerToken: String, peerMetadata: [String: Any], config: ConnectConfig,
@@ -152,10 +164,6 @@ public class RNFishjamClientModule: Module {
             try rnFishjamClient.toggleAppScreenShare(screenShareOptions: screenShareOptions)
         }
 
-        AsyncFunction("getPeers") {
-            try rnFishjamClient.getPeers()
-        }
-
         AsyncFunction("updatePeerMetadata") { (metadata: [String: Any]) in
             try rnFishjamClient.updatePeerMetadata(metadata: metadata)
         }
@@ -164,10 +172,6 @@ public class RNFishjamClientModule: Module {
             try rnFishjamClient.updateLocalVideoTrackMetadata(metadata: metadata)
         }
 
-        AsyncFunction("updateAudioTrackMetadata") { (metadata: [String: Any]) in
-            try rnFishjamClient.updateLocalAudioTrackMetadata(metadata: metadata)
-        }
-
         AsyncFunction("updateScreenShareTrackMetadata") { (metadata: [String: Any]) in
             try rnFishjamClient.updateLocalScreenShareTrackMetadata(metadata: metadata)
         }

package/ios/Utils.swift

@@ -21,23 +21,3 @@ let log = OSLog(subsystem: "com.fishjamcloud.react-native-client", category: "Er
         }
     }
 #endif
-
-extension [String: Any] {
-    public func toMetadata() -> Metadata {
-        var res: Metadata = .init()
-        self.forEach { entry in
-            res[entry.key] = entry.value
-        }
-        return res
-    }
-}
-
-extension AnyJson {
-    public func toDict() -> [String: Any] {
-        var res: [String: Any] = [:]
-        self.keys.forEach { key in
-            res[key] = self[key]
-        }
-        return res
-    }
-}