Merge branch 'main' into daily-js-releases

Author: Daily Autobot

android/src/main/java/com/daily/reactlibrary/DailyNativeUtils.java

@@ -20,6 +20,7 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.PermissionAwareActivity;
 import com.facebook.react.modules.core.PermissionListener;
 
@@ -35,6 +36,7 @@ public class DailyNativeUtils extends ReactContextBaseJavaModule implements Perm
     private static int PERMISSION_REQUEST_CODE = 666;
 
     private final ReactApplicationContext reactContext;
+    private DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter;
     private Set<String> requestersKeepingDeviceAwake = new HashSet<>();
     private Set<String> requestersShowingOngoingMeetingNotification = new HashSet<>();
 
@@ -57,14 +59,17 @@ public void onHostPause() {
 
             @Override
             public void onHostDestroy() {
+                eventEmitter.emit("EventOnHostDestroy", Arguments.createMap());
                 DailyOngoingMeetingForegroundService.stop(reactContext);
-                // This seems extreme, but the process won't otherwise immediately stop sending
-                // audio and video
-                Process.killProcess(Process.myPid());
             }
         });
     }
 
+    @Override
+    public void initialize() {
+        this.eventEmitter = reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
+    }
+
     @Override
     public String getName() {
         return "DailyNativeUtils";

ios/DailyNativeUtils.m

@@ -11,6 +11,7 @@
 // Event to JS layer
 static NSString *const EventSystemScreenCaptureStop = @"EventSystemScreenCaptureStop";
 static NSString *const EventSystemScreenCaptureStart = @"EventSystemScreenCaptureStart";
+static NSString *const EventOnHostDestroy = @"EventOnHostDestroy";
 
 @interface DailyNativeUtils()
 
@@ -53,10 +54,24 @@ - (instancetype)init
                                            selector:@selector(handleNotificationScreenCaptureExtensionStarted)
                                                name:NotificationScreenCaptureExtensionStarted
                                              object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                          selector:@selector(applicationWillTerminate)
+                                              name:UIApplicationWillTerminateNotification
+                                            object:nil];
   }
   return self;
 }
 
+- (void)applicationWillTerminate {
+    NSLog(@"App is about to terminate");
+    BOOL isStillOnMeeting = _requestersKeepingDeviceAwake.count > 0;
+    if (isStillOnMeeting) {
+        [self sendEventWithName:EventOnHostDestroy body:nil];
+        NSLog(@"Triggered the event EventOnHostDestroy");
+    }
+}
+
 + (BOOL)requiresMainQueueSetup
 {
   return NO;
@@ -65,7 +80,7 @@ + (BOOL)requiresMainQueueSetup
 
 - (NSArray<NSString *> *)supportedEvents
 {
-  return @[EventSystemScreenCaptureStop, EventSystemScreenCaptureStart];
+  return @[EventSystemScreenCaptureStop, EventSystemScreenCaptureStart, EventOnHostDestroy];
 }
 
 #pragma mark Public

package-lock.json

@@ -2,7 +2,7 @@
   "name": "@daily-co/react-native-daily-js",
   "private": true,
   "//": "^ COMMENT OUT 'private: true' BEFORE RUNNING NPM PUBLISH",
-  "version": "0.60.0",
+  "version": "0.61.0",
   "description": "React Native library for making video calls using Daily",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,7 +30,7 @@
     "baseUrl": "https://github.com/daily-co/react-native-daily-js"
   },
   "dependencies": {
-    "@daily-co/daily-js": "^0.62.0",
+    "@daily-co/daily-js": "^0.63.0",
     "@types/react-native-background-timer": "^2.0.0",
     "base-64": "^1.0.0",
     "react-native-url-polyfill": "^1.1.2"

package.json

@@ -25,12 +25,20 @@ const dailyNativeUtilsEventEmitter = new NativeEventEmitter(DailyNativeUtils);
 let hasAudioFocus: boolean;
 let appState: AppStateStatus;
 const audioFocusChangeListeners: Set<(hasFocus: boolean) => void> = new Set();
-const appActiveStateChangeListeners: Set<(isActive: boolean) => void> =
-  new Set();
+
+export type DailyAppStateEvent = 'active' | 'inactive' | 'destroyed';
+const appStateChangeListeners: Set<
+  (appState: DailyAppStateEvent) => void
+> = new Set();
+
 const systemScreenCaptureStopListeners: Set<() => void> = new Set();
 let systemScreenCaptureStartCallback: { (): void } | null;
 
 function setupEventListeners() {
+  dailyNativeUtilsEventEmitter.addListener('EventOnHostDestroy', () => {
+    appStateChangeListeners.forEach((listener) => listener('destroyed'));
+  });
+
   // audio focus: used by daily-js to auto-mute mic, for instance
   if (Platform.OS === 'android') {
     hasAudioFocus = true; // safe assumption, hopefully
@@ -56,7 +64,9 @@ function setupEventListeners() {
     const wasActive = previousState === 'active';
     const isActive = appState === 'active';
     if (wasActive !== isActive) {
-      appActiveStateChangeListeners.forEach((listener) => listener(isActive));
+      appStateChangeListeners.forEach((listener) =>
+        listener(isActive ? 'active' : 'inactive')
+      );
     }
   });
 
@@ -127,15 +137,15 @@ function setupGlobals(): void {
     removeAudioFocusChangeListener: (listener: (hasFocus: boolean) => void) => {
       audioFocusChangeListeners.delete(listener);
     },
-    addAppActiveStateChangeListener: (
-      listener: (isActive: boolean) => void
+    addAppStateChangeListener: (
+      listener: (appState: DailyAppStateEvent) => void
     ) => {
-      appActiveStateChangeListeners.add(listener);
+      appStateChangeListeners.add(listener);
     },
-    removeAppActiveStateChangeListener: (
-      listener: (isActive: boolean) => void
+    removeAppStateChangeListener: (
+      listener: (appState: DailyAppStateEvent) => void
     ) => {
-      appActiveStateChangeListeners.delete(listener);
+      appStateChangeListeners.delete(listener);
     },
     addSystemScreenCaptureStopListener: (listener: () => void) => {
       systemScreenCaptureStopListeners.add(listener);