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

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);
         }
@@ -639,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 {
@@ -962,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);

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

@@ -112,14 +112,11 @@ export default class LocalMediaHandler extends EventEmitter {
     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

@@ -805,47 +805,37 @@ class LocalMediaHandler extends EventEmitter {
         return super.on(event, listener);
     }
     destruct() {
-        this.destructMediaHandler();
+        // 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();
-            this.cleanUpTracks();
-            __classPrivateFieldGet(this, _LocalMediaHandler_localMediaUtils, "f").destruct();
-            try {
-                if (Platform.OS === 'android')
-                    yield DyteHelper.stopService();
-            }
-            catch (e) {
-                console.warn('Failed to stop foreground service', e);
-            }
-            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() {
-        __classPrivateFieldGet(this, _LocalMediaHandler_appStateSubscription, "f").remove();
-        broadcastEmitter.removeAllListeners('iOS_BroadcastStarted');
-        broadcastEmitter.removeAllListeners('iOS_BroadcastStopped');
-        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();
+        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() {
@@ -865,15 +855,6 @@ class LocalMediaHandler extends EventEmitter {
         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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudflare/realtimekit-react-native",
-    "version": "0.1.2-staging.8",
+    "version": "0.1.2",
     "description": "Cloudflare RealtimeKit SDK for react native",
     "main": "lib/index.js",
     "author": "Cloudflare",
@@ -44,7 +44,9 @@
         "react-native": "*"
     },
     "publishConfig": {
-        "tag": "staging"
+        "registry": "https://registry.npmjs.org/",
+        "access": "public",
+        "tag": "latest"
     },
     "scripts": {
         "postpublish": "mv package.json.bak package.json"