react-native-mparticle 2.9.0 → 2.9.1

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;
 }
 
@@ -65,8 +89,10 @@ RCT_EXTERN void RCTRegisterModule(Class);
 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.cacheConfig().has_value()) {
         NSMutableDictionary *cacheConfigDict = [[NSMutableDictionary alloc] init];
@@ -78,7 +104,11 @@ static NSDictionary * __attribute__((optnone)) safeExtractRoktConfigDict(
             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;
 }
 
@@ -89,6 +119,7 @@ static NSDictionary * __attribute__((optnone)) safeExtractRoktConfigDict(
                roktConfig:(JS::NativeMPRokt::RoktConfigType &)roktConfig
             fontFilesMap:(NSDictionary *)fontFilesMap
 {
+    _rokt_log(@"[mParticle-Rokt] New Architecture Implementation");
     NSMutableDictionary *finalAttributes = [self convertToMutableDictionaryOfStrings:attributes];
 
     NSDictionary *roktConfigDict = safeExtractRoktConfigDict(roktConfig);
@@ -97,51 +128,73 @@ static NSDictionary * __attribute__((optnone)) safeExtractRoktConfigDict(
 // 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];
     };
 
-    if (self.bridge == nil || self.bridge.uiManager == nil) {
-        NSLog(@"[mParticle-Rokt] addUIBlock skipped: self.bridge%@ is nil. selectPlacements will not be called. This can occur in New Architecture bridgeless production builds.", self.bridge == nil ? @"" : @".uiManager");
+    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);
 
-        [self subscribeViewEvents:identifer];
+        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");
+        _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 : (
@@ -180,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;
 
@@ -212,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];
     }
@@ -227,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){
@@ -248,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/RoktEventManager.m

@@ -1,5 +1,23 @@
 #import "RoktEventManager.h"
 #import <mParticle_Apple_SDK/mParticle_Apple_SDK-Swift.h>
+#import <os/log.h>
+
+static os_log_t _rokt_events_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-events");
+  });
+  return log;
+}
+
+static void _rokt_events_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_events_os_log(), OS_LOG_TYPE_INFO, "%{public}s", [msg UTF8String]);
+}
 
 @implementation RoktEventManager
 {
@@ -13,17 +31,20 @@ RCT_EXPORT_MODULE(RoktEventManager);
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         sharedInstance = [super allocWithZone:zone];
+        _rokt_events_log(@"[mParticle-Rokt] RoktEventManager module alloc");
     });
     return sharedInstance;
 }
 
 // Will be called when this module's first listener is added.
 -(void)startObserving {
+    _rokt_events_log(@"[mParticle-Rokt] RoktEventManager startObserving (JS listener added)");
     hasListeners = YES;
 }
 
 // Will be called when this module's last listener is removed, or on dealloc.
 -(void)stopObserving {
+    _rokt_events_log(@"[mParticle-Rokt] RoktEventManager stopObserving (no JS listeners)");
     hasListeners = NO;
 }
 
@@ -51,6 +72,7 @@ RCT_EXPORT_MODULE(RoktEventManager);
 
 - (void)onRoktCallbackReceived:(NSString*)eventValue
 {
+    _rokt_events_log(@"[mParticle-Rokt] RoktEventManager onRoktCallbackReceived: %@", eventValue ?: @"(nil)");
     if (hasListeners) {
         [self sendEventWithName:@"RoktCallback" body:@{@"callbackValue": eventValue}];
     }
@@ -58,6 +80,8 @@ RCT_EXPORT_MODULE(RoktEventManager);
 
 - (void)onRoktEvents:(MPRoktEvent * _Nonnull)event viewName:(NSString * _Nullable)viewName
 {
+     NSString *eventClass = event ? NSStringFromClass([event class]) : @"nil";
+     _rokt_events_log(@"[mParticle-Rokt] RoktEventManager onRoktEvents: %@ viewName: %@", eventClass, viewName ?: @"(nil)");
      if (hasListeners) {
          NSString *placementId;
          NSString *eventName = @"";

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://www.mparticle.com",
   "license": "Apache-2.0",
   "repository": "mParticle/react-native-mparticle",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "react-native": "js/index",