@stream-io/video-react-native-sdk 1.29.4-beta.0 → 1.30.0

package/dist/module/hooks/push/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["useIosVoipPushEventsSetupEffect","useInitAndroidTokenAndRest","useIosInitRemoteNotifications","useProcessPushNonRingingCallEffect","usePushRegisterEffect"],"sourceRoot":"../../../../src","sources":["hooks/push/index.ts"],"mappings":"AAAA,SAASA,+BAA+B,QAAQ,mCAAmC;AACnF,SAASC,0BAA0B,QAAQ,8BAA8B;AACzE,SAASC,6BAA6B,QAAQ,iCAAiC;AAC/E,SAASC,kCAAkC,QAAQ,sCAAsC;;AAEzF;AACA;AACA;AACA;AACA,OAAO,MAAMC,qBAAqB,GAAGA,CAAA,KAAM;EACzCF,6BAA6B,CAAC,CAAC;EAC/BF,+BAA+B,CAAC,CAAC;EACjCG,kCAAkC,CAAC,CAAC;EACpCF,0BAA0B,CAAC,CAAC;AAC9B,CAAC","ignoreList":[]}
+{"version":3,"names":["useIosVoipPushEventsSetupEffect","useProcessPushCallEffect","useInitAndroidTokenAndRest","useIosInitRemoteNotifications","useProcessPushNonRingingCallEffect","usePushRegisterEffect"],"sourceRoot":"../../../../src","sources":["hooks/push/index.ts"],"mappings":"AAAA,SAASA,+BAA+B,QAAQ,mCAAmC;AACnF,SAASC,wBAAwB,QAAQ,4BAA4B;AACrE,SAASC,0BAA0B,QAAQ,8BAA8B;AACzE,SAASC,6BAA6B,QAAQ,iCAAiC;AAC/E,SAASC,kCAAkC,QAAQ,sCAAsC;;AAEzF;AACA;AACA;AACA;AACA,OAAO,MAAMC,qBAAqB,GAAGA,CAAA,KAAM;EACzCF,6BAA6B,CAAC,CAAC;EAC/BH,+BAA+B,CAAC,CAAC;EACjCI,kCAAkC,CAAC,CAAC;EACpCH,wBAAwB,CAAC,CAAC;EAC1BC,0BAA0B,CAAC,CAAC;AAC9B,CAAC","ignoreList":[]}

package/dist/module/hooks/push/useIosCallkeepWithCallingStateEffect.js

@@ -0,0 +1,153 @@
+import { CallingState, RxUtils, videoLoggerSystem } from '@stream-io/video-client';
+import { useCall, useCallStateHooks } from '@stream-io/video-react-bindings';
+import { NativeModules, Platform } from 'react-native';
+import { useEffect, useState } from 'react';
+import { StreamVideoRN } from '../../utils';
+import { getCallKeepLib } from '../../utils/push/libs';
+import { voipCallkeepAcceptedCallOnNativeDialerMap$, voipCallkeepCallOnForegroundMap$, voipPushNotificationCallCId$ } from '../../utils/push/internal/rxSubjects';
+const isNonActiveCallingState = callingState => {
+  return callingState === CallingState.IDLE || callingState === CallingState.UNKNOWN || callingState === CallingState.LEFT;
+};
+const isAcceptedCallingState = callingState => {
+  return callingState === CallingState.JOINING || callingState === CallingState.JOINED;
+};
+const unsubscribeCallkeepEvents = async activeCallCid => {
+  const voipPushNotificationCallCId = RxUtils.getCurrentValue(voipPushNotificationCallCId$);
+  if (activeCallCid && activeCallCid === voipPushNotificationCallCId) {
+    // callkeep events should not be listened anymore so clear the call cid
+    voipPushNotificationCallCId$.next(undefined);
+  }
+  return await NativeModules.StreamVideoReactNative?.removeIncomingCall(activeCallCid);
+};
+const logger = videoLoggerSystem.getLogger('useIosCallkeepWithCallingStateEffect');
+const log = message => {
+  logger.warn(message);
+};
+
+/**
+ * This hook is used to inform the callkeep library that the call has been joined or ended.
+ */
+export const useIosCallkeepWithCallingStateEffect = () => {
+  const activeCall = useCall();
+  const {
+    useCallCallingState
+  } = useCallStateHooks();
+  const callingState = useCallCallingState();
+  const [acceptedForegroundCallkeepMap, setAcceptedForegroundCallkeepMap] = useState();
+  useEffect(() => {
+    return () => {
+      const pushConfig = StreamVideoRN.getConfig().push;
+      if (Platform.OS !== 'ios' || !pushConfig || !pushConfig.ios?.pushProviderName) {
+        return;
+      }
+      if (!pushConfig.android.incomingCallChannel) {
+        // TODO: remove this check and find a better way once we have telecom integration for android
+        return;
+      }
+      const callkeep = getCallKeepLib();
+      // if the component is unmounted and the callID was not reported to callkeep, then report it now
+      if (acceptedForegroundCallkeepMap) {
+        log(`Ending call in callkeep: ${acceptedForegroundCallkeepMap.cid}, reason: component unmounted and call was present in acceptedForegroundCallkeepMap`);
+        unsubscribeCallkeepEvents(acceptedForegroundCallkeepMap.cid).then(() => callkeep.endCall(acceptedForegroundCallkeepMap.uuid));
+      }
+    };
+  }, [acceptedForegroundCallkeepMap]);
+  const activeCallCid = activeCall?.cid;
+  useEffect(() => {
+    return () => {
+      const pushConfig = StreamVideoRN.getConfig().push;
+      if (Platform.OS !== 'ios' || !pushConfig || !pushConfig.ios?.pushProviderName || !activeCallCid) {
+        return;
+      }
+      if (!pushConfig.android.incomingCallChannel) {
+        // TODO: remove this check and find a better way once we have telecom integration for android
+        return;
+      }
+      const nativeDialerAcceptedCallMap = RxUtils.getCurrentValue(voipCallkeepAcceptedCallOnNativeDialerMap$);
+      const foregroundIncomingCallkeepMap = RxUtils.getCurrentValue(voipCallkeepCallOnForegroundMap$);
+      const callkeep = getCallKeepLib();
+      if (activeCallCid === nativeDialerAcceptedCallMap?.cid) {
+        log(`Ending call in callkeep: ${activeCallCid}, reason: activeCallCid changed or was removed and call was present in nativeDialerAcceptedCallMap`);
+        unsubscribeCallkeepEvents(activeCallCid).then(() => callkeep.endCall(nativeDialerAcceptedCallMap.uuid));
+        // no need to keep this reference anymore
+        voipCallkeepAcceptedCallOnNativeDialerMap$.next(undefined);
+      } else if (activeCallCid === foregroundIncomingCallkeepMap?.cid) {
+        log(`Ending call in callkeep: ${activeCallCid}, reason: activeCallCid changed or was removed and call was present in foregroundIncomingCallkeepMap`);
+        unsubscribeCallkeepEvents(activeCallCid).then(() => callkeep.endCall(foregroundIncomingCallkeepMap.uuid));
+      }
+    };
+  }, [activeCallCid]);
+  const pushConfig = StreamVideoRN.getConfig().push;
+  if (Platform.OS !== 'ios' || !pushConfig || !pushConfig.ios.pushProviderName || !activeCallCid) {
+    return;
+  }
+  if (!pushConfig.android.incomingCallChannel) {
+    // TODO: remove this check and find a better way once we have telecom integration for android
+    return;
+  }
+
+  /**
+   * Check if current call is still needed to be accepted in callkeep
+   */
+  if (isAcceptedCallingState(callingState) && acceptedForegroundCallkeepMap?.cid !== activeCallCid) {
+    const callkeep = getCallKeepLib();
+    // push notification was displayed
+    // but the call has been accepted through the app and not through the native dialer
+    const foregroundCallkeepMap = RxUtils.getCurrentValue(voipCallkeepCallOnForegroundMap$);
+    if (foregroundCallkeepMap && foregroundCallkeepMap.cid === activeCallCid) {
+      log(
+      // @ts-expect-error - types issue
+      `Accepting call in callkeep: ${activeCallCid}, reason: callingstate went to ${CallingState[callingState]} and call was present in foregroundCallkeepMap`);
+      // no need to keep this reference anymore
+      voipCallkeepCallOnForegroundMap$.next(undefined);
+      NativeModules.StreamVideoReactNative?.removeIncomingCall(activeCallCid).then(() => callkeep.answerIncomingCall(foregroundCallkeepMap.uuid));
+      // this call should be accepted in callkeep
+      setAcceptedForegroundCallkeepMap(foregroundCallkeepMap);
+    }
+  }
+
+  /**
+   * Check if current call is still needed to be ended in callkeep
+   */
+  if (isNonActiveCallingState(callingState)) {
+    const callkeep = getCallKeepLib();
+
+    // this was a previously joined call which had push notification displayed
+    // the call was accepted through the app and not through native dialer
+    // the call was left using the leave button in the app and not through native dialer
+    if (activeCallCid === acceptedForegroundCallkeepMap?.cid) {
+      log(
+      // @ts-expect-error - types issue
+      `Ending call in callkeep: ${activeCallCid}, reason: callingstate went to ${CallingState[callingState]} and call was present in acceptedForegroundCallkeepMap`);
+      unsubscribeCallkeepEvents(activeCallCid).then(() => callkeep.endCall(acceptedForegroundCallkeepMap.uuid));
+      setAcceptedForegroundCallkeepMap(undefined);
+      return;
+    }
+    // this was a call which had push notification displayed but never joined
+    // the user rejected in the app and not from native dialer
+    const foregroundIncomingCallkeepMap = RxUtils.getCurrentValue(voipCallkeepCallOnForegroundMap$);
+    if (activeCallCid === foregroundIncomingCallkeepMap?.cid) {
+      log(
+      // @ts-expect-error - types issue
+      `Ending call in callkeep: ${activeCallCid}, reason: callingstate went to ${CallingState[callingState]} and call was present in foregroundIncomingCallkeepMap`);
+      unsubscribeCallkeepEvents(activeCallCid).then(() => callkeep.endCall(foregroundIncomingCallkeepMap.uuid));
+      // no need to keep this reference anymore
+      voipCallkeepCallOnForegroundMap$.next(undefined);
+      return;
+    }
+    // this was a previously joined call
+    // it was an accepted call from native dialer and not from the app
+    // the user left using the leave button in the app
+    const nativeDialerAcceptedCallMap = RxUtils.getCurrentValue(voipCallkeepAcceptedCallOnNativeDialerMap$);
+    if (activeCallCid === nativeDialerAcceptedCallMap?.cid) {
+      log(
+      // @ts-expect-error - types issue
+      `Ending call in callkeep: ${activeCallCid}, reason: callingstate went to ${CallingState[callingState]} and call was present in nativeDialerAcceptedCallMap`);
+      unsubscribeCallkeepEvents(activeCallCid).then(() => callkeep.endCall(nativeDialerAcceptedCallMap.uuid));
+      // no need to keep this reference anymore
+      voipCallkeepAcceptedCallOnNativeDialerMap$.next(undefined);
+      return;
+    }
+  }
+};
+//# sourceMappingURL=useIosCallkeepWithCallingStateEffect.js.map

package/dist/module/hooks/push/useIosCallkeepWithCallingStateEffect.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["CallingState","RxUtils","videoLoggerSystem","useCall","useCallStateHooks","NativeModules","Platform","useEffect","useState","StreamVideoRN","getCallKeepLib","voipCallkeepAcceptedCallOnNativeDialerMap$","voipCallkeepCallOnForegroundMap$","voipPushNotificationCallCId$","isNonActiveCallingState","callingState","IDLE","UNKNOWN","LEFT","isAcceptedCallingState","JOINING","JOINED","unsubscribeCallkeepEvents","activeCallCid","voipPushNotificationCallCId","getCurrentValue","next","undefined","StreamVideoReactNative","removeIncomingCall","logger","getLogger","log","message","warn","useIosCallkeepWithCallingStateEffect","activeCall","useCallCallingState","acceptedForegroundCallkeepMap","setAcceptedForegroundCallkeepMap","pushConfig","getConfig","push","OS","ios","pushProviderName","android","incomingCallChannel","callkeep","cid","then","endCall","uuid","nativeDialerAcceptedCallMap","foregroundIncomingCallkeepMap","foregroundCallkeepMap","answerIncomingCall"],"sourceRoot":"../../../../src","sources":["hooks/push/useIosCallkeepWithCallingStateEffect.ts"],"mappings":"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","ignoreList":[]}

package/dist/module/hooks/push/useIosVoipPushEventsSetupEffect.js

@@ -1,11 +1,11 @@
 import { useEffect, useRef, useState } from 'react';
+import { getVoipPushNotificationLib } from '../../utils/push/libs';
 import { Platform } from 'react-native';
 import { StreamVideoRN } from '../../utils';
 import { onVoipNotificationReceived } from '../../utils/push/internal/ios';
 import { useConnectedUser, useStreamVideoClient } from '@stream-io/video-react-bindings';
 import { setPushLogoutCallback } from '../../utils/internal/pushLogoutCallback';
 import { videoLoggerSystem } from '@stream-io/video-client';
-import { getCallingxLibIfAvailable } from '../../utils/push/libs';
 const logger = videoLoggerSystem.getLogger('useIosVoipPushEventsSetupEffect');
 
 /* VoipPushNotificationLib has support for only one listener type at a time
@@ -23,7 +23,6 @@ function setLogoutCallback(client, token, lastVoipTokenRef) {
     };
     try {
       await client.removeDevice(token);
-      logger.debug('PushLogoutCallback - Removed voip token', token);
     } catch (err) {
       logger.warn('PushLogoutCallback - Failed to remove voip token', err);
     }
@@ -78,10 +77,20 @@ export const useIosVoipPushEventsSetupEffect = () => {
   useEffect(() => {
     const pushConfig = StreamVideoRN.getConfig().push;
     const pushProviderName = pushConfig?.ios.pushProviderName;
-    const callingx = getCallingxLibIfAvailable();
-    if (Platform.OS !== 'ios' || !client || !pushProviderName || !callingx) {
+    if (Platform.OS !== 'ios' || !client || !pushProviderName) {
       return;
     }
+    if (!pushConfig.android.incomingCallChannel) {
+      // 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 useIosVoipPushEventsSetupEffect');
+      return;
+    }
+    const voipPushNotification = getVoipPushNotificationLib();
+
+    // even though we do this natively, we have to still register here again
+    // natively this will make sure "register" event for JS is sent with the last push token
+    // Necessary if client changed before we got the event here or user logged out and logged in again
+    voipPushNotification.registerVoipToken();
     const onTokenReceived = token => {
       const userId = client.streamClient._user?.id ?? '';
       if (client.streamClient.anonymous || !token || !userId) {
@@ -109,24 +118,27 @@ export const useIosVoipPushEventsSetupEffect = () => {
       });
     };
     // fired when PushKit give us the latest token
-    const voipRegisterListener = callingx.addEventListener('voipNotificationsRegistered', ({
-      token
-    }) => {
+    voipPushNotification.addEventListener('register', token => {
       onTokenReceived(token);
     });
 
-    // this will return events that were fired before js bridge initialized
-    callingx.getInitialVoipEvents().forEach(({
-      eventName,
-      params
-    }) => {
-      if (eventName === 'voipNotificationsRegistered' && 'token' in params) {
-        onTokenReceived(params.token);
-      } else if (eventName === 'voipNotificationReceived') {
-        onVoipNotificationReceived(params, pushConfig);
+    // this will fire when there are events occured before js bridge initialized
+    voipPushNotification.addEventListener('didLoadWithEvents', events => {
+      if (!events || !Array.isArray(events) || events.length < 1) {
+        return;
+      }
+      for (const voipPushEvent of events) {
+        const {
+          name,
+          data
+        } = voipPushEvent;
+        if (name === 'RNVoipPushRemoteNotificationsRegisteredEvent') {
+          onTokenReceived(data);
+        } else if (name === 'RNVoipPushRemoteNotificationReceivedEvent') {
+          onVoipNotificationReceived(data, pushConfig);
+        }
       }
     });
-    callingx.registerVoipToken();
     lastListener.count += 1;
     const currentListenerCount = lastListener.count;
     return () => {
@@ -136,7 +148,8 @@ export const useIosVoipPushEventsSetupEffect = () => {
         return;
       }
       logger.debug(`Voip event listeners are removed for user: ${userId}`);
-      voipRegisterListener.remove();
+      voipPushNotification.removeEventListener('didLoadWithEvents');
+      voipPushNotification.removeEventListener('register');
     };
   }, [client]);
 };

package/dist/module/hooks/push/useIosVoipPushEventsSetupEffect.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useRef","useState","Platform","StreamVideoRN","onVoipNotificationReceived","useConnectedUser","useStreamVideoClient","setPushLogoutCallback","videoLoggerSystem","getCallingxLibIfAvailable","logger","getLogger","lastListener","count","setLogoutCallback","client","token","lastVoipTokenRef","current","userId","removeDevice","debug","err","warn","useIosVoipPushEventsSetupEffect","connectedUserId","id","unsentToken","setUnsentToken","pushProviderName","getConfig","push","ios","tokenToSend","addVoipDevice","then","undefined","catch","error","pushConfig","callingx","OS","onTokenReceived","streamClient","_user","anonymous","reason","lastVoipToken","voipRegisterListener","addEventListener","getInitialVoipEvents","forEach","eventName","params","registerVoipToken","currentListenerCount","remove"],"sourceRoot":"../../../../src","sources":["hooks/push/useIosVoipPushEventsSetupEffect.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useEffect","useRef","useState","getVoipPushNotificationLib","Platform","StreamVideoRN","onVoipNotificationReceived","useConnectedUser","useStreamVideoClient","setPushLogoutCallback","videoLoggerSystem","logger","getLogger","lastListener","count","setLogoutCallback","client","token","lastVoipTokenRef","current","userId","removeDevice","err","warn","useIosVoipPushEventsSetupEffect","connectedUserId","id","unsentToken","setUnsentToken","pushProviderName","getConfig","push","ios","tokenToSend","debug","addVoipDevice","then","undefined","catch","error","pushConfig","OS","android","incomingCallChannel","voipPushNotification","registerVoipToken","onTokenReceived","streamClient","_user","anonymous","reason","lastVoipToken","addEventListener","events","Array","isArray","length","voipPushEvent","name","data","currentListenerCount","removeEventListener"],"sourceRoot":"../../../../src","sources":["hooks/push/useIosVoipPushEventsSetupEffect.ts"],"mappings":"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","ignoreList":[]}

package/dist/module/hooks/push/useProcessPushCallEffect.js

@@ -0,0 +1,60 @@
+import { pushAcceptedIncomingCallCId$, pushAndroidBackgroundDeliveredIncomingCallCId$, pushRejectedIncomingCallCId$, pushTappedIncomingCallCId$ } from '../../utils/push/internal/rxSubjects';
+import { useEffect } from 'react';
+import { StreamVideoRN } from '../../utils';
+import { useConnectedUser, useStreamVideoClient } from '@stream-io/video-react-bindings';
+import { distinctUntilChanged, filter } from 'rxjs/operators';
+import { processCallFromPush } from '../../utils/push/internal/utils';
+import { videoLoggerSystem } from '@stream-io/video-client';
+/**
+ * This hook is used to process the incoming call data via push notifications using the relevant rxjs subjects
+ * It either joins or leaves the call based on the user's action.
+ * Note: this effect cannot work when push notifications are received when the app is in quit state or in other words when the client is not connected with a websocket.
+ * So we essentially run this effect only when the client is connected with a websocket.
+ */
+export const useProcessPushCallEffect = () => {
+  const client = useStreamVideoClient();
+  const connectedUserId = useConnectedUser()?.id;
+  // The Effect to join/reject call automatically when incoming call was received and processed from push notification
+  useEffect(() => {
+    const pushConfig = StreamVideoRN.getConfig().push;
+    if (!pushConfig || !client || !connectedUserId) {
+      return;
+    }
+    videoLoggerSystem.getLogger('useProcessPushCallEffect').debug(`Adding subscriptions to process incoming call from push notification`);
+
+    // if the user accepts the call from push notification we join the call
+    const acceptedCallSubscription = createCallSubscription(pushAcceptedIncomingCallCId$, client, pushConfig, 'accept');
+
+    // if the user rejects the call from push notification we leave the call
+    const declinedCallSubscription = createCallSubscription(pushRejectedIncomingCallCId$, client, pushConfig, 'decline');
+
+    // if the user taps the call from push notification we do nothing as the only thing is to get the call which adds it to the client
+    const pressedCallSubscription = createCallSubscription(pushTappedIncomingCallCId$, client, pushConfig, 'pressed');
+    const backgroundIncomingDeliveredCallSubscription = createCallSubscription(pushAndroidBackgroundDeliveredIncomingCallCId$, client, pushConfig, 'backgroundDelivered');
+    return () => {
+      acceptedCallSubscription.unsubscribe();
+      declinedCallSubscription.unsubscribe();
+      pressedCallSubscription.unsubscribe();
+      backgroundIncomingDeliveredCallSubscription.unsubscribe();
+    };
+  }, [client, connectedUserId]);
+};
+
+/**
+ * A type guard to check if the cid is not undefined
+ */
+function cidIsNotUndefined(cid) {
+  return cid !== undefined;
+}
+
+/**
+ * The common logic to create a subscription for the given call cid and action
+ */
+const createCallSubscription = (behaviourSubjectWithCallCid, client, pushConfig, action) => {
+  return behaviourSubjectWithCallCid.pipe(distinctUntilChanged(), filter(cidIsNotUndefined)).subscribe(async callCId => {
+    videoLoggerSystem.getLogger('useProcessPushCallEffect').debug(`Processing call from push notification with action: ${action} and callCId: ${callCId}`);
+    await processCallFromPush(client, callCId, action, pushConfig);
+    behaviourSubjectWithCallCid.next(undefined); // remove the current call id to avoid processing again
+  });
+};
+//# sourceMappingURL=useProcessPushCallEffect.js.map

package/dist/module/hooks/push/useProcessPushCallEffect.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["pushAcceptedIncomingCallCId$","pushAndroidBackgroundDeliveredIncomingCallCId$","pushRejectedIncomingCallCId$","pushTappedIncomingCallCId$","useEffect","StreamVideoRN","useConnectedUser","useStreamVideoClient","distinctUntilChanged","filter","processCallFromPush","videoLoggerSystem","useProcessPushCallEffect","client","connectedUserId","id","pushConfig","getConfig","push","getLogger","debug","acceptedCallSubscription","createCallSubscription","declinedCallSubscription","pressedCallSubscription","backgroundIncomingDeliveredCallSubscription","unsubscribe","cidIsNotUndefined","cid","undefined","behaviourSubjectWithCallCid","action","pipe","subscribe","callCId","next"],"sourceRoot":"../../../../src","sources":["hooks/push/useProcessPushCallEffect.ts"],"mappings":"AAAA,SACEA,4BAA4B,EAC5BC,8CAA8C,EAC9CC,4BAA4B,EAC5BC,0BAA0B,QACrB,sCAAsC;AAC7C,SAASC,SAAS,QAAQ,OAAO;AACjC,SAASC,aAAa,QAAQ,aAAa;AAC3C,SACEC,gBAAgB,EAChBC,oBAAoB,QACf,iCAAiC;AAExC,SAASC,oBAAoB,EAAEC,MAAM,QAAQ,gBAAgB;AAC7D,SAASC,mBAAmB,QAAQ,iCAAiC;AACrE,SAA4BC,iBAAiB,QAAQ,yBAAyB;AAG9E;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,wBAAwB,GAAGA,CAAA,KAAM;EAC5C,MAAMC,MAAM,GAAGN,oBAAoB,CAAC,CAAC;EACrC,MAAMO,eAAe,GAAGR,gBAAgB,CAAC,CAAC,EAAES,EAAE;EAC9C;EACAX,SAAS,CAAC,MAAM;IACd,MAAMY,UAAU,GAAGX,aAAa,CAACY,SAAS,CAAC,CAAC,CAACC,IAAI;IACjD,IAAI,CAACF,UAAU,IAAI,CAACH,MAAM,IAAI,CAACC,eAAe,EAAE;MAC9C;IACF;IAEAH,iBAAiB,CACdQ,SAAS,CAAC,0BAA0B,CAAC,CACrCC,KAAK,CACJ,sEACF,CAAC;;IAEH;IACA,MAAMC,wBAAwB,GAAGC,sBAAsB,CACrDtB,4BAA4B,EAC5Ba,MAAM,EACNG,UAAU,EACV,QACF,CAAC;;IAED;IACA,MAAMO,wBAAwB,GAAGD,sBAAsB,CACrDpB,4BAA4B,EAC5BW,MAAM,EACNG,UAAU,EACV,SACF,CAAC;;IAED;IACA,MAAMQ,uBAAuB,GAAGF,sBAAsB,CACpDnB,0BAA0B,EAC1BU,MAAM,EACNG,UAAU,EACV,SACF,CAAC;IAED,MAAMS,2CAA2C,GAAGH,sBAAsB,CACxErB,8CAA8C,EAC9CY,MAAM,EACNG,UAAU,EACV,qBACF,CAAC;IAED,OAAO,MAAM;MACXK,wBAAwB,CAACK,WAAW,CAAC,CAAC;MACtCH,wBAAwB,CAACG,WAAW,CAAC,CAAC;MACtCF,uBAAuB,CAACE,WAAW,CAAC,CAAC;MACrCD,2CAA2C,CAACC,WAAW,CAAC,CAAC;IAC3D,CAAC;EACH,CAAC,EAAE,CAACb,MAAM,EAAEC,eAAe,CAAC,CAAC;AAC/B,CAAC;;AAED;AACA;AACA;AACA,SAASa,iBAAiBA,CAACC,GAAuB,EAAiB;EACjE,OAAOA,GAAG,KAAKC,SAAS;AAC1B;;AAEA;AACA;AACA;AACA,MAAMP,sBAAsB,GAAGA,CAC7BQ,2BAAgE,EAChEjB,MAAyB,EACzBG,UAAkD,EAClDe,MAAgE,KAC7D;EACH,OAAOD,2BAA2B,CAC/BE,IAAI,CAACxB,oBAAoB,CAAC,CAAC,EAAEC,MAAM,CAACkB,iBAAiB,CAAC,CAAC,CACvDM,SAAS,CAAC,MAAOC,OAAO,IAAK;IAC5BvB,iBAAiB,CACdQ,SAAS,CAAC,0BAA0B,CAAC,CACrCC,KAAK,CACJ,uDAAuDW,MAAM,iBAAiBG,OAAO,EACvF,CAAC;IACH,MAAMxB,mBAAmB,CAACG,MAAM,EAAEqB,OAAO,EAAEH,MAAM,EAAEf,UAAU,CAAC;IAC9Dc,2BAA2B,CAACK,IAAI,CAACN,SAAS,CAAC,CAAC,CAAC;EAC/C,CAAC,CAAC;AACN,CAAC","ignoreList":[]}

package/dist/module/hooks/useAndroidKeepCallAliveEffect.js

@@ -1,58 +1,93 @@
 import { useCall, useCallStateHooks } from '@stream-io/video-react-bindings';
 import { useEffect, useRef } from 'react';
 import { StreamVideoRN } from '../utils';
-import { AppState, NativeModules, PermissionsAndroid, Platform } from 'react-native';
+import { AppState, NativeModules, Platform } from 'react-native';
 import { CallingState, videoLoggerSystem } from '@stream-io/video-client';
-import { keepCallAliveCallRef } from '../utils/keepCallAliveHeadlessTask';
-import { getNotifeeLibNoThrowForKeepCallAlive } from '../utils/push/libs/notifee';
-import { getCallingxLibIfAvailable } from '../utils/push/libs';
+import { getKeepCallAliveForegroundServiceTypes, getNotifeeLibNoThrowForKeepCallAlive } from '../utils/push/libs/notifee';
 const notifeeLib = getNotifeeLibNoThrowForKeepCallAlive();
-async function stopForegroundServiceNoThrow() {
-  const logger = videoLoggerSystem.getLogger('stopForegroundServiceNoThrow');
-  try {
-    await NativeModules.StreamVideoReactNative.stopKeepCallAliveService();
-  } catch (e) {
-    logger.warn('Failed to stop keep-call-alive foreground service', e);
-  }
+const callToPassToForegroundService = {
+  current: undefined
+};
+function setForegroundService() {
+  if (Platform.OS === 'ios' || !notifeeLib) return;
+  NativeModules.StreamVideoReactNative.isCallAliveConfigured().then(isConfigured => {
+    if (!isConfigured) {
+      const logger = videoLoggerSystem.getLogger('setForegroundService method');
+      logger.info('KeepCallAlive is not configured. Skipping foreground service setup.');
+      return;
+    }
+    notifeeLib.default.registerForegroundService(() => {
+      const task = new Promise(resolve => {
+        const logger = videoLoggerSystem.getLogger('setForegroundService method');
+        logger.info('Foreground service running for call in progress');
+        // any task to run from SDK in the foreground service must be added
+        resolve(true);
+      });
+      const videoConfig = StreamVideoRN.getConfig();
+      const foregroundServiceConfig = videoConfig.foregroundService;
+      const {
+        taskToRun
+      } = foregroundServiceConfig.android;
+      const call = callToPassToForegroundService.current;
+      if (!call) {
+        const logger = videoLoggerSystem.getLogger('setForegroundService method');
+        logger.warn('No call to pass to foreground service');
+        return task.then(() => new Promise(() => {}));
+      }
+      callToPassToForegroundService.current = undefined;
+      return task.then(() => taskToRun(call));
+    });
+  });
 }
 async function startForegroundService(call_cid) {
-  const logger = videoLoggerSystem.getLogger('startForegroundService');
-  const isCallAliveConfigured = await (async () => {
-    try {
-      return await NativeModules.StreamVideoReactNative.isCallAliveConfigured();
-    } catch (e) {
-      logger.warn('Failed to check whether KeepCallAlive is configured', e);
-      return false;
-    }
-  })();
+  const isCallAliveConfigured = await NativeModules.StreamVideoReactNative.isCallAliveConfigured();
   if (!isCallAliveConfigured) {
+    const logger = videoLoggerSystem.getLogger('startForegroundService');
     logger.info('KeepCallAlive is not configured. Skipping foreground service setup.');
     return;
   }
-  // Check for notification permission (Android 13+) before starting the service.
-  const hasPostNotificationsPermission = Number(Platform.Version) < 33 || (await PermissionsAndroid.check(PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS));
-  if (!hasPostNotificationsPermission) {
+  // check for notification permission and then start the foreground service
+  if (!notifeeLib) return;
+  const settings = await notifeeLib.default.getNotificationSettings();
+  if (settings.authorizationStatus !== notifeeLib.AuthorizationStatus.AUTHORIZED) {
+    const logger = videoLoggerSystem.getLogger('startForegroundService');
     logger.info('Notification permission not granted, can not start foreground service to keep the call alive');
     return;
   }
   const videoConfig = StreamVideoRN.getConfig();
   const foregroundServiceConfig = videoConfig.foregroundService;
   const notificationTexts = foregroundServiceConfig.android.notificationTexts;
-  const channel = foregroundServiceConfig.android.channel;
-  const smallIconName = videoConfig.push?.android.smallIcon;
-
+  const channelId = foregroundServiceConfig.android.channel.id;
+  await notifeeLib.default.createChannel(foregroundServiceConfig.android.channel);
+  const foregroundServiceTypes = await getKeepCallAliveForegroundServiceTypes();
   // NOTE: we use requestAnimationFrame to ensure that the foreground service is started after all the current UI operations are done
   // this is a workaround for the crash - android.app.RemoteServiceException$ForegroundServiceDidNotStartInTimeException: Context.startForegroundService() did not then call Service.startForeground()
   // this crash was reproducible only in some android devices
-  requestAnimationFrame(async () => {
-    try {
-      await NativeModules.StreamVideoReactNative.startKeepCallAliveService(call_cid, channel.id, channel.name, notificationTexts.title, notificationTexts.body, smallIconName ?? null);
-    } catch (e) {
-      logger.warn('Failed to start keep-call-alive foreground service', e);
-    }
+  requestAnimationFrame(() => {
+    notifeeLib.default.displayNotification({
+      id: call_cid,
+      title: notificationTexts.title,
+      body: notificationTexts.body,
+      android: {
+        channelId,
+        smallIcon: videoConfig.push?.android.smallIcon,
+        foregroundServiceTypes,
+        asForegroundService: true,
+        ongoing: true,
+        // user cannot dismiss the notification
+        colorized: true,
+        pressAction: {
+          id: 'default',
+          launchActivity: 'default' // open the app when the notification is pressed
+        }
+      }
+    });
   });
 }
 
+// flag to check if setForegroundService has already been run once
+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
@@ -62,7 +97,7 @@ async function startForegroundService(call_cid) {
 export const useAndroidKeepCallAliveEffect = () => {
   const foregroundServiceStartedRef = useRef(false);
   const call = useCall();
-  keepCallAliveCallRef.current = call;
+  callToPassToForegroundService.current = call;
   const activeCallCid = call?.cid;
   const {
     useCallCallingState
@@ -70,16 +105,12 @@ export const useAndroidKeepCallAliveEffect = () => {
   const callingState = useCallCallingState();
   const isOutgoingCall = callingState === CallingState.RINGING && call?.isCreatedByMe;
   const isCallJoined = callingState === CallingState.JOINED;
-  const isRingingCall = call?.ringing;
   const shouldStartForegroundService = !foregroundServiceStartedRef.current && (isOutgoingCall || isCallJoined);
   useEffect(() => {
     if (Platform.OS === 'ios' || !activeCallCid) {
       return undefined;
     }
-    const callingx = getCallingxLibIfAvailable();
-    if (callingx?.isSetup && (isRingingCall || !isRingingCall && callingx?.isOngoingCallsEnabled)) {
-      return undefined;
-    }
+    if (!notifeeLib) return undefined;
 
     // start foreground service as soon as the call is joined
     if (shouldStartForegroundService) {
@@ -87,18 +118,21 @@ export const useAndroidKeepCallAliveEffect = () => {
         if (foregroundServiceStartedRef.current) {
           return;
         }
-        // Optional compatibility cleanup: if the app uses Notifee for ringing push,
-        // we might have an incoming call notification running as a foreground service.
-        if (notifeeLib) {
-          const notifee = notifeeLib.default;
-          const displayedNotifications = await notifee.getDisplayedNotifications();
-          const activeCallNotification = displayedNotifications.find(notification => notification.id === activeCallCid);
-          if (activeCallNotification) {
-            // this means that we have a incoming call notification shown as foreground service and we must stop it
-            notifee.stopForegroundService();
-            notifee.cancelDisplayedNotification(activeCallCid);
-          }
+        if (!isSetForegroundServiceRan) {
+          isSetForegroundServiceRan = true;
+          setForegroundService();
+        }
+        const notifee = notifeeLib.default;
+        const displayedNotifications = await notifee.getDisplayedNotifications();
+        const activeCallNotification = displayedNotifications.find(notification => notification.id === activeCallCid);
+        if (activeCallNotification) {
+          callToPassToForegroundService.current = undefined;
+          // this means that we have a incoming call notification shown as foreground service and we must stop it
+          notifee.stopForegroundService();
+          notifee.cancelDisplayedNotification(activeCallCid);
         }
+        // check for notification permission and then start the foreground service
+
         await startForegroundService(activeCallCid);
         foregroundServiceStartedRef.current = true;
       };
@@ -106,6 +140,7 @@ export const useAndroidKeepCallAliveEffect = () => {
       // ensure that app is active before running the function
       if (AppState.currentState === 'active') {
         run();
+        return undefined;
       }
       const sub = AppState.addEventListener('change', nextAppState => {
         if (nextAppState === 'active') {
@@ -120,36 +155,34 @@ export const useAndroidKeepCallAliveEffect = () => {
       return () => {
         // cancel any notifee displayed notification when the call has transitioned out of ringing
         // NOTE: cancels only the non fg service notifications
-        if (notifeeLib) {
-          notifeeLib.default.cancelDisplayedNotification(activeCallCid);
-        }
+        notifeeLib.default.cancelDisplayedNotification(activeCallCid);
       };
     } else if (callingState === CallingState.IDLE || callingState === CallingState.LEFT) {
       if (foregroundServiceStartedRef.current) {
-        keepCallAliveCallRef.current = undefined;
+        callToPassToForegroundService.current = undefined;
         // stop foreground service when the call is not active
-        stopForegroundServiceNoThrow();
+        notifeeLib.default.stopForegroundService();
         foregroundServiceStartedRef.current = false;
       } else {
-        if (notifeeLib) {
-          notifeeLib.default.getDisplayedNotifications().then(displayedNotifications => {
-            const activeCallNotification = displayedNotifications.find(notification => notification.id === activeCallCid);
-            if (activeCallNotification) {
-              // this means that we have a incoming call notification shown as foreground service and we must stop it
-              notifeeLib.default.stopForegroundService();
-            }
-          });
-        }
+        notifeeLib.default.getDisplayedNotifications().then(displayedNotifications => {
+          const activeCallNotification = displayedNotifications.find(notification => notification.id === activeCallCid);
+          if (activeCallNotification) {
+            callToPassToForegroundService.current = undefined;
+            // this means that we have a incoming call notification shown as foreground service and we must stop it
+            notifeeLib.default.stopForegroundService();
+          }
+        });
       }
     }
     return undefined;
-  }, [activeCallCid, callingState, shouldStartForegroundService, isRingingCall]);
+  }, [activeCallCid, callingState, shouldStartForegroundService]);
   useEffect(() => {
     return () => {
       // stop foreground service when this effect is unmounted
       if (foregroundServiceStartedRef.current) {
-        keepCallAliveCallRef.current = undefined;
-        stopForegroundServiceNoThrow();
+        if (!notifeeLib) return;
+        callToPassToForegroundService.current = undefined;
+        notifeeLib.default.stopForegroundService();
         foregroundServiceStartedRef.current = false;
       }
     };