@fishjam-cloud/react-native-client 0.3.0 → 0.4.0

package/build/index.js

@@ -5,14 +5,14 @@ export { useBandwidthEstimation } from './hooks/useBandwidthEstimation';
 export { useCamera } from './hooks/useCamera';
 export { useMicrophone } from './hooks/useMicrophone';
 export { useScreenShare } from './hooks/useScreenShare';
+export { useAppScreenShare } from './hooks/useAppScreenShare';
 export { useReconnection } from './hooks/useReconnection';
 export { updatePeerMetadata } from './common/metadata';
 export { setTargetTrackEncoding } from './common/webRTC';
 export { joinRoom, leaveRoom } from './common/client';
 export { VideoPreviewView } from './components/VideoPreviewView';
 export { VideoRendererView } from './components/VideoRendererView';
-export { AndroidForegroundServiceType } from './types';
-export { startForegroundService, stopForegroundService, } from './utils/foregroundService';
 export { usePeerStatus } from './hooks/usePeerStatus';
+export { useForegroundService } from './hooks/useForegroundService';
 initializeWarningListener();
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AASlE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAO5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AASxE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAMtD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAGzD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EACL,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAWtD,yBAAyB,EAAE,CAAC","sourcesContent":["import { initializeWarningListener } from './utils/errorListener';\n\nexport type {\n  Peer,\n  Track,\n  TrackType,\n  VadStatus,\n  EncodingReason,\n} from './hooks/usePeers';\nexport { usePeers } from './hooks/usePeers';\n\nexport type {\n  AudioOutputDevice,\n  AudioOutputDeviceType,\n  AudioSessionMode,\n} from './hooks/useAudioSettings';\nexport { useAudioSettings } from './hooks/useAudioSettings';\n\nexport { useBandwidthEstimation } from './hooks/useBandwidthEstimation';\n\nexport type {\n  CameraId,\n  Camera,\n  CameraConfig,\n  VideoQuality,\n  CameraFacingDirection,\n} from './hooks/useCamera';\nexport { useCamera } from './hooks/useCamera';\n\nexport { useMicrophone } from './hooks/useMicrophone';\n\nexport type {\n  ScreenShareOptions,\n  ScreenShareQuality,\n} from './hooks/useScreenShare';\nexport { useScreenShare } from './hooks/useScreenShare';\n\nexport type { ReconnectionStatus } from './hooks/useReconnection';\nexport { useReconnection } from './hooks/useReconnection';\n\nexport { updatePeerMetadata } from './common/metadata';\n\nexport { setTargetTrackEncoding } from './common/webRTC';\n\nexport type { ConnectionConfig } from './common/client';\nexport { joinRoom, leaveRoom } from './common/client';\n\nexport type { VideoPreviewViewProps } from './components/VideoPreviewView';\nexport { VideoPreviewView } from './components/VideoPreviewView';\n\nexport type { VideoRendererProps } from './components/VideoRendererView';\nexport { VideoRendererView } from './components/VideoRendererView';\n\nexport { AndroidForegroundServiceType } from './types';\nexport {\n  startForegroundService,\n  stopForegroundService,\n} from './utils/foregroundService';\n\nexport type { PeerStatus } from './hooks/usePeerStatus';\nexport { usePeerStatus } from './hooks/usePeerStatus';\n\nexport type {\n  TrackBandwidthLimit,\n  TrackEncoding,\n  SimulcastBandwidthLimit,\n  BandwidthLimit,\n  SimulcastConfig,\n  VideoLayout,\n} from './types';\n\ninitializeWarningListener();\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAYlE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAO5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AASxE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAMtD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAGzD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAGnE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAMtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAWpE,yBAAyB,EAAE,CAAC","sourcesContent":["import { initializeWarningListener } from './utils/errorListener';\n\nexport type {\n  Peer,\n  Track,\n  TrackType,\n  VadStatus,\n  EncodingReason,\n  AudioTrack,\n  VideoTrack,\n} from './hooks/usePeers';\n\nexport { usePeers } from './hooks/usePeers';\n\nexport type {\n  AudioOutputDevice,\n  AudioOutputDeviceType,\n  AudioSessionMode,\n} from './hooks/useAudioSettings';\nexport { useAudioSettings } from './hooks/useAudioSettings';\n\nexport { useBandwidthEstimation } from './hooks/useBandwidthEstimation';\n\nexport type {\n  CameraId,\n  Camera,\n  CameraConfig,\n  VideoQuality,\n  CameraFacingDirection,\n} from './hooks/useCamera';\nexport { useCamera } from './hooks/useCamera';\n\nexport { useMicrophone } from './hooks/useMicrophone';\n\nexport type {\n  ScreenShareOptions,\n  ScreenShareQuality,\n} from './hooks/useScreenShare';\nexport { useScreenShare } from './hooks/useScreenShare';\n\nexport { useAppScreenShare } from './hooks/useAppScreenShare';\n\nexport type { ReconnectionStatus } from './hooks/useReconnection';\nexport { useReconnection } from './hooks/useReconnection';\n\nexport { updatePeerMetadata } from './common/metadata';\n\nexport { setTargetTrackEncoding } from './common/webRTC';\n\nexport type { ConnectionConfig } from './common/client';\nexport { joinRoom, leaveRoom } from './common/client';\n\nexport type { VideoPreviewViewProps } from './components/VideoPreviewView';\nexport { VideoPreviewView } from './components/VideoPreviewView';\n\nexport type { VideoRendererProps } from './components/VideoRendererView';\nexport { VideoRendererView } from './components/VideoRendererView';\n\nexport type { PeerStatus } from './hooks/usePeerStatus';\nexport { usePeerStatus } from './hooks/usePeerStatus';\n\nexport type {\n  ForegroundServiceNotificationConfig,\n  ForegroundServicePermissionsConfig,\n} from './hooks/useForegroundService';\nexport { useForegroundService } from './hooks/useForegroundService';\n\nexport type {\n  TrackBandwidthLimit,\n  TrackEncoding,\n  SimulcastBandwidthLimit,\n  BandwidthLimit,\n  SimulcastConfig,\n  VideoLayout,\n} from './types';\n\ninitializeWarningListener();\n"]}

package/build/types.d.ts

@@ -45,30 +45,5 @@ declare const brand: unique symbol;
 export type Brand<T, TBrand extends string> = T & {
     [brand]: TBrand;
 };
-/**
- * Enum used to set the foreground service types identifying the work done by the service.
- * See Android's [foreground service types](https://developer.android.com/develop/background-work/services/fg-service-types) documentation.
- */
-export declare enum AndroidForegroundServiceType {
-    FOREGROUND_SERVICE_TYPE_CAMERA = 64,
-    FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION = 32,
-    FOREGROUND_SERVICE_TYPE_MICROPHONE = 128
-}
-/**
- * A type representing the options required for configuring the foreground service.
- *
- * @param channelId The id of the channel. Must be unique per package.
- * @param channelName The user visible name of the channel.
- * @param notificationTitle The title (first row) of the notification, in a standard notification.
- * @param notificationContent The text (second row) of the notification, in a standard notification.
- * @param foregroundServiceTypes The type of foreground service to launch.
- */
-export type ForegroundServiceOptions = {
-    channelId: string;
-    channelName: string;
-    notificationTitle: string;
-    notificationContent: string;
-    foregroundServiceTypes: AndroidForegroundServiceType[];
-};
 export {};
 //# sourceMappingURL=types.d.ts.map

package/build/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,KAAK,CAAC;AAEzC,MAAM,MAAM,aAAa,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAE5C;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,eAAe,EAAE,aAAa,EAAE,CAAC;CAClC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC;;;GAGG;AACH,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;AAE5E;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,uBAAuB,CAAC;AAE3E,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,eAAe,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAGtD,OAAO,CAAC,MAAM,KAAK,EAAE,OAAO,MAAM,CAAC;AACnC,MAAM,MAAM,KAAK,CAAC,CAAC,EAAE,MAAM,SAAS,MAAM,IAAI,CAAC,GAAG;IAAE,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE;;;GAGG;AACH,oBAAY,4BAA4B;IACtC,8BAA8B,KAAK;IACnC,wCAAwC,KAAK;IAC7C,kCAAkC,MAAM;CACzC;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,4BAA4B,EAAE,CAAC;CACxD,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,KAAK,CAAC;AAEzC,MAAM,MAAM,aAAa,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAE5C;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,eAAe,EAAE,aAAa,EAAE,CAAC;CAClC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC;;;GAGG;AACH,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;AAE5E;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,uBAAuB,CAAC;AAE3E,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,eAAe,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAGtD,OAAO,CAAC,MAAM,KAAK,EAAE,OAAO,MAAM,CAAC;AACnC,MAAM,MAAM,KAAK,CAAC,CAAC,EAAE,MAAM,SAAS,MAAM,IAAI,CAAC,GAAG;IAAE,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/build/types.js

@@ -1,11 +1,2 @@
-/**
- * Enum used to set the foreground service types identifying the work done by the service.
- * See Android's [foreground service types](https://developer.android.com/develop/background-work/services/fg-service-types) documentation.
- */
-export var AndroidForegroundServiceType;
-(function (AndroidForegroundServiceType) {
-    AndroidForegroundServiceType[AndroidForegroundServiceType["FOREGROUND_SERVICE_TYPE_CAMERA"] = 64] = "FOREGROUND_SERVICE_TYPE_CAMERA";
-    AndroidForegroundServiceType[AndroidForegroundServiceType["FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION"] = 32] = "FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION";
-    AndroidForegroundServiceType[AndroidForegroundServiceType["FOREGROUND_SERVICE_TYPE_MICROPHONE"] = 128] = "FOREGROUND_SERVICE_TYPE_MICROPHONE";
-})(AndroidForegroundServiceType || (AndroidForegroundServiceType = {}));
+export {};
 //# sourceMappingURL=types.js.map

package/build/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAuDA;;;GAGG;AACH,MAAM,CAAN,IAAY,4BAIX;AAJD,WAAY,4BAA4B;IACtC,oIAAmC,CAAA;IACnC,wJAA6C,CAAA;IAC7C,6IAAwC,CAAA;AAC1C,CAAC,EAJW,4BAA4B,KAA5B,4BAA4B,QAIvC","sourcesContent":["/**\n * `FILL` or `FIT` - it works just like RN Image component. `FILL` fills the whole view\n * with video and it may cut some parts of the video. `FIT` scales the video so the whole\n * video is visible, but it may leave some empty space in the view.\n * @category Components\n */\nexport type VideoLayout = 'FILL' | 'FIT';\n\nexport type TrackEncoding = 'l' | 'm' | 'h';\n\n/**\n * A type describing simulcast configuration.\n *\n * At the moment, simulcast track is initialized in three versions - low, medium and high.\n * High resolution is the original track resolution, while medium and low resolutions are\n * the original track resolution scaled down by 2 and 4 respectively.\n */\nexport type SimulcastConfig = {\n  /**\n   * whether to simulcast track or not. By default simulcast is disabled.\n   */\n  enabled: boolean;\n  /**\n   *  list of active encodings. Encoding can be one of `\"h\"` (original encoding), `\"m\"` (scaled down x2), `\"l\"` (scaled down x4).\n   */\n  activeEncodings: TrackEncoding[];\n};\n\n/**\n * Type describing maximal bandwidth that can be used, in kbps. 0 is interpreted as unlimited bandwidth.\n */\nexport type BandwidthLimit = number;\n\n/**\n * Type describing bandwidth limit for simulcast track. It is a mapping `encoding -> BandwidthLimit`. If encoding isn't present in this mapping,\n * it will be assumed that this particular encoding shouldn't have any bandwidth limit.\n */\nexport type SimulcastBandwidthLimit = Record<TrackEncoding, BandwidthLimit>;\n\n/**\n * A type describing bandwidth limitation of a track, including simulcast and non-simulcast tracks. Can be `BandwidthLimit` or `SimulcastBandwidthLimit`.\n */\nexport type TrackBandwidthLimit = BandwidthLimit | SimulcastBandwidthLimit;\n\nexport type TrackMetadata = {\n  active: boolean;\n  type: 'audio' | 'camera' | 'screensharing';\n};\n\nexport type GenericMetadata = Record<string, unknown>;\n\n// branded types are useful for restricting where given value can be passed\ndeclare const brand: unique symbol;\nexport type Brand<T, TBrand extends string> = T & { [brand]: TBrand };\n\n/**\n * Enum used to set the foreground service types identifying the work done by the service.\n * See Android's [foreground service types](https://developer.android.com/develop/background-work/services/fg-service-types) documentation.\n */\nexport enum AndroidForegroundServiceType {\n  FOREGROUND_SERVICE_TYPE_CAMERA = 64,\n  FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION = 32,\n  FOREGROUND_SERVICE_TYPE_MICROPHONE = 128,\n}\n\n/**\n * A type representing the options required for configuring the foreground service.\n *\n * @param channelId The id of the channel. Must be unique per package.\n * @param channelName The user visible name of the channel.\n * @param notificationTitle The title (first row) of the notification, in a standard notification.\n * @param notificationContent The text (second row) of the notification, in a standard notification.\n * @param foregroundServiceTypes The type of foreground service to launch.\n */\nexport type ForegroundServiceOptions = {\n  channelId: string;\n  channelName: string;\n  notificationTitle: string;\n  notificationContent: string;\n  foregroundServiceTypes: AndroidForegroundServiceType[];\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["/**\n * `FILL` or `FIT` - it works just like RN Image component. `FILL` fills the whole view\n * with video and it may cut some parts of the video. `FIT` scales the video so the whole\n * video is visible, but it may leave some empty space in the view.\n * @category Components\n */\nexport type VideoLayout = 'FILL' | 'FIT';\n\nexport type TrackEncoding = 'l' | 'm' | 'h';\n\n/**\n * A type describing simulcast configuration.\n *\n * At the moment, simulcast track is initialized in three versions - low, medium and high.\n * High resolution is the original track resolution, while medium and low resolutions are\n * the original track resolution scaled down by 2 and 4 respectively.\n */\nexport type SimulcastConfig = {\n  /**\n   * whether to simulcast track or not. By default simulcast is disabled.\n   */\n  enabled: boolean;\n  /**\n   *  list of active encodings. Encoding can be one of `\"h\"` (original encoding), `\"m\"` (scaled down x2), `\"l\"` (scaled down x4).\n   */\n  activeEncodings: TrackEncoding[];\n};\n\n/**\n * Type describing maximal bandwidth that can be used, in kbps. 0 is interpreted as unlimited bandwidth.\n */\nexport type BandwidthLimit = number;\n\n/**\n * Type describing bandwidth limit for simulcast track. It is a mapping `encoding -> BandwidthLimit`. If encoding isn't present in this mapping,\n * it will be assumed that this particular encoding shouldn't have any bandwidth limit.\n */\nexport type SimulcastBandwidthLimit = Record<TrackEncoding, BandwidthLimit>;\n\n/**\n * A type describing bandwidth limitation of a track, including simulcast and non-simulcast tracks. Can be `BandwidthLimit` or `SimulcastBandwidthLimit`.\n */\nexport type TrackBandwidthLimit = BandwidthLimit | SimulcastBandwidthLimit;\n\nexport type TrackMetadata = {\n  active: boolean;\n  type: 'audio' | 'camera' | 'screensharing';\n};\n\nexport type GenericMetadata = Record<string, unknown>;\n\n// branded types are useful for restricting where given value can be passed\ndeclare const brand: unique symbol;\nexport type Brand<T, TBrand extends string> = T & { [brand]: TBrand };\n"]}

package/ios/Events.swift

@@ -9,6 +9,7 @@ enum EmitableEvents: String, CaseIterable {
     case IsCameraOn
     case IsMicrophoneOn
     case IsScreenShareOn
+    case IsAppScreenShareOn
     case SimulcastConfigUpdate
     case PeersUpdate
     case AudioDeviceUpdate

package/ios/RNFishjamClient.podspec

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

package/ios/RNFishjamClient.swift

@@ -11,6 +11,7 @@ class RNFishjamClient: FishjamClientListener {
     var isMicrophoneOn = false
     var isCameraOn = false
     var isScreenShareOn = false
+    var isAppScreenShareOn = false
     var isConnected = false
 
     private var isCameraInitialized = false
@@ -37,8 +38,8 @@ class RNFishjamClient: FishjamClientListener {
 
     let sendEvent: (_ eventName: String, _ data: [String: Any]) -> Void
 
-    static var onTracksUpdateListeners: [OnTrackUpdateListener] = []
-    static var localCameraTrackListeners: [OnLocalCameraTrackChangedListener] = []
+    static var tracksUpdateListenersManager = TracksUpdateListenersManager()
+    static var localCameraTracksChangedListenersManager = LocalCameraTracksChangedListenersManager()
 
     init(sendEvent: @escaping (_ eventName: String, _ data: [String: Any]) -> Void) {
         self.sendEvent = sendEvent
@@ -111,26 +112,34 @@ class RNFishjamClient: FishjamClientListener {
             }
         }()
         let videoParameters = VideoParameters(
-            dimensions: flipDimensions ? preset.dimensions.flip() : preset.dimensions,
+            dimensions: flipDimensions ? preset.dimensions.flipped : preset.dimensions,
             maxBandwidth: videoBandwidthLimit,
             simulcastConfig: simulcastConfig
         )
         return videoParameters
     }
 
-    private func getLocalVideoTrack() -> LocalVideoTrack? {
-        return RNFishjamClient.fishjamClient?.getLocalEndpoint().tracks.first { $0.value is LocalVideoTrack }?.value
-            as? LocalVideoTrack
+    private var localEndpoint: Endpoint? {
+        RNFishjamClient.fishjamClient?.getLocalEndpoint()
+    }
+
+    private func getLocalCameraTrack() -> LocalCameraTrack? {
+        return localEndpoint?.tracks.compactMap { $0.value as? LocalCameraTrack }.first
+
     }
 
     private func getLocalAudioTrack() -> LocalAudioTrack? {
-        return RNFishjamClient.fishjamClient?.getLocalEndpoint().tracks.first { $0.value is LocalAudioTrack }?.value
-            as? LocalAudioTrack
+        return localEndpoint?.tracks.compactMap { $0.value as? LocalAudioTrack }.first
+
+    }
+
+    private func getLocalScreenBroadcastTrack() -> LocalBroadcastScreenShareTrack? {
+        return localEndpoint?.tracks.compactMap { $0.value as? LocalBroadcastScreenShareTrack }.first
+
     }
 
-    private func getLocalScreenShareTrack() -> LocalScreenShareTrack? {
-        return RNFishjamClient.fishjamClient?.getLocalEndpoint().tracks.first { $0.value is LocalScreenShareTrack }?
-            .value as? LocalScreenShareTrack
+    private func getLocalScreenAppTrack() -> LocalAppScreenShareTrack? {
+        return localEndpoint?.tracks.compactMap { $0.value as? LocalAppScreenShareTrack }.first
     }
 
     private func ensureCreated() throws {
@@ -151,8 +160,8 @@ class RNFishjamClient: FishjamClientListener {
         }
     }
 
-    private func ensureVideoTrack() throws {
-        if getLocalVideoTrack() == nil {
+    private func ensureCameraTrack() throws {
+        if getLocalCameraTrack() == nil {
             throw Exception(
                 name: "E_NO_LOCAL_VIDEO_TRACK",
                 description: "No local video track. Make sure to call connect() first!")
@@ -167,11 +176,19 @@ class RNFishjamClient: FishjamClientListener {
         }
     }
 
-    private func ensureScreenShareTrack() throws {
-        if getLocalScreenShareTrack() == nil {
+    private func ensureScreenBroadcastTrack() throws {
+        if getLocalScreenBroadcastTrack() == nil {
             throw Exception(
                 name: "E_NO_LOCAL_SCREENSHARE_TRACK",
-                description: "No local screen share track. Make sure to toggle screen share on first!")
+                description: "No local screen broadcast track. Make sure to toggle screen broadcast on first!")
+        }
+    }
+
+    private func ensureScreenAppTrack() throws {
+        if getLocalScreenAppTrack() == nil {
+            throw Exception(
+                name: "E_NO_LOCAL_SCREENSHARE_TRACK",
+                description: "No local screen app track. Make sure to toggle screen app on first!")
         }
     }
 
@@ -189,7 +206,7 @@ class RNFishjamClient: FishjamClientListener {
     ) {
         peerStatus = .connecting
         connectPromise = promise
-        localUserMetadata = peerMetadata.toMetadata()
+        localUserMetadata = ["server": [:], "peer": peerMetadata].toMetadata()
 
         let reconnectConfig = FishjamCloudClient.ReconnectConfig(
             maxAttempts: config.reconnectConfig.maxAttempts, initialDelayMs: config.reconnectConfig.initialDelayMs,
@@ -197,7 +214,7 @@ class RNFishjamClient: FishjamClientListener {
 
         RNFishjamClient.fishjamClient?.connect(
             config: FishjamCloudClient.ConnectConfig(
-                websocketUrl: url, token: peerToken, peerMetadata: .init(peerMetadata),
+                websocketUrl: url, token: peerToken, peerMetadata: localUserMetadata,
                 reconnectConfig: reconnectConfig
             ))
 
@@ -214,6 +231,7 @@ class RNFishjamClient: FishjamClientListener {
         isMicrophoneOn = false
         isCameraOn = false
         isScreenShareOn = false
+        isAppScreenShareOn = false
         isConnected = false
         isCameraInitialized = false
         RNFishjamClient.fishjamClient?.leave { [weak self] in
@@ -221,7 +239,7 @@ class RNFishjamClient: FishjamClientListener {
         }
     }
 
-    func startCamera(config: CameraConfig) throws {
+    func startCamera(config: CameraConfig) async throws {
         try ensureCreated()
 
         guard !isCameraInitialized else {
@@ -229,13 +247,18 @@ class RNFishjamClient: FishjamClientListener {
             return
         }
 
+        guard await PermissionUtils.requestCameraPermission() else {
+            emit(warning: "Camera permission not granted.")
+            return
+        }
+
         let cameraTrack = try createCameraTrack(config: config)
         setCameraTrackState(cameraTrack, enabled: config.cameraEnabled)
         emitEndpoints()
         isCameraInitialized = true
     }
 
-    private func createCameraTrack(config: CameraConfig) throws -> LocalVideoTrack {
+    private func createCameraTrack(config: CameraConfig) throws -> LocalCameraTrack {
         try ensureCreated()
         let videoParameters = try getVideoParametersFromOptions(connectionOptions: config)
         videoSimulcastConfig = try getSimulcastConfigFromOptions(simulcastConfig: config.simulcastConfig)
@@ -246,42 +269,46 @@ class RNFishjamClient: FishjamClientListener {
         )
     }
 
-    private func setCameraTrackState(_ cameraTrack: LocalVideoTrack, enabled: Bool) {
+    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)
-        RNFishjamClient.localCameraTrackListeners.forEach { $0.onLocalCameraTrackChanged() }
+        RNFishjamClient.localCameraTracksChangedListenersManager.notifyListeners()
     }
 
     func toggleCamera() throws -> Bool {
-        try ensureVideoTrack()
-        setCameraTrackState(getLocalVideoTrack()!, enabled: !isCameraOn)
+        try ensureCameraTrack()
+        setCameraTrackState(getLocalCameraTrack()!, enabled: !isCameraOn)
         return isCameraOn
     }
 
     func flipCamera() throws {
-        try ensureVideoTrack()
-        getLocalVideoTrack()?.flipCamera()
+        try ensureCameraTrack()
+        getLocalCameraTrack()?.flipCamera()
     }
 
     func switchCamera(cameraId: String) throws {
-        try ensureVideoTrack()
-        getLocalVideoTrack()?.switchCamera(deviceId: cameraId)
+        try ensureCameraTrack()
+        getLocalCameraTrack()?.switchCamera(deviceId: cameraId)
 
     }
 
-    func toggleMicrophone() throws -> Bool {
+    func toggleMicrophone() async throws -> Bool {
         if let audioTrack = getLocalAudioTrack() {
             setMicrophoneTrackState(audioTrack, enabled: !isMicrophoneOn)
         } else {
-            try startMicrophone()
+            try await startMicrophone()
         }
         return isMicrophoneOn
     }
 
-    func startMicrophone() throws {
+    func startMicrophone() async throws {
+        guard await PermissionUtils.requestMicrophonePermission() else {
+            emit(warning: "Microphone permission not granted.")
+            return
+        }
         let microphoneTrack = RNFishjamClient.fishjamClient!.createAudioTrack(metadata: Metadata())
         setAudioSessionMode()
         setMicrophoneTrackState(microphoneTrack, enabled: true)
@@ -317,6 +344,10 @@ class RNFishjamClient: FishjamClientListener {
     func toggleScreenShare(screenShareOptions: ScreenShareOptions) throws {
         try ensureCreated()
         try ensureConnected()
+        guard isAppScreenShareOn == false else {
+            emit(warning: "Screensharing screen not available during screensharing app.")
+            return
+        }
         guard let screenShareExtensionBundleId = Bundle.main.infoDictionary?["ScreenShareExtensionBundleId"] as? String
         else {
             throw Exception(
@@ -346,13 +377,18 @@ class RNFishjamClient: FishjamClientListener {
             maxBandwidth: screenShareOptions.maxBandwidth)
         let screenShareMetadata = screenShareOptions.screenShareMetadata.toMetadata()
         let videoParameters = getScreenShareVideoParameters(options: screenShareOptions)
-        RNFishjamClient.fishjamClient!.prepareForScreenSharing(
+        RNFishjamClient.fishjamClient!.prepareForScreenBroadcast(
             appGroup: appGroupName,
             videoParameters: videoParameters,
             metadata: screenShareMetadata,
+            canStart: {
+                if self.isAppScreenShareOn {
+                    self.emit(warning: "Screensharing screen not available during screensharing app.")
+                }
+                return !self.isAppScreenShareOn
+            },
             onStart: { [weak self] in
                 guard let self else { return }
-
                 do {
                     try setScreenShareTrackState(enabled: true)
                 } catch {
@@ -387,6 +423,50 @@ class RNFishjamClient: FishjamClientListener {
         emit(event: event, data: isScreenShareEnabled)
     }
 
+    func startScreenAppShare(screenShareOptions: ScreenShareOptions) throws {
+        try ensureCreated()
+        try ensureConnected()
+
+        let simulcastConfig = try getSimulcastConfigFromOptions(simulcastConfig: screenShareOptions.simulcastConfig)
+
+        screenShareSimulcastConfig = simulcastConfig
+        screenShareMaxBandwidth = getMaxBandwidthFromOptions(maxBandwidth: screenShareOptions.maxBandwidth)
+        let metadata = screenShareOptions.screenShareMetadata.toMetadata()
+        let videoParameters = getScreenShareVideoParameters(options: screenShareOptions)
+        let screenAppTrack = RNFishjamClient.fishjamClient!.createScreenAppTrack(
+            videoParameters: videoParameters, metadata: metadata)
+        setScreenAppTrackState(screenAppTrack, enabled: true)
+        emitEndpoints()
+    }
+
+    func stopAppScreenShare() throws {
+        try ensureScreenAppTrack()
+        let track = getLocalScreenAppTrack()!
+        setScreenAppTrackState(track, enabled: false)
+        RNFishjamClient.fishjamClient?.removeTrack(trackId: track.id)
+        emitEndpoints()
+    }
+
+    func toggleAppScreenShare(screenShareOptions: ScreenShareOptions) throws {
+        guard isScreenShareOn == false else {
+            emit(warning: "App screensharing not available during screensharing.")
+            return
+        }
+        if getLocalScreenAppTrack() != nil {
+            try stopAppScreenShare()
+        } else {
+            try startScreenAppShare(screenShareOptions: screenShareOptions)
+        }
+    }
+
+    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)
+    }
+
     //returns local endpoint and remote endpoints
     static func getLocalAndRemoteEndpoints() -> [Endpoint] {
         let localEndpoint = RNFishjamClient.fishjamClient!.getLocalEndpoint()
@@ -421,14 +501,21 @@ class RNFishjamClient: FishjamClientListener {
                             "vadStatus": track.vadStatus.rawValue,
                         ]
 
-                    case let track as LocalVideoTrack:
+                    case let track as LocalCameraTrack:
+                        return [
+                            "id": track.id,
+                            "type": "Video",
+                            "metadata": track.metadata.toDict(),
+                        ]
+
+                    case let track as LocalBroadcastScreenShareTrack:
                         return [
                             "id": track.id,
                             "type": "Video",
                             "metadata": track.metadata.toDict(),
                         ]
 
-                    case let track as LocalScreenShareTrack:
+                    case let track as LocalAppScreenShareTrack:
                         return [
                             "id": track.id,
                             "type": "Video",
@@ -451,7 +538,7 @@ class RNFishjamClient: FishjamClientListener {
     }
 
     func getCaptureDevices() -> [[String: Any]] {
-        let devices = LocalVideoTrack.getCaptureDevices()
+        let devices = LocalCameraTrack.getCaptureDevices()
         return devices.map { device -> [String: Any] in
             let facingDirection =
                 switch device.position {
@@ -478,8 +565,8 @@ class RNFishjamClient: FishjamClientListener {
     }
 
     func updateLocalVideoTrackMetadata(metadata: [String: Any]) throws {
-        try ensureVideoTrack()
-        if let track = getLocalVideoTrack() {
+        try ensureCameraTrack()
+        if let track = getLocalCameraTrack() {
             updateTrackMetadata(trackId: track.id, metadata: metadata)
         }
     }
@@ -492,8 +579,8 @@ class RNFishjamClient: FishjamClientListener {
     }
 
     func updateLocalScreenShareTrackMetadata(metadata: [String: Any]) throws {
-        try ensureScreenShareTrack()
-        if let track = getLocalScreenShareTrack() {
+        try ensureScreenBroadcastTrack()
+        if let track = getLocalScreenBroadcastTrack() {
             updateTrackMetadata(trackId: track.id, metadata: metadata)
         }
     }
@@ -518,8 +605,8 @@ class RNFishjamClient: FishjamClientListener {
     }
 
     func toggleScreenShareTrackEncoding(encoding: String) throws -> [String: Any] {
-        try ensureScreenShareTrack()
-        if let track = getLocalScreenShareTrack() {
+        try ensureScreenBroadcastTrack()
+        if let track = getLocalScreenBroadcastTrack() {
             screenShareSimulcastConfig = try toggleTrackEncoding(
                 encoding: encoding, trackId: track.id, simulcastConfig: screenShareSimulcastConfig)
         }
@@ -527,15 +614,15 @@ class RNFishjamClient: FishjamClientListener {
     }
 
     func setScreenShareTrackBandwidth(bandwidth: Int) throws {
-        try ensureScreenShareTrack()
-        if let track = getLocalScreenShareTrack() {
+        try ensureScreenBroadcastTrack()
+        if let track = getLocalScreenBroadcastTrack() {
             RNFishjamClient.fishjamClient?.setTrackBandwidth(trackId: track.id, bandwidthLimit: bandwidth)
         }
     }
 
     func setScreenShareTrackEncodingBandwidth(encoding: String, bandwidth: Int) throws {
-        try ensureScreenShareTrack()
-        if let track = getLocalScreenShareTrack() {
+        try ensureScreenBroadcastTrack()
+        if let track = getLocalScreenBroadcastTrack() {
             RNFishjamClient.fishjamClient?.setEncodingBandwidth(
                 trackId: track.id, encoding: encoding, bandwidthLimit: bandwidth)
         }
@@ -548,10 +635,10 @@ class RNFishjamClient: FishjamClientListener {
     }
 
     func toggleVideoTrackEncoding(encoding: String) throws -> [String: Any] {
-        try ensureVideoTrack()
+        try ensureCameraTrack()
         try ensureConnected()
 
-        let track = getLocalVideoTrack()!
+        let track = getLocalCameraTrack()!
         videoSimulcastConfig = try toggleTrackEncoding(
             encoding: encoding, trackId: track.id, simulcastConfig: videoSimulcastConfig)
 
@@ -563,15 +650,15 @@ class RNFishjamClient: FishjamClientListener {
     }
 
     func setVideoTrackEncodingBandwidth(encoding: String, bandwidth: Int) throws {
-        try ensureVideoTrack()
-        let track = getLocalVideoTrack()!
+        try ensureCameraTrack()
+        let track = getLocalCameraTrack()!
         RNFishjamClient.fishjamClient?.setEncodingBandwidth(
             trackId: track.id, encoding: encoding, bandwidthLimit: bandwidth)
     }
 
     func setVideoTrackBandwidth(bandwidth: Int) throws {
-        try ensureVideoTrack()
-        let track = getLocalVideoTrack()!
+        try ensureCameraTrack()
+        let track = getLocalCameraTrack()!
         RNFishjamClient.fishjamClient?.setTrackBandwidth(trackId: track.id, bandwidthLimit: bandwidth)
     }
 
@@ -665,7 +752,7 @@ class RNFishjamClient: FishjamClientListener {
             preset = VideoParameters.presetScreenShareHD15
         }
         return VideoParameters(
-            dimensions: preset.dimensions.flip(),
+            dimensions: preset.dimensions.flipped,
             maxBandwidth: screenShareMaxBandwidth,
             maxFps: preset.maxFps,
             simulcastConfig: screenShareSimulcastConfig
@@ -673,7 +760,9 @@ class RNFishjamClient: FishjamClientListener {
     }
 
     func emit(event: EmitableEvents, data: [String: Any] = [:]) {
-        sendEvent(event.name, data)
+        DispatchQueue.main.async { [weak self] in
+            self?.sendEvent(event.name, data)
+        }
     }
 
     func emit(warning: String) {
@@ -712,9 +801,7 @@ class RNFishjamClient: FishjamClientListener {
             }
         }
 
-        RNFishjamClient.onTracksUpdateListeners.forEach {
-            $0.onTrackUpdate()
-        }
+        RNFishjamClient.tracksUpdateListenersManager.notifyListeners()
 
         emitEndpoints()
     }

package/ios/RNFishjamClientModule.swift

@@ -73,10 +73,6 @@ typealias RNTrackBandwidthLimit = Either<Int, [String: Int]>
 
 public class RNFishjamClientModule: Module {
     public func definition() -> ModuleDefinition {
-        Name("RNFishjamClient")
-
-        Events(EmitableEvents.allEvents)
-
         let rnFishjamClient: RNFishjamClient = {
             let client = RNFishjamClient {
                 (eventName: String, data: [String: Any]) in
@@ -86,6 +82,34 @@ public class RNFishjamClientModule: Module {
             return client
         }()
 
+        Name("RNFishjamClient")
+
+        Events(EmitableEvents.allEvents)
+
+        Property("peerStatus") {
+            return rnFishjamClient.peerStatus.rawValue
+        }
+
+        Property("isMicrophoneOn") {
+            return rnFishjamClient.isMicrophoneOn
+        }
+
+        Property("isCameraOn") {
+            return rnFishjamClient.isCameraOn
+        }
+
+        Property("cameras") {
+            return rnFishjamClient.getCaptureDevices()
+        }
+
+        Property("isScreenShareOn") {
+            return rnFishjamClient.isScreenShareOn
+        }
+
+        Property("isAppScreenShareOn") {
+            return rnFishjamClient.isAppScreenShareOn
+        }
+
         AsyncFunction("joinRoom") {
             (
                 url: String, peerToken: String, peerMetadata: [String: Any], config: ConnectConfig,
@@ -101,19 +125,11 @@ public class RNFishjamClientModule: Module {
         }
 
         AsyncFunction("startCamera") { (config: CameraConfig) in
-            try rnFishjamClient.startCamera(config: config)
-        }
-
-        Property("isMicrophoneOn") {
-            return rnFishjamClient.isMicrophoneOn
+            try await rnFishjamClient.startCamera(config: config)
         }
 
         AsyncFunction("toggleMicrophone") {
-            try rnFishjamClient.toggleMicrophone()
-        }
-
-        Property("isCameraOn") {
-            return rnFishjamClient.isCameraOn
+            try await rnFishjamClient.toggleMicrophone()
         }
 
         AsyncFunction("toggleCamera") {
@@ -128,16 +144,12 @@ public class RNFishjamClientModule: Module {
             try rnFishjamClient.switchCamera(cameraId: cameraId)
         }
 
-        Property("cameras") {
-            rnFishjamClient.getCaptureDevices()
-        }
-
         AsyncFunction("toggleScreenShare") { (screenShareOptions: ScreenShareOptions) in
             try rnFishjamClient.toggleScreenShare(screenShareOptions: screenShareOptions)
         }
 
-        Property("isScreenShareOn") {
-            return rnFishjamClient.isScreenShareOn
+        AsyncFunction("toggleAppScreenShare") { (screenShareOptions: ScreenShareOptions) in
+            try rnFishjamClient.toggleAppScreenShare(screenShareOptions: screenShareOptions)
         }
 
         AsyncFunction("getPeers") {
@@ -209,9 +221,5 @@ public class RNFishjamClientModule: Module {
         AsyncFunction("startAudioSwitcher") {
             rnFishjamClient.startAudioSwitcher()
         }
-
-        Property("peerStatus") {
-            return rnFishjamClient.peerStatus.rawValue
-        }
     }
 }