@cloudflare/realtimekit-react-native 0.1.2-staging.6 → 0.1.2-staging.8

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);
@@ -1018,16 +1037,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/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,18 @@ 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>;
+    cleanUpTracks(): void;
+    destructor(): void;
+    removeAllTracks(): void;
+    private stopAudioTrack;
+    removeAudioTrack(): void;
+    private stopVideoTrack;
+    removeVideoTrack(): void;
     removeAllListeners(event?: keyof typeof MediaEvents): this;
 }
 export interface RNLocalMediaHandler {

package/lib/LocalMediaHandler.js

@@ -51,15 +51,15 @@ class LocalMediaHandler extends EventEmitter {
                 return;
             const val = yield DyteHelper.isForegroundServiceRunning();
             if (!val) {
-                if (Platform.Version >= 26) {
-                    yield DyteHelper.createNotificationChannel();
-                }
                 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();
                 }
@@ -75,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"));
@@ -92,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");
@@ -127,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;
@@ -264,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.
@@ -277,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() {
@@ -319,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();
@@ -483,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;
@@ -509,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);
@@ -528,11 +494,6 @@ class LocalMediaHandler extends EventEmitter {
             video: undefined,
         };
     }
-    removeAllTracks() {
-        this.removeAudioTrack();
-        this.removeVideoTrack();
-        this.removeScreenShareTracks();
-    }
     setAudioTrack(audioTrack) {
         if (audioTrack === this.audioTrack) {
             return;
@@ -674,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) {
@@ -686,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) {
@@ -697,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() {
@@ -733,6 +689,7 @@ class LocalMediaHandler extends EventEmitter {
                 return;
             }
             if (Platform.OS === 'android') {
+                this._pendingScreenShare = true;
                 yield this.configureForeground();
                 try {
                     this.setScreenShareTracks(yield LocalMediaUtils.getScreenShareTracks());
@@ -742,6 +699,10 @@ class LocalMediaHandler extends EventEmitter {
                     console.warn('Failed to start screenshare', e);
                     this.screenShareEnabled = false;
                     yield DyteHelper.stopService();
+                    this._pendingScreenShare = false;
+                }
+                finally {
+                    this._pendingScreenShare = false;
                 }
             }
             if (Platform.OS === 'ios') {
@@ -759,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;
     }
@@ -836,40 +792,84 @@ 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();
+    static init(_) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const localMediaUtils = yield LocalMediaUtils.init();
+            return new LocalMediaHandler(localMediaUtils);
+        });
+    }
+    emit(event, ...args) {
+        return super.emit(event, ...args);
+    }
+    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 {
-                yield DyteHelper.stopService();
+                if (Platform.OS === 'android')
+                    yield DyteHelper.stopService();
             }
             catch (e) {
                 console.warn('Failed to stop foreground service', e);
             }
-            return this.destruct();
+            InCallManger.stop(undefined);
         });
     }
-    static init(_) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const localMediaUtils = yield LocalMediaUtils.init();
-            return new LocalMediaHandler(localMediaUtils);
-        });
+    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();
     }
-    emit(event, ...args) {
-        return super.emit(event, ...args);
+    destructor() {
+        __classPrivateFieldGet(this, _LocalMediaHandler_appStateSubscription, "f").remove();
+        broadcastEmitter.removeAllListeners('iOS_BroadcastStarted');
+        broadcastEmitter.removeAllListeners('iOS_BroadcastStopped');
+        BackgroundTimer.stop();
     }
-    on(event, listener) {
-        return super.on(event, listener);
+    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) {
+        if (event === 'SCREENSHARE_TRACK_CHANGE' ||
+            event === 'DEVICE_LIST_UPDATED' ||
+            event === 'DEVICE_CHANGE' ||
+            !event) {
             return null;
         }
         return super.removeAllListeners(event);

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;
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudflare/realtimekit-react-native",
-    "version": "0.1.2-staging.6",
+    "version": "0.1.2-staging.8",
     "description": "Cloudflare RealtimeKit SDK for react native",
     "main": "lib/index.js",
     "author": "Cloudflare",
@@ -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": "*"