@daily-co/react-native-daily-js 0.60.0 → 0.62.0

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

@@ -20,6 +20,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
 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 class DailyNativeUtils extends ReactContextBaseJavaModule implements Perm
 
             @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";

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import Daily from '../type-overrides/@daily-co/daily-js';
 import DailyMediaView from './DailyMediaView';
 import 'react-native-url-polyfill/auto';
 import 'react-native-get-random-values';
+export type DailyAppStateEvent = 'active' | 'inactive' | 'destroyed';
 export default Daily;
 export * from '../type-overrides/@daily-co/daily-js';
 export { DailyMediaView };

package/dist/index.js

@@ -47,10 +47,13 @@ var dailyNativeUtilsEventEmitter = new react_native_1.NativeEventEmitter(DailyNa
 var hasAudioFocus;
 var appState;
 var audioFocusChangeListeners = new Set();
-var appActiveStateChangeListeners = new Set();
+var appStateChangeListeners = new Set();
 var systemScreenCaptureStopListeners = new Set();
 var systemScreenCaptureStartCallback;
 function setupEventListeners() {
+    dailyNativeUtilsEventEmitter.addListener('EventOnHostDestroy', function () {
+        appStateChangeListeners.forEach(function (listener) { return listener('destroyed'); });
+    });
     // audio focus: used by daily-js to auto-mute mic, for instance
     if (react_native_1.Platform.OS === 'android') {
         hasAudioFocus = true; // safe assumption, hopefully
@@ -75,7 +78,9 @@ function setupEventListeners() {
         var wasActive = previousState === 'active';
         var isActive = appState === 'active';
         if (wasActive !== isActive) {
-            appActiveStateChangeListeners.forEach(function (listener) { return listener(isActive); });
+            appStateChangeListeners.forEach(function (listener) {
+                return listener(isActive ? 'active' : 'inactive');
+            });
         }
     });
     if (react_native_1.Platform.OS === 'ios') {
@@ -125,10 +130,10 @@ function setupGlobals() {
             audioFocusChangeListeners.add(listener);
         }, removeAudioFocusChangeListener: function (listener) {
             audioFocusChangeListeners.delete(listener);
-        }, addAppActiveStateChangeListener: function (listener) {
-            appActiveStateChangeListeners.add(listener);
-        }, removeAppActiveStateChangeListener: function (listener) {
-            appActiveStateChangeListeners.delete(listener);
+        }, addAppStateChangeListener: function (listener) {
+            appStateChangeListeners.add(listener);
+        }, removeAppStateChangeListener: function (listener) {
+            appStateChangeListeners.delete(listener);
         }, addSystemScreenCaptureStopListener: function (listener) {
             systemScreenCaptureStopListeners.add(listener);
         }, removeSystemScreenCaptureStopListener: function (listener) {

package/ios/DailyNativeUtils.m

@@ -11,6 +11,7 @@ static NSString *const NotificationScreenCaptureExtensionStarted = @"ScreenCaptu
 // 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 @@ RCT_EXPORT_MODULE()
                                            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 @@ RCT_EXPORT_MODULE()
 
 - (NSArray<NSString *> *)supportedEvents
 {
-  return @[EventSystemScreenCaptureStop, EventSystemScreenCaptureStart];
+  return @[EventSystemScreenCaptureStop, EventSystemScreenCaptureStart, EventOnHostDestroy];
 }
 
 #pragma mark Public

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daily-co/react-native-daily-js",
-  "version": "0.60.0",
+  "version": "0.62.0",
   "description": "React Native library for making video calls using Daily",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,7 +28,7 @@
     "baseUrl": "https://github.com/daily-co/react-native-daily-js"
   },
   "dependencies": {
-    "@daily-co/daily-js": "^0.62.0",
+    "@daily-co/daily-js": "^0.64.0",
     "@types/react-native-background-timer": "^2.0.0",
     "base-64": "^1.0.0",
     "react-native-url-polyfill": "^1.1.2"