@cloudflare/realtimekit-react-native 0.1.2-staging.1 → 0.1.2-staging.11

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

@@ -181,8 +181,7 @@ RCT_EXPORT_METHOD(chooseAudioRoute: (NSString *)audioRoute  Promise:(RCTPromiseR
     if (![_userSelectedAudioRoute isEqualToString:_currentAudioRoute]) {
         if ([audioRoute  isEqual: @"SPEAKER_PHONE"] || [audioRoute isEqualToString:@"speaker"]) {
             _forceSpeakerOn = 1;
-            [self updateAudioRoute];
-            success = true;
+            success = [self routeAudioFromSpeakerphone];
         } else if ([audioRoute isEqualToString:@"WIRED_HEADSET"] || [audioRoute isEqualToString:@"wired"]) {
             _forceSpeakerOn = 0;
             success = [self routeAudioFromEarpiece];
@@ -286,8 +285,19 @@ RCT_EXPORT_METHOD(setSpeakerphoneOn:(BOOL)enable)
 }
 
 - (BOOL)routeAudioFromBluetooth {
+    BOOL success;
     NSError *error = nil;
     _audioSession =  [AVAudioSession sharedInstance];
+    success = [_audioSession setCategory:AVAudioSessionCategoryPlayAndRecord
+                        withOptions:AVAudioSessionCategoryOptionAllowBluetooth
+                        error:&error];
+        if (!success)  {
+            NSLog(@"📕 Cannot set category due to error: %@", error);
+        }
+        success = [_audioSession setMode:AVAudioSessionModeVoiceChat error: &error];
+        if (!success)  {
+            NSLog(@"📕 Cannot set mode due to error: %@", error);
+        }
     for (AVAudioSessionPortDescription* input in [_audioSession availableInputs]) {
         if ([[input portType] isEqualToString:AVAudioSessionPortBluetoothHFP] ||
             [[input portType] isEqualToString:AVAudioSessionPortBluetoothA2DP] ||
@@ -351,7 +361,7 @@ RCT_EXPORT_METHOD(setSpeakerphoneOn:(BOOL)enable)
     @try {
         success = [_audioSession setCategory:AVAudioSessionCategoryPlayAndRecord
                         withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker
-                        error:nil];
+                        error:&error];
         if (!success)  {
             NSLog(@"📕 Cannot set category due to error: %@", error);
         }
@@ -549,6 +559,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 +573,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,11 +649,6 @@ RCT_EXPORT_METHOD(isBluetoothHeadsetConnected: (RCTPromiseResolveBlock) resolve
         [self audioSessionSetMode:audioMode
                        callerMemo:NSStringFromSelector(_cmd)];
 
-        @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 {
@@ -943,60 +967,63 @@ RCT_EXPORT_METHOD(isBluetoothHeadsetConnected: (RCTPromiseResolveBlock) resolve
                     // NSLog(@"🧑‍💻 RNInCallManager.AudioRouteChange.Reason: NewDeviceAvailable");
                     if ([self checkAudioRoute:@[AVAudioSessionPortHeadsetMic]
                                     routeType:@"input"]) {
-                        _forceSpeakerOn = 0;
+                      self->_forceSpeakerOn = 0;
                         @try {
                             [self sendEventWithName:@"onAudioDeviceChanged"
                                                body:@{
                                                    @"availableAudioDeviceList": @"[speaker, earpiece, wired]",
-                                                   @"selectedAudioDevice": AVAudioSessionPortHeadsetMic,
+                                                   @"selectedAudioDevice": @"wired",
                                                }];
                         } @catch (NSException *exception) {
                             NSLog(@"Error sending event 'onAudioDeviceChanged' (HeadsetMic): %@", exception.reason);
                         }
                     } else if ([self checkAudioRoute:@[AVAudioSessionPortHeadphones]
                                            routeType:@"output"]) {
-                        _forceSpeakerOn = 0;
+                      self->_forceSpeakerOn = 0;
                         @try {
                             [self sendEventWithName:@"onAudioDeviceChanged"
                                                body:@{
                                                    @"availableAudioDeviceList": @"[speaker, earpiece, wired]",
-                                                   @"selectedAudioDevice": AVAudioSessionPortHeadphones,
+                                                   @"selectedAudioDevice": @"wired",
                                                }];
                         } @catch (NSException *exception) {
                             NSLog(@"Error sending event 'onAudioDeviceChanged' (Headphones): %@", exception.reason);
                         }
                     } else if ([self checkAudioRoute:@[AVAudioSessionPortBluetoothHFP]
                                            routeType:@"input"]) {
-                        _forceSpeakerOn = 0;
+                        self->_forceSpeakerOn = 0;
+                        [self routeAudioFromBluetooth];
                         @try {
                             [self sendEventWithName:@"onAudioDeviceChanged"
                                                body:@{
                                                    @"availableAudioDeviceList": @"[speaker, earpiece, bluetooth]",
-                                                   @"selectedAudioDevice": AVAudioSessionPortBluetoothHFP,
+                                                   @"selectedAudioDevice": @"bluetooth",
                                                }];
                         } @catch (NSException *exception) {
                             NSLog(@"Error sending event 'onAudioDeviceChanged' (BluetoothHFP): %@", exception.reason);
                         }
                     } else if ([self checkAudioRoute:@[AVAudioSessionPortBluetoothA2DP]
                                            routeType:@"input"]) {
-                        _forceSpeakerOn = 0;
+                        self->_forceSpeakerOn = 0;
+                        [self routeAudioFromBluetooth];
                         @try {
                             [self sendEventWithName:@"onAudioDeviceChanged"
                                                body:@{
                                                    @"availableAudioDeviceList": @"[speaker, earpiece, bluetooth]",
-                                                   @"selectedAudioDevice": AVAudioSessionPortBluetoothA2DP,
+                                                   @"selectedAudioDevice": @"bluetooth",
                                                }];
                         } @catch (NSException *exception) {
                             NSLog(@"Error sending event 'onAudioDeviceChanged' (BluetoothA2DP): %@", exception.reason);
                         }
                     } else if ([self checkAudioRoute:@[AVAudioSessionPortBluetoothLE]
                                            routeType:@"input"]) {
-                        _forceSpeakerOn = 0;
+                        self->_forceSpeakerOn = 0;
+                        [self routeAudioFromBluetooth];
                         @try {
                             [self sendEventWithName:@"onAudioDeviceChanged"
                                                body:@{
                                                    @"availableAudioDeviceList": @"[speaker, earpiece, bluetooth]",
-                                                   @"selectedAudioDevice": AVAudioSessionPortBluetoothLE,
+                                                   @"selectedAudioDevice": @"bluetooth",
                                                }];
                         } @catch (NSException *exception) {
                             NSLog(@"Error sending event 'onAudioDeviceChanged' (BluetoothLE): %@", exception.reason);
@@ -1018,16 +1045,7 @@ RCT_EXPORT_METHOD(isBluetoothHeadsetConnected: (RCTPromiseResolveBlock) resolve
                     // NSLog(@"🧑‍💻 RNInCallManager.AudioRouteChange.Reason: CategoryChange. category=%@ mode=%@", self->_audioSession.category, self->_audioSession.mode);
                     break;
                 case AVAudioSessionRouteChangeReasonOverride:
-                    @try {
-                        // NSLog(@"🧑‍💻 RNInCallManager.AudioRouteChange.Reason: Override");
-                        [self sendEventWithName:@"onAudioDeviceChanged"
-                                            body:@{
-                                                @"availableAudioDeviceList": @"[speaker, earpiece]",
-                                                @"selectedAudioDevice": @"speaker",
-                                            }];  
-                    } @catch (NSException *exception) {
-                        NSLog(@"Error sending event 'onAudioDeviceChanged' (Override): %@", exception.reason);
-                    }         
+                    // 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,16 +62,11 @@ 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;
@@ -86,13 +80,12 @@ export default class LocalMediaHandler extends EventEmitter {
     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;
@@ -114,11 +107,16 @@ export default class LocalMediaHandler extends EventEmitter {
         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>;
+    removeAllTracks(): void;
+    private stopAudioTrack;
+    removeAudioTrack(): void;
+    private stopVideoTrack;
+    removeVideoTrack(): void;
 }
 export interface RNLocalMediaHandler {
     new (): LocalMediaHandler;

package/lib/LocalMediaHandler.js

@@ -22,7 +22,7 @@ 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';
@@ -47,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) {
@@ -61,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"));
@@ -78,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");
@@ -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;
@@ -250,9 +257,8 @@ class LocalMediaHandler extends EventEmitter {
             }
             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.
@@ -263,10 +269,6 @@ class LocalMediaHandler extends EventEmitter {
             this.emit('DEVICE_CHANGE', {
                 device: this.currentDevices.audio,
             });
-            /*
-              TODO
-              callStats.mediaPermission('AUDIO', CallStatsPermissionEnum.ACCEPTED);
-              callStats.selectedDevice('AUDIO', this.currentDevices.audio); */
         });
     }
     onVisibilityChange() {
@@ -305,6 +307,7 @@ class LocalMediaHandler extends EventEmitter {
                 }
                 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();
@@ -469,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;
@@ -495,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);
@@ -514,11 +494,6 @@ class LocalMediaHandler extends EventEmitter {
             video: undefined,
         };
     }
-    removeAllTracks() {
-        this.removeAudioTrack();
-        this.removeVideoTrack();
-        this.removeScreenShareTracks();
-    }
     setAudioTrack(audioTrack) {
         if (audioTrack === this.audioTrack) {
             return;
@@ -660,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) {
@@ -672,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) {
@@ -683,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() {
@@ -706,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) {
@@ -713,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();
@@ -736,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;
     }
@@ -813,20 +792,6 @@ class LocalMediaHandler extends EventEmitter {
             }
         });
     }
-    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();
-        });
-    }
     static init(_) {
         return __awaiter(this, void 0, void 0, function* () {
             const localMediaUtils = yield LocalMediaUtils.init();
@@ -839,6 +804,58 @@ class LocalMediaHandler extends EventEmitter {
     on(event, listener) {
         return super.on(event, listener);
     }
+    destruct() {
+        // TODO: Do not remove native broadcast listeners when going OFF_STAGE in webinar
+        // this.#localMediaUtils.destruct();
+        if (Platform.OS === 'android')
+            __classPrivateFieldGet(this, _LocalMediaHandler_appStateSubscription, "f").remove();
+        BackgroundTimer.stop();
+        try {
+            if (Platform.OS === 'android')
+                DyteHelper.stopService();
+        }
+        catch (_err) { }
+        InCallManger.stop(undefined);
+        // NOTE: This is a no-op, it's functions are handled in web-core
+        // this.destructMediaHandler();
+    }
+    destructMediaHandler() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.removeAllTracks();
+            this.removeAllListeners();
+        });
+    }
+    removeAllTracks() {
+        this.removeAudioTrack();
+        this.removeVideoTrack();
+        this.removeScreenShareTracks();
+    }
+    stopAudioTrack() {
+        var _a, _b, _c, _d;
+        (_a = this.rawAudioTrack) === null || _a === void 0 ? void 0 : _a.stop();
+        (_b = this.audioTrack) === null || _b === void 0 ? void 0 : _b.stop();
+        (_c = this.rawAudioTrack) === null || _c === void 0 ? void 0 : _c.release();
+        (_d = this.audioTrack) === null || _d === void 0 ? void 0 : _d.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();
+        this.videoEnabled = false;
+    }
+    removeVideoTrack() {
+        this.stopVideoTrack();
+        this.videoTrack = undefined;
+        this.rawVideoTrack = undefined;
+    }
 }
 _LocalMediaHandler_localMediaUtils = new WeakMap(), _LocalMediaHandler_appState = new WeakMap(), _LocalMediaHandler_appStateSubscription = new WeakMap(), _LocalMediaHandler_interval = new WeakMap();
 export default LocalMediaHandler;

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;
         });
     }
@@ -178,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],

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudflare/realtimekit-react-native",
-    "version": "0.1.2-staging.1",
+    "version": "0.1.2-staging.11",
     "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,7 +38,7 @@
         "android"
     ],
     "peerDependencies": {
-        "@cloudflare/react-native-webrtc": "114.0.16",
+        "@cloudflare/react-native-webrtc": "~114.0.18",
         "@expo/config-plugins": "*",
         "react": "*",
         "react-native": "*"