@stream-io/video-react-native-sdk 0.9.7 → 0.10.0

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

@@ -9,25 +9,20 @@ const addNewLinesToMainActivity_1 = __importDefault(require("./common/addNewLine
 const withStreamVideoReactNativeSDKMainActivity = (configuration, props) => {
     return (0, config_plugins_1.withMainActivity)(configuration, (config) => {
         const isMainActivityJava = config.modResults.language === 'java';
-        try {
-            config.modResults.contents = (0, codeMod_1.addImports)(config.modResults.contents, [
-                'com.streamvideo.reactnative.StreamVideoReactNative',
-                'android.os.Build',
-                'android.util.Rational',
-                'androidx.lifecycle.Lifecycle',
-                'android.app.PictureInPictureParams',
-                'com.oney.WebRTCModule.WebRTCModuleOptions',
-            ], isMainActivityJava);
-            config.modResults.contents = addOnPictureInPictureModeChanged(config.modResults.contents, isMainActivityJava);
-            if (props?.androidPictureInPicture?.enableAutomaticEnter) {
-                config.modResults.contents = addOnUserLeaveHint(config.modResults.contents, isMainActivityJava);
-            }
-            if (props?.enableScreenshare) {
-                config.modResults.contents = addInsideOnCreate(config.modResults.contents, isMainActivityJava);
-            }
+        config.modResults.contents = (0, codeMod_1.addImports)(config.modResults.contents, [
+            'com.streamvideo.reactnative.StreamVideoReactNative',
+            'android.os.Build',
+            'android.util.Rational',
+            'androidx.lifecycle.Lifecycle',
+            'android.app.PictureInPictureParams',
+            'com.oney.WebRTCModule.WebRTCModuleOptions',
+        ], isMainActivityJava);
+        config.modResults.contents = addOnPictureInPictureModeChanged(config.modResults.contents, isMainActivityJava);
+        if (props?.androidPictureInPicture?.enableAutomaticEnter) {
+            config.modResults.contents = addOnUserLeaveHint(config.modResults.contents, isMainActivityJava);
         }
-        catch (error) {
-            throw new Error("Cannot add StreamVideoReactNativeSDK to the project's MainApplication because it's malformed.");
+        if (props?.enableScreenshare) {
+            config.modResults.contents = addInsideOnCreate(config.modResults.contents, isMainActivityJava);
         }
         return config;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/video-react-native-sdk",
-  "version": "0.9.7",
+  "version": "0.10.0",
   "packageManager": "yarn@3.2.4",
   "main": "dist/commonjs/index.js",
   "module": "dist/module/index.js",
@@ -17,7 +17,7 @@
     "build:expo-plugin": "rimraf expo-config-plugin/dist && tsc --project expo-config-plugin/tsconfig.json",
     "build": "yarn clean && yarn copy-version && bob build && yarn build:expo-plugin",
     "test:expo-plugin": "jest expo-config-plugin --coverage",
-    "test": "jest --coverage && yarn test:expo-plugin",
+    "test": "yarn copy-version && jest --coverage && yarn test:expo-plugin",
     "copy-version": "echo \"export const version = '$npm_package_version';\" > ./src/version.ts"
   },
   "files": [
@@ -75,6 +75,9 @@
     "react-native-voip-push-notification": ">=3.3.1"
   },
   "peerDependenciesMeta": {
+    "@notifee/react-native": {
+      "optional": true
+    },
     "@react-native-community/push-notification-ios": {
       "optional": true
     },

package/src/hooks/useAndroidKeepCallAliveEffect.ts

@@ -1,15 +1,19 @@
 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';
 import { Platform } from 'react-native';
 import { CallingState, getLogger } from '@stream-io/video-client';
+import { getNotifeeLibNoThrowForKeepCallAlive } from '../utils/push/libs/notifee';
 
 const isAndroid7OrBelow = Platform.OS === 'android' && Platform.Version < 26;
 
+const notifeeLib = isAndroid7OrBelow
+  ? getNotifeeLibNoThrowForKeepCallAlive()
+  : undefined;
+
 function setForegroundService() {
   if (!isAndroid7OrBelow) return;
-  notifee.registerForegroundService(() => {
+  notifeeLib?.default.registerForegroundService(() => {
     return new Promise(() => {
       const logger = getLogger(['setForegroundService method']);
       logger('info', 'Foreground service running for call in progress');
@@ -23,8 +27,11 @@ async function startForegroundService(call_cid: string) {
   const { title, body } = foregroundServiceConfig.android.notificationTexts;
 
   // request for notification permission and then start the foreground service
-  const settings = await notifee.getNotificationSettings();
-  if (settings.authorizationStatus !== AuthorizationStatus.AUTHORIZED) {
+  if (!notifeeLib) return;
+  const settings = await notifeeLib.default.getNotificationSettings();
+  if (
+    settings.authorizationStatus !== notifeeLib.AuthorizationStatus.AUTHORIZED
+  ) {
     const logger = getLogger(['startForegroundService']);
     logger(
       'info',
@@ -32,7 +39,7 @@ async function startForegroundService(call_cid: string) {
     );
     return;
   }
-  await notifee.displayNotification({
+  await notifeeLib.default.displayNotification({
     id: call_cid,
     title,
     body,
@@ -69,6 +76,7 @@ export const useAndroidKeepCallAliveEffect = () => {
   const callingState = useCallCallingState();
 
   useEffect((): (() => void) | undefined => {
+    if (!notifeeLib) return;
     if (Platform.OS === 'ios' || !activeCallCid) {
       return;
     }
@@ -79,6 +87,7 @@ export const useAndroidKeepCallAliveEffect = () => {
         if (foregroundServiceStartedRef.current) {
           return;
         }
+        const notifee = notifeeLib.default;
         notifee.getDisplayedNotifications().then((displayedNotifications) => {
           const activeCallNotification = displayedNotifications.find(
             (notification) => notification.id === activeCallCid
@@ -99,7 +108,7 @@ export const useAndroidKeepCallAliveEffect = () => {
       // cancel any notifee displayed notification when the call has transitioned out of ringing
       return () => {
         // cancels the non fg service notifications
-        notifee.cancelDisplayedNotification(activeCallCid);
+        notifeeLib.default.cancelDisplayedNotification(activeCallCid);
       };
     } else if (
       callingState === CallingState.IDLE ||
@@ -107,18 +116,20 @@ export const useAndroidKeepCallAliveEffect = () => {
     ) {
       if (foregroundServiceStartedRef.current) {
         // stop foreground service when the call is not active
-        notifee.stopForegroundService();
+        notifeeLib.default.stopForegroundService();
         foregroundServiceStartedRef.current = false;
       } else {
-        notifee.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
-            notifee.stopForegroundService();
-          }
-        });
+        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();
+            }
+          });
       }
     }
   }, [activeCallCid, callingState]);
@@ -127,7 +138,8 @@ export const useAndroidKeepCallAliveEffect = () => {
     return () => {
       // stop foreground service when this effect is unmounted
       if (foregroundServiceStartedRef.current) {
-        notifee.stopForegroundService();
+        if (!notifeeLib) return;
+        notifeeLib.default.stopForegroundService();
         foregroundServiceStartedRef.current = false;
       }
     };

package/src/utils/StreamVideoRN/types.ts

@@ -1,5 +1,5 @@
 import { StreamVideoClient } from '@stream-io/video-client';
-import { AndroidChannel } from '@notifee/react-native';
+import type { AndroidChannel } from '@notifee/react-native';
 
 export type NonRingingPushEvent = 'call.live_started' | 'call.notification';
 

package/src/utils/push/android.ts

@@ -1,8 +1,3 @@
-import notifee, {
-  EventType,
-  Event,
-  AndroidCategory,
-} from '@notifee/react-native';
 import { FirebaseMessagingTypes } from '@react-native-firebase/messaging';
 import {
   Call,
@@ -20,6 +15,8 @@ import {
   getFirebaseMessagingLibNoThrow,
   getExpoNotificationsLib,
   getExpoTaskManagerLib,
+  getNotifeeLibThrowIfNotInstalledForPush,
+  NotifeeLib,
 } from './libs';
 import {
   pushAcceptedIncomingCallCId$,
@@ -43,6 +40,14 @@ const DECLINE_CALL_ACTION_ID = 'decline';
 
 type PushConfig = NonNullable<StreamVideoConfig['push']>;
 
+type onBackgroundEventFunctionParams = Parameters<
+  NotifeeLib['default']['onBackgroundEvent']
+>[0];
+
+type Event = Parameters<onBackgroundEventFunctionParams>[0];
+
+//  EventType = NotifeeLib['EventType'];
+
 /** Setup Firebase push message handler **/
 export function setupFirebaseHandlerAndroid(pushConfig: PushConfig) {
   if (Platform.OS !== 'android') {
@@ -114,6 +119,8 @@ export function setupFirebaseHandlerAndroid(pushConfig: PushConfig) {
   }
 
   // the notification tap handlers are always registered with notifee for both expo and non-expo in android
+  const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
+  const notifee = notifeeLib.default;
   notifee.onBackgroundEvent(async (event) => {
     await onNotifeeEvent(event, pushConfig, true);
   });
@@ -208,6 +215,9 @@ const firebaseMessagingOnMessageHandler = async (
       AppState.currentState !== 'active';
     const asForegroundService = canListenToWS();
 
+    const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
+    const notifee = notifeeLib.default;
+
     if (asForegroundService) {
       // Listen to call events from WS through fg service
       // note: this will replace the current empty fg service runner
@@ -291,7 +301,7 @@ const firebaseMessagingOnMessageHandler = async (
             },
           },
         ],
-        category: AndroidCategory.CALL,
+        category: notifeeLib.AndroidCategory.CALL,
         fullScreenAction: {
           id: 'stream_ringing_incoming_call',
         },
@@ -316,6 +326,8 @@ const firebaseMessagingOnMessageHandler = async (
       return;
     }
   } else {
+    const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
+    const notifee = notifeeLib.default;
     // the other types are call.live_started and call.notification
     const callChannel = pushConfig.android.callChannel;
     const callNotificationTextGetters =
@@ -376,18 +388,24 @@ const onNotifeeEvent = async (
       pushAcceptedIncomingCallCId$.observed &&
       pushRejectedIncomingCallCId$.observed;
 
+    const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
+    const notifee = notifeeLib.default;
     // Check if we need to decline the call
     const didPressDecline =
-      type === EventType.ACTION_PRESS &&
+      type === notifeeLib.EventType.ACTION_PRESS &&
       pressAction?.id === DECLINE_CALL_ACTION_ID;
-    const didDismiss = type === EventType.DISMISSED;
+    const didDismiss = type === notifeeLib.EventType.DISMISSED;
     const mustDecline = didPressDecline || didDismiss;
     // Check if we need to accept the call
     const mustAccept =
-      type === EventType.ACTION_PRESS &&
+      type === notifeeLib.EventType.ACTION_PRESS &&
       pressAction?.id === ACCEPT_CALL_ACTION_ID;
 
-    if (mustAccept || mustDecline || type === EventType.ACTION_PRESS) {
+    if (
+      mustAccept ||
+      mustDecline ||
+      type === notifeeLib.EventType.ACTION_PRESS
+    ) {
       clearPushWSEventSubscriptions();
       notifee.stopForegroundService();
     }
@@ -403,16 +421,17 @@ const onNotifeeEvent = async (
       }
       await processCallFromPushInBackground(pushConfig, call_cid, 'decline');
     } else {
-      if (type === EventType.PRESS) {
+      if (type === notifeeLib.EventType.PRESS) {
         pushTappedIncomingCallCId$.next(call_cid);
         // pressed state will be handled by the app with rxjs observers as the app will go to foreground always
-      } else if (isBackground && type === EventType.DELIVERED) {
+      } else if (isBackground && type === notifeeLib.EventType.DELIVERED) {
         pushAndroidBackgroundDeliveredIncomingCallCId$.next(call_cid);
         // background delivered state will be handled by the app with rxjs observers as processing needs to happen only when app is opened
       }
     }
   } else {
-    if (type === EventType.PRESS) {
+    const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
+    if (type === notifeeLib.EventType.PRESS) {
       pushTappedIncomingCallCId$.next(call_cid);
       pushConfig.onTapNonRingingCallNotification?.(
         call_cid,

package/src/utils/push/ios.ts

@@ -14,10 +14,13 @@ import {
   clearPushWSEventSubscriptions,
   processCallFromPushInBackground,
 } from './utils';
-import { getExpoNotificationsLib, getPushNotificationIosLib } from './libs';
+import {
+  getExpoNotificationsLib,
+  getNotifeeLibThrowIfNotInstalledForPush,
+  getPushNotificationIosLib,
+} from './libs';
 import { StreamVideoClient, getLogger } from '@stream-io/video-client';
 import { setPushLogoutCallback } from '../internal/pushLogoutCallback';
-import notifee, { EventType } from '@notifee/react-native';
 
 type PushConfig = NonNullable<StreamVideoConfig['push']>;
 
@@ -96,8 +99,10 @@ export const setupRemoteNotificationsHandleriOS = (pushConfig: PushConfig) => {
   if (Platform.OS !== 'ios') {
     return;
   }
-  notifee.onForegroundEvent(({ type, detail }) => {
-    if (type === EventType.PRESS) {
+  const notifeeLib = getNotifeeLibThrowIfNotInstalledForPush();
+
+  notifeeLib.default.onForegroundEvent(({ type, detail }) => {
+    if (type === notifeeLib.EventType.PRESS) {
       const streamPayload = detail.notification?.data?.stream as
         | StreamPayload
         | undefined;

package/src/utils/push/libs/index.ts

@@ -4,6 +4,7 @@ export * from './firebaseMessaging';
 export * from './iosPushNotification';
 export * from './voipPushNotification';
 export * from './callkeep';
+export * from './notifee';
 
 /*
 NOTE: must keep each libs in different files

package/src/utils/push/libs/notifee.ts

@@ -0,0 +1,33 @@
+import { getLogger } from '../../..';
+
+export type NotifeeLib = typeof import('@notifee/react-native');
+
+let notifeeLib: NotifeeLib | undefined;
+
+try {
+  notifeeLib = require('@notifee/react-native');
+} catch (_e) {}
+
+const INSTALLATION_INSTRUCTION =
+  'Please see https://notifee.app/react-native/docs/installation for installation instructions';
+
+export function getNotifeeLibThrowIfNotInstalledForPush() {
+  if (!notifeeLib) {
+    throw Error(
+      '@notifee/react-native is not installed. It is required for implementing push notifications. ' +
+        INSTALLATION_INSTRUCTION
+    );
+  }
+  return notifeeLib;
+}
+
+export function getNotifeeLibNoThrowForKeepCallAlive() {
+  if (!notifeeLib) {
+    const logger = getLogger(['getNotifeeLibNoThrow']);
+    logger(
+      'info',
+      `${'@notifee/react-native library not installed. It is required to keep call alive in the background for Android < 26. '}${INSTALLATION_INSTRUCTION}`
+    );
+  }
+  return notifeeLib;
+}

package/src/version.ts

@@ -1 +1 @@
-export const version = '0.9.7';
+export const version = '0.10.0';