@datalyr/react-native 1.4.4 → 1.4.6

package/ios/DatalyrNativeModule.swift

@@ -11,8 +11,7 @@ public class DatalyrNativeModule: Module {
 
     AsyncFunction("initializeMetaSDK") { (appId: String, clientToken: String?, advertiserTrackingEnabled: Bool, promise: Promise) in
       DispatchQueue.main.async {
-        var nativeError: NSError?
-        let success = ObjCExceptionHelper.tryBlock({
+        let error = ObjCExceptionHelper.execute {
           Settings.shared.appID = appId
 
           if let token = clientToken, !token.isEmpty {
@@ -26,9 +25,9 @@ public class DatalyrNativeModule: Module {
             UIApplication.shared,
             didFinishLaunchingWithOptions: nil
           )
-        }, error: &nativeError)
+        }
 
-        if !success, let error = nativeError {
+        if let error = error {
           promise.reject("meta_init_exception", error.localizedDescription)
           return
         }
@@ -38,8 +37,7 @@ public class DatalyrNativeModule: Module {
     }
 
     AsyncFunction("fetchDeferredAppLink") { (promise: Promise) in
-      var nativeError: NSError?
-      let success = ObjCExceptionHelper.tryBlock({
+      let error = ObjCExceptionHelper.execute {
         AppLinkUtility.fetchDeferredAppLink { url, error in
           if error != nil {
             promise.resolve(nil)
@@ -52,9 +50,9 @@ public class DatalyrNativeModule: Module {
             promise.resolve(nil)
           }
         }
-      }, error: &nativeError)
+      }
 
-      if !success {
+      if error != nil {
         promise.resolve(nil)
       }
     }
@@ -68,8 +66,7 @@ public class DatalyrNativeModule: Module {
         }
       }
 
-      var nativeError: NSError?
-      let success = ObjCExceptionHelper.tryBlock({
+      let error = ObjCExceptionHelper.execute {
         if let value = valueToSum {
           AppEvents.shared.logEvent(AppEvents.Name(eventName), valueToSum: value, parameters: params)
         } else if params.isEmpty {
@@ -77,9 +74,9 @@ public class DatalyrNativeModule: Module {
         } else {
           AppEvents.shared.logEvent(AppEvents.Name(eventName), parameters: params)
         }
-      }, error: &nativeError)
+      }
 
-      if !success, let error = nativeError {
+      if let error = error {
         promise.reject("meta_exception", error.localizedDescription)
         return
       }
@@ -96,12 +93,11 @@ public class DatalyrNativeModule: Module {
         }
       }
 
-      var nativeError: NSError?
-      let success = ObjCExceptionHelper.tryBlock({
+      let error = ObjCExceptionHelper.execute {
         AppEvents.shared.logPurchase(amount: amount, currency: currency, parameters: params)
-      }, error: &nativeError)
+      }
 
-      if !success, let error = nativeError {
+      if let error = error {
         promise.reject("meta_exception", error.localizedDescription)
         return
       }
@@ -110,8 +106,7 @@ public class DatalyrNativeModule: Module {
     }
 
     AsyncFunction("setMetaUserData") { (userData: [String: Any], promise: Promise) in
-      var nativeError: NSError?
-      let success = ObjCExceptionHelper.tryBlock({
+      let error = ObjCExceptionHelper.execute {
         AppEvents.shared.setUserData(userData["email"] as? String, forType: .email)
         AppEvents.shared.setUserData(userData["firstName"] as? String, forType: .firstName)
         AppEvents.shared.setUserData(userData["lastName"] as? String, forType: .lastName)
@@ -122,9 +117,9 @@ public class DatalyrNativeModule: Module {
         AppEvents.shared.setUserData(userData["state"] as? String, forType: .state)
         AppEvents.shared.setUserData(userData["zip"] as? String, forType: .zip)
         AppEvents.shared.setUserData(userData["country"] as? String, forType: .country)
-      }, error: &nativeError)
+      }
 
-      if !success, let error = nativeError {
+      if let error = error {
         promise.reject("meta_exception", error.localizedDescription)
         return
       }
@@ -133,12 +128,11 @@ public class DatalyrNativeModule: Module {
     }
 
     AsyncFunction("clearMetaUserData") { (promise: Promise) in
-      var nativeError: NSError?
-      let success = ObjCExceptionHelper.tryBlock({
+      let error = ObjCExceptionHelper.execute {
         AppEvents.shared.clearUserData()
-      }, error: &nativeError)
+      }
 
-      if !success, let error = nativeError {
+      if let error = error {
         promise.reject("meta_exception", error.localizedDescription)
         return
       }
@@ -147,13 +141,12 @@ public class DatalyrNativeModule: Module {
     }
 
     AsyncFunction("updateMetaTrackingAuthorization") { (enabled: Bool, promise: Promise) in
-      var nativeError: NSError?
-      let success = ObjCExceptionHelper.tryBlock({
+      let error = ObjCExceptionHelper.execute {
         Settings.shared.isAdvertiserTrackingEnabled = enabled
         Settings.shared.isAdvertiserIDCollectionEnabled = enabled
-      }, error: &nativeError)
+      }
 
-      if !success, let error = nativeError {
+      if let error = error {
         promise.reject("meta_exception", error.localizedDescription)
         return
       }
@@ -181,12 +174,11 @@ public class DatalyrNativeModule: Module {
           return
         }
 
-        var nativeError: NSError?
-        let success = ObjCExceptionHelper.tryBlock({
+        let error = ObjCExceptionHelper.execute {
           TikTokBusiness.initializeSdk(validConfig)
-        }, error: &nativeError)
+        }
 
-        if !success, let error = nativeError {
+        if let error = error {
           promise.reject("tiktok_init_exception", error.localizedDescription)
           return
         }
@@ -196,8 +188,7 @@ public class DatalyrNativeModule: Module {
     }
 
     AsyncFunction("trackTikTokEvent") { (eventName: String, eventId: String?, properties: [String: Any]?, promise: Promise) in
-      var nativeError: NSError?
-      let success = ObjCExceptionHelper.tryBlock({
+      let error = ObjCExceptionHelper.execute {
         let event: TikTokBaseEvent
 
         if let eid = eventId, !eid.isEmpty {
@@ -213,9 +204,9 @@ public class DatalyrNativeModule: Module {
         }
 
         TikTokBusiness.trackTTEvent(event)
-      }, error: &nativeError)
+      }
 
-      if !success, let error = nativeError {
+      if let error = error {
         promise.reject("tiktok_exception", error.localizedDescription)
         return
       }
@@ -224,17 +215,16 @@ public class DatalyrNativeModule: Module {
     }
 
     AsyncFunction("identifyTikTokUser") { (externalId: String, externalUserName: String, phoneNumber: String, email: String, promise: Promise) in
-      var nativeError: NSError?
-      let success = ObjCExceptionHelper.tryBlock({
+      let error = ObjCExceptionHelper.execute {
         TikTokBusiness.identify(
           withExternalID: externalId.isEmpty ? nil : externalId,
           externalUserName: externalUserName.isEmpty ? nil : externalUserName,
           phoneNumber: phoneNumber.isEmpty ? nil : phoneNumber,
           email: email.isEmpty ? nil : email
         )
-      }, error: &nativeError)
+      }
 
-      if !success, let error = nativeError {
+      if let error = error {
         promise.reject("tiktok_exception", error.localizedDescription)
         return
       }
@@ -243,12 +233,11 @@ public class DatalyrNativeModule: Module {
     }
 
     AsyncFunction("logoutTikTok") { (promise: Promise) in
-      var nativeError: NSError?
-      let success = ObjCExceptionHelper.tryBlock({
+      let error = ObjCExceptionHelper.execute {
         TikTokBusiness.logout()
-      }, error: &nativeError)
+      }
 
-      if !success, let error = nativeError {
+      if let error = error {
         promise.reject("tiktok_exception", error.localizedDescription)
         return
       }

package/ios/ObjCExceptionHelper.h

@@ -4,7 +4,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ObjCExceptionHelper : NSObject
 
-+ (BOOL)tryBlock:(void (NS_NOESCAPE ^)(void))block error:(NSError *_Nullable *_Nullable)error;
++ (nullable NSError *)execute:(void (NS_NOESCAPE ^)(void))block;
 
 @end
 

package/ios/ObjCExceptionHelper.m

@@ -2,23 +2,20 @@
 
 @implementation ObjCExceptionHelper
 
-+ (BOOL)tryBlock:(void (NS_NOESCAPE ^)(void))block error:(NSError **)error {
++ (nullable NSError *)execute:(void (NS_NOESCAPE ^)(void))block {
     @try {
         block();
-        return YES;
+        return nil;
     } @catch (NSException *exception) {
-        if (error) {
-            NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
-            userInfo[NSLocalizedDescriptionKey] = exception.reason ?: @"Unknown NSException";
-            userInfo[@"ExceptionName"] = exception.name;
-            if (exception.userInfo) {
-                userInfo[@"ExceptionUserInfo"] = exception.userInfo;
-            }
-            *error = [NSError errorWithDomain:@"com.datalyr.exception"
-                                         code:-1
-                                     userInfo:userInfo];
+        NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
+        userInfo[NSLocalizedDescriptionKey] = exception.reason ?: @"Unknown NSException";
+        userInfo[@"ExceptionName"] = exception.name;
+        if (exception.userInfo) {
+            userInfo[@"ExceptionUserInfo"] = exception.userInfo;
         }
-        return NO;
+        return [NSError errorWithDomain:@"com.datalyr.exception"
+                                   code:-1
+                               userInfo:userInfo];
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datalyr/react-native",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "Datalyr SDK for React Native & Expo - Server-side attribution tracking with bundled Meta and TikTok SDKs for iOS and Android",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",