@datalyr/react-native 1.3.1 → 1.4.1

package/src/native/DatalyrNativeBridge.ts

@@ -8,6 +8,7 @@
  */
 
 import { NativeModules, Platform } from 'react-native';
+import { requireNativeModule } from 'expo-modules-core';
 
 /**
  * Apple Search Ads attribution data returned from AdServices API (iOS only)
@@ -107,11 +108,23 @@ interface PlayInstallReferrerModule {
 }
 
 // Native modules - available on both iOS and Android
-const DatalyrNative: DatalyrNativeModule | null = NativeModules.DatalyrNative ?? null;
+// iOS uses Expo Modules (new arch compatible), Android uses NativeModules (interop layer)
+let DatalyrNative: DatalyrNativeModule | null = null;
+if (Platform.OS === 'ios') {
+  try {
+    DatalyrNative = requireNativeModule<DatalyrNativeModule>('DatalyrNative');
+  } catch {
+    // Native module not available
+  }
+} else if (Platform.OS === 'android') {
+  DatalyrNative = NativeModules.DatalyrNative ?? null;
+}
 
-// Play Install Referrer - Android only
-const DatalyrPlayInstallReferrer: PlayInstallReferrerModule | null =
-  Platform.OS === 'android' ? NativeModules.DatalyrPlayInstallReferrer : null;
+// Play Install Referrer - Android only (stays on NativeModules)
+let DatalyrPlayInstallReferrer: PlayInstallReferrerModule | null = null;
+if (Platform.OS === 'android') {
+  DatalyrPlayInstallReferrer = NativeModules.DatalyrPlayInstallReferrer ?? null;
+}
 
 /**
  * Check if native module is available

package/src/native/SKAdNetworkBridge.ts

@@ -1,4 +1,5 @@
-import { NativeModules, Platform } from 'react-native';
+import { Platform } from 'react-native';
+import { requireNativeModule } from 'expo-modules-core';
 
 // SKAN 4.0 / AdAttributionKit coarse value type
 export type SKANCoarseValue = 'low' | 'medium' | 'high';
@@ -87,9 +88,15 @@ interface SKAdNetworkModule {
   ): Promise<OverlappingWindowPostbackResponse>;
 }
 
-const { DatalyrSKAdNetwork } = NativeModules as {
-  DatalyrSKAdNetwork?: SKAdNetworkModule
-};
+// SKAdNetwork is iOS-only, use Expo Modules for new arch compatibility
+let DatalyrSKAdNetwork: SKAdNetworkModule | undefined;
+if (Platform.OS === 'ios') {
+  try {
+    DatalyrSKAdNetwork = requireNativeModule<SKAdNetworkModule>('DatalyrSKAdNetwork');
+  } catch {
+    // Module not available
+  }
+}
 
 export class SKAdNetworkBridge {
   private static _isSKAN4Available: boolean | null = null;

package/ios/DatalyrNative.m

@@ -1,74 +0,0 @@
-#import <React/RCTBridgeModule.h>
-
-@interface RCT_EXTERN_MODULE(DatalyrNative, NSObject)
-
-// Meta SDK Methods
-RCT_EXTERN_METHOD(initializeMetaSDK:(NSString *)appId
-                  clientToken:(NSString *)clientToken
-                  advertiserTrackingEnabled:(BOOL)advertiserTrackingEnabled
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(fetchDeferredAppLink:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(logMetaEvent:(NSString *)eventName
-                  valueToSum:(NSNumber *)valueToSum
-                  parameters:(NSDictionary *)parameters
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(logMetaPurchase:(double)amount
-                  currency:(NSString *)currency
-                  parameters:(NSDictionary *)parameters
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(setMetaUserData:(NSDictionary *)userData
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(clearMetaUserData:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(updateMetaTrackingAuthorization:(BOOL)enabled
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-// TikTok SDK Methods
-RCT_EXTERN_METHOD(initializeTikTokSDK:(NSString *)appId
-                  tiktokAppId:(NSString *)tiktokAppId
-                  accessToken:(NSString *)accessToken
-                  debug:(BOOL)debug
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(trackTikTokEvent:(NSString *)eventName
-                  eventId:(NSString *)eventId
-                  properties:(NSDictionary *)properties
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(identifyTikTokUser:(NSString *)externalId
-                  externalUserName:(NSString *)externalUserName
-                  phoneNumber:(NSString *)phoneNumber
-                  email:(NSString *)email
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(logoutTikTok:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(updateTikTokTrackingAuthorization:(BOOL)enabled
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-// SDK Availability Check
-RCT_EXTERN_METHOD(getSDKAvailability:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-// Apple Search Ads Attribution
-RCT_EXTERN_METHOD(getAppleSearchAdsAttribution:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-@end

package/ios/DatalyrNative.swift

@@ -1,332 +0,0 @@
-import Foundation
-import FBSDKCoreKit
-import TikTokBusinessSDK
-import AdServices
-
-@objc(DatalyrNative)
-class DatalyrNative: NSObject {
-
-  @objc static func requiresMainQueueSetup() -> Bool {
-    return false
-  }
-
-  // MARK: - Meta (Facebook) SDK Methods
-
-  @objc func initializeMetaSDK(
-    _ appId: String,
-    clientToken: String?,
-    advertiserTrackingEnabled: Bool,
-    resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    DispatchQueue.main.async {
-      Settings.shared.appID = appId
-
-      if let token = clientToken, !token.isEmpty {
-        Settings.shared.clientToken = token
-      }
-
-      Settings.shared.isAdvertiserTrackingEnabled = advertiserTrackingEnabled
-      Settings.shared.isAdvertiserIDCollectionEnabled = advertiserTrackingEnabled
-
-      ApplicationDelegate.shared.application(
-        UIApplication.shared,
-        didFinishLaunchingWithOptions: nil
-      )
-
-      resolve(true)
-    }
-  }
-
-  @objc func fetchDeferredAppLink(
-    _ resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    AppLinkUtility.fetchDeferredAppLink { url, error in
-      if error != nil {
-        // Don't reject - deferred deep link not available is expected in many cases
-        // Error is normal when no deferred link exists
-        resolve(nil)
-        return
-      }
-
-      if let url = url {
-        resolve(url.absoluteString)
-      } else {
-        resolve(nil)
-      }
-    }
-  }
-
-  @objc func logMetaEvent(
-    _ eventName: String,
-    valueToSum: NSNumber?,
-    parameters: NSDictionary?,
-    resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    var params: [AppEvents.ParameterName: Any] = [:]
-
-    if let dict = parameters as? [String: Any] {
-      for (key, value) in dict {
-        params[AppEvents.ParameterName(key)] = value
-      }
-    }
-
-    if let value = valueToSum?.doubleValue {
-      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)
-    }
-
-    resolve(true)
-  }
-
-  @objc func logMetaPurchase(
-    _ amount: Double,
-    currency: String,
-    parameters: NSDictionary?,
-    resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    var params: [AppEvents.ParameterName: Any] = [:]
-
-    if let dict = parameters as? [String: Any] {
-      for (key, value) in dict {
-        params[AppEvents.ParameterName(key)] = value
-      }
-    }
-
-    AppEvents.shared.logPurchase(amount: amount, currency: currency, parameters: params)
-    resolve(true)
-  }
-
-  @objc func setMetaUserData(
-    _ userData: NSDictionary,
-    resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    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
-    )
-
-    resolve(true)
-  }
-
-  @objc func clearMetaUserData(
-    _ resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    AppEvents.shared.clearUserData()
-    resolve(true)
-  }
-
-  @objc func updateMetaTrackingAuthorization(
-    _ enabled: Bool,
-    resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    Settings.shared.isAdvertiserTrackingEnabled = enabled
-    Settings.shared.isAdvertiserIDCollectionEnabled = enabled
-    resolve(true)
-  }
-
-  // MARK: - TikTok SDK Methods
-
-  @objc func initializeTikTokSDK(
-    _ appId: String,
-    tiktokAppId: String,
-    accessToken: String?,
-    debug: Bool,
-    resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    DispatchQueue.main.async {
-      let config = TikTokConfig(appId: appId, tiktokAppId: tiktokAppId)
-
-      if let token = accessToken, !token.isEmpty {
-        config?.accessToken = token
-      }
-
-      if debug {
-        config?.setLogLevel(.debug)
-      }
-
-      if let validConfig = config {
-        TikTokBusiness.initializeSdk(validConfig)
-        resolve(true)
-      } else {
-        reject("tiktok_init_error", "Failed to create TikTok config", nil)
-      }
-    }
-  }
-
-  @objc func trackTikTokEvent(
-    _ eventName: String,
-    eventId: String?,
-    properties: NSDictionary?,
-    resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    // Use TikTokBaseEvent for modern API (trackEvent methods are deprecated)
-    let event: TikTokBaseEvent
-
-    if let eid = eventId, !eid.isEmpty {
-      event = TikTokBaseEvent(eventName: eventName, eventId: eid)
-    } else {
-      event = TikTokBaseEvent(eventName: eventName)
-    }
-
-    // Add properties to the event
-    if let dict = properties as? [String: Any] {
-      for (key, value) in dict {
-        event.addProperty(withKey: key, value: value)
-      }
-    }
-
-    TikTokBusiness.trackTTEvent(event)
-    resolve(true)
-  }
-
-  @objc func identifyTikTokUser(
-    _ externalId: String,
-    externalUserName: String,
-    phoneNumber: String,
-    email: String,
-    resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    // Method signature: identifyWithExternalID:externalUserName:phoneNumber:email:
-    TikTokBusiness.identify(
-      withExternalID: externalId.isEmpty ? nil : externalId,
-      externalUserName: externalUserName.isEmpty ? nil : externalUserName,
-      phoneNumber: phoneNumber.isEmpty ? nil : phoneNumber,
-      email: email.isEmpty ? nil : email
-    )
-    resolve(true)
-  }
-
-  @objc func logoutTikTok(
-    _ resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    TikTokBusiness.logout()
-    resolve(true)
-  }
-
-  @objc func updateTikTokTrackingAuthorization(
-    _ enabled: Bool,
-    resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    // TikTok SDK handles ATT automatically, but we track the change
-    resolve(true)
-  }
-
-  // MARK: - SDK Availability Check
-
-  @objc func getSDKAvailability(
-    _ resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    resolve([
-      "meta": true,
-      "tiktok": true,
-      "appleSearchAds": true
-    ])
-  }
-
-  // MARK: - Apple Search Ads Attribution
-
-  @objc func getAppleSearchAdsAttribution(
-    _ resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock
-  ) {
-    // AdServices is available on iOS 14.3+
-    if #available(iOS 14.3, *) {
-      do {
-        // Get the attribution token from AdServices
-        let token = try AAAttribution.attributionToken()
-
-        // Send token to Apple's API to get attribution data
-        var request = URLRequest(url: URL(string: "https://api-adservices.apple.com/api/v1/")!)
-        request.httpMethod = "POST"
-        request.setValue("text/plain", forHTTPHeaderField: "Content-Type")
-        request.httpBody = token.data(using: .utf8)
-
-        let task = URLSession.shared.dataTask(with: request) { data, response, error in
-          if let error = error {
-            // Network error - resolve with nil instead of rejecting
-            resolve(nil)
-            return
-          }
-
-          guard let data = data else {
-            resolve(nil)
-            return
-          }
-
-          do {
-            if let json = try JSONSerialization.jsonObject(with: data) as? [String: Any] {
-              // Return attribution data
-              // Includes: attribution, orgId, orgName, campaignId, campaignName,
-              // adGroupId, adGroupName, clickDate, conversionType, etc.
-              resolve(json)
-            } else {
-              resolve(nil)
-            }
-          } catch {
-            resolve(nil)
-          }
-        }
-        task.resume()
-
-      } catch {
-        // Attribution token not available (user didn't come from Apple Search Ads)
-        resolve(nil)
-      }
-    } else {
-      // iOS version too old
-      resolve(nil)
-    }
-  }
-}