react-native-mparticle 2.8.1 → 2.9.1

package/android/src/test/java/com/mparticle/react/testutils/MockMParticleUser.java

@@ -0,0 +1,109 @@
+package com.mparticle.react.testutils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.mparticle.MParticle;
+import com.mparticle.UserAttributeListenerType;
+import com.mparticle.consent.ConsentState;
+import com.mparticle.identity.MParticleUser;
+import com.mparticle.audience.AudienceTask;
+import com.mparticle.audience.AudienceResponse;
+
+import java.util.Map;
+
+public class MockMParticleUser implements MParticleUser {
+    Long mpid = 0L;
+
+    public MockMParticleUser() {}
+
+    public MockMParticleUser(Long mpid) {
+        this.mpid = mpid;
+    }
+
+    @NonNull
+    @Override
+    public long getId() {
+        return mpid;
+    }
+
+    @NonNull
+    @Override
+    public Map<String, Object> getUserAttributes() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Object> getUserAttributes(@Nullable UserAttributeListenerType userAttributeListener) {
+        return null;
+    }
+
+    @Override
+    public boolean setUserAttributes(@NonNull Map<String, Object> map) {
+        return false;
+    }
+
+    @NonNull
+    @Override
+    public Map<MParticle.IdentityType, String> getUserIdentities() {
+        return null;
+    }
+
+    @Override
+    public boolean setUserAttribute(@NonNull String s, @NonNull Object o) {
+        return false;
+    }
+
+    @Override
+    public boolean setUserAttributeList(@NonNull String s, @NonNull Object o) {
+        return false;
+    }
+
+    @Override
+    public boolean incrementUserAttribute(@NonNull String s, Number i) {
+        return false;
+    }
+
+    @Override
+    public boolean removeUserAttribute(@NonNull String s) {
+        return false;
+    }
+
+    @Override
+    public boolean setUserTag(@NonNull String s) {
+        return false;
+    }
+
+    @NonNull
+    @Override
+    public ConsentState getConsentState() {
+        return null;
+    }
+
+    @Override
+    public void setConsentState(@Nullable ConsentState consentState) {
+
+    }
+
+    @Override
+    public boolean isLoggedIn() {
+        return false;
+    }
+
+    @Override
+    public long getFirstSeenTime() {
+        return 0;
+    }
+
+    @Override
+    public long getLastSeenTime() {
+        return 0;
+    }
+
+    @Override
+    public AudienceTask<AudienceResponse> getUserAudiences() {
+        return null;
+    }
+}
+

package/android/src/test/java/com/mparticle/react/testutils/MockMap.java

@@ -0,0 +1,203 @@
+package com.mparticle.react.testutils;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.ReadableType;
+import com.facebook.react.bridge.WritableMap;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class MockMap implements WritableMap {
+    private Map map = new HashMap();
+
+    public MockMap() {}
+
+    public MockMap(JSONObject jsonObject) throws JSONException {
+        Map map = new HashMap();
+        Iterator<String> keys = jsonObject.keys();
+        while(keys.hasNext()) {
+            String key = keys.next();
+            map.put(key, jsonObject.get(key));
+        }
+        this.map = map;
+    }
+
+    public MockMap(Map map) {
+        this.map = map;
+    }
+
+    @Override
+    public boolean hasKey(String name) {
+        return map.containsKey(name);
+    }
+
+    @Override
+    public boolean isNull(String name) {
+        return map.get(name) == null;
+    }
+
+    @Override
+    public boolean getBoolean(String name) {
+        return (boolean) map.get(name);
+    }
+
+    @Override
+    public double getDouble(String name) {
+        return (double) map.get(name);
+    }
+
+    @Override
+    public int getInt(String name) {
+        return (int) map.get(name);
+    }
+
+    @Override
+    public long getLong(String name) {
+        return (long) map.get(name);
+    }
+
+    @Override
+    public String getString(String name) {
+        return (String) map.get(name);
+    }
+
+    @Override
+    public ReadableArray getArray(String name) {
+        return null;
+    }
+
+    @Override
+    public ReadableMap getMap(String name) {
+        return new MockMap((Map) map.get(name));
+    }
+
+    @Override
+    public ReadableType getType(String name) {
+        Object obj = map.get(name);
+        if (obj instanceof String) {
+            return ReadableType.String;
+        }
+        if (obj instanceof Number) {
+            return ReadableType.Number;
+        }
+        if (obj instanceof Collection) {
+            return ReadableType.Array;
+        }
+        if (obj instanceof Map) {
+            return ReadableType.Map;
+        }
+        if (obj instanceof Boolean) {
+            return ReadableType.Boolean;
+        }
+        if (obj == null) {
+            return ReadableType.Null;
+        }
+        return null;
+    }
+
+    @Override
+    public ReadableMapKeySetIterator keySetIterator() {
+        return new MockReadableMapKeySetIterator(map.keySet());
+    }
+
+    @Override
+    public java.util.HashMap<String, Object> toHashMap() {
+        return new java.util.HashMap<>(map);
+    }
+
+    @Override
+    public void putNull(String key) {
+        map.put(key, null);
+    }
+
+    @Override
+    public void putBoolean(String key, boolean value) {
+        map.put(key, value);
+    }
+
+    @Override
+    public void putDouble(String key, double value) {
+        map.put(key, value);
+    }
+
+    @Override
+    public void putInt(String key, int value) {
+        map.put(key, value);
+    }
+
+    @Override
+    public void putLong(String key, long value) {
+        map.put(key, value);
+    }
+
+    @Override
+    public void putString(String key, String value) {
+        map.put(key, value);
+    }
+
+    @Override
+    public void putArray(String key, ReadableArray value) {
+        map.put(key, value);
+    }
+
+    @Override
+    public void putMap(String key, ReadableMap value) {
+        map.put(key, value);
+    }
+
+    @Override
+    public void merge(ReadableMap source) {
+        throw new RuntimeException("Not Implemented");
+    }
+
+    @Override
+    public WritableMap copy() {
+        return new MockMap(new java.util.HashMap<>(map));
+    }
+
+    @NonNull
+    @Override
+    public Iterator<Map.Entry<String, Object>> getEntryIterator() {
+        return map.entrySet().iterator();
+    }
+
+    @NonNull
+    @Override
+    public Dynamic getDynamic(@NonNull String s) {
+        return new DynamicFromObject(map.get(s));
+    }
+
+    class MockReadableMapKeySetIterator implements ReadableMapKeySetIterator {
+        List<String> keys;
+        int index = 0;
+
+        MockReadableMapKeySetIterator(Collection<String> keys) {
+            this.keys = new ArrayList(keys);
+        }
+
+        @Override
+        public boolean hasNextKey() {
+            return index < keys.size();
+        }
+
+        @Override
+        public String nextKey() {
+            String val = keys.get(index);
+            index++;
+            return val;
+        }
+    }
+}

package/android/src/test/java/com/mparticle/react/testutils/MockReadableArray.java

@@ -0,0 +1,68 @@
+package com.mparticle.react.testutils;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableType;
+
+public class MockReadableArray implements ReadableArray {
+
+    @Override
+    public int size() {
+        return 0;
+    }
+
+    @Override
+    public boolean isNull(int index) {
+        return false;
+    }
+
+    @Override
+    public boolean getBoolean(int index) {
+        return false;
+    }
+
+    @Override
+    public double getDouble(int index) {
+        return 0;
+    }
+
+    @Override
+    public int getInt(int index) {
+        return 0;
+    }
+
+    @Override
+    public long getLong(int index) {
+        return 0;
+    }
+
+    @Override
+    public String getString(int index) {
+        return null;
+    }
+
+    @Override
+    public ReadableArray getArray(int index) {
+        return null;
+    }
+
+    @Override
+    public ReadableMap getMap(int index) {
+        return null;
+    }
+
+    @Override
+    public ReadableType getType(int index) {
+        return null;
+    }
+
+    @Override
+    public com.facebook.react.bridge.Dynamic getDynamic(int index) {
+        return null;
+    }
+
+    @Override
+    public java.util.ArrayList<Object> toArrayList() {
+        return new java.util.ArrayList<>();
+    }
+}

package/android/src/test/java/com/mparticle/react/testutils/MockWritableMap.java

@@ -0,0 +1,4 @@
+package com.mparticle.react.testutils;
+
+public class MockWritableMap {
+}

package/android/src/test/java/com/mparticle/react/testutils/Mutable.java

@@ -0,0 +1,13 @@
+package com.mparticle.react.testutils;
+
+public class Mutable<T> {
+    public T value;
+
+    public Mutable() {
+        value = null;
+    }
+
+    public Mutable(T t) {
+        this.value = t;
+    }
+}

package/app.plugin.js

@@ -0,0 +1 @@
+module.exports = require('./plugin/build/withMParticle');

package/ios/RNMParticle/RNMPRokt.mm

@@ -19,6 +19,7 @@
 #import <React/RCTViewManager.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTBridge.h>
+#import <os/log.h>
 #import "RoktEventManager.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -26,6 +27,25 @@
 #import <RNMParticle/RNMParticle.h>
 #endif // RCT_NEW_ARCH_ENABLED
 
+// os_log for [mParticle-Rokt] diagnostics: visible in production (Console.app, device logs)
+// and does not trigger RCT LogBox/warning UI in debug.
+static os_log_t _rokt_os_log(void) {
+  static os_log_t log;
+  static dispatch_once_t once;
+  dispatch_once(&once, ^{
+    log = os_log_create("com.mparticle.react-native", "rokt");
+  });
+  return log;
+}
+
+static void _rokt_log(NSString *format, ...) {
+  va_list args;
+  va_start(args, format);
+  NSString *msg = [[NSString alloc] initWithFormat:format arguments:args];
+  va_end(args);
+  os_log_with_type(_rokt_os_log(), OS_LOG_TYPE_INFO, "%{public}s", [msg UTF8String]);
+}
+
 @interface RNMPRokt ()
 
 @property (nonatomic, nullable) RoktEventManager *eventManager;
@@ -43,11 +63,15 @@ RCT_EXTERN void RCTRegisterModule(Class);
 }
 
 + (void)load {
+    _rokt_log(@"[mParticle-Rokt] RNMPRokt module load");
     RCTRegisterModule(self);
 }
 
 - (dispatch_queue_t)methodQueue
 {
+    BOOL bridgeNil = (self.bridge == nil);
+    BOOL uiManagerNil = (self.bridge.uiManager == nil);
+    _rokt_log(@"[mParticle-Rokt] methodQueue called, bridge %@, uiManager %@", bridgeNil ? @"nil" : @"non-nil", uiManagerNil ? @"nil" : @"non-nil");
     return self.bridge.uiManager.methodQueue;
 }
 
@@ -58,18 +82,19 @@ RCT_EXTERN void RCTRegisterModule(Class);
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED
-// New Architecture Implementation
-- (void)selectPlacements:(NSString *)identifer
-              attributes:(NSDictionary *)attributes
-            placeholders:(NSDictionary *)placeholders
-               roktConfig:(JS::NativeMPRokt::RoktConfigType &)roktConfig
-            fontFilesMap:(NSDictionary *)fontFilesMap
-{
-    NSMutableDictionary *finalAttributes = [self convertToMutableDictionaryOfStrings:attributes];
-
-    // Convert JS struct to NSDictionary for internal use
+// Extracts roktConfig fields into an NSDictionary, returning nil when the
+// TurboModule bridge passes a null C++ reference for an omitted optional param.
+// __attribute__((optnone)) is required: &ref != nullptr is UB in C++ and the
+// compiler removes the check at -O2, causing a SIGSEGV in Release builds.
+static NSDictionary * __attribute__((optnone)) safeExtractRoktConfigDict(
+    JS::NativeMPRokt::RoktConfigType &roktConfig) {
+    if (&roktConfig == nullptr) {
+        _rokt_log(@"[mParticle-Rokt] safeExtractRoktConfigDict: roktConfig ref is nullptr, returning nil");
+        return nil;
+    }
+    _rokt_log(@"[mParticle-Rokt] safeExtractRoktConfigDict: extracting config");
     NSMutableDictionary *roktConfigDict = [[NSMutableDictionary alloc] init];
-    if (&roktConfig != nullptr && roktConfig.cacheConfig().has_value()) {
+    if (roktConfig.cacheConfig().has_value()) {
         NSMutableDictionary *cacheConfigDict = [[NSMutableDictionary alloc] init];
         auto cacheConfig = roktConfig.cacheConfig().value();
         if (cacheConfig.cacheDurationInSeconds().has_value()) {
@@ -79,55 +104,97 @@ RCT_EXTERN void RCTRegisterModule(Class);
             cacheConfigDict[@"cacheAttributes"] = cacheConfig.cacheAttributes();
         }
         roktConfigDict[@"cacheConfig"] = cacheConfigDict;
+        _rokt_log(@"[mParticle-Rokt] safeExtractRoktConfigDict: cacheConfig present, keys: %lu", (unsigned long)roktConfigDict.count);
+    } else {
+        _rokt_log(@"[mParticle-Rokt] safeExtractRoktConfigDict: cacheConfig has no value");
     }
+    _rokt_log(@"[mParticle-Rokt] safeExtractRoktConfigDict: returning dict with %lu keys", (unsigned long)roktConfigDict.count);
+    return roktConfigDict;
+}
 
+// New Architecture Implementation
+- (void)selectPlacements:(NSString *)identifer
+              attributes:(NSDictionary *)attributes
+            placeholders:(NSDictionary *)placeholders
+               roktConfig:(JS::NativeMPRokt::RoktConfigType &)roktConfig
+            fontFilesMap:(NSDictionary *)fontFilesMap
+{
+    _rokt_log(@"[mParticle-Rokt] New Architecture Implementation");
+    NSMutableDictionary *finalAttributes = [self convertToMutableDictionaryOfStrings:attributes];
+
+    NSDictionary *roktConfigDict = safeExtractRoktConfigDict(roktConfig);
     MPRoktConfig *config = [self buildRoktConfigFromDict:roktConfigDict];
 #else
 // Old Architecture Implementation
 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];
 #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];
-
     __weak __typeof__(self) weakSelf = self;
 
     callbacks.onLoad = ^{
-        [self.eventManager onRoktCallbackReceived:@"onLoad"];
+        _rokt_log(@"[mParticle-Rokt] onLoad");
+        [weakSelf.eventManager onRoktCallbackReceived:@"onLoad"];
     };
 
     callbacks.onUnLoad = ^{
-        [self.eventManager onRoktCallbackReceived:@"onUnLoad"];
-        RCTLogInfo(@"unloaded");
+        _rokt_log(@"[mParticle-Rokt] onUnLoad");
+        [weakSelf.eventManager onRoktCallbackReceived:@"onUnLoad"];
     };
 
     callbacks.onShouldShowLoadingIndicator = ^{
-        [self.eventManager onRoktCallbackReceived:@"onShouldShowLoadingIndicator"];
+        _rokt_log(@"[mParticle-Rokt] onShouldShowLoadingIndicator");
+        [weakSelf.eventManager onRoktCallbackReceived:@"onShouldShowLoadingIndicator"];
     };
 
     callbacks.onShouldHideLoadingIndicator = ^{
-        [self.eventManager onRoktCallbackReceived:@"onShouldHideLoadingIndicator"];
+        _rokt_log(@"[mParticle-Rokt] onShouldHideLoadingIndicator");
+        [weakSelf.eventManager onRoktCallbackReceived:@"onShouldHideLoadingIndicator"];
     };
 
     callbacks.onEmbeddedSizeChange = ^(NSString *placementId, CGFloat height) {
-        [self.eventManager onWidgetHeightChanges:height placement:placementId];
+        _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");
+
+    if (bridgeNil || uiManagerNil) {
+        _rokt_log(@"[mParticle-Rokt] addUIBlock skipped: self.bridge%@ is nil. selectPlacements will not be called. This can occur in New Architecture bridgeless production builds.", bridgeNil ? @"" : @".uiManager");
+    } else {
+        _rokt_log(@"[mParticle-Rokt] queuing addUIBlock for identifier: %@", identifer);
+    }
     [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *,UIView *> *viewRegistry) {
-        NSMutableDictionary *nativePlaceholders = [self getNativePlaceholders:placeholders viewRegistry:viewRegistry];
+        __strong __typeof__(weakSelf) strongSelf = weakSelf;
+        _rokt_log(@"[mParticle-Rokt] addUIBlock executing for identifier: %@, viewRegistry count: %lu", identifer, (unsigned long)viewRegistry.count);
+
+        NSMutableDictionary *nativePlaceholders = strongSelf ? [strongSelf getNativePlaceholders:placeholders viewRegistry:viewRegistry] : [NSMutableDictionary dictionary];
 
-        [self subscribeViewEvents:identifer];
+        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");
+        _rokt_log(@"[mParticle-Rokt] calling mParticle Core selectPlacements for: %@", identifer);
         [[[MParticle sharedInstance] rokt] selectPlacements:identifer
                                                  attributes:finalAttributes
                                               embeddedViews:nativePlaceholders
                                                      config:config
                                                   callbacks:callbacks];
     }];
+    _rokt_log(@"[mParticle-Rokt] addUIBlock enqueued for identifier: %@", identifer);
 }
 
 RCT_EXPORT_METHOD(purchaseFinalized : (NSString *)placementId catalogItemId : (
@@ -166,6 +233,7 @@ RCT_EXPORT_METHOD(purchaseFinalized : (NSString *)placementId catalogItemId : (
 }
 
 - (MPRoktConfig *)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];
     BOOL isConfigEmpty = YES;
 
@@ -198,11 +266,13 @@ RCT_EXPORT_METHOD(purchaseFinalized : (NSString *)placementId catalogItemId : (
         config.cacheDuration = cacheDuration;
     }
 
+    _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];
     }
@@ -213,6 +283,7 @@ RCT_EXPORT_METHOD(purchaseFinalized : (NSString *)placementId catalogItemId : (
 
 - (NSMutableDictionary *)getNativePlaceholders:(NSDictionary *)placeholders viewRegistry:(NSDictionary<NSNumber *, UIView *> *)viewRegistry
 {
+    _rokt_log(@"[mParticle-Rokt] getNativePlaceholders: placeholders %lu, viewRegistry %lu", (unsigned long)placeholders.count, (unsigned long)viewRegistry.count);
     NSMutableDictionary *nativePlaceholders = [[NSMutableDictionary alloc]initWithCapacity:placeholders.count];
 
     for(id key in placeholders){
@@ -234,12 +305,14 @@ RCT_EXPORT_METHOD(purchaseFinalized : (NSString *)placementId catalogItemId : (
 #endif // RCT_NEW_ARCH_ENABLED
     }
 
+    _rokt_log(@"[mParticle-Rokt] getNativePlaceholders: resolved %lu native placeholder(s)", (unsigned long)nativePlaceholders.count);
     return nativePlaceholders;
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
     self.bridge = params.instance.bridge;
+    _rokt_log(@"[mParticle-Rokt] getTurboModule: bridge set to %@", self.bridge == nil ? @"nil" : @"non-nil");
     return std::make_shared<facebook::react::NativeMPRoktSpecJSI>(params);
 }
 #endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMParticle/RNMParticle.mm

@@ -163,7 +163,8 @@ RCT_EXPORT_METHOD(getUserAttributes:(NSString *)mpid callback:(RCTResponseSender
 {
     MParticleUser *selectedUser = [[MParticleUser alloc] init];
     selectedUser.userId = [NSNumber numberWithLong:mpid.longLongValue];
-    callback(@[[NSNull null], [selectedUser userAttributes]]);
+    NSDictionary *attributes = [selectedUser userAttributes] ?: @{};
+    callback(@[[NSNull null], attributes]);
 }
 
 RCT_EXPORT_METHOD(setUserTag:(NSString *)mpid tag:(NSString *)tag)