@cloudflare/realtimekit-react-native 0.1.1 → 0.1.2-staging.10

package/android/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
   <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30"/>
   <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30" />
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
   <uses-permission android:name="android.permission.CAMERA"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>

package/android/src/main/java/com/reactnativecore/DyteHelperModule.java

@@ -134,6 +134,7 @@ public class DyteHelperModule extends ReactContextBaseJavaModule {
         for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
             if ((ForegroundService.class).getName().equals(service.service.getClassName())) {
                 promise.resolve(true);
+                return;
             }
         }
         promise.resolve(false);

package/android/src/main/java/com/reactnativecore/ForegroundService.java

@@ -28,7 +28,7 @@ public class ForegroundService extends Service {
                     if (notification != null) {
                         try {
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                                startForeground(notificationHelper.NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION | ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA | ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE);
+                                startForeground(notificationHelper.NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION);
                             } else {
                                 startForeground(notificationHelper.NOTIFICATION_ID, notification);
                             }

package/android/src/main/java/com/reactnativecore/NotificationHelper.java

@@ -22,9 +22,9 @@ import java.util.Random;
 
 class NotificationHelper {
     public  static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
-    private static final String CHANNEL_ID = "DyteNotificationChannel";
-    private static final String CHANNEL_NAME = "Ongoing Conference Notifications";
-    private static final String CHANNEL_DESC = "Ongoing Conference Notifications";
+    private static final String CHANNEL_ID = "RealtimeKitNotificationChannel";
+    private static final String CHANNEL_NAME = "Screen Sharing";
+    private static final String CHANNEL_DESC = "Screen Sharing";
 
     private static NotificationHelper instance = null;
     private NotificationManager mNotificationManager;
@@ -83,18 +83,17 @@ class NotificationHelper {
 
         builder
                 .setCategory(NotificationCompat.CATEGORY_CALL)
-                .setContentTitle("Ongoing Meeting")
-                .setContentText("Tap to return to the meeting")
-                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setContentTitle("Screen Share")
+                .setContentText("You are sharing your screen")
+                .setPriority(NotificationCompat.PRIORITY_LOW)
                 .setContentIntent(pendingIntent)
-                .setOngoing(true)
-                .setWhen(System.currentTimeMillis())
-                .setUsesChronometer(true)
-                .setAutoCancel(false)
+                .setOngoing(false)
+                .setUsesChronometer(false)
+                .setAutoCancel(true)
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setOnlyAlertOnce(true)
-                .setSmallIcon(appIconResId);
-
+                .setSmallIcon(appIconResId)
+                .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE);
         if(largeIcon != null){
             builder.setLargeIcon(largeIcon);
         }

package/ios/RNInCallManager.m

@@ -549,6 +549,11 @@ RCT_EXPORT_METHOD(isBluetoothHeadsetConnected: (RCTPromiseResolveBlock) resolve
 {
     // NSLog(@"👉 Checking if Bluetooth device is connected");
     NSMutableArray *devices = [NSMutableArray array];
+    NSError *error = nil;
+    [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayAndRecord
+                                             withOptions:AVAudioSessionCategoryOptionAllowBluetooth
+                                                   error:&error];
+    [[AVAudioSession sharedInstance] overrideOutputAudioPort:AVAudioSessionPortOverrideNone error:nil];
     AVAudioSessionRouteDescription* route = [[AVAudioSession sharedInstance] currentRoute];
     for (AVAudioSessionPortDescription* desc in [route outputs]) {
         // NSLog(@"🧑‍💻 Bluetooth Desc: %@", desc);
@@ -558,6 +563,20 @@ RCT_EXPORT_METHOD(isBluetoothHeadsetConnected: (RCTPromiseResolveBlock) resolve
             [devices addObject:[desc portName]];
         }
     }
+
+    // If no Bluetooth device found in current route, check available outputs
+    if (devices.count == 0) {
+        NSArray<AVAudioSessionPortDescription *> *inputs = [route inputs];
+
+        // Check if Bluetooth is available in inputs (for headsets that function as both input and output)
+        for (AVAudioSessionPortDescription* desc in inputs) {
+            if ([[desc portType] isEqualToString:AVAudioSessionPortBluetoothHFP] ||
+                [[desc portType] isEqualToString:AVAudioSessionPortBluetoothLE]) {
+                [devices addObject:[desc portName]];
+            }
+        }
+    }
+
     // NSLog(@"🧑‍💻 Bluetooth Devices %@", devices);
     if (!devices || !devices.count){
         resolve(@NO);
@@ -620,7 +639,11 @@ RCT_EXPORT_METHOD(isBluetoothHeadsetConnected: (RCTPromiseResolveBlock) resolve
         [self audioSessionSetMode:audioMode
                        callerMemo:NSStringFromSelector(_cmd)];
 
-        [self sendEventWithName:@"onAudioDeviceChanged" body:@{@"devices": audioMode}];
+        @try {
+            [self sendEventWithName:@"onAudioDeviceChanged" body:@{@"devices": audioMode}];
+        } @catch (NSException *exception) {
+            NSLog(@"Error sending event 'onAudioDeviceChanged': %@", exception.reason);
+        }
         // NSLog(@"👨‍💻 RNInCallManager.updateAudioRoute() audio mode has changed to %@", audioMode);
       return true;
     } else {
@@ -806,7 +829,11 @@ RCT_EXPORT_METHOD(isBluetoothHeadsetConnected: (RCTPromiseResolveBlock) resolve
         if (state != self->_proximityIsNear) {
             // NSLog(@"RNInCallManager.UIDeviceProximityStateDidChangeNotification(): isNear: %@", state ? @"YES" : @"NO");
             self->_proximityIsNear = state;
-            [self sendEventWithName:@"Proximity" body:@{@"isNear": state ? @YES : @NO}];
+            @try {
+                [self sendEventWithName:@"Proximity" body:@{@"isNear": state ? @YES : @NO}];
+            } @catch (NSException *exception) {
+                NSLog(@"Error sending event 'Proximity': %@", exception.reason);
+            }
         }
     }];
 
@@ -936,62 +963,81 @@ RCT_EXPORT_METHOD(isBluetoothHeadsetConnected: (RCTPromiseResolveBlock) resolve
                     if ([self checkAudioRoute:@[AVAudioSessionPortHeadsetMic]
                                     routeType:@"input"]) {
                         _forceSpeakerOn = 0;
-                        [self sendEventWithName:@"onAudioDeviceChanged"
-                                           body:@{
-                                               @"availableAudioDeviceList": @"[speaker, earpiece, wired]",
-                                               @"selectedAudioDevice": AVAudioSessionPortHeadsetMic,
-                                           }];
+                        @try {
+                            [self sendEventWithName:@"onAudioDeviceChanged"
+                                               body:@{
+                                                   @"availableAudioDeviceList": @"[speaker, earpiece, wired]",
+                                                   @"selectedAudioDevice": AVAudioSessionPortHeadsetMic,
+                                               }];
+                        } @catch (NSException *exception) {
+                            NSLog(@"Error sending event 'onAudioDeviceChanged' (HeadsetMic): %@", exception.reason);
+                        }
                     } else if ([self checkAudioRoute:@[AVAudioSessionPortHeadphones]
                                            routeType:@"output"]) {
                         _forceSpeakerOn = 0;
-                        [self sendEventWithName:@"onAudioDeviceChanged"
-                                           body:@{
-                                               @"availableAudioDeviceList": @"[speaker, earpiece, wired]",
-                                               @"selectedAudioDevice": AVAudioSessionPortHeadphones,
-                                           }];
+                        @try {
+                            [self sendEventWithName:@"onAudioDeviceChanged"
+                                               body:@{
+                                                   @"availableAudioDeviceList": @"[speaker, earpiece, wired]",
+                                                   @"selectedAudioDevice": AVAudioSessionPortHeadphones,
+                                               }];
+                        } @catch (NSException *exception) {
+                            NSLog(@"Error sending event 'onAudioDeviceChanged' (Headphones): %@", exception.reason);
+                        }
                     } else if ([self checkAudioRoute:@[AVAudioSessionPortBluetoothHFP]
                                            routeType:@"input"]) {
                         _forceSpeakerOn = 0;
-                        [self sendEventWithName:@"onAudioDeviceChanged"
-                                           body:@{
-                                               @"availableAudioDeviceList": @"[speaker, earpiece, bluetooth]",
-                                               @"selectedAudioDevice": AVAudioSessionPortBluetoothHFP,
-                                           }];
+                        @try {
+                            [self sendEventWithName:@"onAudioDeviceChanged"
+                                               body:@{
+                                                   @"availableAudioDeviceList": @"[speaker, earpiece, bluetooth]",
+                                                   @"selectedAudioDevice": AVAudioSessionPortBluetoothHFP,
+                                               }];
+                        } @catch (NSException *exception) {
+                            NSLog(@"Error sending event 'onAudioDeviceChanged' (BluetoothHFP): %@", exception.reason);
+                        }
                     } else if ([self checkAudioRoute:@[AVAudioSessionPortBluetoothA2DP]
                                            routeType:@"input"]) {
                         _forceSpeakerOn = 0;
-                        [self sendEventWithName:@"onAudioDeviceChanged"
-                                           body:@{
-                                               @"availableAudioDeviceList": @"[speaker, earpiece, bluetooth]",
-                                               @"selectedAudioDevice": AVAudioSessionPortBluetoothA2DP,
-                                           }];
+                        @try {
+                            [self sendEventWithName:@"onAudioDeviceChanged"
+                                               body:@{
+                                                   @"availableAudioDeviceList": @"[speaker, earpiece, bluetooth]",
+                                                   @"selectedAudioDevice": AVAudioSessionPortBluetoothA2DP,
+                                               }];
+                        } @catch (NSException *exception) {
+                            NSLog(@"Error sending event 'onAudioDeviceChanged' (BluetoothA2DP): %@", exception.reason);
+                        }
                     } else if ([self checkAudioRoute:@[AVAudioSessionPortBluetoothLE]
                                            routeType:@"input"]) {
                         _forceSpeakerOn = 0;
-                        [self sendEventWithName:@"onAudioDeviceChanged"
-                                           body:@{
-                                               @"availableAudioDeviceList": @"[speaker, earpiece, bluetooth]",
-                                               @"selectedAudioDevice": AVAudioSessionPortBluetoothLE,
-                                           }];
+                        @try {
+                            [self sendEventWithName:@"onAudioDeviceChanged"
+                                               body:@{
+                                                   @"availableAudioDeviceList": @"[speaker, earpiece, bluetooth]",
+                                                   @"selectedAudioDevice": AVAudioSessionPortBluetoothLE,
+                                               }];
+                        } @catch (NSException *exception) {
+                            NSLog(@"Error sending event 'onAudioDeviceChanged' (BluetoothLE): %@", exception.reason);
+                        }
                     }
                     break;
                 case AVAudioSessionRouteChangeReasonOldDeviceUnavailable:
-                    [self sendEventWithName:@"onAudioDeviceChanged"
-                                        body:@{
+                    @try {
+                        [self sendEventWithName:@"onAudioDeviceChanged"
+                                           body:@{
                                                @"availableAudioDeviceList": @"[speaker, earpiece]",
                                                @"selectedAudioDevice": @"speaker",
-                                           }];                    
+                                           }];
+                    } @catch (NSException *exception) {
+                        NSLog(@"Error sending event 'onAudioDeviceChanged' (OldDeviceUnavailable): %@", exception.reason);
+                    }
                     break;
                 case AVAudioSessionRouteChangeReasonCategoryChange:
                     // NSLog(@"🧑‍💻 RNInCallManager.AudioRouteChange.Reason: CategoryChange. category=%@ mode=%@", self->_audioSession.category, self->_audioSession.mode);
                     break;
                 case AVAudioSessionRouteChangeReasonOverride:
-                    // NSLog(@"🧑‍💻 RNInCallManager.AudioRouteChange.Reason: Override");
-                    [self sendEventWithName:@"onAudioDeviceChanged"
-                                        body:@{
-                                               @"availableAudioDeviceList": @"[speaker, earpiece]",
-                                               @"selectedAudioDevice": @"speaker",
-                                           }];           
+                    // NSLog(@"🧑‍💻 RNInCallManager.AudioRouteChange.Reason: Override");         
                     break;
                 case AVAudioSessionRouteChangeReasonWakeFromSleep:
                     // NSLog(@"RNInCallManager.AudioRouteChange.Reason: WakeFromSleep");

package/ios/screenshare/DyteScreenshareHandler.swift

@@ -1,6 +1,6 @@
 import ReplayKit
 
-open class DyteScreenshareHandler: RPBroadcastSampleHandler {
+open class RTKScreenshareHandler: RPBroadcastSampleHandler {
     
     private var clientConnection: DyteSocketConnection?
     private var uploader: DyteScreenshareUploader?
@@ -21,7 +21,6 @@ open class DyteScreenshareHandler: RPBroadcastSampleHandler {
         super.init()
         if let connection = DyteSocketConnection(filePath: socketFilePath) {
             clientConnection = connection
-            print("Setup Connection")
             setupConnection()
             uploader = DyteScreenshareUploader(connection: connection, bundleIdentifier: bundleIdentifier)
         }
@@ -49,7 +48,6 @@ open class DyteScreenshareHandler: RPBroadcastSampleHandler {
     
     public override func broadcastFinished() {
         // User has requested to finish the broadcast.
-        print("Broadcast Stopped")
         DyteDarwinNotificationCenter.shared.postNotification(.broadcastStopped)
         clientConnection?.close()
     }
@@ -68,7 +66,7 @@ open class DyteScreenshareHandler: RPBroadcastSampleHandler {
     }
 }
 
-private extension DyteScreenshareHandler {
+private extension RTKScreenshareHandler {
   
     func setupConnection() {
         clientConnection?.didClose = { [weak self] error in

package/lib/BackgroundHandler.js

@@ -13,7 +13,9 @@ class BackgroundTimer {
                     delete this.callbacks[id];
                 }
                 else {
-                    DyteRNBackgroundTimer.backgroundTimerSetTimeout(id, this.callbacks[id].timeout);
+                    Platform.OS === 'android'
+                        ? DyteRNBackgroundTimer.backgroundTimerSetTimeout(id, this.callbacks[id].timeout)
+                        : DyteRNBackgroundTimer.setTimeout(id, this.callbacks[id].timeout);
                 }
                 callback();
             }
@@ -21,11 +23,15 @@ class BackgroundTimer {
     }
     // Original API
     start(delay = 0) {
-        return DyteRNBackgroundTimer.start(delay);
+        return Platform.OS === 'android'
+            ? DyteRNBackgroundTimer.backgroundTimerStart(delay)
+            : DyteRNBackgroundTimer.start(delay);
     }
     stop() {
         Emitter.removeAllListeners('backgroundTimer.timeout');
-        return DyteRNBackgroundTimer.stop();
+        return Platform.OS === 'android'
+            ? DyteRNBackgroundTimer.backgroundTimerStop()
+            : DyteRNBackgroundTimer.stop();
     }
     runBackgroundTimer(callback, delay) {
         const EventEmitter = Platform.select({
@@ -57,7 +63,9 @@ class BackgroundTimer {
             interval: false,
             timeout,
         };
-        DyteRNBackgroundTimer.setTimeout(timeoutId, timeout);
+        Platform.OS === 'android'
+            ? DyteRNBackgroundTimer.backgroundTimerSetTimeout(timeoutId, timeout)
+            : DyteRNBackgroundTimer.setTimeout(timeoutId, timeout);
         return timeoutId;
     }
     clearTimeout(timeoutId) {
@@ -74,7 +82,9 @@ class BackgroundTimer {
             interval: true,
             timeout,
         };
-        DyteRNBackgroundTimer.backgroundTimerSetTimeout(intervalId, timeout);
+        Platform.OS === 'android'
+            ? DyteRNBackgroundTimer.backgroundTimerSetTimeout(intervalId, timeout)
+            : DyteRNBackgroundTimer.setTimeout(intervalId, timeout);
         return intervalId;
     }
     clearInterval(intervalId) {

package/lib/LocalMediaHandler.d.ts

@@ -26,6 +26,7 @@ export default class LocalMediaHandler extends EventEmitter {
     audioEnabled: boolean;
     videoEnabled: boolean;
     screenShareEnabled: boolean;
+    private _pendingScreenShare;
     currentDevices: {
         audio?: MediaDeviceInfo;
         video?: MediaDeviceInfo;
@@ -38,8 +39,6 @@ export default class LocalMediaHandler extends EventEmitter {
     _handleAppStateChange: (nextAppState: any) => void;
     private configureForeground;
     constructor(localMediaUtils: LocalMediaUtils);
-    destructor(): void;
-    private handlePermissionErrors;
     private conditionallyRestartAudio;
     private conditionallyRestartVideo;
     private shouldReacquireTrack;
@@ -63,36 +62,30 @@ export default class LocalMediaHandler extends EventEmitter {
         audio: boolean;
         video: boolean;
     }): Promise<void>;
-    private stopAudioTrack;
-    private stopVideoTrack;
     private stopScreenShareTracks;
-    removeAudioTrack(): void;
-    removeVideoTrack(): void;
     removeScreenShareTracks(tracks?: {
         audio?: boolean;
         video?: boolean;
     }): void;
-    removeAllTracks(): void;
     private setAudioTrack;
     private setVideoTrack;
     private setScreenShareTracks;
     private onScreenShareEnded;
-    disableAudio(): void;
+    disableAudio(): Promise<void>;
     enableAudio(): Promise<void>;
+    toggleAudio(): Promise<void>;
     enableVideo(): Promise<void>;
     disableVideo(): Promise<void>;
-    toggleAudio(): Promise<void>;
     toggleVideo(): Promise<void>;
     setAudioDevice(device: MediaDeviceInfo): Promise<void>;
     setVideoDevice(device: MediaDeviceInfo): Promise<void>;
     setSpeakerDevice(device?: MediaDeviceInfo): Promise<void>;
-    setDevice(route: MediaDeviceInfo): Promise<any>;
+    setDevice(route: MediaDeviceInfo): Promise<void>;
     private oniOSBroadcastStart;
     private oniOSBroadcastStop;
     toggleScreenShare(): Promise<void>;
     enableScreenShare(): Promise<void>;
     disableScreenShare(): Promise<void>;
-    destruct(): void;
     getAllDevices(): MediaDeviceInfo[];
     getCurrentDevices(): {
         audio?: MediaDeviceInfo;
@@ -102,16 +95,31 @@ export default class LocalMediaHandler extends EventEmitter {
     getDeviceById(deviceId: string, kind: 'audioinput' | 'audiooutput' | 'videoinput'): MediaDeviceInfo;
     getAudioDevices(): MediaDeviceInfo[];
     getVideoDevices(): MediaDeviceInfo[];
-    getSpeakerDevices(): MediaDeviceInfo[];
+    getSpeakerDevices(): {
+        deviceId: string;
+        label: string;
+        kind: string;
+        groupId: string;
+        facing: string;
+        toJSON(): any;
+    }[];
     onDeviceChange(changedDevices: {
         added: MediaDeviceInfo[];
         removed: MediaDeviceInfo[];
     }, forceDeviceChange: boolean): Promise<void>;
-    cleanUpTracks(): void;
-    destructMediaHandler(): Promise<void>;
     static init(_: any): Promise<LocalMediaHandler>;
     emit(event: keyof typeof MediaEvents, ...args: any[]): boolean;
     on(event: keyof typeof MediaEvents, listener: (...args: any[]) => void): this;
+    destruct(): void;
+    destructMediaHandler(): Promise<void>;
+    cleanUpTracks(): void;
+    destructor(): void;
+    removeAllTracks(): void;
+    private stopAudioTrack;
+    removeAudioTrack(): void;
+    private stopVideoTrack;
+    removeVideoTrack(): void;
+    removeAllListeners(event?: keyof typeof MediaEvents): this;
 }
 export interface RNLocalMediaHandler {
     new (): LocalMediaHandler;

package/lib/LocalMediaHandler.js

@@ -22,12 +22,13 @@ var _LocalMediaHandler_localMediaUtils, _LocalMediaHandler_appState, _LocalMedia
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { EventEmitter } from 'events';
 import LocalMediaUtils from './LocalMediaUtils';
-import { AppState, NativeEventEmitter, NativeModules, Platform, } from 'react-native';
+import { AppState, NativeEventEmitter, NativeModules, PermissionsAndroid, Platform, } from 'react-native';
 import BackgroundTimer from './BackgroundHandler';
 import InCallManger from './NativeAudioManager';
 import { setupPermissions } from './PermissionHandler';
 const { DyteHelper, BroadcastEventEmitter } = NativeModules;
 const broadcastEmitter = new NativeEventEmitter(BroadcastEventEmitter);
+// eslint-disable-next-line no-shadow
 export var MediaEvents;
 (function (MediaEvents) {
     MediaEvents[MediaEvents["AUDIO_TRACK_CHANGE"] = 0] = "AUDIO_TRACK_CHANGE";
@@ -46,12 +47,26 @@ function checkIfAudioTrackIsSilent(track) {
 class LocalMediaHandler extends EventEmitter {
     configureForeground() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (Platform.OS !== 'android')
+                return;
             const val = yield DyteHelper.isForegroundServiceRunning();
-            if (Platform.Version >= 26) {
-                yield DyteHelper.createNotificationChannel();
+            if (!val) {
+                if (Platform.Version >= 33) {
+                    const res = yield PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS);
+                    if (res !== PermissionsAndroid.RESULTS.GRANTED) {
+                        console.warn('Permission required for screenshare notification');
+                    }
+                }
+                if (Platform.Version >= 26) {
+                    yield DyteHelper.createNotificationChannel();
+                }
+                try {
+                    yield DyteHelper.startService();
+                }
+                catch (e) {
+                    console.warn('Failed to start foreground service', e);
+                }
             }
-            if (!val)
-                yield DyteHelper.startService();
         });
     }
     constructor(localMediaUtils) {
@@ -60,8 +75,8 @@ class LocalMediaHandler extends EventEmitter {
         _LocalMediaHandler_appState.set(this, void 0);
         _LocalMediaHandler_appStateSubscription.set(this, void 0);
         _LocalMediaHandler_interval.set(this, void 0);
+        this._pendingScreenShare = false;
         this._handleAppStateChange = (nextAppState) => {
-            // console.log('App state changed to : ', nextAppState);
             if (__classPrivateFieldGet(this, _LocalMediaHandler_appState, "f").match(/inactive|background/) &&
                 nextAppState === 'active') {
                 BackgroundTimer.clearInterval(__classPrivateFieldGet(this, _LocalMediaHandler_interval, "f"));
@@ -77,7 +92,9 @@ class LocalMediaHandler extends EventEmitter {
             }
             else {
                 if (__classPrivateFieldGet(this, _LocalMediaHandler_interval, "f") === null) {
-                    this.configureForeground();
+                    if (this.screenShareEnabled || this._pendingScreenShare) {
+                        this.configureForeground();
+                    }
                 }
                 __classPrivateFieldSet(this, _LocalMediaHandler_interval, BackgroundTimer.setInterval(() => { }, 1000), "f");
                 __classPrivateFieldSet(this, _LocalMediaHandler_appState, nextAppState, "f");
@@ -98,8 +115,7 @@ class LocalMediaHandler extends EventEmitter {
             video: undefined,
             speaker: undefined,
         };
-        // NOTE(roerohan): The arrow function is required so that the reference to "this" is proper.
-        //if (Platform.OS === 'android')
+        // LocalMediaUtils onDeviceChange with callback from native onAudioDeviceChanged events
         __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").onDeviceChange((changedDevices) => __awaiter(this, void 0, void 0, function* () {
             yield this.onDeviceChange(changedDevices, false);
         }));
@@ -113,15 +129,6 @@ class LocalMediaHandler extends EventEmitter {
         }
         InCallManger.start({});
     }
-    destructor() {
-        __classPrivateFieldGet(this, _LocalMediaHandler_appStateSubscription, "f").remove();
-        broadcastEmitter.removeAllListeners('iOS_BroadcastStarted');
-        broadcastEmitter.removeAllListeners('iOS_BroadcastStopped');
-        BackgroundTimer.stop();
-    }
-    handlePermissionErrors(kind, err) {
-        // pass
-    }
     conditionallyRestartAudio() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -241,12 +248,17 @@ class LocalMediaHandler extends EventEmitter {
                 (_b = this.audioTrack) === null || _b === void 0 ? void 0 : _b.stop();
                 (_c = this.rawAudioTrack) === null || _c === void 0 ? void 0 : _c.stop();
             }
-            this.rawAudioTrack = yield LocalMediaUtils.getAudioTrack();
+            try {
+                this.rawAudioTrack = yield LocalMediaUtils.getAudioTrack();
+            }
+            catch (err) {
+                console.warn('Failed to acquire audio track: ', err);
+                this.rawAudioTrack = undefined;
+            }
             this.setAudioTrack(this.rawAudioTrack);
             this.addMediaStreamTrackListeners(this.audioTrack);
+            this.emit('AUDIO_TRACK_CHANGE');
             this.setDevice(this.currentDevices.audio);
-            // await InCallManger.chooseAudioRoute(audioDeviceId);
-            // console.log('Device selected: ', audioDeviceId);
             /**
              * NOTE(roerohan): Firefox does not show device labels until permissions are granted.
              * So, we need to repopulate the devices once permission is granted.
@@ -254,18 +266,9 @@ class LocalMediaHandler extends EventEmitter {
             if (this.audioTrack && this.permissions.audio === 'NOT_REQUESTED') {
                 yield __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").repopulateAvailableDevices();
             }
-            this.permissions.audio = 'ACCEPTED';
-            this.emit('MEDIA_PERMISSION_UPDATE', {
-                kind: 'audio',
-                message: this.permissions.audio,
-            });
             this.emit('DEVICE_CHANGE', {
                 device: this.currentDevices.audio,
             });
-            /*
-              TODO
-              callStats.mediaPermission('AUDIO', CallStatsPermissionEnum.ACCEPTED);
-              callStats.selectedDevice('AUDIO', this.currentDevices.audio); */
         });
     }
     onVisibilityChange() {
@@ -294,10 +297,17 @@ class LocalMediaHandler extends EventEmitter {
                     videoDeviceId,
                 });
                 if (!this.rawVideoTrack) {
-                    this.rawVideoTrack = yield LocalMediaUtils.getVideoTrack(videoConstraints);
+                    try {
+                        this.rawVideoTrack = yield LocalMediaUtils.getVideoTrack(videoConstraints);
+                    }
+                    catch (err) {
+                        console.warn('Failed to acquire video track: ', err);
+                        this.rawVideoTrack = undefined;
+                    }
                 }
                 this.setVideoTrack(this.rawVideoTrack);
                 this.addMediaStreamTrackListeners(this.rawVideoTrack);
+                this.emit('VIDEO_TRACK_CHANGE');
             }
             if (forceStopTrack) {
                 (_b = this.videoTrack) === null || _b === void 0 ? void 0 : _b.stop();
@@ -310,11 +320,6 @@ class LocalMediaHandler extends EventEmitter {
             if (this.videoTrack && this.permissions.video === 'NOT_REQUESTED') {
                 yield __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").repopulateAvailableDevices();
             }
-            this.permissions.video = 'ACCEPTED';
-            this.emit('MEDIA_PERMISSION_UPDATE', {
-                kind: 'video',
-                message: this.permissions.video,
-            });
             this.emit('DEVICE_CHANGE', {
                 device: this.currentDevices.video,
             });
@@ -327,23 +332,17 @@ class LocalMediaHandler extends EventEmitter {
             if (!speakerDevices.length) {
                 return;
             }
-            const speakerDeviceId = deviceId !== null && deviceId !== void 0 ? deviceId : speakerDevices[0].deviceId;
+            const lastDeviceIndex = speakerDevices.length - 1;
+            const speakerDeviceId = deviceId !== null && deviceId !== void 0 ? deviceId : speakerDevices[lastDeviceIndex].deviceId;
             if (((_a = this.currentDevices.speaker) === null || _a === void 0 ? void 0 : _a.deviceId) !== speakerDeviceId) {
-                this.currentDevices.speaker = __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").getDeviceById(speakerDeviceId, 'audiooutput');
+                // Audio Input devices are same as output devices in mobile
+                this.currentDevices.audio = __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").getDeviceById(speakerDeviceId, 'audioinput');
+                this.currentDevices.speaker = this.currentDevices.audio;
             }
+            yield this.setDevice(this.currentDevices.audio);
             this.emit('DEVICE_CHANGE', {
                 device: this.currentDevices.speaker,
             });
-            /*
-            TODO
-            const speakerDeviceId = deviceId ?? speakerDevices[0].deviceId;
-            if (this.currentDevices.speaker?.deviceId !== speakerDeviceId) {
-              this.currentDevices.speaker = this.#localMediaUtils.getDeviceById(
-                speakerDeviceId,
-                'audiooutput'
-              );
-              callStats.selectedDevice('SPEAKER', this.currentDevices.speaker);
-            } */
         });
     }
     getOperationalWebcamDeviceId() {
@@ -374,10 +373,6 @@ class LocalMediaHandler extends EventEmitter {
     getOperationalMicDeviceId() {
         return __awaiter(this, void 0, void 0, function* () {
             let audioDevices = __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").getAudioDevices();
-            // console.log(
-            //   'getOperationalMicDeviceId: ',
-            //   JSON.stringify(audioDevices, null, 2)
-            // );
             if (!audioDevices.length) {
                 return { isOperational: false, deviceId: null };
             }
@@ -387,10 +382,6 @@ class LocalMediaHandler extends EventEmitter {
                     We are giving preference to external device
                 */
             audioDevices = [...audioDevices].reverse();
-            // console.log(
-            //   'getOperationalMicDeviceId Reverse: ',
-            //   JSON.stringify(audioDevices, null, 2)
-            // );
             let operationalDeviceId = null;
             for (let deviceIndex = 0; deviceIndex < audioDevices.length; deviceIndex += 1) {
                 try {
@@ -403,7 +394,9 @@ class LocalMediaHandler extends EventEmitter {
                         break;
                     }
                 }
-                catch (err) { }
+                catch (err) {
+                    console.warn('Failed to acquire audio track: ', err);
+                }
             }
             return operationalDeviceId
                 ? { isOperational: true, deviceId: operationalDeviceId }
@@ -412,7 +405,7 @@ class LocalMediaHandler extends EventEmitter {
     }
     setupStreams(_a) {
         return __awaiter(this, arguments, void 0, function* ({ audio, video, }) {
-            var _b, _c, _d;
+            var _b, _c;
             try {
                 const permResult = yield setupPermissions(audio, video);
                 this.permissions.video = permResult.camera;
@@ -422,6 +415,14 @@ class LocalMediaHandler extends EventEmitter {
                 this.permissions.video = (_b = val.camera) !== null && _b !== void 0 ? _b : false;
                 this.permissions.audio = (_c = val.microphone) !== null && _c !== void 0 ? _c : false;
             }
+            this.emit('MEDIA_PERMISSION_UPDATE', {
+                kind: 'audio',
+                message: this.permissions.audio,
+            });
+            this.emit('MEDIA_PERMISSION_UPDATE', {
+                kind: 'video',
+                message: this.permissions.video,
+            });
             const constraints = {};
             if (!this.currentDevices) {
                 this.currentDevices = {
@@ -450,37 +451,20 @@ class LocalMediaHandler extends EventEmitter {
                     constraints.video = videoConstraints.video;
                 }
             }
-            const { audioTrack, videoTrack } = yield LocalMediaUtils.getAudioAndVideoTrack(constraints);
-            if (audio && audioTrack) {
-                this.rawAudioTrack = audioTrack;
-                this.permissions.audio = 'ACCEPTED';
-            }
-            this.emit('MEDIA_PERMISSION_UPDATE', {
-                kind: 'audio',
-                message: this.permissions.audio,
-            });
-            if (video && videoTrack) {
-                this.rawVideoTrack = videoTrack;
-                this.permissions.video = 'ACCEPTED';
-            }
-            this.emit('MEDIA_PERMISSION_UPDATE', {
-                kind: 'video',
-                message: this.permissions.video,
-            });
-            if (((_d = Object.keys(constraints)) === null || _d === void 0 ? void 0 : _d.length) === 0) {
-                this.audioEnabled = false;
-                this.videoEnabled = false;
-                return;
-            }
             if (audio)
                 yield this.setupAudioStream();
             if (video)
                 yield this.setupVideoStream();
-            if (audioTrack)
+            if (this.audioTrack)
                 this.audioEnabled = true;
-            if (videoTrack)
+            else
+                this.audioEnabled = false;
+            if (this.videoTrack)
                 this.videoEnabled = true;
+            else
+                this.videoEnabled = false;
             this.screenShareEnabled = false;
+            // Setting default audio output to speaker
             yield this.setupSpeaker();
             // Setup Foreground Service after handling permissions
             if (Platform.OS === 'android') {
@@ -488,19 +472,6 @@ class LocalMediaHandler extends EventEmitter {
             }
         });
     }
-    stopAudioTrack() {
-        var _a, _b;
-        (_a = this.audioTrack) === null || _a === void 0 ? void 0 : _a.stop();
-        (_b = this.audioTrack) === null || _b === void 0 ? void 0 : _b.release();
-        this.audioEnabled = false;
-    }
-    stopVideoTrack() {
-        var _a, _b, _c, _d;
-        (_a = this.rawVideoTrack) === null || _a === void 0 ? void 0 : _a.stop();
-        (_b = this.videoTrack) === null || _b === void 0 ? void 0 : _b.stop();
-        (_c = this.rawVideoTrack) === null || _c === void 0 ? void 0 : _c.release();
-        (_d = this.videoTrack) === null || _d === void 0 ? void 0 : _d.release();
-    }
     stopScreenShareTracks(tracks = {}) {
         var _a, _b, _c, _d;
         const { audio = true, video = true } = tracks;
@@ -514,16 +485,6 @@ class LocalMediaHandler extends EventEmitter {
             this.screenShareEnabled = false;
         }
     }
-    removeAudioTrack() {
-        this.stopAudioTrack();
-        this.audioTrack = undefined;
-        this.rawAudioTrack = undefined;
-    }
-    removeVideoTrack() {
-        this.stopVideoTrack();
-        this.videoTrack = undefined;
-        this.rawVideoTrack = undefined;
-    }
     removeScreenShareTracks(tracks) {
         var _a;
         (_a = this.screenShareTracks.video) === null || _a === void 0 ? void 0 : _a.removeEventListener('ended', this.onScreenShareEnded);
@@ -533,11 +494,6 @@ class LocalMediaHandler extends EventEmitter {
             video: undefined,
         };
     }
-    removeAllTracks() {
-        this.removeAudioTrack();
-        this.removeVideoTrack();
-        this.removeScreenShareTracks();
-    }
     setAudioTrack(audioTrack) {
         if (audioTrack === this.audioTrack) {
             return;
@@ -570,12 +526,16 @@ class LocalMediaHandler extends EventEmitter {
         this.emit('SCREENSHARE_ENDED');
     }
     disableAudio() {
-        this.audioEnabled = false;
-        if (this.audioTrack) {
-            this.audioTrack.enabled = this.audioEnabled;
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.toggleAudio();
+        });
     }
     enableAudio() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.toggleAudio();
+        });
+    }
+    toggleAudio() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             if (this.permissions.audio !== 'ACCEPTED') {
@@ -591,10 +551,18 @@ class LocalMediaHandler extends EventEmitter {
                 kind: 'audio',
                 message: this.permissions.audio,
             });
-            if (this.permissions.audio === 'DENIED') {
+            if (this.permissions.audio === 'DENIED' ||
+                this.permissions.audio === 'NOT_REQUESTED') {
                 this.audioEnabled = false;
                 return;
             }
+            if (this.audioEnabled) {
+                this.audioEnabled = false;
+                if (this.audioTrack) {
+                    this.audioTrack.enabled = this.audioEnabled;
+                }
+                return;
+            }
             try {
                 /**
                  * NOTE (@madhugb): We need to setup new stream,
@@ -631,20 +599,6 @@ class LocalMediaHandler extends EventEmitter {
             yield this.toggleVideo();
         });
     }
-    toggleAudio() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (this.permissions.audio === 'DENIED') {
-                this.audioEnabled = false;
-                return;
-            }
-            if (!this.audioTrack) {
-                yield this.setupAudioStream((_a = this.currentDevices.audio) === null || _a === void 0 ? void 0 : _a.deviceId);
-            }
-            this.audioEnabled = !this.audioEnabled;
-            this.audioTrack.enabled = this.audioEnabled;
-        });
-    }
     toggleVideo() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -661,7 +615,8 @@ class LocalMediaHandler extends EventEmitter {
                 kind: 'video',
                 message: this.permissions.video,
             });
-            if (this.permissions.video === 'DENIED') {
+            if (this.permissions.video === 'DENIED' ||
+                this.permissions.video === 'NOT_REQUESTED') {
                 this.videoEnabled = false;
                 return;
             }
@@ -680,10 +635,7 @@ class LocalMediaHandler extends EventEmitter {
     }
     setAudioDevice(device) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").chooseAudioRoute(device.deviceId);
-            this.setupAudioStream(device.deviceId);
-            this.emit('AUDIO_TRACK_CHANGE');
-            this.emit('DEVICE_CHANGE', { device });
+            yield this.setupAudioStream(device.deviceId);
         });
     }
     setVideoDevice(device) {
@@ -692,8 +644,6 @@ class LocalMediaHandler extends EventEmitter {
                 this.removeVideoTrack();
             }
             yield this.setupVideoStream(device.deviceId);
-            this.emit('VIDEO_TRACK_CHANGE');
-            this.emit('DEVICE_CHANGE', { device });
         });
     }
     setSpeakerDevice(device) {
@@ -703,7 +653,7 @@ class LocalMediaHandler extends EventEmitter {
     }
     setDevice(route) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").chooseAudioRoute(route.deviceId);
+            yield __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").chooseAudioRoute(route.deviceId);
         });
     }
     oniOSBroadcastStart() {
@@ -726,6 +676,12 @@ class LocalMediaHandler extends EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.screenShareEnabled && Platform.OS !== 'ios') {
                 this.removeScreenShareTracks();
+                try {
+                    yield DyteHelper.stopService();
+                }
+                catch (e) {
+                    console.warn('Failed to stop foreground service', e);
+                }
                 return;
             }
             if (Platform.OS === 'ios' && this.screenShareEnabled) {
@@ -733,13 +689,21 @@ class LocalMediaHandler extends EventEmitter {
                 return;
             }
             if (Platform.OS === 'android') {
-                /* getDisplayMedia() needs to be called before configureForeground()
-                  This is because we need to get user permission starting foreground service in Android >=14
-                  1. createScreenCaptureIntent() -> startForeground()
-                */
-                this.setScreenShareTracks(yield LocalMediaUtils.getScreenShareTracks());
+                this._pendingScreenShare = true;
                 yield this.configureForeground();
-                this.screenShareEnabled = true;
+                try {
+                    this.setScreenShareTracks(yield LocalMediaUtils.getScreenShareTracks());
+                    this.screenShareEnabled = true;
+                }
+                catch (e) {
+                    console.warn('Failed to start screenshare', e);
+                    this.screenShareEnabled = false;
+                    yield DyteHelper.stopService();
+                    this._pendingScreenShare = false;
+                }
+                finally {
+                    this._pendingScreenShare = false;
+                }
             }
             if (Platform.OS === 'ios') {
                 NativeModules.DyteScreensharePickerView.showScreenSharePickerView();
@@ -756,11 +720,6 @@ class LocalMediaHandler extends EventEmitter {
             yield this.toggleScreenShare();
         });
     }
-    destruct() {
-        this.removeAllTracks();
-        this.removeAllListeners();
-        InCallManger.stop(undefined);
-    }
     getAllDevices() {
         return __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").availableDevices;
     }
@@ -794,12 +753,16 @@ class LocalMediaHandler extends EventEmitter {
              */
             if (addedDevice) {
                 if (addedDevice.kind === 'audioinput') {
-                    yield this.setupAudioStream(addedDevice.deviceId);
-                    this.emit('DEVICE_CHANGE', this.currentDevices.audio);
+                    if (this.permissions.audio === 'DENIED' ||
+                        this.permissions.audio === 'NOT_REQUESTED') {
+                        yield this.setupSpeaker(addedDevice.deviceId);
+                    }
+                    else {
+                        yield this.setupAudioStream(addedDevice.deviceId);
+                    }
                 }
                 else if (addedDevice.kind === 'videoinput') {
                     yield this.setupVideoStream(addedDevice.deviceId);
-                    this.emit('DEVICE_CHANGE', this.currentDevices.video);
                 }
                 else if (addedDevice.kind === 'audiooutput') {
                     yield this.setupSpeaker(addedDevice.deviceId);
@@ -808,7 +771,13 @@ class LocalMediaHandler extends EventEmitter {
             }
             if (removedDevice) {
                 if (removedDevice.kind === 'audioinput') {
-                    yield this.setupAudioStream();
+                    if (this.permissions.audio === 'DENIED' ||
+                        this.permissions.audio === 'NOT_REQUESTED') {
+                        yield this.setupSpeaker();
+                    }
+                    else {
+                        yield this.setupAudioStream();
+                    }
                 }
                 else if (removedDevice.kind === 'videoinput') {
                     yield this.setupVideoStream();
@@ -818,26 +787,13 @@ class LocalMediaHandler extends EventEmitter {
                 }
                 this.emit('AUDIO_TRACK_CHANGE');
             }
-            this.emit('DEVICE_LIST_UPDATED', changedDevices);
-        });
-    }
-    cleanUpTracks() {
-        var _a, _b, _c, _d;
-        (_a = this.audioTrack) === null || _a === void 0 ? void 0 : _a.stop();
-        (_b = this.rawAudioTrack) === null || _b === void 0 ? void 0 : _b.stop();
-        (_c = this.videoTrack) === null || _c === void 0 ? void 0 : _c.stop();
-        (_d = this.rawVideoTrack) === null || _d === void 0 ? void 0 : _d.stop();
-        this.destructor();
-    }
-    destructMediaHandler() {
-        return __awaiter(this, void 0, void 0, function* () {
-            __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").destruct();
-            return this.destruct();
+            if (changedDevices.added.length || changedDevices.removed.length) {
+                this.emit('DEVICE_LIST_UPDATED', changedDevices);
+            }
         });
     }
     static init(_) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield setupPermissions(true, true);
             const localMediaUtils = yield LocalMediaUtils.init();
             return new LocalMediaHandler(localMediaUtils);
         });
@@ -848,6 +804,74 @@ class LocalMediaHandler extends EventEmitter {
     on(event, listener) {
         return super.on(event, listener);
     }
+    destruct() {
+        this.destructMediaHandler();
+    }
+    destructMediaHandler() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.removeAllTracks();
+            this.removeAllListeners();
+            this.cleanUpTracks();
+            __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").destruct();
+            try {
+                if (Platform.OS === 'android')
+                    yield DyteHelper.stopService();
+            }
+            catch (_err) { }
+            InCallManger.stop(undefined);
+        });
+    }
+    cleanUpTracks() {
+        var _a, _b, _c, _d;
+        (_a = this.audioTrack) === null || _a === void 0 ? void 0 : _a.stop();
+        (_b = this.rawAudioTrack) === null || _b === void 0 ? void 0 : _b.stop();
+        (_c = this.videoTrack) === null || _c === void 0 ? void 0 : _c.stop();
+        (_d = this.rawVideoTrack) === null || _d === void 0 ? void 0 : _d.stop();
+        this.destructor();
+    }
+    destructor() {
+        if (Platform.OS === 'android')
+            __classPrivateFieldGet(this, _LocalMediaHandler_appStateSubscription, "f").remove();
+        // TODO: Remove native broadcast listeners for group_call & not for webinar
+        BackgroundTimer.stop();
+    }
+    removeAllTracks() {
+        this.removeAudioTrack();
+        this.removeVideoTrack();
+        this.removeScreenShareTracks();
+    }
+    stopAudioTrack() {
+        var _a, _b;
+        (_a = this.audioTrack) === null || _a === void 0 ? void 0 : _a.stop();
+        (_b = this.audioTrack) === null || _b === void 0 ? void 0 : _b.release();
+        this.audioEnabled = false;
+    }
+    removeAudioTrack() {
+        this.stopAudioTrack();
+        this.audioTrack = undefined;
+        this.rawAudioTrack = undefined;
+    }
+    stopVideoTrack() {
+        var _a, _b, _c, _d;
+        (_a = this.rawVideoTrack) === null || _a === void 0 ? void 0 : _a.stop();
+        (_b = this.videoTrack) === null || _b === void 0 ? void 0 : _b.stop();
+        (_c = this.rawVideoTrack) === null || _c === void 0 ? void 0 : _c.release();
+        (_d = this.videoTrack) === null || _d === void 0 ? void 0 : _d.release();
+    }
+    removeVideoTrack() {
+        this.stopVideoTrack();
+        this.videoTrack = undefined;
+        this.rawVideoTrack = undefined;
+    }
+    removeAllListeners(event) {
+        if (event === 'SCREENSHARE_TRACK_CHANGE' ||
+            event === 'DEVICE_LIST_UPDATED' ||
+            event === 'DEVICE_CHANGE' ||
+            !event) {
+            return null;
+        }
+        return super.removeAllListeners(event);
+    }
 }
 _LocalMediaHandler_localMediaUtils = new WeakMap(), _LocalMediaHandler_appState = new WeakMap(), _LocalMediaHandler_appStateSubscription = new WeakMap(), _LocalMediaHandler_interval = new WeakMap();
 export default LocalMediaHandler;

package/lib/LocalMediaInterfaces.d.ts

@@ -68,6 +68,7 @@ export interface RealtimeKitMediaTrackConstraints extends MediaTrackConstraints
 }
 export interface RealtimeKitMediaStreamConstraints extends MediaStreamConstraints {
     audio?: boolean | RealtimeKitMediaTrackConstraints;
+    timeout?: number;
 }
 export interface VideoConstraints {
     [key: string]: RealtimeKitMediaTrackConstraints;

package/lib/LocalMediaUtils.d.ts

@@ -89,5 +89,12 @@ export default class LocalMediaUtils {
     /**
      * Returns all audio output devices (speaker devices).
      */
-    getSpeakerDevices(): MediaDeviceInfo[];
+    getSpeakerDevices(): {
+        deviceId: string;
+        label: string;
+        kind: string;
+        groupId: string;
+        facing: string;
+        toJSON(): any;
+    }[];
 }

package/lib/LocalMediaUtils.js

@@ -120,7 +120,6 @@ class LocalMediaUtils {
                 return Object.assign(Object.assign({}, audioDeviceProps), { deviceId: audioDevice, label: audioDevice, kind: 'audioinput' });
             })
                 .filter((audioDevice) => audioDevice.connected);
-            // console.log('Resp: ', JSON.stringify(resp, null, 2));
             return resp;
         });
     }
@@ -143,7 +142,7 @@ class LocalMediaUtils {
                     return yield mediaDevices.getUserMedia(constraints);
                 }
                 // NOTE(roerohan): The await is required to catch errors (if any).
-                return yield Promise.race([
+                return Promise.race([
                     mediaDevices.getUserMedia(constraints),
                     new Promise((_resolve, reject) => {
                         setTimeout(() => reject(new LocalMediaError('Get user media timed out', 'ERR_GUM_TIMEOUT')), timeout);
@@ -159,13 +158,14 @@ class LocalMediaUtils {
         return __awaiter(this, void 0, void 0, function* () {
             const mediaStream = (yield LocalMediaUtils.getUserMediaWithTimeout({
                 audio: true,
+                timeout: 5000,
             }));
             return mediaStream.getAudioTracks()[0];
         });
     }
     static getVideoTrack(constraints) {
         return __awaiter(this, void 0, void 0, function* () {
-            const mediaStream = (yield LocalMediaUtils.getUserMediaWithTimeout(constraints));
+            const mediaStream = (yield LocalMediaUtils.getUserMediaWithTimeout(Object.assign(Object.assign({}, constraints), { timeout: 5000 })));
             return mediaStream.getVideoTracks()[0];
         });
     }
@@ -177,7 +177,6 @@ class LocalMediaUtils {
              * is made: https://github.com/microsoft/TypeScript/issues/33232
              */
             const stream = (yield mediaDevices.getDisplayMedia());
-            // console.log('Screenshare stream: ', stream.getVideoTracks());
             return {
                 video: stream.getVideoTracks()[0],
                 audio: stream.getAudioTracks()[0],
@@ -186,11 +185,16 @@ class LocalMediaUtils {
     }
     static getAudioAndVideoTrack(constraints) {
         return __awaiter(this, void 0, void 0, function* () {
-            const mediaStream = (yield LocalMediaUtils.getUserMediaWithTimeout(constraints));
-            return {
-                audioTrack: mediaStream.getAudioTracks()[0],
-                videoTrack: mediaStream.getVideoTracks()[0],
-            };
+            try {
+                const mediaStream = (yield LocalMediaUtils.getUserMediaWithTimeout(Object.assign(Object.assign({}, constraints), { timeout: 5000 })));
+                return {
+                    audioTrack: mediaStream.getAudioTracks()[0],
+                    videoTrack: mediaStream.getVideoTracks()[0],
+                };
+            }
+            catch (err) {
+                throw err;
+            }
         });
     }
     onDeviceChange(callback) {
@@ -212,7 +216,9 @@ class LocalMediaUtils {
                     removed: previouslyAvailableDevices.filter((device) => !currentlyAvailableDeviceIds.includes(device.deviceId)),
                 };
                 this.repopulateAvailableDevices().then(() => {
-                    callback(changedDevices, false);
+                    if (changedDevices.added.length || changedDevices.removed.length) {
+                        callback(changedDevices, false);
+                    }
                 });
             }
             else {
@@ -224,7 +230,9 @@ class LocalMediaUtils {
                     removed: previouslyAvailableDevices.filter((device) => !currentlyAvailableDeviceIds.includes(device.deviceId)),
                 };
                 this.repopulateAvailableDevices().then(() => {
-                    callback(changedDevices, false);
+                    if (changedDevices.added.length || changedDevices.removed.length) {
+                        callback(changedDevices, false);
+                    }
                 });
             }
         });
@@ -269,7 +277,11 @@ class LocalMediaUtils {
      * Returns all audio output devices (speaker devices).
      */
     getSpeakerDevices() {
-        return this.getAvailableDevicesByKind('audiooutput');
+        const speakerDevices = __classPrivateFieldGet(this, _LocalMediaUtils_availableDevices, "f");
+        // In Mobile, speaker devices are the same as audio input devices
+        return speakerDevices
+            .filter((device) => device.kind === 'audioinput')
+            .map((device) => (Object.assign(Object.assign({}, device), { deviceId: device.deviceId, label: device.label, kind: 'audiooutput' })));
     }
 }
 _LocalMediaUtils_availableDevices = new WeakMap(), _LocalMediaUtils_nativeEventEmitter = new WeakMap();

package/lib/ReactContext.d.ts

@@ -22,16 +22,11 @@ export declare const RealtimeKitContext: React.Context<{
  * @param renderBeforeLoad The provider will not render children by default
  * until it gets a client object, renderBeforeLoad can be used to override that
  */
-export declare function RealtimeKitProvider({ value, children, renderBeforeLoad, }: {
+export declare function RealtimeKitProvider({ value, children, fallback, }: {
     value: RealtimeKitClient | undefined;
     children: ReactChild | ReactChild[];
-    renderBeforeLoad?: boolean;
+    fallback?: ReactChild | ReactChild[];
 }): JSX.Element;
-export declare namespace RealtimeKitProvider {
-    var defaultProps: {
-        renderBeforeLoad: boolean;
-    };
-}
 /**
  * Hook which returns the reference to the DyteClient object
  * @returns meeting instance from `useDyteClient()`

package/lib/ReactContext.js

@@ -59,31 +59,25 @@ export const RealtimeKitContext = createContext({
  * @param renderBeforeLoad The provider will not render children by default
  * until it gets a client object, renderBeforeLoad can be used to override that
  */
-export function RealtimeKitProvider({ value, children, 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-renderBeforeLoad, }) {
+export function RealtimeKitProvider({ value, children, fallback = null, }) {
     const [updates, setUpdates] = useState();
     const updatesRef = useRef();
     useEffect(() => {
         if (value) {
-            setUpdates(new RealtimeKitUpdates(value));
+            const newUpdate = new RealtimeKitUpdates(value);
+            setUpdates(newUpdate);
+            updatesRef.current = newUpdate;
         }
         return () => {
             var _a;
-            // eslint-disable-next-line react-hooks/exhaustive-deps
             (_a = updatesRef.current) === null || _a === void 0 ? void 0 : _a.clean();
         };
     }, [value]);
-    if (!value)
-        return null;
     return (React.createElement(RealtimeKitContext.Provider, { value: {
             meeting: value,
             updates,
-        } }, children));
+        } }, value ? children : fallback));
 }
-RealtimeKitProvider.defaultProps = {
-    renderBeforeLoad: false,
-};
 /**
  * Hook which returns the reference to the DyteClient object
  * @returns meeting instance from `useDyteClient()`

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudflare/realtimekit-react-native",
-    "version": "0.1.1",
+    "version": "0.1.2-staging.10",
     "description": "Cloudflare RealtimeKit SDK for react native",
     "main": "lib/index.js",
     "author": "Cloudflare",
@@ -25,7 +25,7 @@
     },
     "private": false,
     "dependencies": {
-        "@cloudflare/realtimekit": "1.0.1",
+        "@cloudflare/realtimekit": "1.0.2",
         "events": "^3.3.0",
         "fast-base64-decode": "1.0.0",
         "node-libs-react-native": "^1.2.1",
@@ -38,15 +38,13 @@
         "android"
     ],
     "peerDependencies": {
-        "@cloudflare/react-native-webrtc": "114.0.16",
+        "@cloudflare/react-native-webrtc": "~114.0.18",
         "@expo/config-plugins": "*",
         "react": "*",
         "react-native": "*"
     },
     "publishConfig": {
-        "registry": "https://registry.npmjs.org/",
-        "access": "public",
-        "tag": "latest"
+        "tag": "staging"
     },
     "scripts": {
         "postpublish": "mv package.json.bak package.json"