@stream-io/video-react-native-sdk 1.44.0 → 1.45.1

package/dist/module/utils/internal/callingx/callingx.js

@@ -27,12 +27,25 @@ export function getCallDisplayName(callMembers, participants, currentUserId) {
 
   // if no names are found, we use the name of the current user
   if (names.length === 0) {
-    names = [participants.find(participant => participant.userId === currentUserId)?.name ?? 'Call'];
+    names = [participants.find(participant => participant.userId === currentUserId)?.name || 'Call'];
   }
   return names.sort().join(', ');
 }
-function getCallDisplayNameFromCall(call) {
-  return call.state.custom?.display_name ?? getCallDisplayName(call.state.members, call.state.participants, call.currentUserId);
+
+/**
+ * Args shared by the callingx call registration APIs:
+ * `(callId, phoneNumber, callerName, hasVideo)`.
+ */
+function getCallingxCallArgs(call) {
+  const callDisplayName = call.state.custom?.display_name || getCallDisplayName(call.state.members, call.state.participants, call.currentUserId);
+  return [call.cid,
+  // unique id for call
+  call.state.createdBy?.id ?? callDisplayName,
+  // handle for native call UI (prefer createdBy user id, fallback to call display name)
+  callDisplayName,
+  // display name for display in call screen
+  call.state.settings?.video?.enabled ?? false // is video call?
+  ];
 }
 export async function registerOutgoingCall(call) {
   if (!CallingxModule || !CallingxModule.isSetup || call.isOwnTracksLoopbackAllowed) {
@@ -45,15 +58,7 @@ export async function registerOutgoingCall(call) {
   const logger = videoLoggerSystem.getLogger('callingx');
   try {
     logger.debug(`registerOutgoingCall: Registering outgoing call ${call.cid}`);
-    const callDisplayName = getCallDisplayNameFromCall(call);
-    await CallingxModule.startCall(call.cid,
-    // unique id for call
-    call.state.createdBy?.id ?? callDisplayName,
-    // handle for native call UI (prefer createdBy user id, fallback to call display name)
-    callDisplayName,
-    // display name for display in call screen
-    call.state.settings?.video?.enabled ?? false // is video call?
-    );
+    await CallingxModule.startCall(...getCallingxCallArgs(call));
   } catch (error) {
     logger.error(`registerOutgoingCall: Error registering outgoing call in callingx: ${call.cid}`, error);
   }
@@ -74,53 +79,30 @@ export async function joinCallingxCall(call, activeCalls) {
   const logger = videoLoggerSystem.getLogger('callingx');
   const isOutcomingCall = call.ringing && call.isCreatedByMe;
   const isIncomingCall = call.ringing && !call.isCreatedByMe;
-  const startCallInCallingx = async () => {
-    logger.debug(`joinCallingxCall: Joining call ${call.cid}`);
-    const callDisplayName = getCallDisplayNameFromCall(call);
-    await CallingxModule.startCall(call.cid,
-    // unique id for call
-    call.state.createdBy?.id ?? callDisplayName,
-    // handle for native call UI (prefer createdBy user id, fallback to call display name)
-    callDisplayName,
-    // display name for display in call screen
-    call.state.settings?.video?.enabled ?? false // is video call?
-    );
-  };
-  if (isOutcomingCall || !call.ringing && CallingxModule.isOngoingCallsEnabled) {
-    try {
-      await startCallInCallingx();
-    } catch (error) {
-      logger.error(`startCallingxCall: Error starting call in callingx: ${call.cid}`, error);
+  const isOngoingCall = c => !c.ringing && CallingxModule.isOngoingCallsEnabled && !c.isOwnTracksLoopbackAllowed;
+  if (!isIncomingCall && !isOutcomingCall && !isOngoingCall(call)) {
+    return;
+  }
+  try {
+    const activeCallsToLeave = activeCalls.filter(c => c.cid !== call.cid && (c.ringing || isOngoingCall(c)) && c.state.callingState !== CallingState.LEFT);
+    for (const activeCall of activeCallsToLeave) {
+      logger.debug(`leaving currently-active-call:${activeCall.cid} before joining the call:${call.cid}`);
+      await activeCall.leave({
+        reason: 'cancel'
+      }).catch(e => {
+        logger.error(`failed to leave active call ${activeCall.cid}`, e);
+      });
     }
-  } else if (isIncomingCall) {
-    logger.debug(`joinCallingxCall: Joining incoming call ${call.cid}`);
-    try {
-      // Leave any existing active ringing calls before joining a new ringing call
-      const activeCallsToLeave = activeCalls.filter(c => c.cid !== call.cid && c.ringing && c.state.callingState !== CallingState.LEFT);
-      for (const activeCall of activeCallsToLeave) {
-        logger.debug(`leaving active call ${activeCall.cid} before joining ${call.cid}`);
-        await activeCall.leave({
-          reason: 'cancel'
-        }).catch(e => {
-          logger.error(`failed to leave active call ${activeCall.cid}`, e);
-        });
-      }
-      // Awaits native CallKit/Telecom registration before answering.
-      // Safe to call even if the call is already registered (e.g. from VoIP push) --
-      // iOS early-returns with no error, Android sends the registered broadcast.
-      const callDisplayName = getCallDisplayNameFromCall(call);
-      await CallingxModule.displayIncomingCall(call.cid,
-      // unique id for call
-      call.state.createdBy?.id ?? callDisplayName,
-      // handle for native call UI (prefer createdBy user id, fallback to call display name)
-      callDisplayName,
-      // display name for display in call screen
-      call.state.settings?.video?.enabled ?? false // is video call?
-      );
+    logger.debug(`joinCallingxCall: Joining call ${call.cid} isIncoming: ${isIncomingCall} isOutgoing: ${isOutcomingCall}`);
+    const callArgs = getCallingxCallArgs(call);
+    if (isIncomingCall) {
+      await CallingxModule.displayIncomingCall(...callArgs);
       await CallingxModule.answerIncomingCall(call.cid);
-    } catch (error) {
-      logger.error(`Error joining incoming call in callingx: ${call.cid}`, error);
+    } else {
+      await CallingxModule.startCall(...callArgs);
     }
+  } catch (error) {
+    logger.error(`startCallingxCall: Error starting call in callingx: ${call.cid} isIncoming: ${isIncomingCall} isOutgoing: ${isOutcomingCall}`, error);
   }
 }
 export async function endCallingxCall(call, reason) {

package/dist/module/utils/internal/callingx/callingx.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","getCallingxLibIfAvailable","CallingState","videoLoggerSystem","CallingxModule","getCallDisplayName","callMembers","participants","currentUserId","names","length","flatMap","member","user","id","name","participant","userId","find","sort","join","getCallDisplayNameFromCall","call","state","custom","display_name","members","registerOutgoingCall","isSetup","isOwnTracksLoopbackAllowed","isOutcomingCall","ringing","isCreatedByMe","logger","getLogger","debug","cid","callDisplayName","startCall","createdBy","settings","video","enabled","error","joinCallingxCall","activeCalls","isIncomingCall","startCallInCallingx","isOngoingCallsEnabled","activeCallsToLeave","filter","c","callingState","LEFT","activeCall","leave","reason","catch","e","displayIncomingCall","answerIncomingCall","endCallingxCall","isCallTracked","endCallWithReason","wireAudioEngineSubscription","OS","unwireAudioEngineSubscription"],"sourceRoot":"../../../../../src","sources":["utils/internal/callingx/callingx.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Platform","getCallingxLibIfAvailable","CallingState","videoLoggerSystem","CallingxModule","getCallDisplayName","callMembers","participants","currentUserId","names","length","flatMap","member","user","id","name","participant","userId","find","sort","join","getCallingxCallArgs","call","callDisplayName","state","custom","display_name","members","cid","createdBy","settings","video","enabled","registerOutgoingCall","isSetup","isOwnTracksLoopbackAllowed","isOutcomingCall","ringing","isCreatedByMe","logger","getLogger","debug","startCall","error","joinCallingxCall","activeCalls","isIncomingCall","isOngoingCall","c","isOngoingCallsEnabled","activeCallsToLeave","filter","callingState","LEFT","activeCall","leave","reason","catch","e","callArgs","displayIncomingCall","answerIncomingCall","endCallingxCall","isCallTracked","endCallWithReason","wireAudioEngineSubscription","OS","unwireAudioEngineSubscription"],"sourceRoot":"../../../../../src","sources":["utils/internal/callingx/callingx.ts"],"mappings":"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","ignoreList":[]}

package/dist/module/utils/keepCallAliveHeadlessTask.js

@@ -12,6 +12,20 @@ export const KEEP_CALL_ALIVE_HEADLESS_TASK_NAME = 'StreamVideoKeepCallAlive';
 export const keepCallAliveCallRef = {
   current: undefined
 };
+let resolveRunningTask;
+
+/**
+ * Ends the currently running keep-alive headless task.
+ *
+ * The task's promise is app-provided (`foregroundService.android.taskToRun`) and by default never
+ * resolves, so stopping the native service alone would leave the task registered in
+ * `HeadlessJsTaskContext` forever - which keeps RN's timer choreographer callback posted for the
+ * rest of the process lifetime. Resolving it here lets React Native unwind the task properly.
+ */
+export const endKeepCallAliveHeadlessTask = () => {
+  resolveRunningTask?.();
+  resolveRunningTask = undefined;
+};
 function registerKeepCallAliveHeadlessTaskOnce() {
   if (Platform.OS !== 'android') return;
   AppRegistry.registerHeadlessTask(KEEP_CALL_ALIVE_HEADLESS_TASK_NAME, () => async data => {
@@ -33,10 +47,34 @@ function registerKeepCallAliveHeadlessTaskOnce() {
     }
     const config = StreamVideoRN.getConfig();
     const taskToRun = config.foregroundService.android.taskToRun;
+    // A previous task (if any) must not keep hanging around.
+    endKeepCallAliveHeadlessTask();
+    const taskEnded = new Promise(resolve => {
+      resolveRunningTask = resolve;
+    });
+    const ownResolver = resolveRunningTask;
+
+    // React Native stops the foreground service as soon as the promise returned from here
+    // settles. `taskToRun` is app-provided and may resolve early - or immediately - so its
+    // completion must not end the keep-alive: that would drop the call's background protection
+    // while the call is still ongoing. The task's lifetime is owned by the SDK instead, and ends
+    // via endKeepCallAliveHeadlessTask() when the call is left.
+    (async () => {
+      try {
+        await taskToRun(call);
+        logger.debug('Keep-alive taskToRun completed, keeping the call alive until the call ends');
+      } catch (e) {
+        logger.error('Keep-alive headless task failed', e);
+      }
+    })();
     try {
-      await taskToRun(call);
-    } catch (e) {
-      logger.error('Keep-alive headless task failed', e);
+      await taskEnded;
+    } finally {
+      // a newer task may already have installed its own resolver - clearing it here would leave
+      // that task with no way to be ended.
+      if (resolveRunningTask === ownResolver) {
+        resolveRunningTask = undefined;
+      }
     }
   });
 }

package/dist/module/utils/keepCallAliveHeadlessTask.js.map

@@ -1 +1 @@
-{"version":3,"names":["AppRegistry","Platform","videoLoggerSystem","StreamVideoRN","KEEP_CALL_ALIVE_HEADLESS_TASK_NAME","keepCallAliveCallRef","current","undefined","registerKeepCallAliveHeadlessTaskOnce","OS","registerHeadlessTask","data","logger","getLogger","callCid","call","warn","cid","activeCallCid","config","getConfig","taskToRun","foregroundService","android","e","error"],"sourceRoot":"../../../src","sources":["utils/keepCallAliveHeadlessTask.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,QAAQ,QAAQ,cAAc;AAEpD,SAASC,iBAAiB,QAAQ,yBAAyB;AAC3D,SAASC,aAAa,QAAQ,iBAAiB;AAE/C,OAAO,MAAMC,kCAAkC,GAAG,0BAA0B;;AAE5E;AACA;AACA;AACA;AACA,OAAO,MAAMC,oBAAmD,GAAG;EACjEC,OAAO,EAAEC;AACX,CAAC;AAED,SAASC,qCAAqCA,CAAA,EAAG;EAC/C,IAAIP,QAAQ,CAACQ,EAAE,KAAK,SAAS,EAAE;EAE/BT,WAAW,CAACU,oBAAoB,CAC9BN,kCAAkC,EAClC,MAAM,MAAOO,IAAsC,IAAK;IACtD,MAAMC,MAAM,GAAGV,iBAAiB,CAACW,SAAS,CACxC,+BACF,CAAC;IACD,MAAMC,OAAO,GAAGH,IAAI,EAAEG,OAAO;IAE7B,MAAMC,IAAI,GAAGV,oBAAoB,CAACC,OAAO;IACzC,IAAI,CAACS,IAAI,EAAE;MACTH,MAAM,CAACI,IAAI,CACT,kEAAkE,EAClE;QAAEF;MAAQ,CACZ,CAAC;MACD;IACF;IACA,IAAIA,OAAO,IAAIC,IAAI,CAACE,GAAG,IAAIF,IAAI,CAACE,GAAG,KAAKH,OAAO,EAAE;MAC/CF,MAAM,CAACI,IAAI,CACT,+DAA+D,EAC/D;QAAEF,OAAO;QAAEI,aAAa,EAAEH,IAAI,CAACE;MAAI,CACrC,CAAC;MACD;IACF;IAEA,MAAME,MAAM,GAAGhB,aAAa,CAACiB,SAAS,CAAC,CAAC;IACxC,MAAMC,SAAS,GAAGF,MAAM,CAACG,iBAAiB,CAACC,OAAO,CAACF,SAAS;IAC5D,IAAI;MACF,MAAMA,SAAS,CAACN,IAAI,CAAC;IACvB,CAAC,CAAC,OAAOS,CAAC,EAAE;MACVZ,MAAM,CAACa,KAAK,CAAC,iCAAiC,EAAED,CAAC,CAAC;IACpD;EACF,CACF,CAAC;AACH;AAEAhB,qCAAqC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["AppRegistry","Platform","videoLoggerSystem","StreamVideoRN","KEEP_CALL_ALIVE_HEADLESS_TASK_NAME","keepCallAliveCallRef","current","undefined","resolveRunningTask","endKeepCallAliveHeadlessTask","registerKeepCallAliveHeadlessTaskOnce","OS","registerHeadlessTask","data","logger","getLogger","callCid","call","warn","cid","activeCallCid","config","getConfig","taskToRun","foregroundService","android","taskEnded","Promise","resolve","ownResolver","debug","e","error"],"sourceRoot":"../../../src","sources":["utils/keepCallAliveHeadlessTask.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,QAAQ,QAAQ,cAAc;AAEpD,SAASC,iBAAiB,QAAQ,yBAAyB;AAC3D,SAASC,aAAa,QAAQ,iBAAiB;AAE/C,OAAO,MAAMC,kCAAkC,GAAG,0BAA0B;;AAE5E;AACA;AACA;AACA;AACA,OAAO,MAAMC,oBAAmD,GAAG;EACjEC,OAAO,EAAEC;AACX,CAAC;AAED,IAAIC,kBAA4C;;AAEhD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,4BAA4B,GAAGA,CAAA,KAAM;EAChDD,kBAAkB,GAAG,CAAC;EACtBA,kBAAkB,GAAGD,SAAS;AAChC,CAAC;AAED,SAASG,qCAAqCA,CAAA,EAAG;EAC/C,IAAIT,QAAQ,CAACU,EAAE,KAAK,SAAS,EAAE;EAE/BX,WAAW,CAACY,oBAAoB,CAC9BR,kCAAkC,EAClC,MAAM,MAAOS,IAAsC,IAAK;IACtD,MAAMC,MAAM,GAAGZ,iBAAiB,CAACa,SAAS,CACxC,+BACF,CAAC;IACD,MAAMC,OAAO,GAAGH,IAAI,EAAEG,OAAO;IAE7B,MAAMC,IAAI,GAAGZ,oBAAoB,CAACC,OAAO;IACzC,IAAI,CAACW,IAAI,EAAE;MACTH,MAAM,CAACI,IAAI,CACT,kEAAkE,EAClE;QAAEF;MAAQ,CACZ,CAAC;MACD;IACF;IACA,IAAIA,OAAO,IAAIC,IAAI,CAACE,GAAG,IAAIF,IAAI,CAACE,GAAG,KAAKH,OAAO,EAAE;MAC/CF,MAAM,CAACI,IAAI,CACT,+DAA+D,EAC/D;QAAEF,OAAO;QAAEI,aAAa,EAAEH,IAAI,CAACE;MAAI,CACrC,CAAC;MACD;IACF;IAEA,MAAME,MAAM,GAAGlB,aAAa,CAACmB,SAAS,CAAC,CAAC;IACxC,MAAMC,SAAS,GAAGF,MAAM,CAACG,iBAAiB,CAACC,OAAO,CAACF,SAAS;IAC5D;IACAd,4BAA4B,CAAC,CAAC;IAC9B,MAAMiB,SAAS,GAAG,IAAIC,OAAO,CAAQC,OAAO,IAAK;MAC/CpB,kBAAkB,GAAGoB,OAAO;IAC9B,CAAC,CAAC;IACF,MAAMC,WAAW,GAAGrB,kBAAkB;;IAEtC;IACA;IACA;IACA;IACA;IACA,CAAC,YAAY;MACX,IAAI;QACF,MAAMe,SAAS,CAACN,IAAI,CAAC;QACrBH,MAAM,CAACgB,KAAK,CACV,4EACF,CAAC;MACH,CAAC,CAAC,OAAOC,CAAC,EAAE;QACVjB,MAAM,CAACkB,KAAK,CAAC,iCAAiC,EAAED,CAAC,CAAC;MACpD;IACF,CAAC,EAAE,CAAC;IAEJ,IAAI;MACF,MAAML,SAAS;IACjB,CAAC,SAAS;MACR;MACA;MACA,IAAIlB,kBAAkB,KAAKqB,WAAW,EAAE;QACtCrB,kBAAkB,GAAGD,SAAS;MAChC;IACF;EACF,CACF,CAAC;AACH;AAEAG,qCAAqC,CAAC,CAAC","ignoreList":[]}

package/dist/module/utils/push/android.js

@@ -1,13 +1,9 @@
 "use strict";
 
-import { CallingState, videoLoggerSystem } from '@stream-io/video-client';
-import { AppState, Platform } from 'react-native';
+import { videoLoggerSystem } from '@stream-io/video-client';
+import { Platform } from 'react-native';
 import { getFirebaseMessagingLib } from './libs';
-import { pushUnsubscriptionCallbacks } from './internal/constants';
-import { canListenToWS, shouldCallBeClosed } from './internal/utils';
 import { setPushLogoutCallback } from '../internal/pushLogoutCallback';
-import { StreamVideoRN } from '../StreamVideoRN';
-import { getCallingxLib } from './libs/callingx';
 let lastFirebaseToken = {
   token: '',
   userId: ''
@@ -56,172 +52,16 @@ export async function initAndroidPushToken(client, pushConfig, setUnsubscribeLis
   const token = await messaging().getToken();
   await setDeviceToken(token);
 }
-
+let firebaseDataHandlerDeprecationLogged = false;
 /**
- * Creates notification from the push message data.
- * For Ringing and Non-Ringing calls.
+ * @deprecated Ring notifications are now handled by the SDK internally. This method is a no-op;
+ * you can safely remove `firebaseDataHandler(...)` wiring from your Firebase messaging handlers.
  */
-
 export const firebaseDataHandler = async data => {
-  /* Example data from firebase
-    "message": {
-        "data": {
-          call_cid: 'audio_room:dcc1638c-e90d-4dcb-bf3b-8fa7767bfbb0',
-          call_display_name: '',
-          created_by_display_name: 'tommaso',
-          created_by_id: 'tommaso-03dcddb7-e9e2-42ec-b2f3-5043aac666ee',
-          receiver_id: 'martin-21824f17-319b-401b-a61b-fcab646f0d3f',
-          sender: 'stream.video',
-          type: 'call.live_started',
-          version: 'v2'
-        },
-        // other stuff
-    }
-  */
-  if (Platform.OS !== 'android') return;
-  const logger = videoLoggerSystem.getLogger('firebaseDataHandler');
-  const pushConfig = StreamVideoRN.getConfig().push;
-  if (!pushConfig || !data || data.sender !== 'stream.video') {
-    return;
-  }
-  if (data.type === 'call.ring') {
-    const call_cid = data.call_cid;
-    const callingx = getCallingxLib();
-    const client = await pushConfig.createStreamVideoClient();
-    if (!client) {
-      logger.debug(`video client not found, skipping the call.ring notification`);
-      await callingx.stopService();
-      return;
-    }
-    const asForegroundService = canListenToWS();
-    if (asForegroundService) {
-      // Listen to call events from WS with headless task, bound to call service.
-      // By this moment the call service is already running, so we can acquire the background task.
-      const backgroundTaskOwner = `push:${call_cid}`;
-      await callingx.acquireBackgroundTask(backgroundTaskOwner).catch(e => {
-        logger.error(`Failed to acquire background task for callCid: ${call_cid} error: ${e}`);
-      });
-      const finishBackgroundTask = () => {
-        callingx.log(`Finishing background task for callCid: ${call_cid}`, 'debug');
-        callingx.releaseBackgroundTask(backgroundTaskOwner);
-      };
-      (async () => {
-        try {
-          const _client = await pushConfig.createStreamVideoClient();
-          if (!_client) {
-            logger.debug(`Closing fg service as there is no client to create from push config`);
-            finishBackgroundTask();
-            return;
-          }
-          const callFromPush = await _client.onRingingCall(call_cid);
-          const {
-            mustEndCall,
-            endCallReason
-          } = shouldCallBeClosed(callFromPush, data);
-          if (mustEndCall) {
-            logger.debug(`Closing fg service callCid: ${call_cid} endCallReason: ${endCallReason}`);
-            callingx.log(`Ending call with callCid: ${call_cid} endCallReason: ${endCallReason}`, 'debug');
-            callingx.endCallWithReason(call_cid, endCallReason);
-            callFromPush.leave({
-              reject: false
-            }).catch(error => {
-              logger.error(`Failed to leave already-ended ringing call ${call_cid}: ${error}`);
-            });
-            finishBackgroundTask();
-            return;
-          }
-          const unsubscribeFunctions = [];
-          // check if service needs to be closed if accept/decline event was done on another device
-          const unsubscribe = callFromPush.on('all', event => {
-            const _canListenToWS = canListenToWS();
-            if (!_canListenToWS) {
-              logger.debug(`Closing fg service from event callCid: ${call_cid} canListenToWS: ${_canListenToWS}`, {
-                event
-              });
-              unsubscribeFunctions.forEach(fn => fn());
-              finishBackgroundTask();
-              return;
-            }
-            const {
-              mustEndCall: mustEndCallFromEvent,
-              endCallReason: endCallReasonFromEvent
-            } = shouldCallBeClosed(callFromPush, data);
-            if (mustEndCallFromEvent) {
-              logger.debug(`Closing fg service from event callCid: ${call_cid} canListenToWS: ${_canListenToWS} shouldCallBeClosed`, {
-                event
-              });
-              unsubscribeFunctions.forEach(fn => fn());
-              callingx.endCallWithReason(call_cid, endCallReasonFromEvent);
-              finishBackgroundTask();
-            }
-          });
-
-          // check if service needs to be closed if call was left
-          const stateSubscription = callFromPush.state.callingState$.subscribe(callingState => {
-            if (callingState === CallingState.IDLE || callingState === CallingState.LEFT) {
-              logger.debug(`Closing fg service from callingState callCid: ${call_cid} callingState: ${callingState}`);
-              unsubscribeFunctions.forEach(fn => fn());
-              callingx.log(`Ending call with callCid: ${call_cid} callingState: ${callingState}`, 'debug');
-              finishBackgroundTask();
-            }
-          });
-          const endCallSubscription = callingx.addEventListener('endCall', async ({
-            callId
-          }) => {
-            unsubscribeFunctions.forEach(fn => fn());
-            try {
-              await callFromPush.leave({
-                reject: callFromPush.state.callingState === CallingState.RINGING,
-                reason: 'decline'
-              });
-            } catch (error) {
-              logger.error(`Failed to leave call with callCid: ${call_cid} error: ${error}`);
-            } finally {
-              callingx.log(`Ending call with callCid: ${call_cid} callId: ${callId}`, 'debug');
-              finishBackgroundTask();
-            }
-          });
-
-          //stop background task when app comes to foreground
-          const appStateSubscription = AppState.addEventListener('change', nextAppState => {
-            const _canListenToWS = canListenToWS();
-            callingx.log(`AppState changed to: ${nextAppState} for callCid: ${call_cid} canListenToWS: ${_canListenToWS}`, 'debug');
-            if (!_canListenToWS) {
-              unsubscribeFunctions.forEach(fn => fn());
-              finishBackgroundTask();
-              return;
-            }
-          });
-          unsubscribeFunctions.push(unsubscribe);
-          unsubscribeFunctions.push(() => stateSubscription.unsubscribe());
-          unsubscribeFunctions.push(() => endCallSubscription.remove());
-          unsubscribeFunctions.push(() => appStateSubscription.remove());
-          pushUnsubscriptionCallbacks.get(call_cid)?.forEach(cb => cb());
-          pushUnsubscriptionCallbacks.set(call_cid, unsubscribeFunctions);
-        } catch (error) {
-          callingx.log(`Failed to start background task with callCid: ${call_cid} error: ${error}`, 'error');
-          finishBackgroundTask();
-        }
-      })();
-    }
-    if (asForegroundService) {
-      // no need to check if call has be closed as that will be handled by the fg service
-      return;
-    }
-    const callFromPush = await client.onRingingCall(call_cid);
-    const {
-      mustEndCall,
-      endCallReason
-    } = shouldCallBeClosed(callFromPush, data);
-    if (mustEndCall) {
-      logger.debug(`Removing incoming call notification immediately with callCid: ${call_cid} as it should be closed`);
-      callingx.endCallWithReason(call_cid, endCallReason);
-      callFromPush.leave({
-        reject: false
-      }).catch(error => {
-        logger.error(`Failed to leave already-ended ringing call ${call_cid}: ${error}`);
-      });
-    }
+  void data;
+  if (!firebaseDataHandlerDeprecationLogged) {
+    firebaseDataHandlerDeprecationLogged = true;
+    console.warn('[@stream-io/video-react-native-sdk] `firebaseDataHandler` is deprecated. Ring notifications are now handled by the SDK internally — you can remove calls to it from your Firebase messaging handlers.');
   }
 };
 //# sourceMappingURL=android.js.map

package/dist/module/utils/push/android.js.map

@@ -1 +1 @@
-{"version":3,"names":["CallingState","videoLoggerSystem","AppState","Platform","getFirebaseMessagingLib","pushUnsubscriptionCallbacks","canListenToWS","shouldCallBeClosed","setPushLogoutCallback","StreamVideoRN","getCallingxLib","lastFirebaseToken","token","userId","initAndroidPushToken","client","pushConfig","setUnsubscribeListener","OS","android","pushProviderName","logger","getLogger","setDeviceToken","streamClient","_user","id","anonymous","debug","removeDevice","err","warn","push_provider_name","addDevice","messaging","unsubscribe","onTokenRefresh","refreshedToken","getToken","firebaseDataHandler","data","getConfig","push","sender","type","call_cid","callingx","createStreamVideoClient","stopService","asForegroundService","backgroundTaskOwner","acquireBackgroundTask","catch","e","error","finishBackgroundTask","log","releaseBackgroundTask","_client","callFromPush","onRingingCall","mustEndCall","endCallReason","endCallWithReason","leave","reject","unsubscribeFunctions","on","event","_canListenToWS","forEach","fn","mustEndCallFromEvent","endCallReasonFromEvent","stateSubscription","state","callingState$","subscribe","callingState","IDLE","LEFT","endCallSubscription","addEventListener","callId","RINGING","reason","appStateSubscription","nextAppState","remove","get","cb","set"],"sourceRoot":"../../../../src","sources":["utils/push/android.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["videoLoggerSystem","Platform","getFirebaseMessagingLib","setPushLogoutCallback","lastFirebaseToken","token","userId","initAndroidPushToken","client","pushConfig","setUnsubscribeListener","OS","android","pushProviderName","logger","getLogger","setDeviceToken","streamClient","_user","id","anonymous","debug","removeDevice","err","warn","push_provider_name","addDevice","messaging","unsubscribe","onTokenRefresh","refreshedToken","getToken","firebaseDataHandlerDeprecationLogged","firebaseDataHandler","data","console"],"sourceRoot":"../../../../src","sources":["utils/push/android.ts"],"mappings":";;AAAA,SAA4BA,iBAAiB,QAAQ,yBAAyB;AAC9E,SAASC,QAAQ,QAAQ,cAAc;AAEvC,SAASC,uBAAuB,QAAQ,QAAQ;AAChD,SAASC,qBAAqB,QAAQ,gCAAgC;AAItE,IAAIC,iBAAiB,GAAG;EAAEC,KAAK,EAAE,EAAE;EAAEC,MAAM,EAAE;AAAG,CAAC;;AAEjD;AACA,OAAO,eAAeC,oBAAoBA,CACxCC,MAAyB,EACzBC,UAAsB,EACtBC,sBAAyD,EACzD;EACA,IAAIT,QAAQ,CAACU,EAAE,KAAK,SAAS,IAAI,CAACF,UAAU,CAACG,OAAO,EAAEC,gBAAgB,EAAE;IACtE;EACF;EACA,MAAMC,MAAM,GAAGd,iBAAiB,CAACe,SAAS,CAAC,sBAAsB,CAAC;EAClE,MAAMC,cAAc,GAAG,MAAOX,KAAa,IAAK;IAC9C,MAAMC,MAAM,GAAGE,MAAM,CAACS,YAAY,CAACC,KAAK,EAAEC,EAAE,IAAI,EAAE;IAClD,IAAIX,MAAM,CAACS,YAAY,CAACG,SAAS,EAAE;MACjCN,MAAM,CAACO,KAAK,CAAC,mDAAmD,CAAC;MACjE;IACF;IACA,IACEjB,iBAAiB,CAACC,KAAK,KAAKA,KAAK,IACjCD,iBAAiB,CAACE,MAAM,KAAKA,MAAM,EACnC;MACAQ,MAAM,CAACO,KAAK,CACV,qDAAqDf,MAAM,eAAeD,KAAK,EACjF,CAAC;MACD;IACF;IACAD,iBAAiB,GAAG;MAAEC,KAAK;MAAEC;IAAO,CAAC;IACrCH,qBAAqB,CAAC,YAAY;MAChCC,iBAAiB,GAAG;QAAEC,KAAK,EAAE,EAAE;QAAEC,MAAM,EAAE;MAAG,CAAC;MAC7C,IAAI;QACFQ,MAAM,CAACO,KAAK,CAAC,6BAA6BhB,KAAK,EAAE,CAAC;QAClD,MAAMG,MAAM,CAACc,YAAY,CAACjB,KAAK,CAAC;MAClC,CAAC,CAAC,OAAOkB,GAAG,EAAE;QACZT,MAAM,CAACU,IAAI,CAAC,6CAA6C,EAAED,GAAG,CAAC;MACjE;IACF,CAAC,CAAC;IACF,MAAME,kBAAkB,GAAGhB,UAAU,CAACG,OAAO,EAAEC,gBAAgB;IAC/DC,MAAM,CAACO,KAAK,CAAC,2BAA2BhB,KAAK,gBAAgBC,MAAM,EAAE,CAAC;IACtE,MAAME,MAAM,CAACkB,SAAS,CAACrB,KAAK,EAAE,UAAU,EAAEoB,kBAAkB,CAAC;EAC/D,CAAC;EAED,MAAME,SAAS,GAAGzB,uBAAuB,CAAC,CAAC;EAC3CY,MAAM,CAACO,KAAK,CAAC,kCAAkC,CAAC;EAChD,MAAMO,WAAW,GAAGD,SAAS,CAAC,CAAC,CAACE,cAAc,CAAEC,cAAc,IAC5Dd,cAAc,CAACc,cAAc,CAC/B,CAAC;EACDpB,sBAAsB,CAACkB,WAAW,CAAC;EACnC,MAAMvB,KAAK,GAAG,MAAMsB,SAAS,CAAC,CAAC,CAACI,QAAQ,CAAC,CAAC;EAC1C,MAAMf,cAAc,CAACX,KAAK,CAAC;AAC7B;AAEA,IAAI2B,oCAAoC,GAAG,KAAK;AAChD;AACA;AACA;AACA;AACA,OAAO,MAAMC,mBAAmB,GAAG,MAAOC,IAAU,IAAK;EACvD,KAAKA,IAAI;EACT,IAAI,CAACF,oCAAoC,EAAE;IACzCA,oCAAoC,GAAG,IAAI;IAC3CG,OAAO,CAACX,IAAI,CACV,uMACF,CAAC;EACH;AACF,CAAC","ignoreList":[]}