FENCE-2697: Fix TurboModule event emitter crash on iOS startup (#433)

* add _jsEventEmitterReady check

* cleanup whitespace

* match naming convention

* prep for release

Author: alanjcharles14

android/src/newarch/java/com/radar/RadarModule.kt

@@ -143,7 +143,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
     override fun initialize(publishableKey: String, fraud: Boolean): Unit {
         val editor = reactApplicationContext.getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit()
         editor.putString("x_platform_sdk_type", "ReactNative")
-        editor.putString("x_platform_sdk_version", "3.30.0")
+        editor.putString("x_platform_sdk_version", "3.31.0")
         editor.apply()
 
         Radar.initialize(reactApplicationContext, publishableKey, radarReceiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, radarInAppMessageReceiver, currentActivity)

android/src/oldarch/java/com/radar/RadarModule.java

@@ -102,7 +102,7 @@ public void initialize(String publishableKey, boolean fraud) {
         this.fraud = fraud;
         SharedPreferences.Editor editor = getReactApplicationContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit();
         editor.putString("x_platform_sdk_type", "ReactNative");
-        editor.putString("x_platform_sdk_version", "3.30.0");
+        editor.putString("x_platform_sdk_version", "3.31.0");
         editor.apply();
         Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, inAppMessageReceiver, getCurrentActivity());
         if (fraud) { 

example/package-lock.json

@@ -9,6 +9,9 @@ @implementation RNRadar {
     CLLocationManager *locationManager;
     RCTPromiseResolveBlock permissionsRequestResolver;
     bool hasListeners;
+    #ifdef RCT_NEW_ARCH_ENABLED
+    bool jsEventEmitterReady;
+    #endif
 }
 
 RCT_EXPORT_MODULE()
@@ -52,12 +55,21 @@ - (void)stopObserving {
     hasListeners = NO;
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)setEventEmitterCallback:(EventEmitterCallbackWrapper *)eventEmitterCallbackWrapper {
+    [super setEventEmitterCallback:eventEmitterCallbackWrapper];
+    jsEventEmitterReady = YES;
+}
+#endif
+
 - (void)onNewInAppMessage:(RadarInAppMessage *)inAppMessage {
 
     NSMutableDictionary *body = [NSMutableDictionary new];
     [body setValue:[Radar dictionaryForInAppMessage:inAppMessage] forKey:@"inAppMessage"];
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitNewInAppMessageEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitNewInAppMessageEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"newInAppMessageEmitter" body:body];
@@ -69,7 +81,9 @@ - (void)onInAppMessageDismissed:(RadarInAppMessage *)inAppMessage {
     NSMutableDictionary *body = [NSMutableDictionary new];
     [body setValue:[Radar dictionaryForInAppMessage:inAppMessage] forKey:@"inAppMessage"];
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitInAppMessageDismissedEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitInAppMessageDismissedEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"inAppMessageDismissedEmitter" body:body];
@@ -81,7 +95,9 @@ - (void)onInAppMessageButtonClicked:(RadarInAppMessage *)inAppMessage {
     NSMutableDictionary *body = [NSMutableDictionary new];
     [body setValue:[Radar dictionaryForInAppMessage:inAppMessage] forKey:@"inAppMessage"];
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitInAppMessageClickedEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitInAppMessageClickedEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"inAppMessageClickedEmitter" body:body];
@@ -105,7 +121,9 @@ - (void)didReceiveEvents:(NSArray<RadarEvent *> *)events user:(RadarUser * _Null
         [body setValue:[user dictionaryValue] forKey:@"user"];
     }
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitEventsEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitEventsEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"eventsEmitter" body:body];
@@ -115,10 +133,12 @@ - (void)didReceiveEvents:(NSArray<RadarEvent *> *)events user:(RadarUser * _Null
 
 - (void)didUpdateLocation:(CLLocation *)location user:(RadarUser *)user {
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitLocationEmitter:@{
-        @"location": [Radar dictionaryForLocation:location],
-        @"user": [user dictionaryValue]
-    }];
+    if (jsEventEmitterReady) {
+        [self emitLocationEmitter:@{
+            @"location": [Radar dictionaryForLocation:location],
+            @"user": [user dictionaryValue]
+        }];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"locationEmitter" body:@{
@@ -131,11 +151,13 @@ - (void)didUpdateLocation:(CLLocation *)location user:(RadarUser *)user {
 
 - (void)didUpdateClientLocation:(CLLocation *)location stopped:(BOOL)stopped source:(RadarLocationSource)source {
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitClientLocationEmitter:@{
-        @"location": [Radar dictionaryForLocation:location],
-        @"stopped": @(stopped),
-        @"source": [Radar stringForLocationSource:source]
-    }];
+    if (jsEventEmitterReady) {
+        [self emitClientLocationEmitter:@{
+            @"location": [Radar dictionaryForLocation:location],
+            @"stopped": @(stopped),
+            @"source": [Radar stringForLocationSource:source]
+        }];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"clientLocationEmitter" body:@{
@@ -152,7 +174,9 @@ - (void)didFailWithStatus:(RadarStatus)status {
         @"status": [Radar stringForStatus:status]
     };
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitErrorEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitErrorEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"errorEmitter" body:body];
@@ -165,7 +189,9 @@ - (void)didLogMessage:(NSString *)message {
         @"message": message
     };
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitLogEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitLogEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"logEmitter" body:body];
@@ -178,7 +204,9 @@ - (void)didUpdateToken:(RadarVerifiedLocationToken *)token {
         @"token": [token dictionaryValue]
     };
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitTokenEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitTokenEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"tokenEmitter" body:body];
@@ -189,7 +217,7 @@ - (void)didUpdateToken:(RadarVerifiedLocationToken *)token {
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
     _publishableKey = publishableKey; 
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"3.30.0" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.31.0" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 

ios/RNRadar.mm

@@ -3,7 +3,7 @@
   "description": "React Native module for Radar, the leading geofencing and location tracking platform",
   "homepage": "https://radar.com",
   "license": "Apache-2.0",
-  "version": "3.30.0",
+  "version": "3.31.0",
   "main": "dist/index.js",
   "files": [
     "dist",

package-lock.json

@@ -1,3 +1,3 @@
 // This file contains the version of the react-native-radar package
 // It should be updated to match the version in package.json
-export const VERSION = '3.30.0';
+export const VERSION = '3.31.0';