@stream-io/video-react-native-sdk 0.3.18 → 0.4.0

package/dist/typescript/utils/push/utils.d.ts

@@ -1,6 +1,17 @@
-import { StreamVideoClient } from '@stream-io/video-client';
+import { Call, StreamVideoClient } from '@stream-io/video-client';
 import type { NonRingingPushEvent, StreamVideoConfig } from '../StreamVideoRN/types';
 type PushConfig = NonNullable<StreamVideoConfig['push']>;
+type CanAddPushWSSubscriptionsRef = {
+    current: boolean;
+};
+/**
+ * This function is used to check if the call should be ended based on the push notification
+ * Useful for callkeep management to end the call if necessary (with reportEndCallWithUUID)
+ */
+export declare const shouldCallBeEnded: (callFromPush: Call, created_by_id: string | undefined, receiver_id: string | undefined) => {
+    mustEndCall: boolean;
+    callkeepReason: number;
+};
 export declare const processCallFromPushInBackground: (pushConfig: PushConfig, call_cid: string, action: Parameters<typeof processCallFromPush>[2]) => Promise<void>;
 /**
  * This function is used process the call from push notifications due to incoming call
@@ -18,5 +29,15 @@ export declare const processCallFromPush: (client: StreamVideoClient, call_cid:
  * 3. Call all the callbacks to inform the app about the call
  */
 export declare const processNonIncomingCallFromPush: (client: StreamVideoClient, call_cid: string, nonRingingNotificationType: NonRingingPushEvent) => Promise<void>;
+/**
+ * This function is used to clear all the push related WS subscriptions
+ * note: events are subscribed in push for accept/decline through WS
+ */
+export declare const clearPushWSEventSubscriptions: () => void;
+/**
+ * This ref is used to check if the push WS subscriptions can be added
+ * It is used to avoid adding the push WS subscriptions when the client is connected to WS in the foreground
+ */
+export declare const canAddPushWSSubscriptionsRef: CanAddPushWSSubscriptionsRef;
 export {};
 //# sourceMappingURL=utils.d.ts.map

package/dist/typescript/utils/push/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EACV,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAGhC,KAAK,UAAU,GAAG,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;AAMzD,eAAO,MAAM,+BAA+B,eAC9B,UAAU,YACZ,MAAM,UACR,WAAW,0BAA0B,CAAC,CAAC,CAAC,CAAC,kBAclD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,WACtB,iBAAiB,YACf,MAAM,UACR,QAAQ,GAAG,SAAS,GAAG,SAAS,kBAmBzC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,8BAA8B,WACjC,iBAAiB,YACf,MAAM,8BACY,mBAAmB,kBAkBhD,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAW,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,KAAK,EACV,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAIhC,KAAK,UAAU,GAAG,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;AAEzD,KAAK,4BAA4B,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAEzD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,iBACd,IAAI,iBACH,MAAM,GAAG,SAAS,eACpB,MAAM,GAAG,SAAS;;;CAmChC,CAAC;AAMF,eAAO,MAAM,+BAA+B,eAC9B,UAAU,YACZ,MAAM,UACR,WAAW,0BAA0B,CAAC,CAAC,CAAC,CAAC,kBAclD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,WACtB,iBAAiB,YACf,MAAM,UACR,QAAQ,GAAG,SAAS,GAAG,SAAS,kBAmBzC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,8BAA8B,WACjC,iBAAiB,YACf,MAAM,8BACY,mBAAmB,kBAkBhD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,6BAA6B,YAQzC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,4BAA4B,EAAE,4BAE1C,CAAC"}

package/dist/typescript/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "0.3.18";
+export declare const version = "0.4.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/typescript/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,WAAW,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,UAAU,CAAC"}

package/expo-config-plugin/dist/withAndroidPermissions.js

@@ -6,6 +6,7 @@ const withStreamVideoReactNativeSDKAndroidPermissions = (config) => {
         'android.permission.POST_NOTIFICATIONS',
         'android.permission.FOREGROUND_SERVICE',
         'android.permission.FOREGROUND_SERVICE_MICROPHONE',
+        'android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION',
         'android.permission.BLUETOOTH',
         'android.permission.BLUETOOTH_CONNECT',
         'android.permission.BLUETOOTH_ADMIN',

package/expo-config-plugin/dist/withPushAppDelegate.js

@@ -22,6 +22,7 @@ const withPushAppDelegate = (configuration, props) => {
                     '"RNCallKeep.h"',
                     '<PushKit/PushKit.h>',
                     '"RNVoipPushNotificationManager.h"',
+                    '"StreamVideoReactNative.h"',
                 ]);
                 config.modResults.contents = addDidFinishLaunchingWithOptions(config.modResults.contents, props.ringingPushNotifications);
                 config.modResults.contents = addDidUpdatePushCredentials(config.modResults.contents);
@@ -86,6 +87,11 @@ function addDidReceiveIncomingPushCallback(contents) {
   NSDictionary *stream = payload.dictionaryPayload[@"stream"];
   NSString *uuid = [[NSUUID UUID] UUIDString];
   NSString *createdCallerName = stream[@"created_by_display_name"];
+  NSString *cid = stream[@"call_cid"];
+
+  [StreamVideoReactNative registerIncomingCall:cid uuid:uuid];
+
+  [RNVoipPushNotificationManager addCompletionHandler:uuid completionHandler:completion];
 
   // display the incoming call notification
   [RNCallKeep reportNewIncomingCall: uuid
@@ -99,7 +105,7 @@ function addDidReceiveIncomingPushCallback(contents) {
                  supportsUngrouping: YES
                         fromPushKit: YES
                             payload: stream
-              withCompletionHandler: completion];
+              withCompletionHandler: nil];
 `;
     if (!contents.includes('[RNVoipPushNotificationManager didReceiveIncomingPushWithPayload')) {
         const codeblock = (0, codeMod_1.findObjcFunctionCodeBlock)(contents, DID_RECEIVE_INCOMING_PUSH);

package/ios/StreamVideoReactNative.h

@@ -4,6 +4,8 @@
 
 - (void)screenShareEventReceived:(NSString *)event;
 
++ (void)registerIncomingCall:(NSString *)cid uuid:(NSString *)uuid;
+
 + (void)setup DEPRECATED_MSG_ATTRIBUTE("No need to use setup() anymore");
 
-@end
+@end

package/ios/StreamVideoReactNative.m

@@ -7,6 +7,7 @@
 // Do not change these consts, it is what is used react-native-webrtc
 NSNotificationName const kBroadcastStartedNotification = @"iOS_BroadcastStarted";
 NSNotificationName const kBroadcastStoppedNotification = @"iOS_BroadcastStopped";
+NSMutableDictionary *dictionary;
 
 void broadcastNotificationCallback(CFNotificationCenterRef center,
                                    void *observer,
@@ -92,9 +93,31 @@ RCT_EXPORT_MODULE();
     }
 }
 
++(void)registerIncomingCall:(NSString *)cid uuid:(NSString *)uuid {
+    if (dictionary == nil) {
+       dictionary = [NSMutableDictionary dictionary];
+    }
+    dictionary[cid] = uuid;
+}
+
+RCT_EXPORT_METHOD(getIncomingCallUUid:(NSString *)cid
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    if (dictionary == nil) {
+        reject(@"access_failure", @"no incoming call dictionary found", nil);
+    }
+    NSString *uuid = dictionary[cid];
+    if (uuid) {
+       resolve(uuid);
+     } else {
+        reject(@"access_failure", @"requested incoming call found", nil);
+     }
+    
+}
+
 -(NSArray<NSString *> *)supportedEvents {
     return @[@"StreamVideoReactNative_Ios_Screenshare_Event"];
 }
 
-
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/video-react-native-sdk",
-  "version": "0.3.18",
+  "version": "0.4.0",
   "packageManager": "yarn@3.2.4",
   "main": "dist/commonjs/index.js",
   "module": "dist/module/index.js",

package/src/components/Call/CallControls/AcceptCallButton.tsx

@@ -3,8 +3,6 @@ import React from 'react';
 import { CallControlsButton } from './CallControlsButton';
 import { Phone } from '../../../icons';
 import { useTheme } from '../../../contexts/ThemeContext';
-import { Platform } from 'react-native';
-import notifee from '@notifee/react-native';
 
 /**
  * The props for the Accept Call button.
@@ -45,9 +43,6 @@ export const AcceptCallButton = ({
       return;
     }
     try {
-      if (Platform.OS === 'android' && call?.cid) {
-        notifee.cancelDisplayedNotification(call?.cid);
-      }
       await call?.join();
       if (onAcceptCallHandler) {
         onAcceptCallHandler();

package/src/components/Call/CallControls/RejectCallButton.tsx

@@ -4,8 +4,6 @@ import { CallControlsButton } from './CallControlsButton';
 import { PhoneDown } from '../../../icons';
 import { CallingState } from '@stream-io/video-client';
 import { useTheme } from '../../../contexts/ThemeContext';
-import { Platform } from 'react-native';
-import notifee from '@notifee/react-native';
 
 /**
  * The props for the Reject Call button.
@@ -52,9 +50,6 @@ export const RejectCallButton = ({
       if (callingState === CallingState.LEFT) {
         return;
       }
-      if (Platform.OS === 'android' && call?.cid) {
-        notifee.cancelDisplayedNotification(call?.cid);
-      }
       await call?.leave({ reject: true });
       if (onRejectCallHandler) {
         onRejectCallHandler();

package/src/hooks/push/useIosVoipPushEventsSetupEffect.ts

@@ -1,11 +1,23 @@
 import { useEffect } from 'react';
-import { getVoipPushNotificationLib } from '../../utils/push/libs';
+import {
+  getCallKeepLib,
+  getVoipPushNotificationLib,
+} from '../../utils/push/libs';
 
-import { Platform } from 'react-native';
+import { AppState, Platform } from 'react-native';
 import { StreamVideoRN } from '../../utils';
 import { useStreamVideoClient } from '@stream-io/video-react-bindings';
-import { voipPushNotificationCallCId$ } from '../../utils/push/rxSubjects';
 import { setPushLogoutCallback } from '../../utils/internal/pushLogoutCallback';
+import { NativeModules } from 'react-native';
+import {
+  canAddPushWSSubscriptionsRef,
+  shouldCallBeEnded,
+} from '../../utils/push/utils';
+import {
+  pushUnsubscriptionCallbacks$,
+  voipPushNotificationCallCId$,
+} from '../../utils/push/rxSubjects';
+import { RxUtils } from '@stream-io/video-client';
 
 let lastVoipToken: string | undefined = '';
 
@@ -91,7 +103,7 @@ export const useIosVoipPushEventsSetupEffect = () => {
   }, []);
 };
 
-const onNotificationReceived = (notification: any) => {
+const onNotificationReceived = async (notification: any) => {
   /* --- Example payload ---
   {
     "aps": {
@@ -121,9 +133,65 @@ const onNotificationReceived = (notification: any) => {
     return;
   }
   const call_cid = notification?.stream?.call_cid;
-  if (call_cid) {
-    // send the info to this subject, it is listened by callkeep events
-    // callkeep events will then accept/reject the call
-    voipPushNotificationCallCId$.next(call_cid);
+  const pushConfig = StreamVideoRN.getConfig().push;
+  if (!call_cid || Platform.OS !== 'ios' || !pushConfig) {
+    return;
+  }
+  const client = await pushConfig.createStreamVideoClient();
+  if (!client) {
+    return;
+  }
+  const callFromPush = await client.onRingingCall(call_cid);
+  let uuid = '';
+  try {
+    uuid = await NativeModules?.StreamVideoReactNative?.getIncomingCallUUid(
+      call_cid,
+    );
+  } catch (error) {
+    console.log('Error in getting call uuid', error);
+  }
+  if (!uuid) {
+    return;
+  }
+  const created_by_id = notification?.stream?.created_by_id;
+  const receiver_id = notification?.stream?.receiver_id;
+  function closeCallIfNecessary() {
+    const { mustEndCall, callkeepReason } = shouldCallBeEnded(
+      callFromPush,
+      created_by_id,
+      receiver_id,
+    );
+    if (mustEndCall) {
+      const callkeep = getCallKeepLib();
+      callkeep.reportEndCallWithUUID(uuid, callkeepReason);
+      return true;
+    }
+    return false;
+  }
+  const closed = closeCallIfNecessary();
+  const canListenToWS = () =>
+    canAddPushWSSubscriptionsRef.current && AppState.currentState !== 'active';
+  if (!closed && canListenToWS()) {
+    const unsubscribe = callFromPush.on('all', () => {
+      if (!canListenToWS()) {
+        unsubscribe();
+        return;
+      }
+      const _closed = closeCallIfNecessary();
+      if (_closed) {
+        unsubscribe();
+      }
+    });
+    const unsubscriptionCallbacks =
+      RxUtils.getCurrentValue(pushUnsubscriptionCallbacks$) ?? [];
+    pushUnsubscriptionCallbacks$.next([
+      ...unsubscriptionCallbacks,
+      unsubscribe,
+    ]);
   }
+  // send the info to this subject, it is listened by callkeep events
+  // callkeep events will then accept/reject the call
+  voipPushNotificationCallCId$.next(call_cid);
+  const voipPushNotification = getVoipPushNotificationLib();
+  voipPushNotification.onVoipNotificationCompleted(uuid);
 };

package/src/hooks/useAndroidKeepCallAliveEffect.ts

@@ -1,4 +1,4 @@
-import { useCallStateHooks } from '@stream-io/video-react-bindings';
+import { useCall, useCallStateHooks } from '@stream-io/video-react-bindings';
 import { useEffect, useRef } from 'react';
 import notifee, { AuthorizationStatus } from '@notifee/react-native';
 import { StreamVideoRN } from '../utils';
@@ -63,6 +63,7 @@ let isSetForegroundServiceRan = false;
  * This hook is used to keep the call alive in the background for Android.
  * It starts a foreground service to keep the call alive as soon as the call is joined
  * and stops the foreground Service when the call is left.
+ * Additonally: also responsible for cancelling any notifee displayed notification when the call has transitioned out of ringing
  */
 export const useAndroidKeepCallAliveEffect = () => {
   if (!isSetForegroundServiceRan && Platform.OS === 'android') {
@@ -71,6 +72,7 @@ export const useAndroidKeepCallAliveEffect = () => {
   }
   const foregroundServiceStartedRef = useRef(false);
 
+  const activeCallCid = useCall()?.cid;
   const { useCallCallingState } = useCallStateHooks();
   const callingState = useCallCallingState();
 
@@ -90,16 +92,25 @@ export const useAndroidKeepCallAliveEffect = () => {
         foregroundServiceStartedRef.current = true;
       };
       run();
+    } else if (callingState === CallingState.RINGING) {
+      // cancel any notifee displayed notification when the call has transitioned out of ringing
       return () => {
-        if (!foregroundServiceStartedRef.current) {
-          return;
+        if (activeCallCid) {
+          notifee.cancelDisplayedNotification(activeCallCid);
         }
-        // stop foreground service when the call is not active
-        stopForegroundService();
-        foregroundServiceStartedRef.current = false;
       };
+    } else if (
+      callingState === CallingState.IDLE ||
+      callingState === CallingState.LEFT
+    ) {
+      if (!foregroundServiceStartedRef.current) {
+        return;
+      }
+      // stop foreground service when the call is not active
+      stopForegroundService();
+      foregroundServiceStartedRef.current = false;
     }
-  }, [callingState]);
+  }, [activeCallCid, callingState]);
 
   useEffect(() => {
     return () => {

package/src/providers/MediaStreamManagement.tsx

@@ -38,17 +38,17 @@ export const MediaStreamManagement = ({
   // Memoization is needed to avoid unnecessary useEffect triggers
   const targetResolutionSetting = useMemo<TargetResolution | undefined>(() => {
     if (
-      settings?.video.target_resolution?.width === undefined ||
-      settings?.video.target_resolution?.height === undefined ||
-      settings?.video.target_resolution?.bitrate === undefined
+      settings?.video.target_resolution?.width !== undefined ||
+      settings?.video.target_resolution?.height !== undefined ||
+      settings?.video.target_resolution?.bitrate !== undefined
     ) {
-      return undefined;
+      return {
+        width: settings?.video.target_resolution.width,
+        height: settings?.video.target_resolution.height,
+        bitrate: settings?.video.target_resolution.bitrate,
+      };
     }
-    return {
-      width: settings?.video.target_resolution.width,
-      height: settings?.video.target_resolution.height,
-      bitrate: settings?.video.target_resolution.bitrate,
-    };
+    return undefined;
   }, [
     settings?.video.target_resolution.width,
     settings?.video.target_resolution.height,
@@ -82,25 +82,15 @@ export const MediaStreamManagement = ({
    * This is the object is used to track the initial audio/video enablement
    * Uses backend settings or the Prop to set initial audio/video enabled
    * Backend settings is applied only if the prop was undefined -- meaning user did not provide any value
+   * Memoization is needed to avoid unnecessary useEffect triggers
    */
   const { initialAudioEnabled, initialVideoEnabled } =
     useMemo<MediaDevicesInitialState>(() => {
-      let _initialAudioEnabled: boolean | undefined;
-      let _initialVideoEnabled: boolean | undefined;
-      if (propInitialAudioEnabled !== undefined) {
-        _initialAudioEnabled = propInitialAudioEnabled;
-      } else if (settings?.audio.mic_default_on !== undefined) {
-        _initialAudioEnabled = settings?.audio.mic_default_on;
-      }
-
-      if (propInitialVideoEnabled !== undefined) {
-        _initialVideoEnabled = propInitialVideoEnabled;
-      } else if (settings?.video.camera_default_on !== undefined) {
-        _initialVideoEnabled = settings?.video.camera_default_on;
-      }
       return {
-        initialAudioEnabled: _initialAudioEnabled,
-        initialVideoEnabled: _initialVideoEnabled,
+        initialAudioEnabled:
+          propInitialAudioEnabled ?? settings?.audio.mic_default_on,
+        initialVideoEnabled:
+          propInitialVideoEnabled ?? settings?.video.camera_default_on,
       };
     }, [
       settings?.audio.mic_default_on,
@@ -112,28 +102,29 @@ export const MediaStreamManagement = ({
   // The main logic
   // Enable or Disable the audio/video stream based on the initial state
   useEffect(() => {
-    if (initialAudioEnabled === undefined) {
+    if (!call) {
       return;
     }
-    if (initialVideoEnabled === undefined) {
-      return;
+
+    if (initialAudioEnabled !== undefined) {
+      if (initialAudioEnabled) {
+        call.microphone.enable();
+      } else {
+        call.microphone.disable();
+      }
     }
+
     // we wait until we receive the resolution settings from the backend
-    if (!call || !targetResolutionSetting) {
+    if (!targetResolutionSetting) {
       return;
     }
-
-    if (initialAudioEnabled) {
-      call.microphone.enable();
-    } else {
-      call.microphone.disable();
-    }
-
     call.camera.selectTargetResolution(targetResolutionSetting);
-    if (initialVideoEnabled) {
-      call.camera.enable();
-    } else {
-      call.camera.disable();
+    if (initialVideoEnabled !== undefined) {
+      if (initialVideoEnabled) {
+        call.camera.enable();
+      } else {
+        call.camera.disable();
+      }
     }
   }, [call, initialAudioEnabled, initialVideoEnabled, targetResolutionSetting]);
 

package/src/providers/StreamCall.tsx

@@ -1,12 +1,16 @@
 import { StreamCallProvider } from '@stream-io/video-react-bindings';
-import React, { PropsWithChildren } from 'react';
+import React, { PropsWithChildren, useEffect } from 'react';
 import { Call } from '@stream-io/video-client';
-import { useAndroidKeepCallAliveEffect } from '../hooks';
 import { useIosCallkeepWithCallingStateEffect } from '../hooks/push/useIosCallkeepWithCallingStateEffect';
 import {
   MediaDevicesInitialState,
   MediaStreamManagement,
 } from './MediaStreamManagement';
+import {
+  canAddPushWSSubscriptionsRef,
+  clearPushWSEventSubscriptions,
+} from '../utils/push/utils';
+import { useAndroidKeepCallAliveEffect } from '../hooks/useAndroidKeepCallAliveEffect';
 
 export type StreamCallProps = {
   /**
@@ -15,7 +19,9 @@ export type StreamCallProps = {
    */
   call: Call;
   /**
-   * Provides the initial status of the media devices(audio/video) to the `MediaStreamManagement`.
+   * Optionally provide the initial status of the media devices(audio/video) to the `MediaStreamManagement`.
+   * Note: It will override the default state of the media devices set from the server side.
+   * It is used to control the initial state of the media devices(audio/video) in a custom lobby component.
    */
   mediaDeviceInitialState?: MediaDevicesInitialState;
 };
@@ -36,6 +42,7 @@ export const StreamCall = ({
       <MediaStreamManagement {...mediaDeviceInitialState}>
         <AndroidKeepCallAlive />
         <IosInformCallkeepCallEnd />
+        <ClearPushWSSubscriptions />
         {children}
       </MediaStreamManagement>
     </StreamCallProvider>
@@ -59,3 +66,18 @@ const IosInformCallkeepCallEnd = () => {
   useIosCallkeepWithCallingStateEffect();
   return null;
 };
+
+/**
+ * This is a renderless component to clear all push ws event subscriptions
+ * and set whether push ws subscriptions can be added or not.
+ */
+const ClearPushWSSubscriptions = () => {
+  useEffect(() => {
+    clearPushWSEventSubscriptions();
+    canAddPushWSSubscriptionsRef.current = false;
+    return () => {
+      canAddPushWSSubscriptionsRef.current = true;
+    };
+  }, []);
+  return null;
+};

package/src/utils/push/android.ts

@@ -1,7 +1,7 @@
 import notifee, { EventType, Event } from '@notifee/react-native';
 import { FirebaseMessagingTypes } from '@react-native-firebase/messaging';
-import { StreamVideoClient } from '@stream-io/video-client';
-import { Platform } from 'react-native';
+import { Call, RxUtils, StreamVideoClient } from '@stream-io/video-client';
+import { AppState, Platform } from 'react-native';
 import type {
   NonRingingPushEvent,
   StreamVideoConfig,
@@ -16,8 +16,14 @@ import {
   pushRejectedIncomingCallCId$,
   pushTappedIncomingCallCId$,
   pushNonRingingCallData$,
+  pushUnsubscriptionCallbacks$,
 } from './rxSubjects';
-import { processCallFromPushInBackground } from './utils';
+import {
+  canAddPushWSSubscriptionsRef,
+  clearPushWSEventSubscriptions,
+  processCallFromPushInBackground,
+  shouldCallBeEnded,
+} from './utils';
 import { setPushLogoutCallback } from '../internal/pushLogoutCallback';
 import { getAndroidDefaultRingtoneUrl } from '../getAndroidDefaultRingtoneUrl';
 
@@ -153,6 +159,54 @@ const firebaseMessagingOnMessageHandler = async (
   }
 
   if (data.type === 'call.ring') {
+    const call_cid = data.call_cid;
+    const created_by_id = data.created_by_id;
+    const receiver_id = data.receiver_id;
+
+    function shouldCallBeClosed(callToCheck: Call) {
+      const { mustEndCall } = shouldCallBeEnded(
+        callToCheck,
+        created_by_id,
+        receiver_id,
+      );
+      return mustEndCall;
+    }
+
+    const canListenToWS = () =>
+      canAddPushWSSubscriptionsRef.current &&
+      AppState.currentState !== 'active';
+    const asForegroundService = canListenToWS();
+
+    if (asForegroundService) {
+      // Listen to call events from WS through fg service
+      // note: this will replace the current empty fg service runner
+      notifee.registerForegroundService(() => {
+        return new Promise(async () => {
+          const client = await pushConfig.createStreamVideoClient();
+          if (!client) {
+            notifee.stopForegroundService();
+            return;
+          }
+          const callFromPush = await client.onRingingCall(call_cid);
+          if (shouldCallBeClosed(callFromPush)) {
+            notifee.stopForegroundService();
+            return;
+          }
+          const unsubscribe = callFromPush.on('all', () => {
+            if (!canListenToWS() || shouldCallBeClosed(callFromPush)) {
+              unsubscribe();
+              notifee.stopForegroundService();
+            }
+          });
+          const unsubscriptionCallbacks =
+            RxUtils.getCurrentValue(pushUnsubscriptionCallbacks$) ?? [];
+          pushUnsubscriptionCallbacks$.next([
+            ...unsubscriptionCallbacks,
+            unsubscribe,
+          ]);
+        });
+      });
+    }
     const incomingCallChannel = pushConfig.android.incomingCallChannel;
     const incomingCallNotificationTextGetters =
       pushConfig.android.incomingCallNotificationTextGetters;
@@ -172,12 +226,13 @@ const firebaseMessagingOnMessageHandler = async (
 
     const channelId = incomingCallChannel.id;
     await notifee.displayNotification({
-      id: data.call_cid,
+      id: call_cid,
       title: getTitle(createdUserName),
       body: getBody(createdUserName),
       data,
       android: {
         channelId,
+        asForegroundService,
         sound: incomingCallChannel.sound,
         vibrationPattern: incomingCallChannel.vibrationPattern,
         pressAction: {
@@ -202,6 +257,23 @@ const firebaseMessagingOnMessageHandler = async (
         timeoutAfter: 60000, // 60 seconds, after which the notification will be dismissed automatically
       },
     });
+
+    // check if call needs to be closed if accept/decline event was done
+    // before the notification was shown
+    const client = await pushConfig.createStreamVideoClient();
+    if (!client) {
+      return;
+    }
+    const callFromPush = await client.onRingingCall(call_cid);
+
+    if (shouldCallBeClosed(callFromPush)) {
+      if (asForegroundService) {
+        notifee.stopForegroundService();
+      } else {
+        notifee.cancelDisplayedNotification(call_cid);
+      }
+      return;
+    }
   } else {
     // the other types are call.live_started and call.notification
     const callChannel = pushConfig.android.callChannel;
@@ -272,6 +344,12 @@ const onNotifeeEvent = async (event: Event, pushConfig: PushConfig) => {
     const mustAccept =
       type === EventType.ACTION_PRESS &&
       pressAction.id === ACCEPT_CALL_ACTION_ID;
+
+    if (mustAccept || mustDecline || type === EventType.ACTION_PRESS) {
+      clearPushWSEventSubscriptions();
+      notifee.stopForegroundService();
+    }
+
     if (mustAccept) {
       pushAcceptedIncomingCallCId$.next(call_cid);
       // NOTE: accept will be handled by the app with rxjs observers as the app will go to foreground always

package/src/utils/push/ios.ts

@@ -10,7 +10,10 @@ import {
   voipCallkeepAcceptedCallOnNativeDialerMap$,
   pushNonRingingCallData$,
 } from './rxSubjects';
-import { processCallFromPushInBackground } from './utils';
+import {
+  clearPushWSEventSubscriptions,
+  processCallFromPushInBackground,
+} from './utils';
 import { getExpoNotificationsLib, getPushNotificationIosLib } from './libs';
 import { StreamVideoClient } from '@stream-io/video-client';
 import { setPushLogoutCallback } from '../internal/pushLogoutCallback';
@@ -47,6 +50,7 @@ export const iosCallkeepAcceptCall = (
   if (!shouldProcessCallFromCallkeep(call_cid, callUUIDFromCallkeep)) {
     return;
   }
+  clearPushWSEventSubscriptions();
   // to call end callkeep later if ended in app and not through callkeep
   voipCallkeepAcceptedCallOnNativeDialerMap$.next({
     uuid: callUUIDFromCallkeep,
@@ -66,6 +70,7 @@ export const iosCallkeepRejectCall = async (
   if (!shouldProcessCallFromCallkeep(call_cid, callUUIDFromCallkeep)) {
     return;
   }
+  clearPushWSEventSubscriptions();
   // no need to keep these references anymore
   voipCallkeepAcceptedCallOnNativeDialerMap$.next(undefined);
   voipCallkeepCallOnForegroundMap$.next(undefined);