react-native-insider 8.1.0 → 9.0.0-nh

package/ios/RNInsider/RNInsider.m

@@ -18,57 +18,124 @@
 #import <InsiderHybrid/InsiderHybridMethods.h>
 #import <InsiderMobile/InsiderCallbackTypeEnum.h>
 
+#pragma mark - Insider event listener
+
+/**
+ * Dedicated observer for the SDK's recorded-event stream.
+ *
+ * iOS holds event observers WEAKLY (Android holds them strongly), so whatever object
+ * implements InsiderEventListener must be kept alive by us. RNInsider instances are
+ * created/destroyed by React Native and are not a safe owner, so this small class is
+ * retained by the file-static `insiderEventListener` below for as long as the JS side
+ * has at least one subscriber.
+ */
+@interface RNInsiderEventListener : NSObject <InsiderEventListener>
+@end
+
+@implementation RNInsiderEventListener
+
+- (void)onEventRecorded:(NSString *)name
+             parameters:(NSDictionary<NSString *, id> *)parameters
+              timestamp:(NSTimeInterval)timestamp {
+    @try {
+        if (name == nil) return;
+
+        // `parameters` is a defensive copy owned by the SDK — read only, never mutate.
+        //
+        // It MUST go through the converter rather than being passed straight through: RN's
+        // `convertIdToFollyDynamic` only understands NSNumber/NSString/NSArray/NSDictionary/
+        // NSNull, and turns anything else (NSDate in particular) into a NULL dynamic — the
+        // value would reach JS as `null`. See RNUtils.convertParametersForBridge:.
+        //
+        // `timestamp` is forwarded in WHOLE SECONDS, matching the native SDK. JS must
+        // do `new Date(timestamp * 1000)`. Note this differs deliberately from Date values
+        // nested inside `parameters`, which are normalized to epoch MILLIS for Android parity.
+        NSDictionary *payload = @{
+            @"name": name,
+            @"parameters": [RNUtils convertParametersForBridge:parameters],
+            @"timestamp": @(timestamp)
+        };
+
+        RNNotificationHandler *handler = [[RNNotificationHandler alloc] init];
+
+        // THREADING (verified against React Native 0.83 sources — do not re-litigate):
+        // this runs on the SDK's internal listener thread, and that is fine. No manual
+        // dispatch hop is needed, because RN marshals to the JS thread itself:
+        //   RCTEventEmitter.sendEventWithName:body: (React/Modules/RCTEventEmitter.m:66)
+        //     -> RCTCallableJSModules.invokeModule: (React/Base/RCTCallableJSModules.m:43/49)
+        //     -> bridge:      RCTCxxBridge.enqueueJSCall (explicitly annotated "AnyThread")
+        //                     -> NativeToJsBridge.cpp:298 m_executorMessageQueueThread->runOnQueue
+        //                     -> CFRunLoopPerformBlock onto the dedicated JS thread (FIFO).
+        //        bridgeless:  ReactInstance.cpp:299 bufferedRuntimeExecutor_->execute
+        //                     -> RuntimeScheduler task queue, drained on the JS thread.
+        // Adding our own queue here would buy nothing and would only add a second hop.
+        // Ordering is preserved on the bridge path, so sequential emits from this one SDK
+        // thread stay in order and a purchase cannot overtake a product_detail_page_view.
+        [handler sendDataToJS:INSIDER_EVENT_RECORDED data:payload];
+    } @catch (NSException *e) {
+        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    }
+}
+
+@end
+
+/// Strong reference keeping the weakly-held observer alive. Non-nil while registered.
+static RNInsiderEventListener *insiderEventListener;
+
 @implementation RNInsider
 
 - (dispatch_queue_t)methodQueue
 {
     return dispatch_get_main_queue();
 }
+
++ (BOOL)requiresMainQueueSetup {
+    return NO;
+}
+
 RCT_EXPORT_MODULE()
 
-RCT_EXPORT_METHOD(initWithLaunchOptions:(NSDictionary *)launchOptions partnerName:(NSString *)partnerName appGroup:(NSString *)appGroup sdkVersion:(NSString *)sdkVersion) {
-    @try {
-        [Insider registerInsiderCallbackWithSelector:@selector(emitEvent:) sender:self];
-        [Insider setHybridSDKVersion:sdkVersion];
+- (NSString *)resolveAppIdentifier:(NSString *)app {
+    return app.length > 0 ? app : nil;
+}
+
+RCT_EXPORT_METHOD(initWithLaunchOptions:(NSDictionary *)launchOptions partnerName:(NSString *)partnerName appGroup:(NSString *)appGroup sdkVersion:(NSString *)sdkVersion appIdentifier:(NSString *)appIdentifier) {
+    [Insider registerInsiderCallbackWithSelector:@selector(emitEvent:) sender:self];
+    [Insider setHybridSDKVersion:sdkVersion];
+    NSString *app = [self resolveAppIdentifier:appIdentifier];
+    if (app) {
+        [Insider initWithLaunchOptions:nil partnerName:partnerName appGroup:appGroup appIdentifier:app];
+    } else {
         [Insider initWithLaunchOptions:nil partnerName:partnerName appGroup:appGroup];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
 
-RCT_EXPORT_METHOD(initWithCustomEndpoint:(NSDictionary *)launchOptions partnerName:(NSString *)partnerName appGroup:(NSString *)appGroup customEndpoint:(NSString *)endpoint sdkVersion:(NSString *)sdkVersion) {
-    @try {
-        [Insider registerInsiderCallbackWithSelector:@selector(emitEvent:) sender:self];
-        [Insider setHybridSDKVersion:sdkVersion];
+RCT_EXPORT_METHOD(initWithCustomEndpoint:(NSDictionary *)launchOptions partnerName:(NSString *)partnerName appGroup:(NSString *)appGroup customEndpoint:(NSString *)endpoint sdkVersion:(NSString *)sdkVersion appIdentifier:(NSString *)appIdentifier) {
+    [Insider registerInsiderCallbackWithSelector:@selector(emitEvent:) sender:self];
+    [Insider setHybridSDKVersion:sdkVersion];
+    NSString *app = [self resolveAppIdentifier:appIdentifier];
+    if (app) {
+        [Insider initWithLaunchOptions:nil partnerName:partnerName appGroup:appGroup customEndpoint:endpoint appIdentifier:app];
+    } else {
         [Insider initWithLaunchOptions:nil partnerName:partnerName appGroup:appGroup customEndpoint:endpoint];
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
 
 RCT_EXPORT_METHOD(reinitWithPartnerName:(NSString *)partnerName) {
-    @try {
-        [Insider reinitWithPartnerName:partnerName];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider reinitWithPartnerName:partnerName];
 }
 
 RCT_EXPORT_METHOD(tagEvent:(NSString *)eventName withParameters:(NSArray *)parameters) {
     @try {
         [[RNUtils parseEventFromEventName:eventName andParameters:parameters] build];
-    } @catch (NSException *e){
+    } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
 
 // Insider User
 RCT_EXPORT_METHOD(setGender:(int)gender) {
-    @try {
-        [InsiderHybrid setGender:gender];
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [InsiderHybrid setGender:gender];
 }
 
 RCT_EXPORT_METHOD(setBirthday:(NSString *)birthday) {
@@ -83,91 +150,47 @@ RCT_EXPORT_METHOD(setBirthday:(NSString *)birthday) {
 }
 
 RCT_EXPORT_METHOD(setName:(NSString *)value) {
-    @try {
-        [Insider getCurrentUser].setName(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setName(value);
 }
 
 RCT_EXPORT_METHOD(setSurname:(NSString *)value) {
-    @try {
-        [Insider getCurrentUser].setSurname(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setSurname(value);
 }
 
 RCT_EXPORT_METHOD(setAge:(int)value) {
-    @try {
-        [Insider getCurrentUser].setAge(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setAge(value);
 }
 
 RCT_EXPORT_METHOD(setLanguage:(NSString *)value) {
-    @try {
-        [Insider getCurrentUser].setLanguage(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setLanguage(value);
 }
 
 RCT_EXPORT_METHOD(setLocale:(NSString *)value) {
-    @try {
-        [Insider getCurrentUser].setLocale(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setLocale(value);
 }
 
 RCT_EXPORT_METHOD(setFacebookID:(NSString *)value) {
-    @try {
-        [Insider getCurrentUser].setFacebookID(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setFacebookID(value);
 }
 
 RCT_EXPORT_METHOD(setTwitterID:(NSString *)value) {
-    @try {
-        [Insider getCurrentUser].setTwitterID(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setTwitterID(value);
 }
 
 RCT_EXPORT_METHOD(setEmailOptin:(BOOL)value) {
-    @try {
-        [Insider getCurrentUser].setEmailOptin(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setEmailOptin(value);
 }
 
 RCT_EXPORT_METHOD(setEmail:(NSString *)value) {
-    @try {
-        [Insider getCurrentUser].setEmail(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setEmail(value);
 }
 
 RCT_EXPORT_METHOD(setSMSOptin:(BOOL)value) {
-    @try {
-        [Insider getCurrentUser].setSMSOptin(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setSMSOptin(value);
 }
 
 RCT_EXPORT_METHOD(setPhoneNumber:(NSString *)value) {
-    @try {
-        [Insider getCurrentUser].setPhoneNumber(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setPhoneNumber(value);
 }
 
 RCT_EXPORT_METHOD(handleURL:(NSString *)value) {
@@ -185,24 +208,20 @@ RCT_EXPORT_METHOD(handleURL:(NSString *)value) {
 }
 
 RCT_EXPORT_METHOD(setPushOptin:(BOOL)value) {
-    @try {
-        [Insider getCurrentUser].setPushOptin(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setPushOptin(value);
 }
 
 RCT_EXPORT_METHOD(setLocationOptin:(BOOL)value) {
-    @try {
-        [Insider getCurrentUser].setLocationOptin(value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setLocationOptin(value);
 }
 
 RCT_EXPORT_METHOD(setWhatsappOptin:(BOOL)value) {
+    [Insider getCurrentUser].setWhatsappOptin(value);
+}
+
+RCT_EXPORT_METHOD(setPromotionalOptin:(BOOL)value) {
     @try {
-        [Insider getCurrentUser].setWhatsappOptin(value);
+        [Insider getCurrentUser].setPromotionalOptin(value);
     } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
@@ -211,13 +230,14 @@ RCT_EXPORT_METHOD(setWhatsappOptin:(BOOL)value) {
 RCT_EXPORT_METHOD(login:(NSDictionary *)identifiers) {
     @try {
         if (!identifiers) return;
+
         InsiderIdentifiers *insiderIdentifiers = [[InsiderIdentifiers alloc] init];
-        for (NSString *key in identifiers.allKeys){
-            if([key isEqualToString:ADD_EMAIL]){
+        for (NSString *key in identifiers.allKeys) {
+            if ([key isEqualToString:ADD_EMAIL]) {
                 insiderIdentifiers.addEmail([identifiers objectForKey:key]);
-            } else if([key isEqualToString:ADD_PHONE_NUMBER]){
+            } else if ([key isEqualToString:ADD_PHONE_NUMBER]) {
                 insiderIdentifiers.addPhoneNumber([identifiers objectForKey:key]);
-            } else if([key isEqualToString:ADD_USER_ID]){
+            } else if ([key isEqualToString:ADD_USER_ID]) {
                 insiderIdentifiers.addUserID([identifiers objectForKey:key]);
             } else {
                 insiderIdentifiers.addCustomIdentifier(key, [identifiers objectForKey:key]);
@@ -230,34 +250,34 @@ RCT_EXPORT_METHOD(login:(NSDictionary *)identifiers) {
 }
 RCT_EXPORT_METHOD(loginWithReturningID:(NSDictionary *)identifiers insiderIDResult:(RCTResponseSenderBlock) insiderIDResult) {
     @try {
-        if (!identifiers) return;
+        if (!identifiers) {
+            insiderIDResult(@[[NSNull null]]);
+            return;
+        }
+
         InsiderIdentifiers *insiderIdentifiers = [[InsiderIdentifiers alloc] init];
-        for (NSString *key in identifiers.allKeys){
-            if([key isEqualToString:ADD_EMAIL]){
+        for (NSString *key in identifiers.allKeys) {
+            if ([key isEqualToString:ADD_EMAIL]) {
                 insiderIdentifiers.addEmail([identifiers objectForKey:key]);
-            } else if([key isEqualToString:ADD_PHONE_NUMBER]){
+            } else if ([key isEqualToString:ADD_PHONE_NUMBER]) {
                 insiderIdentifiers.addPhoneNumber([identifiers objectForKey:key]);
-            } else if([key isEqualToString:ADD_USER_ID]){
+            } else if ([key isEqualToString:ADD_USER_ID]) {
                 insiderIdentifiers.addUserID([identifiers objectForKey:key]);
             } else {
                 insiderIdentifiers.addCustomIdentifier(key, [identifiers objectForKey:key]);
             }
         }
         [[Insider getCurrentUser] login:insiderIdentifiers insiderIDResult:^(NSString *insiderID) {
-            NSArray *insiderIDToPass = [NSArray arrayWithObjects:insiderID, nil];
-            insiderIDResult(insiderIDToPass);
+            insiderIDResult(@[insiderID ?: [NSNull null]]);
         }];
     } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+        insiderIDResult(@[[NSNull null]]);
     }
 }
 
 RCT_EXPORT_METHOD(logout) {
-    @try {
-        [[Insider getCurrentUser] logout];
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [[Insider getCurrentUser] logout];
 }
 
 RCT_EXPORT_METHOD(logoutResettingInsiderID:(NSArray *)identifiersArray insiderIDResult:(RCTResponseSenderBlock)insiderIDResult) {
@@ -274,6 +294,10 @@ RCT_EXPORT_METHOD(logoutResettingInsiderID:(NSArray *)identifiersArray insiderID
         }
     } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+
+        if (insiderIDResult != nil) {
+            insiderIDResult(@[[NSNull null]]);
+        }
     }
 }
 
@@ -302,35 +326,19 @@ RCT_EXPORT_METHOD(logoutResettingInsiderID:(NSArray *)identifiersArray insiderID
 }
 
 RCT_EXPORT_METHOD(setCustomAttributeWithString:(NSString *)key value:(NSString *)value) {
-    @try {
-        [Insider getCurrentUser].setCustomAttributeWithString(key, value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setCustomAttributeWithString(key, value);
 }
 
 RCT_EXPORT_METHOD(setCustomAttributeWithInt:(NSString *)key value:(int)value) {
-    @try {
-        [Insider getCurrentUser].setCustomAttributeWithInt(key, value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setCustomAttributeWithInt(key, value);
 }
 
 RCT_EXPORT_METHOD(setCustomAttributeWithDouble:(NSString *)key value:(double)value) {
-    @try {
-        [Insider getCurrentUser].setCustomAttributeWithDouble(key, value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setCustomAttributeWithDouble(key, value);
 }
 
 RCT_EXPORT_METHOD(setCustomAttributeWithBoolean:(NSString *)key value:(BOOL)value) {
-    @try {
-        [Insider getCurrentUser].setCustomAttributeWithBoolean(key, value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setCustomAttributeWithBoolean(key, value);
 }
 
 RCT_EXPORT_METHOD(setCustomAttributeWithDate:(NSString *)key value:(NSString *)value) {
@@ -345,35 +353,19 @@ RCT_EXPORT_METHOD(setCustomAttributeWithDate:(NSString *)key value:(NSString *)v
 }
 
 RCT_EXPORT_METHOD(setCustomAttributeWithArray:(NSString *)key value:(NSArray *)value) {
-    @try {
-        [Insider getCurrentUser].setCustomAttributeWithArray(key, value);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].setCustomAttributeWithArray(key, value);
 }
 
 RCT_EXPORT_METHOD(unsetCustomAttribute:(NSString *)key) {
-    @try {
-        [Insider getCurrentUser].unsetCustomAttribute(key);
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider getCurrentUser].unsetCustomAttribute(key);
 }
 
 RCT_EXPORT_METHOD(setGDPRConsent:(BOOL)gdprConsent) {
-    @try {
-        [Insider setGDPRConsent:gdprConsent];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider setGDPRConsent:gdprConsent];
 }
 
 RCT_EXPORT_METHOD(setMobileAppAccess:(BOOL)mobileAppAccess) {
-    @try {
-        [Insider setMobileAppAccess:mobileAppAccess];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider setMobileAppAccess:mobileAppAccess];
 }
 
 RCT_EXPORT_METHOD(signUpConfirmation:(NSArray *)customParameters) {
@@ -385,7 +377,7 @@ RCT_EXPORT_METHOD(signUpConfirmation:(NSArray *)customParameters) {
         } else {
             [Insider signUpConfirmation];
         }
-    } @catch (NSException *e){
+    } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
@@ -401,7 +393,7 @@ RCT_EXPORT_METHOD(itemPurchased:(NSString *)saleID requiredFields:(NSDictionary
         } else {
             [Insider itemPurchasedWithSaleID:saleID product:product];
         }
-    } @catch (NSException *e){
+    } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
@@ -416,38 +408,30 @@ RCT_EXPORT_METHOD(itemAddedToCart:(NSDictionary *)requiredFields optionalFields:
         } else {
             [Insider itemAddedToCartWithProduct:product];
         }
-    } @catch (NSException *e){
+    } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
 
 RCT_EXPORT_METHOD(itemRemovedFromCart:(NSString *)productID saleID:(NSString *)saleID customParameters:(NSArray *)customParameters) {
-    @try {
-        NSDictionary<NSString *, id> *mappedCustomParameters = [RNUtils parseCustomParameters:customParameters];
+    NSDictionary<NSString *, id> *mappedCustomParameters = [RNUtils parseCustomParameters:customParameters];
 
-        if (saleID.length > 0) {
-            [Insider itemRemovedFromCartWithProductID:productID saleID:saleID customParameters:mappedCustomParameters];
-        } else if (mappedCustomParameters.count > 0) {
-            [Insider itemRemovedFromCartWithProductID:productID customParameters:mappedCustomParameters];
-        } else {
-            [Insider itemRemovedFromCartWithProductID:productID];
-        }
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    if (saleID.length > 0) {
+        [Insider itemRemovedFromCartWithProductID:productID saleID:saleID customParameters:mappedCustomParameters];
+    } else if (mappedCustomParameters.count > 0) {
+        [Insider itemRemovedFromCartWithProductID:productID customParameters:mappedCustomParameters];
+    } else {
+        [Insider itemRemovedFromCartWithProductID:productID];
     }
 }
 
 RCT_EXPORT_METHOD(cartCleared:(NSArray *)customParameters) {
-    @try {
-        NSDictionary<NSString *, id> *mappedCustomParameters = [RNUtils parseCustomParameters:customParameters];
+    NSDictionary<NSString *, id> *mappedCustomParameters = [RNUtils parseCustomParameters:customParameters];
 
-        if (mappedCustomParameters.count > 0) {
-            [Insider cartClearedWithCustomParameters:mappedCustomParameters];
-        } else {
-            [Insider cartCleared];
-        }
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    if (mappedCustomParameters.count > 0) {
+        [Insider cartClearedWithCustomParameters:mappedCustomParameters];
+    } else {
+        [Insider cartCleared];
     }
 }
 
@@ -461,36 +445,28 @@ RCT_EXPORT_METHOD(itemAddedToWishlist:(NSDictionary *)requiredFields optionalFie
         } else {
             [Insider itemAddedToWishlistWithProduct:product];
         }
-    } @catch (NSException *e){
+    } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
 
 RCT_EXPORT_METHOD(itemRemovedFromWishlist:(NSString *)productID customParameters:(NSArray *)customParameters) {
-    @try {
-        NSDictionary<NSString *, id> *mappedCustomParameters = [RNUtils parseCustomParameters:customParameters];
+    NSDictionary<NSString *, id> *mappedCustomParameters = [RNUtils parseCustomParameters:customParameters];
 
-        if (mappedCustomParameters.count > 0) {
-            [Insider itemRemovedFromWishlistWithProductID:productID customParameters:mappedCustomParameters];
-        } else {
-            [Insider itemRemovedFromWishlistWithProductID:productID];
-        }
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    if (mappedCustomParameters.count > 0) {
+        [Insider itemRemovedFromWishlistWithProductID:productID customParameters:mappedCustomParameters];
+    } else {
+        [Insider itemRemovedFromWishlistWithProductID:productID];
     }
 }
 
 RCT_EXPORT_METHOD(wishlistCleared:(NSArray *)customParameters) {
-        @try {
-            NSDictionary<NSString *, id> *mappedCustomParameters = [RNUtils parseCustomParameters:customParameters];
+        NSDictionary<NSString *, id> *mappedCustomParameters = [RNUtils parseCustomParameters:customParameters];
 
-            if (mappedCustomParameters.count > 0) {
-                [Insider wishlistClearedWithCustomParameters:mappedCustomParameters];
-            } else {
-                [Insider wishlistCleared];
-            }
-        } @catch (NSException *e){
-            [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+        if (mappedCustomParameters.count > 0) {
+            [Insider wishlistClearedWithCustomParameters:mappedCustomParameters];
+        } else {
+            [Insider wishlistCleared];
         }
 }
 
@@ -501,8 +477,9 @@ RCT_EXPORT_METHOD(getMessageCenterData:(NSInteger)limit startDate:(NSString *)st
         [InsiderHybrid getMessageCenterDataWithLimit:limit startDate:startDateEpoch endDate:endDateEpoch success:^(NSArray *messageCenterData) {
             callback(messageCenterData);
         }];
-    } @catch (NSException *e){
+    } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+        callback(@[@{@"data": @[]}]);
     }
 }
 
@@ -535,6 +512,7 @@ RCT_EXPORT_METHOD(getMessageCenterDataWithIdentifiers:(NSInteger)limit startDate
         }];
     } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+        callback(@[@[]]);
     }
 }
 
@@ -545,6 +523,7 @@ RCT_EXPORT_METHOD(getSmartRecommendation:(int)recommendationID locale:(NSString
         }];
     } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+        smartRecommendation(@[@{}]);
     }
 }
 
@@ -556,6 +535,7 @@ RCT_EXPORT_METHOD(getSmartRecommendationWithProduct:(NSDictionary *)requiredFiel
         }];
     } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+        smartRecommendation(@[@{}]);
     }
 }
 
@@ -566,6 +546,7 @@ RCT_EXPORT_METHOD(getSmartRecommendationWithProductIDs:(NSArray *)productIDs rec
         }];
     } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+        smartRecommendation(@[@{}]);
     }
 }
 
@@ -579,78 +560,54 @@ RCT_EXPORT_METHOD(clickSmartRecommendationProduct:(int)recommendationID required
 }
 
 RCT_EXPORT_METHOD(getContentStringWithName:(NSString *)variableName defaultValue:(NSString *)defaultValue dataType:(int)dataType callback:(RCTResponseSenderBlock)callback) {
-    @try {
-        callback([InsiderHybrid getContentStringWithName:variableName defaultString:defaultValue dataType:dataType]);
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    callback([InsiderHybrid getContentStringWithName:variableName defaultString:defaultValue dataType:dataType]);
 }
 
 RCT_EXPORT_METHOD(getContentBoolWithName:(NSString *)variableName defaultValue:(BOOL)defaultValue dataType:(int)dataType callback:(RCTResponseSenderBlock)callback) {
-    @try {
-        callback([InsiderHybrid getContentBoolWithName:variableName defaultBool:defaultValue dataType:dataType]);
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    callback([InsiderHybrid getContentBoolWithName:variableName defaultBool:defaultValue dataType:dataType]);
 }
 
 RCT_EXPORT_METHOD(getContentIntWithName:(NSString *)variableName defaultValue:(int)defaultValue dataType:(int)dataType callback:(RCTResponseSenderBlock)callback) {
-    @try {
-        callback([InsiderHybrid getContentIntWithName:variableName defaultInt:defaultValue dataType:dataType]);
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    callback([InsiderHybrid getContentIntWithName:variableName defaultInt:defaultValue dataType:dataType]);
 }
 
 RCT_EXPORT_METHOD(getContentStringWithoutCache:(NSString *)variableName defaultValue:(NSString *)defaultValue dataType:(int)dataType callback:(RCTResponseSenderBlock)callback) {
-    @try {
-        callback([InsiderHybrid getContentStringWithoutCache:variableName defaultString:defaultValue dataType:dataType]);
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    callback([InsiderHybrid getContentStringWithoutCache:variableName defaultString:defaultValue dataType:dataType]);
 }
 
 RCT_EXPORT_METHOD(getContentBoolWithoutCache:(NSString *)variableName defaultValue:(BOOL)defaultValue dataType:(int)dataType callback:(RCTResponseSenderBlock)callback) {
-    @try {
-        callback([InsiderHybrid getContentBoolWithoutCache:variableName defaultBool:defaultValue dataType:dataType]);
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    callback([InsiderHybrid getContentBoolWithoutCache:variableName defaultBool:defaultValue dataType:dataType]);
 }
 
 RCT_EXPORT_METHOD(getContentIntWithoutCache:(NSString *)variableName defaultValue:(int)defaultValue dataType:(int)dataType callback:(RCTResponseSenderBlock)callback) {
+    callback([InsiderHybrid getContentIntWithoutCache:variableName defaultInt:defaultValue dataType:dataType]);
+}
+
+RCT_EXPORT_METHOD(markContentOptimizerAsSeen:(NSString *)variableName) {
     @try {
-        callback([InsiderHybrid getContentIntWithoutCache:variableName defaultInt:defaultValue dataType:dataType]);
+        [Insider markContentOptimizerAsSeen:variableName];
     } @catch (NSException *e){
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
 
 RCT_EXPORT_METHOD(visitHomePage:(NSArray *)customParameters) {
-    @try {
-        NSDictionary<NSString *, id> *mappedCustomParameters = [RNUtils parseCustomParameters:customParameters];
+    NSDictionary<NSString *, id> *mappedCustomParameters = [RNUtils parseCustomParameters:customParameters];
 
-        if (mappedCustomParameters.count > 0) {
-            [Insider visitHomepageWithCustomParameters:mappedCustomParameters];
-        } else {
-            [Insider visitHomepage];
-        }
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    if (mappedCustomParameters.count > 0) {
+        [Insider visitHomepageWithCustomParameters:mappedCustomParameters];
+    } else {
+        [Insider visitHomepage];
     }
 }
 
 RCT_EXPORT_METHOD(visitListingPage:(NSArray *)taxonomy customParameters:(NSArray *)customParameters) {
-    @try {
-        NSDictionary<NSString *, id> *mappedCustomParameters = [RNUtils parseCustomParameters:customParameters];
+    NSDictionary<NSString *, id> *mappedCustomParameters = [RNUtils parseCustomParameters:customParameters];
 
-        if (mappedCustomParameters.count > 0) {
-            [Insider visitListingPageWithTaxonomy:taxonomy customParameters:mappedCustomParameters];
-        } else {
-            [Insider visitListingPageWithTaxonomy:taxonomy];
-        }
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    if (mappedCustomParameters.count > 0) {
+        [Insider visitListingPageWithTaxonomy:taxonomy customParameters:mappedCustomParameters];
+    } else {
+        [Insider visitListingPageWithTaxonomy:taxonomy];
     }
 }
 
@@ -718,19 +675,11 @@ RCT_EXPORT_METHOD(visitWishlistPage:(NSArray *)products customParameters:(NSArra
 }
 
 RCT_EXPORT_METHOD(startTrackingGeofence) {
-    @try {
-        [InsiderGeofence startTracking];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [InsiderGeofence startTracking];
 }
 
 RCT_EXPORT_METHOD(setAllowsBackgroundLocationUpdates:(BOOL)allowsBackgroundLocationUpdates) {
-    @try {
-        [InsiderGeofence setAllowsBackgroundLocationUpdates:allowsBackgroundLocationUpdates];
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [InsiderGeofence setAllowsBackgroundLocationUpdates:allowsBackgroundLocationUpdates];
 }
 
 RCT_EXPORT_METHOD(handleNotification:(NSDictionary *)notification) {
@@ -739,7 +688,7 @@ RCT_EXPORT_METHOD(handleNotification:(NSDictionary *)notification) {
         mutableNotification[@"aps"] = @"insider";
         [Insider handlePushLogWithUserInfo:mutableNotification];
         [Insider trackInteractiveLogWithUserInfo:mutableNotification];
-    } @catch (NSException *e){
+    } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
@@ -749,100 +698,52 @@ RCT_EXPORT_METHOD(triggerPushProcessWithNotificationData:(NSDictionary *)notific
 }
 
 RCT_EXPORT_METHOD(enableIDFACollection:(BOOL)enableIDFACollection) {
-    @try {
-        [Insider enableIDFACollection:enableIDFACollection];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider enableIDFACollection:enableIDFACollection];
 }
 
 RCT_EXPORT_METHOD(removeInapp) {
-    @try {
-        [Insider removeInapp];
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider removeInapp];
 }
 
 RCT_EXPORT_METHOD(registerWithQuietPermission:(BOOL)enabled) {
-    @try {
-        [Insider registerWithQuietPermission:enabled];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider registerWithQuietPermission:enabled];
 }
 
 RCT_EXPORT_METHOD(putErrorLog:(NSString *)errorString) {
-    @try{
-        NSException *exception = [NSException exceptionWithName:@"[JavaScript Error]" reason:errorString userInfo:nil];
-        [Insider sendError:exception desc:@"RNInsider.m - JavaScript Error"];
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    NSException *exception = [NSException exceptionWithName:@"[JavaScript Error]" reason:errorString userInfo:nil];
+    [Insider sendError:exception desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
 }
 
 RCT_EXPORT_METHOD(showNativeAppReview) {
-    @try {
-        [Insider showNativeAppReview];
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider showNativeAppReview];
 }
 
 RCT_EXPORT_METHOD(enableLocationCollection:(BOOL)enabled) {
-    @try {
-        [Insider enableLocationCollection:enabled];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider enableLocationCollection:enabled];
 }
 
 RCT_EXPORT_METHOD(enableIpCollection:(BOOL)enabled) {
-    @try {
-        [Insider enableIpCollection:enabled];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider enableIpCollection:enabled];
 }
 
 RCT_EXPORT_METHOD(enableCarrierCollection:(BOOL)enabled) {
-    @try {
-        [Insider enableCarrierCollection:enabled];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider enableCarrierCollection:enabled];
 }
 
 RCT_EXPORT_METHOD(setForegroundPushCallback) {
-    @try {
-        [Insider setForegroundPushCallback:@selector(foregroundPushCallback:) sender:self];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider setForegroundPushCallback:@selector(foregroundPushCallback:) sender:self];
 }
 
 RCT_EXPORT_METHOD(setActiveForegroundPushView) {
-    @try {
-        [Insider setActiveForegroundPushView];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider setActiveForegroundPushView];
 }
 
 RCT_EXPORT_METHOD(disableTemplates:(NSString *)value) {
-    @try {
-        [Insider disableTemplates];
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider disableTemplates];
 }
 
 RCT_EXPORT_METHOD(reenableTemplates:(NSString *)value) {
-    @try {
-        [Insider reenableTemplates];
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider reenableTemplates];
 }
 
 RCT_EXPORT_METHOD(getInsiderID:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
@@ -856,27 +757,42 @@ RCT_EXPORT_METHOD(getInsiderID:(RCTPromiseResolveBlock)resolve rejecter:(RCTProm
 }
 
 RCT_EXPORT_METHOD(registerInsiderIDListener) {
+    [Insider registerInsiderIDListenerWithSelector:@selector(insiderIDChangeListener:) sender:self];
+}
+
+RCT_EXPORT_METHOD(registerInsiderEventListener) {
     @try {
-        [Insider registerInsiderIDListenerWithSelector:@selector(insiderIDChangeListener:) sender:self];
+        if (insiderEventListener != nil) return;
+
+        insiderEventListener = [[RNInsiderEventListener alloc] init];
+
+        [[Insider events] addObserver:insiderEventListener];
     } @catch (NSException *e) {
+        insiderEventListener = nil;
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
 
-RCT_EXPORT_METHOD(disableInAppMessages) {
+RCT_EXPORT_METHOD(unregisterInsiderEventListener) {
     @try {
-        [Insider disableInAppMessages];
-    } @catch (NSException *e){
+        if (insiderEventListener == nil) return;
+
+        [[Insider events] removeObserver:insiderEventListener];
+
+        // Dropping our strong reference is what actually deallocates the observer,
+        // since the SDK only holds it weakly.
+        insiderEventListener = nil;
+    } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
 
+RCT_EXPORT_METHOD(disableInAppMessages) {
+    [Insider disableInAppMessages];
+}
+
 RCT_EXPORT_METHOD(enableInAppMessages) {
-    @try {
-        [Insider enableInAppMessages];
-    } @catch (NSException *e){
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
-    }
+    [Insider enableInAppMessages];
 }
 
 RCT_EXPORT_METHOD(getAppCardsCampaigns:(RCTResponseSenderBlock)callback) {
@@ -944,64 +860,52 @@ RCT_EXPORT_METHOD(deleteAppCards:(NSArray<NSString *> *)appCardIds callback:(RCT
 }
 
 RCT_EXPORT_METHOD(clickAppCardButton:(NSString *)appCardId data:(NSDictionary *)data) {
-    @try {
-        InsiderAppCardButtonModel *model = [[InsiderAppCardButtonModel alloc] initWithDictionary:data error:nil];
-        if (model) {
-            [model setAppCardId:appCardId];
-            [model click];
-        }
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    InsiderAppCardButtonModel *model = [[InsiderAppCardButtonModel alloc] initWithDictionary:data error:nil];
+    if (model) {
+        [model setAppCardId:appCardId];
+        [model click];
     }
 }
 
 RCT_EXPORT_METHOD(viewAppCard:(NSDictionary *)data) {
-    @try {
-        InsiderAppCardModel *model = [[InsiderAppCardModel alloc] initWithDictionary:data error:nil];
-        if (model) {
-            [model view];
-        }
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    InsiderAppCardModel *model = [[InsiderAppCardModel alloc] initWithDictionary:data error:nil];
+    if (model) {
+        [model view];
     }
 }
 
 RCT_EXPORT_METHOD(clickAppCard:(NSDictionary *)data) {
-    @try {
-        InsiderAppCardModel *model = [[InsiderAppCardModel alloc] initWithDictionary:data error:nil];
-        if (model) {
-            [model click];
-        }
-    } @catch (NSException *e) {
-        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    InsiderAppCardModel *model = [[InsiderAppCardModel alloc] initWithDictionary:data error:nil];
+    if (model) {
+        [model click];
     }
 }
 
--(void)insiderIDChangeListener:(NSString *) insiderID {
+- (void)insiderIDChangeListener:(NSString *) insiderID {
     @try {
         if (insiderID == nil) return;
 
         RNNotificationHandler *handler = [[RNNotificationHandler alloc] init];
 
         [handler sendDataToJS:INSIDER_ID_LISTENER data:insiderID];
-    } @catch (NSException *e){
+    } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
 
--(void)foregroundPushCallback:(UNNotification *) notification {
+- (void)foregroundPushCallback:(UNNotification *) notification {
   @try {
         if (notification == nil) return;
 
         RNNotificationHandler *handler = [[RNNotificationHandler alloc] init];
 
         [handler sendDataToJS:@"FOREGROUND_PUSH" data:notification.request.content.userInfo];
-    } @catch (NSException *e){
+    } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }
 
--(void)emitEvent:(NSDictionary *)eventData {
+- (void)emitEvent:(NSDictionary *)eventData {
     @try {
         RNNotificationHandler *handler = [[RNNotificationHandler alloc] init];
         if (!eventData || [eventData count] == 0)
@@ -1032,7 +936,7 @@ RCT_EXPORT_METHOD(clickAppCard:(NSDictionary *)data) {
             default:
                 break;
         }
-    } @catch (NSException *e){
+    } @catch (NSException *e) {
         [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
     }
 }