@stream-io/video-react-native-sdk 1.20.16 → 1.21.1-alpha.1

package/src/utils/push/internal/ios.ts

@@ -1,10 +1,8 @@
-import { getLogger, RxUtils } from '@stream-io/video-client';
+import { getLogger } from '@stream-io/video-client';
 import { AppState, NativeModules, Platform } from 'react-native';
 import { getCallKeepLib, getVoipPushNotificationLib } from '../libs';
-import {
-  pushUnsubscriptionCallbacks$,
-  voipPushNotificationCallCId$,
-} from './rxSubjects';
+import { voipPushNotificationCallCId$ } from './rxSubjects';
+import { pushUnsubscriptionCallbacks } from './constants';
 import { canAddPushWSSubscriptionsRef, shouldCallBeEnded } from './utils';
 import { StreamVideoConfig } from '../../StreamVideoRN/types';
 
@@ -46,6 +44,7 @@ export const onVoipNotificationReceived = async (
   }
   const logger = getLogger(['setupIosVoipPushEvents']);
   const client = await pushConfig.createStreamVideoClient();
+
   if (!client) {
     logger(
       'debug',
@@ -53,6 +52,13 @@ export const onVoipNotificationReceived = async (
     );
     return;
   }
+  const shouldRejectCallWhenBusy = client['rejectCallWhenBusy'] ?? false;
+  if (shouldRejectCallWhenBusy) {
+    // inform the iOS native module that we should reject call when busy
+    NativeModules.StreamVideoReactNative.setShouldRejectCallWhenBusy(
+      shouldRejectCallWhenBusy,
+    );
+  }
   const callFromPush = await client.onRingingCall(call_cid);
   let uuid = '';
   try {
@@ -116,12 +122,9 @@ export const onVoipNotificationReceived = async (
         unsubscribe();
       }
     });
-    const unsubscriptionCallbacks =
-      RxUtils.getCurrentValue(pushUnsubscriptionCallbacks$) ?? [];
-    pushUnsubscriptionCallbacks$.next([
-      ...unsubscriptionCallbacks,
-      unsubscribe,
-    ]);
+
+    pushUnsubscriptionCallbacks.get(call_cid)?.forEach((cb) => cb());
+    pushUnsubscriptionCallbacks.set(call_cid, [unsubscribe]);
   }
   // send the info to this subject, it is listened by callkeep events
   // callkeep events will then accept/reject the call

package/src/utils/push/internal/rxSubjects.ts

@@ -69,13 +69,3 @@ export const voipCallkeepCallOnForegroundMap$ = new BehaviorSubject<
 export const voipCallkeepAcceptedCallOnNativeDialerMap$ = new BehaviorSubject<
   CallkeepMap | undefined
 >(undefined);
-
-type UnsubscribeCallback = () => void;
-
-/**
- * This rxjs subject is used to store the unsubscribe callbacks (if any) of the push notification processing
- * Note: it should be used to clear it when app processes push notification from foreground
- */
-export const pushUnsubscriptionCallbacks$ = new BehaviorSubject<
-  UnsubscribeCallback[] | undefined
->(undefined);

package/src/utils/push/internal/utils.ts

@@ -2,7 +2,6 @@ import {
   Call,
   CallingState,
   getLogger,
-  RxUtils,
   StreamVideoClient,
 } from '@stream-io/video-client';
 import type {
@@ -10,7 +9,7 @@ import type {
   StreamVideoConfig,
 } from '../../StreamVideoRN/types';
 import { onNewCallNotification } from '../../internal/newNotificationCallbacks';
-import { pushUnsubscriptionCallbacks$ } from './rxSubjects';
+import { pushUnsubscriptionCallbacks } from './constants';
 
 type PushConfig = NonNullable<StreamVideoConfig['push']>;
 
@@ -174,14 +173,12 @@ export const processNonIncomingCallFromPush = async (
  * This function is used to clear all the push related WS subscriptions
  * note: events are subscribed in push for accept/decline through WS
  */
-export const clearPushWSEventSubscriptions = () => {
-  const unsubscriptionCallbacks = RxUtils.getCurrentValue(
-    pushUnsubscriptionCallbacks$,
-  );
+export const clearPushWSEventSubscriptions = (call_cid: string) => {
+  const unsubscriptionCallbacks = pushUnsubscriptionCallbacks.get(call_cid);
   if (unsubscriptionCallbacks) {
     unsubscriptionCallbacks.forEach((cb) => cb());
+    pushUnsubscriptionCallbacks.delete(call_cid);
   }
-  pushUnsubscriptionCallbacks$.next(undefined);
 };
 
 /**

package/src/utils/push/setupIosCallKeepEvents.ts

@@ -37,24 +37,29 @@ export function setupIosCallKeepEvents(
   const callkeep = getCallKeepLib();
 
   async function getCallCid(callUUID: string): Promise<string | undefined> {
-    let call_cid = RxUtils.getCurrentValue(voipPushNotificationCallCId$);
-    if (!call_cid) {
-      // if call_cid is not available, try to get it from native module
-      try {
-        call_cid =
-          await NativeModules?.StreamVideoReactNative?.getIncomingCallCid(
-            callUUID,
-          );
-        voipPushNotificationCallCId$.next(call_cid);
-      } catch (error) {
+    try {
+      const call_cid =
+        await NativeModules.StreamVideoReactNative.getIncomingCallCid(callUUID);
+      // in a case that voipPushNotificationCallCId$ is empty (this should not happen as voipPushNotificationCallCId$ is updated in push reception)]
+      // update it with this call_cid
+      const voipPushNotificationCallCId = RxUtils.getCurrentValue(
+        voipPushNotificationCallCId$,
+      );
+      if (!voipPushNotificationCallCId) {
         logger(
           'debug',
-          'Error in getting call cid from native module - probably the call was already processed, so ignoring this callkeep event',
-          error,
+          `voipPushNotificationCallCId$ is empty, updating it with the call_cid: ${call_cid} for callUUID: ${callUUID}`,
         );
+        voipPushNotificationCallCId$.next(call_cid);
       }
+      return call_cid;
+    } catch {
+      logger(
+        'debug',
+        `Error in getting call cid from native module for callUUID: ${callUUID} - probably the call was already processed, so ignoring this callkeep event`,
+      );
     }
-    return call_cid;
+    return undefined;
   }
 
   function answerCall(callUUID: string) {
@@ -150,7 +155,7 @@ const iosCallkeepAcceptCall = (
   if (!shouldProcessCallFromCallkeep(call_cid, callUUIDFromCallkeep)) {
     return;
   }
-  clearPushWSEventSubscriptions();
+  clearPushWSEventSubscriptions(call_cid);
   // to call end callkeep later if ended in app and not through callkeep
   voipCallkeepAcceptedCallOnNativeDialerMap$.next({
     uuid: callUUIDFromCallkeep,
@@ -170,11 +175,17 @@ const iosCallkeepRejectCall = async (
   if (!shouldProcessCallFromCallkeep(call_cid, callUUIDFromCallkeep)) {
     return;
   }
-  clearPushWSEventSubscriptions();
-  // no need to keep these references anymore
-  voipCallkeepAcceptedCallOnNativeDialerMap$.next(undefined);
-  voipCallkeepCallOnForegroundMap$.next(undefined);
-  voipPushNotificationCallCId$.next(undefined);
+  clearPushWSEventSubscriptions(call_cid);
+  // remove the references if the call_cid matches
+  const voipPushNotificationCallCId = RxUtils.getCurrentValue(
+    voipPushNotificationCallCId$,
+  );
+  if (voipPushNotificationCallCId === call_cid) {
+    voipCallkeepAcceptedCallOnNativeDialerMap$.next(undefined);
+    voipCallkeepCallOnForegroundMap$.next(undefined);
+    voipPushNotificationCallCId$.next(undefined);
+  }
+
   await processCallFromPushInBackground(pushConfig, call_cid, 'decline');
   await NativeModules.StreamVideoReactNative?.removeIncomingCall(call_cid);
 };

package/src/utils/push/setupIosVoipPushEvents.ts

@@ -13,11 +13,11 @@ export function setupIosVoipPushEvents(
     return;
   }
   const logger = getLogger(['setupIosVoipPushEvents']);
-  if (!pushConfig.android.incomingCallChannel) {
+  if (!pushConfig.ios.pushProviderName) {
     // TODO: remove this check and find a better way once we have telecom integration for android
     logger(
       'debug',
-      'android incomingCallChannel is not defined, so skipping the setupIosVoipPushEvents',
+      'ios pushProviderName is not defined, so skipping the setupIosVoipPushEvents',
     );
     return;
   }

package/src/version.ts

@@ -1 +1 @@
-export const version = '1.20.16';
+export const version = '1.21.0';