@stream-io/video-react-native-sdk 1.29.1-beta.0 → 1.29.2

package/src/utils/StreamVideoRN/index.ts

@@ -3,14 +3,9 @@ import pushLogoutCallbacks from '../internal/pushLogoutCallback';
 import newNotificationCallbacks, {
   type NewCallNotificationCallback,
 } from '../internal/newNotificationCallbacks';
+import { setupIosCallKeepEvents } from '../push/setupIosCallKeepEvents';
 import { setupIosVoipPushEvents } from '../push/setupIosVoipPushEvents';
-import { setupCallingExpEvents } from '../push/setupCallingExpEvents';
-import {
-  extractCallingExpOptions,
-  getCallingxLib,
-} from '../push/libs/callingx';
 import { NativeModules, Platform } from 'react-native';
-import { videoLoggerSystem } from '@stream-io/video-client';
 
 // Utility type for deep partial
 type DeepPartial<T> = {
@@ -52,7 +47,10 @@ const DEFAULT_STREAM_VIDEO_CONFIG: StreamVideoConfig = {
     android: {
       channel: {
         id: 'stream_call_foreground_service',
-        name: 'Ongoing calls',
+        name: 'To keep calls alive',
+        lights: false,
+        vibration: false,
+        importance: 3,
       },
       notificationTexts: {
         title: 'Call in progress',
@@ -78,6 +76,20 @@ export class StreamVideoRN {
     this.config = deepMerge(this.config, updateConfig);
   }
 
+  static updateAndroidIncomingCallChannel(
+    updateChannel: Partial<
+      NonNullable<StreamVideoConfig['push']>['android']['incomingCallChannel']
+    >,
+  ) {
+    const prevChannel = this.config.push?.android?.incomingCallChannel;
+    if (prevChannel) {
+      this.config.push!.android.incomingCallChannel = {
+        ...prevChannel,
+        ...updateChannel,
+      };
+    }
+  }
+
   /**
    * Set the push config for StreamVideoRN.
    * This method must be called **outside** of your application lifecycle, e.g. alongside your
@@ -90,26 +102,7 @@ export class StreamVideoRN {
    * import App from './App';
    * // Set push config
    * const pushConfig = {}; // construct your config
-   * // Set CallKit/Android Telecom API integration options. All params are optional. If not provided, the default values will be used.
-   * const callingExpOptions = {
-   *   ios: {
-   *     callsHistory: true,
-   *     displayCallTimeout: 60000,
-   *     sound: 'ringtone',
-   *     imageName: 'callkit_icon',
-   *   },
-   *   android: {
-   *     incomingChannel: {
-   *       id: 'stream_incoming_call_notifications',
-   *       name: 'Call notifications',
-   *       vibration: true,
-   *       sound: 'default',
-   *     },
-   *     titleTransformer: (text: string) => text,
-   *     subtitleTransformer: (text: string) => text,
-   *   },
-   * };
-   * StreamVideoRN.setPushConfig(pushConfig, callingExpOptions);
+   * StreamVideoRN.setPushConfig(pushConfig);
    * AppRegistry.registerComponent('app', () => App);
    */
   static setPushConfig(pushConfig: NonNullable<StreamVideoConfig['push']>) {
@@ -117,23 +110,20 @@ export class StreamVideoRN {
       // Ignoring this config as push config was already set
       return;
     }
-
-    this.config.push = pushConfig;
-
-    try {
-      const callingx = getCallingxLib();
-      videoLoggerSystem
-        .getLogger('StreamVideoRN.setPushConfig')
-        .info(JSON.stringify(this.config));
-      const options = extractCallingExpOptions(this.config);
-      callingx.setup(options);
-    } catch {
+    if (
+      __DEV__ &&
+      (pushConfig.navigateAcceptCall || pushConfig.navigateToIncomingCall)
+    ) {
       throw new Error(
-        'react-native-callingx library is not installed. Please check the installation instructions: https://getstream.io/video/docs/react-native/incoming-calls/ringing-setup/react-native/.',
+        `Support for navigateAcceptCall or navigateToIncomingCall in pushConfig has been removed.
+        Please watch for incoming and outgoing calls in the root component of your app.
+        Please see https://getstream.io/video/docs/react-native/advanced/ringing-calls/#watch-for-incoming-and-outgoing-calls for more information.`,
       );
     }
 
-    setupCallingExpEvents(pushConfig);
+    this.config.push = pushConfig;
+
+    setupIosCallKeepEvents(pushConfig);
     setupIosVoipPushEvents(pushConfig);
   }
 

package/src/utils/StreamVideoRN/types.ts

@@ -5,18 +5,6 @@ import {
 } from '@stream-io/video-client';
 import type { AndroidChannel } from '@notifee/react-native';
 
-export type AndroidChannelConfig = {
-  id: string;
-  name: string;
-  sound?: string;
-  vibration?: boolean;
-};
-
-export type KeepAliveAndroidNotificationTexts = {
-  title: string;
-  body: string;
-};
-
 export type NonRingingPushEvent =
   | 'call.live_started'
   | 'call.notification'
@@ -44,27 +32,6 @@ export type StreamVideoConfig = {
        * @example "production-apn-video" or "staging-apn-video" based on the environment
        */
       pushProviderName?: string;
-      supportsVideo?: boolean;
-      /**
-       * Sound to play when an incoming call is received. Must be a valid sound resource name in the project.
-       * @default '' (no sound)
-       */
-      sound?: string;
-      /**
-       * Image to display when an incoming call is received. Must be a valid image resource name in the project.
-       * @default '' (no image)
-       */
-      imageName?: string;
-      /**
-       * Enable calls history. When enabled, the call will be added to the calls history.
-       * @default false
-       */
-      callsHistory?: boolean;
-      /**
-       * Timeout to display an incoming call. When the call is displayed for more than the timeout, the call will be rejected.
-       * @default 60000 (1 minute)
-       */
-      displayCallTimeout?: number;
     };
     android: {
       /**
@@ -94,21 +61,28 @@ export type StreamVideoConfig = {
        * The notification channel to be used for incoming calls for Android.
        * @example
        * {
-       *  id: 'incoming_calls_channel',
-       *  name: 'Incoming calls',
-       *  sound?: string;
-       *  vibration?: boolean;
+       *  id: 'stream_incoming_call',
+       *  name: 'Incoming call notifications',
+       *  importance: AndroidImportance.HIGH,
        * }
        */
-      incomingChannel?: AndroidChannelConfig;
-      /**
-       * The transformer to be used to transform the call title in the notification for ringing and ongoing calls for Android.
-       */
-      titleTransformer?: (memberName: string, incoming: boolean) => string;
+      incomingCallChannel?: AndroidChannel;
       /**
-       * The transformer to be used to transform the call subtitle for ringing and ongoing calls for Android.
+       * Functions to create the texts shown in the notification for incoming calls in Android.
+       * @example
+       * {
+       *  getTitle: (createdUserName: string) => `Incoming call from ${createdUserName}`,
+       *  getBody: (createdUserName: string) => `Tap to answer the call`
+       *  getAcceptButtonTitle?: () => `Accept`,
+       *  getDeclineButtonTitle?: () => `Decline`,
+       * }
        */
-      subtitleTransformer?: (call_cid: string, incoming: boolean) => string;
+      incomingCallNotificationTextGetters?: {
+        getTitle: (createdUserName: string) => string;
+        getBody: (createdUserName: string) => string;
+        getAcceptButtonTitle?: () => string;
+        getDeclineButtonTitle?: () => string;
+      };
       /**
        * Functions to create the texts shown in the notification for non ringing calls in Android.
        * @example
@@ -137,16 +111,6 @@ export type StreamVideoConfig = {
         getBody: (type: NonRingingPushEvent, createdUserName: string) => string;
       };
     };
-    /**
-     * Whether to enable ongoing calls.
-     * @default false
-     */
-    enableOngoingCalls?: boolean;
-    /**
-     * Whether to reject calls when the user is busy.
-     * @default false
-     */
-    shouldRejectCallWhenBusy?: boolean;
     /**
      * This function is used to create a custom video client.
      * This is used create a video client for incoming calls in the background and inform call events to the server.
@@ -166,6 +130,12 @@ export type StreamVideoConfig = {
      * }
      */
     createStreamVideoClient: () => Promise<StreamVideoClient | undefined>;
+    /** @deprecated This method will be removed in the future. Please watch for incoming and outgoing calls in the root component of your app.
+        Please see https://getstream.io/video/docs/react-native/advanced/ringing-calls/#watch-for-incoming-and-outgoing-calls for more information */
+    navigateAcceptCall?: () => void;
+    /** @deprecated This method will be removed in the future. Please watch for incoming and outgoing calls in the root component of your app.
+        Please see https://getstream.io/video/docs/react-native/advanced/ringing-calls/#watch-for-incoming-and-outgoing-calls for more information */
+    navigateToIncomingCall?: () => void;
     /** Callback that is called when a non ringing push notification was tapped */
     onTapNonRingingCallNotification?: (
       call_cid: string,
@@ -177,11 +147,14 @@ export type StreamVideoConfig = {
       /**
        * The notification channel to keep call alive in the background for Android using a foreground service.
        */
-      channel: Omit<AndroidChannelConfig, 'sound' | 'vibration'>;
+      channel: AndroidChannel;
       /**
        * The texts shown in the notification to keep call alive in the background
        */
-      notificationTexts: KeepAliveAndroidNotificationTexts;
+      notificationTexts: {
+        title: string;
+        body: string;
+      };
       /**
        * The task to run in the foreground service
        * The task must resolve a promise once complete

package/src/utils/internal/registerSDKGlobals.ts

@@ -1,66 +1,23 @@
-import { StreamRNVideoSDKGlobals } from '@stream-io/video-client';
+import type { StreamRNVideoSDKGlobals } from '@stream-io/video-client';
 import { NativeModules, PermissionsAndroid, Platform } from 'react-native';
-import { getCallingxLibIfAvailable } from '../push/libs/callingx';
-import { endCallingxCall, startCallingxCall } from './callingx/callingx';
 
 const StreamInCallManagerNativeModule = NativeModules.StreamInCallManager;
 const StreamVideoReactNativeModule = NativeModules.StreamVideoReactNative as {
   checkPermission: StreamRNVideoSDKGlobals['permissions']['check'] | undefined;
 };
 
-const CallingxModule = getCallingxLibIfAvailable();
-
-/**
- * Checks if StreamInCallManager should be bypassed because CallKit is handling
- * the audio session via CallingX.
- *
- * On iOS, when CallingX is set up and has a registered call, the audio session
- * is managed by CallKit through CallingxImpl.swift.
- * In this case, StreamInCallManager should not run to avoid conflicting audio
- * session configurations.
- */
-const shouldBypassForCallKit = ({
-  isRingingTypeCall,
-}: {
-  isRingingTypeCall: boolean;
-}): boolean => {
-  if (Platform.OS !== 'ios') {
-    return false;
-  }
-  if (!CallingxModule) {
-    return false;
-  }
-  const bypass =
-    CallingxModule.isSetup &&
-    (isRingingTypeCall || CallingxModule.isOngoingCallsEnabled);
-  return bypass;
-};
-
 const streamRNVideoSDKGlobals: StreamRNVideoSDKGlobals = {
-  callingX: {
-    startCall: startCallingxCall,
-    endCall: endCallingxCall,
-  },
   callManager: {
-    setup: ({ defaultDevice, isRingingTypeCall }) => {
-      if (shouldBypassForCallKit({ isRingingTypeCall })) {
-        return;
-      }
+    setup: ({ defaultDevice }) => {
       StreamInCallManagerNativeModule.setDefaultAudioDeviceEndpointType(
         defaultDevice,
       );
       StreamInCallManagerNativeModule.setup();
     },
-    start: ({ isRingingTypeCall }) => {
-      if (shouldBypassForCallKit({ isRingingTypeCall })) {
-        return;
-      }
+    start: () => {
       StreamInCallManagerNativeModule.start();
     },
-    stop: ({ isRingingTypeCall }) => {
-      if (shouldBypassForCallKit({ isRingingTypeCall })) {
-        return;
-      }
+    stop: () => {
       StreamInCallManagerNativeModule.stop();
     },
   },