@datalyr/react-native 1.4.2 → 1.4.4

package/datalyr-react-native.podspec

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
 
   s.dependency "ExpoModulesCore"
   s.dependency "FBSDKCoreKit", "~> 18.0"
-  s.dependency "TikTokBusinessSDK", "~> 1.6"
+  s.dependency "TikTokBusinessSDK", "1.6.0"
 
   # Disable bitcode (required for TikTok SDK)
   s.pod_target_xcconfig = {

package/ios/DatalyrNativeModule.swift

@@ -11,36 +11,51 @@ public class DatalyrNativeModule: Module {
 
     AsyncFunction("initializeMetaSDK") { (appId: String, clientToken: String?, advertiserTrackingEnabled: Bool, promise: Promise) in
       DispatchQueue.main.async {
-        Settings.shared.appID = appId
+        var nativeError: NSError?
+        let success = ObjCExceptionHelper.tryBlock({
+          Settings.shared.appID = appId
 
-        if let token = clientToken, !token.isEmpty {
-          Settings.shared.clientToken = token
-        }
+          if let token = clientToken, !token.isEmpty {
+            Settings.shared.clientToken = token
+          }
 
-        Settings.shared.isAdvertiserTrackingEnabled = advertiserTrackingEnabled
-        Settings.shared.isAdvertiserIDCollectionEnabled = advertiserTrackingEnabled
+          Settings.shared.isAdvertiserTrackingEnabled = advertiserTrackingEnabled
+          Settings.shared.isAdvertiserIDCollectionEnabled = advertiserTrackingEnabled
 
-        ApplicationDelegate.shared.application(
-          UIApplication.shared,
-          didFinishLaunchingWithOptions: nil
-        )
+          ApplicationDelegate.shared.application(
+            UIApplication.shared,
+            didFinishLaunchingWithOptions: nil
+          )
+        }, error: &nativeError)
+
+        if !success, let error = nativeError {
+          promise.reject("meta_init_exception", error.localizedDescription)
+          return
+        }
 
         promise.resolve(true)
       }
     }
 
     AsyncFunction("fetchDeferredAppLink") { (promise: Promise) in
-      AppLinkUtility.fetchDeferredAppLink { url, error in
-        if error != nil {
-          promise.resolve(nil)
-          return
-        }
+      var nativeError: NSError?
+      let success = ObjCExceptionHelper.tryBlock({
+        AppLinkUtility.fetchDeferredAppLink { url, error in
+          if error != nil {
+            promise.resolve(nil)
+            return
+          }
 
-        if let url = url {
-          promise.resolve(url.absoluteString)
-        } else {
-          promise.resolve(nil)
+          if let url = url {
+            promise.resolve(url.absoluteString)
+          } else {
+            promise.resolve(nil)
+          }
         }
+      }, error: &nativeError)
+
+      if !success {
+        promise.resolve(nil)
       }
     }
 
@@ -53,12 +68,20 @@ public class DatalyrNativeModule: Module {
         }
       }
 
-      if let value = valueToSum {
-        AppEvents.shared.logEvent(AppEvents.Name(eventName), valueToSum: value, parameters: params)
-      } else if params.isEmpty {
-        AppEvents.shared.logEvent(AppEvents.Name(eventName))
-      } else {
-        AppEvents.shared.logEvent(AppEvents.Name(eventName), parameters: params)
+      var nativeError: NSError?
+      let success = ObjCExceptionHelper.tryBlock({
+        if let value = valueToSum {
+          AppEvents.shared.logEvent(AppEvents.Name(eventName), valueToSum: value, parameters: params)
+        } else if params.isEmpty {
+          AppEvents.shared.logEvent(AppEvents.Name(eventName))
+        } else {
+          AppEvents.shared.logEvent(AppEvents.Name(eventName), parameters: params)
+        }
+      }, error: &nativeError)
+
+      if !success, let error = nativeError {
+        promise.reject("meta_exception", error.localizedDescription)
+        return
       }
 
       promise.resolve(true)
@@ -73,33 +96,68 @@ public class DatalyrNativeModule: Module {
         }
       }
 
-      AppEvents.shared.logPurchase(amount: amount, currency: currency, parameters: params)
+      var nativeError: NSError?
+      let success = ObjCExceptionHelper.tryBlock({
+        AppEvents.shared.logPurchase(amount: amount, currency: currency, parameters: params)
+      }, error: &nativeError)
+
+      if !success, let error = nativeError {
+        promise.reject("meta_exception", error.localizedDescription)
+        return
+      }
+
       promise.resolve(true)
     }
 
     AsyncFunction("setMetaUserData") { (userData: [String: Any], promise: Promise) in
-      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)
-      AppEvents.shared.setUserData(userData["phone"] as? String, forType: .phone)
-      AppEvents.shared.setUserData(userData["dateOfBirth"] as? String, forType: .dateOfBirth)
-      AppEvents.shared.setUserData(userData["gender"] as? String, forType: .gender)
-      AppEvents.shared.setUserData(userData["city"] as? String, forType: .city)
-      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)
+      var nativeError: NSError?
+      let success = ObjCExceptionHelper.tryBlock({
+        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)
+        AppEvents.shared.setUserData(userData["phone"] as? String, forType: .phone)
+        AppEvents.shared.setUserData(userData["dateOfBirth"] as? String, forType: .dateOfBirth)
+        AppEvents.shared.setUserData(userData["gender"] as? String, forType: .gender)
+        AppEvents.shared.setUserData(userData["city"] as? String, forType: .city)
+        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 {
+        promise.reject("meta_exception", error.localizedDescription)
+        return
+      }
 
       promise.resolve(true)
     }
 
     AsyncFunction("clearMetaUserData") { (promise: Promise) in
-      AppEvents.shared.clearUserData()
+      var nativeError: NSError?
+      let success = ObjCExceptionHelper.tryBlock({
+        AppEvents.shared.clearUserData()
+      }, error: &nativeError)
+
+      if !success, let error = nativeError {
+        promise.reject("meta_exception", error.localizedDescription)
+        return
+      }
+
       promise.resolve(true)
     }
 
     AsyncFunction("updateMetaTrackingAuthorization") { (enabled: Bool, promise: Promise) in
-      Settings.shared.isAdvertiserTrackingEnabled = enabled
-      Settings.shared.isAdvertiserIDCollectionEnabled = enabled
+      var nativeError: NSError?
+      let success = ObjCExceptionHelper.tryBlock({
+        Settings.shared.isAdvertiserTrackingEnabled = enabled
+        Settings.shared.isAdvertiserIDCollectionEnabled = enabled
+      }, error: &nativeError)
+
+      if !success, let error = nativeError {
+        promise.reject("meta_exception", error.localizedDescription)
+        return
+      }
+
       promise.resolve(true)
     }
 
@@ -115,49 +173,86 @@ public class DatalyrNativeModule: Module {
         }
 
         if debug {
-          config?.setLogLevel(.verbose)
+          config?.setLogLevel(TikTokLogLevelDebug)
         }
 
-        if let validConfig = config {
-          TikTokBusiness.initializeSdk(validConfig)
-          promise.resolve(true)
-        } else {
+        guard let validConfig = config else {
           promise.reject("tiktok_init_error", "Failed to create TikTok config")
+          return
         }
+
+        var nativeError: NSError?
+        let success = ObjCExceptionHelper.tryBlock({
+          TikTokBusiness.initializeSdk(validConfig)
+        }, error: &nativeError)
+
+        if !success, let error = nativeError {
+          promise.reject("tiktok_init_exception", error.localizedDescription)
+          return
+        }
+
+        promise.resolve(true)
       }
     }
 
     AsyncFunction("trackTikTokEvent") { (eventName: String, eventId: String?, properties: [String: Any]?, promise: Promise) in
-      let event: TikTokBaseEvent
+      var nativeError: NSError?
+      let success = ObjCExceptionHelper.tryBlock({
+        let event: TikTokBaseEvent
 
-      if let eid = eventId, !eid.isEmpty {
-        event = TikTokBaseEvent(eventName: eventName, eventId: eid)
-      } else {
-        event = TikTokBaseEvent(eventName: eventName)
-      }
+        if let eid = eventId, !eid.isEmpty {
+          event = TikTokBaseEvent(eventName: eventName, eventId: eid)
+        } else {
+          event = TikTokBaseEvent(eventName: eventName)
+        }
 
-      if let dict = properties {
-        for (key, value) in dict {
-          event.addProperty(withKey: key, value: value)
+        if let dict = properties {
+          for (key, value) in dict {
+            event.addProperty(withKey: key, value: value)
+          }
         }
+
+        TikTokBusiness.trackTTEvent(event)
+      }, error: &nativeError)
+
+      if !success, let error = nativeError {
+        promise.reject("tiktok_exception", error.localizedDescription)
+        return
       }
 
-      TikTokBusiness.trackTTEvent(event)
       promise.resolve(true)
     }
 
     AsyncFunction("identifyTikTokUser") { (externalId: String, externalUserName: String, phoneNumber: String, email: String, promise: Promise) in
-      TikTokBusiness.identify(
-        withExternalID: externalId.isEmpty ? nil : externalId,
-        externalUserName: externalUserName.isEmpty ? nil : externalUserName,
-        phoneNumber: phoneNumber.isEmpty ? nil : phoneNumber,
-        email: email.isEmpty ? nil : email
-      )
+      var nativeError: NSError?
+      let success = ObjCExceptionHelper.tryBlock({
+        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 {
+        promise.reject("tiktok_exception", error.localizedDescription)
+        return
+      }
+
       promise.resolve(true)
     }
 
     AsyncFunction("logoutTikTok") { (promise: Promise) in
-      TikTokBusiness.logout()
+      var nativeError: NSError?
+      let success = ObjCExceptionHelper.tryBlock({
+        TikTokBusiness.logout()
+      }, error: &nativeError)
+
+      if !success, let error = nativeError {
+        promise.reject("tiktok_exception", error.localizedDescription)
+        return
+      }
+
       promise.resolve(true)
     }
 

package/ios/ObjCExceptionHelper.h

@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ObjCExceptionHelper : NSObject
+
++ (BOOL)tryBlock:(void (NS_NOESCAPE ^)(void))block error:(NSError *_Nullable *_Nullable)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/ObjCExceptionHelper.m

@@ -0,0 +1,25 @@
+#import "ObjCExceptionHelper.h"
+
+@implementation ObjCExceptionHelper
+
++ (BOOL)tryBlock:(void (NS_NOESCAPE ^)(void))block error:(NSError **)error {
+    @try {
+        block();
+        return YES;
+    } @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];
+        }
+        return NO;
+    }
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datalyr/react-native",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "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",
@@ -9,6 +9,7 @@
     "dev": "tsc --watch",
     "test": "jest",
     "lint": "eslint src --ext .ts,.tsx",
+    "validate:ios": "bash scripts/validate-ios.sh",
     "prepublishOnly": "npm run build"
   },
   "files": [