react-native-mparticle 2.9.2 → 3.1.0

package/README.md

@@ -82,6 +82,7 @@ npx expo run:android
 | `dataPlanId`              | string   | No       | Data plan ID for validation                                         |
 | `dataPlanVersion`         | number   | No       | Data plan version                                                   |
 | `iosKits`                 | string[] | No       | iOS kit pod names (e.g., `['mParticle-Rokt']`)                      |
+| `customBaseUrl`           | string   | No       | Custom base URL for global CNAME setup on iOS and Android           |
 | `androidKits`             | string[] | No       | Android kit artifact names (e.g., `['android-rokt-kit']`)           |
 | `useEmptyIdentifyRequest` | boolean  | No       | Use empty user identify request at init (default: `true`)           |
 
@@ -109,17 +110,27 @@ npx expo run:android
 }
 ```
 
+For global CNAME setup, add the optional shared `customBaseUrl` setting:
+
+```json
+{
+  "customBaseUrl": "https://cname.example.com"
+}
+```
+
 ### What the Plugin Does
 
 **iOS:**
 
 - Adds mParticle SDK initialization to `AppDelegate` (supports both Swift and Objective-C)
+- Sets `MPNetworkOptions.customBaseURL` before startup when `customBaseUrl` is configured
 - Configures `pre_install` hook in Podfile for dynamic framework linking
 - Adds specified kit pod dependencies
 
 **Android:**
 
 - Adds mParticle SDK initialization to `MainApplication` (supports both Kotlin and Java)
+- Sets `NetworkOptions.setCustomBaseURL` before startup when `customBaseUrl` is configured
 - Adds specified kit Maven dependencies to `build.gradle`
 
 ### Version Support
@@ -219,6 +230,12 @@ func application(_ application: UIApplication, didFinishLaunchingWithOptions lau
         mParticleOptions.onAttributionComplete = { (attributionResult, error) in
                     NSLog(@"Attribution Complete. attributionResults = %@", attributionResult.linkInfo)
         }
+
+        // Optional global CNAME setup. Configure before start.
+        let networkOptions = MPNetworkOptions()
+        networkOptions.customBaseURL = URL(string: "https://cname.example.com")
+        mParticleOptions.networkOptions = networkOptions
+
         MParticle.sharedInstance().start(with: mParticleOptions)
         return true
 }
@@ -260,12 +277,34 @@ Next, you'll need to start the SDK:
         NSLog(@"Attribution Complete. attributionResults = %@", attributionResult.linkInfo)
     }
 
+    // Optional global CNAME setup. Configure before start.
+    MPNetworkOptions *networkOptions = [[MPNetworkOptions alloc] init];
+    networkOptions.customBaseURL = [NSURL URLWithString:@"https://cname.example.com"];
+    mParticleOptions.networkOptions = networkOptions;
+
     [[MParticle sharedInstance] startWithOptions:mParticleOptions];
 
     return YES;
 }
 ```
 
+### Rokt iOS Setup
+
+For standard Rokt placements, add the mParticle Rokt kit:
+
+```ruby
+pod 'mParticle-Rokt', '~> 9.2'
+```
+
+In Expo apps, use `iosKits: ["mParticle-Rokt"]` for standard Rokt placements. The Expo plugin does not add payment-extension pods or URL callback forwarding in this release.
+
+See [MIGRATING.md](./MIGRATING.md) for release-specific migration guidance.
+
+For Android integrations that use `MParticle.Rokt.setSessionId()` or
+`MParticle.Rokt.getSessionId()`, `android-core` and `android-rokt-kit`
+`5.79.0` or newer are required. Android CNAME setup through
+`customBaseUrl` also requires `android-core` `5.79.0` or newer.
+
 See [Identity](http://docs.mparticle.com/developers/sdk/ios/identity/) for more information on supplying an `MPIdentityApiRequest` object during SDK initialization.
 
 4. Remember to start Metro with:
@@ -285,13 +324,15 @@ and build your workspace from xCode.
 For more help, see [the Android set up docs](https://docs.mparticle.com/developers/sdk/android/getting-started/#create-an-input).
 
 ```kotlin
-package com.example.myapp;
+package com.example.myapp
 
-import android.app.Application;
-import com.mparticle.MParticle;
+import android.app.Application
+import com.mparticle.MParticle
+import com.mparticle.MParticleOptions
+import com.mparticle.networking.NetworkOptions
 
 class MyApplication : Application() {
-    fun onCreate() {
+    override fun onCreate() {
         super.onCreate()
         val options: MParticleOptions = MParticleOptions.builder(this)
             .credentials("REPLACE ME WITH KEY", "REPLACE ME WITH SECRET")
@@ -299,6 +340,12 @@ class MyApplication : Application() {
             .logLevel(MParticle.LogLevel.VERBOSE)
             //optional
             .identify(identifyRequest)
+            //optional global CNAME setup
+            .networkOptions(
+                NetworkOptions.builder()
+                    .setCustomBaseURL("https://cname.example.com")
+                    .build()
+            )
             //optional
             .identifyTask(
                 BaseIdentityTask()

package/android/build.gradle

@@ -118,7 +118,7 @@ dependencies {
     //
     // (See https://github.com/mparticle/mparticle-android-sdk for the latest version)
     //
-    api 'com.mparticle:android-core:[5.9.3, )'
+    api 'com.mparticle:android-core:[5.79.0, )'
 
     //
     // And, if you want to include kits, you can do so as follows:
@@ -134,6 +134,6 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     testImplementation files('libs/java-json.jar')
 
-    testImplementation 'com.mparticle:android-core:5+'
+    testImplementation 'com.mparticle:android-core:5.79.0'
     testImplementation("com.facebook.react:react-android:+")
 }

package/android/gradle.properties

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

package/android/src/main/java/com/mparticle/react/rokt/MPRoktModuleImpl.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReadableMap
@@ -16,6 +17,7 @@ import com.mparticle.MpRoktEventCallback
 import com.mparticle.RoktEvent
 import com.mparticle.UnloadReasons
 import com.mparticle.WrapperSdk
+import com.mparticle.internal.Logger
 import com.mparticle.rokt.CacheConfig
 import com.mparticle.rokt.RoktConfig
 import kotlinx.coroutines.Job
@@ -39,6 +41,14 @@ class MPRoktModuleImpl(
 
     fun getName(): String = MODULE_NAME
 
+    fun selectShoppableAds(
+        identifier: String,
+        attributes: ReadableMap?,
+        roktConfig: ReadableMap?,
+    ) {
+        Logger.warning("selectShoppableAds is not yet supported on Android")
+    }
+
     fun purchaseFinalized(
         placementId: String,
         catalogItemId: String,
@@ -47,6 +57,23 @@ class MPRoktModuleImpl(
         MParticle.getInstance()?.Rokt()?.purchaseFinalized(placementId, catalogItemId, success)
     }
 
+    fun close(promise: Promise) {
+        MParticle.getInstance()?.Rokt()?.close()
+        promise.resolve(null)
+    }
+
+    fun setSessionId(
+        sessionId: String,
+        promise: Promise,
+    ) {
+        MParticle.getInstance()?.Rokt()?.setSessionId(sessionId)
+        promise.resolve(null)
+    }
+
+    fun getSessionId(promise: Promise) {
+        promise.resolve(MParticle.getInstance()?.Rokt()?.getSessionId())
+    }
+
     fun setRoktEventHandler(roktEventHandler: MpRoktEventCallback) {
         this.roktEventHandler = roktEventHandler
     }

package/android/src/newarch/java/com/mparticle/react/rokt/MPRoktModule.kt

@@ -1,5 +1,6 @@
 package com.mparticle.react.rokt
 
+import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
@@ -7,17 +8,15 @@ import com.facebook.react.bridge.ReadableType
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.uimanager.UIManagerHelper
 import com.mparticle.MParticle
-import com.mparticle.WrapperSdk
+import com.mparticle.internal.Logger
 import com.mparticle.react.NativeMPRoktSpec
 import com.mparticle.rokt.RoktEmbeddedView
-import com.mparticle.internal.Logger
 import java.lang.ref.WeakReference
 import java.util.concurrent.CountDownLatch
 
 class MPRoktModule(
     private val reactContext: ReactApplicationContext,
 ) : NativeMPRoktSpec(reactContext) {
-
     private val impl = MPRoktModuleImpl(reactContext)
 
     override fun getName(): String = impl.getName()
@@ -52,6 +51,15 @@ class MPRoktModule(
         )
     }
 
+    @ReactMethod
+    override fun selectShoppableAds(
+        identifier: String,
+        attributes: ReadableMap?,
+        roktConfig: ReadableMap?,
+    ) {
+        impl.selectShoppableAds(identifier, attributes, roktConfig)
+    }
+
     @ReactMethod
     override fun purchaseFinalized(
         placementId: String,
@@ -61,6 +69,23 @@ class MPRoktModule(
         impl.purchaseFinalized(placementId, catalogItemId, success)
     }
 
+    @ReactMethod
+    override fun close(promise: Promise) {
+        impl.close(promise)
+    }
+
+    @ReactMethod
+    override fun setSessionId(
+        sessionId: String,
+        promise: Promise,
+    ) {
+        impl.setSessionId(sessionId, promise)
+    }
+
+    @ReactMethod
+    override fun getSessionId(promise: Promise) {
+        impl.getSessionId(promise)
+    }
 
     /**
      * Process placeholders from ReadableMap to a map of Widgets for use with Rokt.
@@ -83,8 +108,9 @@ class MPRoktModule(
                             // Get the tag value as an integer
                             val reactTag =
                                 when {
-                                    placeholders.getType(key) == ReadableType.Number ->
+                                    placeholders.getType(key) == ReadableType.Number -> {
                                         placeholders.getDouble(key).toInt()
+                                    }
 
                                     else -> {
                                         Logger.warning("Invalid view tag for key: $key")

package/android/src/oldarch/java/com/mparticle/react/NativeMPRoktSpec.kt

@@ -1,5 +1,6 @@
 package com.mparticle.react
 
+import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReadableMap
@@ -21,9 +22,24 @@ abstract class NativeMPRoktSpec(
         fontFilesMap: ReadableMap?,
     )
 
+    abstract fun selectShoppableAds(
+        identifier: String,
+        attributes: ReadableMap?,
+        roktConfig: ReadableMap?,
+    )
+
     abstract fun purchaseFinalized(
         placementId: String,
         catalogItemId: String,
         success: Boolean,
     )
+
+    abstract fun close(promise: Promise)
+
+    abstract fun setSessionId(
+        sessionId: String,
+        promise: Promise,
+    )
+
+    abstract fun getSessionId(promise: Promise)
 }

package/android/src/oldarch/java/com/mparticle/react/rokt/MPRoktModule.kt

@@ -1,5 +1,6 @@
 package com.mparticle.react.rokt
 
+import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
@@ -48,6 +49,15 @@ class MPRoktModule(
         }
     }
 
+    @ReactMethod
+    override fun selectShoppableAds(
+        identifier: String,
+        attributes: ReadableMap?,
+        roktConfig: ReadableMap?,
+    ) {
+        impl.selectShoppableAds(identifier, attributes, roktConfig)
+    }
+
     @ReactMethod
     override fun purchaseFinalized(
         placementId: String,
@@ -57,6 +67,24 @@ class MPRoktModule(
         impl.purchaseFinalized(placementId, catalogItemId, success)
     }
 
+    @ReactMethod
+    override fun close(promise: Promise) {
+        impl.close(promise)
+    }
+
+    @ReactMethod
+    override fun setSessionId(
+        sessionId: String,
+        promise: Promise,
+    ) {
+        impl.setSessionId(sessionId, promise)
+    }
+
+    @ReactMethod
+    override fun getSessionId(promise: Promise) {
+        impl.getSessionId(promise)
+    }
+
     private fun safeUnwrapPlaceholders(
         placeholders: ReadableMap?,
         nativeViewHierarchyManager: NativeViewHierarchyManager,

package/ios/RNMParticle/RNMPRokt.mm

@@ -1,20 +1,22 @@
 #import "RNMPRokt.h"
-#if defined(__has_include) && __has_include(<mParticle_Apple_SDK/mParticle.h>)
+// SDK 9.0: ObjC headers moved to mParticle_Apple_SDK_ObjC module
+#if defined(__has_include) && __has_include(<mParticle_Apple_SDK_ObjC/mParticle.h>)
+    #import <mParticle_Apple_SDK_ObjC/mParticle.h>
+    #import <mParticle_Apple_SDK_ObjC/MPRokt.h>
+#elif defined(__has_include) && __has_include(<mParticle_Apple_SDK/mParticle.h>)
     #import <mParticle_Apple_SDK/mParticle.h>
     #import <mParticle_Apple_SDK/MPRokt.h>
-#elif defined(__has_include) && __has_include(<mParticle_Apple_SDK_NoLocation/mParticle.h>)
-    #import <mParticle_Apple_SDK_NoLocation/mParticle.h>
 #else
-    #import <mParticle_Apple_SDK/Include/mParticle.h>
+    #import <mParticle_Apple_SDK_ObjC/mParticle.h>
+    #import <mParticle_Apple_SDK_ObjC/MPRokt.h>
 #endif
-#if defined(__has_include) && __has_include(<mParticle_Apple_SDK/mParticle_Apple_SDK-Swift.h>)
-    #import <mParticle_Apple_SDK/mParticle_Apple_SDK-Swift.h>
-#elif defined(__has_include) && __has_include(<mParticle_Apple_SDK_NoLocation/mParticle_Apple_SDK-Swift.h>)
-    #import <mParticle_Apple_SDK_NoLocation/mParticle_Apple_SDK-Swift.h>
-#else
-    #import "mParticle_Apple_SDK-Swift.h"
+#if __has_include(<RoktContracts/RoktContracts-Swift.h>)
+    #import <RoktContracts/RoktContracts-Swift.h>
+#elif __has_include(<RoktContracts/RoktContracts.h>)
+    #import <RoktContracts/RoktContracts.h>
 #endif
 #import <React/RCTConvert.h>
+#import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 #import <React/RCTViewManager.h>
 #import <React/RCTUIManager.h>
@@ -81,6 +83,12 @@ RCT_EXTERN void RCTRegisterModule(Class);
     // We always return the UI manager's method queue
 }
 
+- (void)ensureEventManager {
+    if (self.eventManager == nil) {
+        self.eventManager = [RoktEventManager allocWithZone: nil];
+    }
+}
+
 #ifdef RCT_NEW_ARCH_ENABLED
 // Extracts roktConfig fields into an NSDictionary, returning nil when the
 // TurboModule bridge passes a null C++ reference for an omitted optional param.
@@ -112,7 +120,7 @@ static NSDictionary * __attribute__((optnone)) safeExtractRoktConfigDict(
     return roktConfigDict;
 }
 
-// New Architecture Implementation
+// New Architecture Implementation — selectPlacements
 - (void)selectPlacements:(NSString *)identifer
               attributes:(NSDictionary *)attributes
             placeholders:(NSDictionary *)placeholders
@@ -123,48 +131,22 @@ static NSDictionary * __attribute__((optnone)) safeExtractRoktConfigDict(
     NSMutableDictionary *finalAttributes = [self convertToMutableDictionaryOfStrings:attributes];
 
     NSDictionary *roktConfigDict = safeExtractRoktConfigDict(roktConfig);
-    MPRoktConfig *config = [self buildRoktConfigFromDict:roktConfigDict];
+    RoktConfig *config = [self buildRoktConfigFromDict:roktConfigDict];
 #else
-// Old Architecture Implementation
+// Old Architecture Implementation — selectPlacements
 RCT_EXPORT_METHOD(selectPlacements:(NSString *) identifer attributes:(NSDictionary *)attributes placeholders:(NSDictionary * _Nullable)placeholders roktConfig:(NSDictionary * _Nullable)roktConfig fontFilesMap:(NSDictionary * _Nullable)fontFilesMap)
 {
     _rokt_log(@"[mParticle-Rokt] Old Architecture Implementation");
     NSMutableDictionary *finalAttributes = [self convertToMutableDictionaryOfStrings:attributes];
-    MPRoktConfig *config = [self buildRoktConfigFromDict:roktConfig];
+    RoktConfig *config = [self buildRoktConfigFromDict:roktConfig];
 #endif
 
     _rokt_log(@"[mParticle-Rokt] selectPlacements called with identifier: %@, attributes count: %lu", identifer, (unsigned long)finalAttributes.count);
 
     [MParticle _setWrapperSdk_internal:MPWrapperSdkReactNative version:@""];
-    // Create callback implementation
-    MPRoktEventCallback *callbacks = [[MPRoktEventCallback alloc] init];
+    [self ensureEventManager];
     __weak __typeof__(self) weakSelf = self;
 
-    callbacks.onLoad = ^{
-        _rokt_log(@"[mParticle-Rokt] onLoad");
-        [weakSelf.eventManager onRoktCallbackReceived:@"onLoad"];
-    };
-
-    callbacks.onUnLoad = ^{
-        _rokt_log(@"[mParticle-Rokt] onUnLoad");
-        [weakSelf.eventManager onRoktCallbackReceived:@"onUnLoad"];
-    };
-
-    callbacks.onShouldShowLoadingIndicator = ^{
-        _rokt_log(@"[mParticle-Rokt] onShouldShowLoadingIndicator");
-        [weakSelf.eventManager onRoktCallbackReceived:@"onShouldShowLoadingIndicator"];
-    };
-
-    callbacks.onShouldHideLoadingIndicator = ^{
-        _rokt_log(@"[mParticle-Rokt] onShouldHideLoadingIndicator");
-        [weakSelf.eventManager onRoktCallbackReceived:@"onShouldHideLoadingIndicator"];
-    };
-
-    callbacks.onEmbeddedSizeChange = ^(NSString *placementId, CGFloat height) {
-        _rokt_log(@"[mParticle-Rokt] onEmbeddedSizeChange");
-        [weakSelf.eventManager onWidgetHeightChanges:height placement:placementId];
-    };
-
     BOOL bridgeNil = (self.bridge == nil);
     BOOL uiManagerNil = (self.bridge.uiManager == nil);
     _rokt_log(@"[mParticle-Rokt] bridge %@, uiManager %@", bridgeNil ? @"nil" : @"non-nil", uiManagerNil ? @"nil" : @"non-nil");
@@ -180,10 +162,6 @@ RCT_EXPORT_METHOD(selectPlacements:(NSString *) identifer attributes:(NSDictiona
 
         NSMutableDictionary *nativePlaceholders = strongSelf ? [strongSelf getNativePlaceholders:placeholders viewRegistry:viewRegistry] : [NSMutableDictionary dictionary];
 
-        if (strongSelf) {
-            [strongSelf subscribeViewEvents:identifer];
-        }
-
         id mpInstance = [MParticle sharedInstance];
         id roktKit = mpInstance ? [mpInstance rokt] : nil;
         _rokt_log(@"[mParticle-Rokt] MParticle sharedInstance %@, rokt kit %@", mpInstance ? @"non-nil" : @"nil", roktKit ? @"non-nil" : @"nil");
@@ -192,11 +170,103 @@ RCT_EXPORT_METHOD(selectPlacements:(NSString *) identifer attributes:(NSDictiona
                                                  attributes:finalAttributes
                                               embeddedViews:nativePlaceholders
                                                      config:config
-                                                  callbacks:callbacks];
+                                                    onEvent:^(RoktEvent * _Nonnull event) {
+            [weakSelf.eventManager onRoktEvents:event viewName:identifer];
+        }];
     }];
     _rokt_log(@"[mParticle-Rokt] addUIBlock enqueued for identifier: %@", identifer);
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+// New Architecture Implementation — selectShoppableAds
+- (void)selectShoppableAds:(NSString *)identifier
+                attributes:(NSDictionary *)attributes
+                roktConfig:(JS::NativeMPRokt::RoktConfigType &)roktConfig
+{
+    _rokt_log(@"[mParticle-Rokt] selectShoppableAds New Architecture");
+    NSMutableDictionary *finalAttributes = [self convertToMutableDictionaryOfStrings:attributes];
+    NSDictionary *roktConfigDict = safeExtractRoktConfigDict(roktConfig);
+    RoktConfig *config = [self buildRoktConfigFromDict:roktConfigDict];
+#else
+// Old Architecture Implementation — selectShoppableAds
+RCT_EXPORT_METHOD(selectShoppableAds:(NSString *)identifier attributes:(NSDictionary *)attributes roktConfig:(NSDictionary * _Nullable)roktConfig)
+{
+    _rokt_log(@"[mParticle-Rokt] selectShoppableAds Old Architecture");
+    NSMutableDictionary *finalAttributes = [self convertToMutableDictionaryOfStrings:attributes];
+    RoktConfig *config = [self buildRoktConfigFromDict:roktConfig];
+#endif
+
+    _rokt_log(@"[mParticle-Rokt] selectShoppableAds called with identifier: %@, attributes count: %lu", identifier, (unsigned long)finalAttributes.count);
+
+    [MParticle _setWrapperSdk_internal:MPWrapperSdkReactNative version:@""];
+    [self ensureEventManager];
+    __weak __typeof__(self) weakSelf = self;
+
+    [[[MParticle sharedInstance] rokt] selectShoppableAds:identifier
+                                              attributes:finalAttributes
+                                                  config:config
+                                                 onEvent:^(RoktEvent * _Nonnull event) {
+        [weakSelf.eventManager onRoktEvents:event viewName:identifier];
+    }];
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)close:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
+{
+    (void)reject;
+    [self closeWithResolve:resolve];
+}
+
+- (void)setSessionId:(NSString *)sessionId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
+{
+    (void)reject;
+    [self setSessionIdWithString:sessionId resolve:resolve];
+}
+
+- (void)getSessionId:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
+{
+    (void)reject;
+    [self getSessionIdWithResolve:resolve];
+}
+#else
+RCT_EXPORT_METHOD(close:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+{
+    (void)reject;
+    [self closeWithResolve:resolve];
+}
+
+RCT_EXPORT_METHOD(setSessionId:(NSString *)sessionId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+{
+    (void)reject;
+    [self setSessionIdWithString:sessionId resolve:resolve];
+}
+
+RCT_EXPORT_METHOD(getSessionId:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+{
+    (void)reject;
+    [self getSessionIdWithResolve:resolve];
+}
+#endif
+
+- (void)closeWithResolve:(RCTPromiseResolveBlock)resolve
+{
+    [[[MParticle sharedInstance] rokt] close];
+    resolve(nil);
+}
+
+- (void)setSessionIdWithString:(NSString *)sessionId
+                       resolve:(RCTPromiseResolveBlock)resolve
+{
+    [[[MParticle sharedInstance] rokt] setSessionId:sessionId ?: @""];
+    resolve(nil);
+}
+
+- (void)getSessionIdWithResolve:(RCTPromiseResolveBlock)resolve
+{
+    NSString *sessionId = [[[MParticle sharedInstance] rokt] getSessionId];
+    resolve(sessionId ?: [NSNull null]);
+}
+
 RCT_EXPORT_METHOD(purchaseFinalized : (NSString *)placementId catalogItemId : (
     NSString *)catalogItemId success : (BOOL)success) {
     [[[MParticle sharedInstance] rokt] purchaseFinalized:placementId
@@ -209,48 +279,35 @@ RCT_EXPORT_METHOD(purchaseFinalized : (NSString *)placementId catalogItemId : (
     NSMutableDictionary *finalAttributes = [attributes mutableCopy];
     NSArray *keysForNullValues = [finalAttributes allKeysForObject:[NSNull null]];
     [finalAttributes removeObjectsForKeys:keysForNullValues];
-    
+
     NSSet *keys = [finalAttributes keysOfEntriesPassingTest:^BOOL(id key, id obj, BOOL *stop) {
         return ![obj isKindOfClass:[NSString class]];
     }];
-    
+
     [finalAttributes removeObjectsForKeys:[keys allObjects]];
     return finalAttributes;
-    
-}
 
-- (MPColorMode)stringToColorMode:(NSString*)colorString
-{
-    if ([colorString isEqualToString:@"light"]) {
-        return MPColorModeLight;
-    }
-    else if ([colorString isEqualToString:@"dark"]) {
-        return MPColorModeDark;
-    }
-    else {
-        return MPColorModeSystem;
-    }
 }
 
-- (MPRoktConfig *)buildRoktConfigFromDict:(NSDictionary<NSString *, id> *)configMap {
+- (RoktConfig *)buildRoktConfigFromDict:(NSDictionary<NSString *, id> *)configMap {
     _rokt_log(@"[mParticle-Rokt] buildRoktConfigFromDict: configMap %@", configMap == nil ? @"nil" : [NSString stringWithFormat:@"non-nil (%lu keys)", (unsigned long)configMap.count]);
-    MPRoktConfig *config = [[MPRoktConfig alloc] init];
+    if (configMap == nil || configMap.count == 0) {
+        _rokt_log(@"[mParticle-Rokt] buildRoktConfigFromDict: returning nil");
+        return nil;
+    }
+
+    RoktConfigBuilder *builder = [[RoktConfigBuilder alloc] init];
     BOOL isConfigEmpty = YES;
 
     NSString *colorModeString = configMap[@"colorMode"];
     if (colorModeString && [colorModeString isKindOfClass:[NSString class]]) {
-        if (@available(iOS 12.0, *)) {
-            isConfigEmpty = NO;
-            if ([colorModeString isEqualToString:@"dark"]) {
-                if (@available(iOS 13.0, *)) {
-                    config.colorMode = MPColorModeDark;
-                }
-            } else if ([colorModeString isEqualToString:@"light"]) {
-                config.colorMode = MPColorModeLight;
-            } else {
-                // default: "system"
-                config.colorMode = MPColorModeSystem;
-            }
+        isConfigEmpty = NO;
+        if ([colorModeString isEqualToString:@"dark"]) {
+            [builder colorMode:RoktColorModeDark];
+        } else if ([colorModeString isEqualToString:@"light"]) {
+            [builder colorMode:RoktColorModeLight];
+        } else {
+            [builder colorMode:RoktColorModeSystem];
         }
     }
 
@@ -262,23 +319,13 @@ RCT_EXPORT_METHOD(purchaseFinalized : (NSString *)placementId catalogItemId : (
             cacheDuration = @0;
         }
         NSDictionary<NSString *, NSString *> *cacheAttributes = cacheConfigMap[@"cacheAttributes"];
-        config.cacheAttributes = cacheAttributes;
-        config.cacheDuration = cacheDuration;
+        RoktCacheConfig *cacheConfig = [[RoktCacheConfig alloc] initWithCacheDuration:[cacheDuration longLongValue]
+                                                                      cacheAttributes:cacheAttributes ?: @{}];
+        [builder cacheConfig:cacheConfig];
     }
 
     _rokt_log(@"[mParticle-Rokt] buildRoktConfigFromDict: returning %@", isConfigEmpty ? @"nil" : @"config");
-    return isConfigEmpty ? nil : config;
-}
-
-- (void)subscribeViewEvents:(NSString* _Nonnull) viewName
-{
-    _rokt_log(@"[mParticle-Rokt] subscribeViewEvents for viewName: %@", viewName);
-    if (self.eventManager == nil) {
-        self.eventManager = [RoktEventManager allocWithZone: nil];
-    }
-    [[[MParticle sharedInstance] rokt] events:viewName onEvent:^(MPRoktEvent * _Nonnull roktEvent) {
-            [self.eventManager onRoktEvents:roktEvent viewName:viewName];
-        }];
+    return isConfigEmpty ? nil : [builder build];
 }
 
 - (NSMutableDictionary *)getNativePlaceholders:(NSDictionary *)placeholders viewRegistry:(NSDictionary<NSNumber *, UIView *> *)viewRegistry
@@ -295,8 +342,8 @@ RCT_EXPORT_METHOD(purchaseFinalized : (NSString *)placementId catalogItemId : (
         }
         nativePlaceholders[key] = wrapperView.roktEmbeddedView;
 #else
-        MPRoktEmbeddedView *view = viewRegistry[[placeholders objectForKey:key]];
-        if (!view || ![view isKindOfClass:[MPRoktEmbeddedView class]]) {
+        RoktEmbeddedView *view = viewRegistry[[placeholders objectForKey:key]];
+        if (!view || ![view isKindOfClass:[RoktEmbeddedView class]]) {
             RCTLogError(@"Cannot find RoktEmbeddedView with tag #%@", key);
             continue;
         }