react-native-mapp-plugin 1.4.1 → 1.4.3

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## Version 1.4.3
+
+***Bug Fixes***
+
+- Android/iOS: `Mapp.engage(...)` is now awaitable, allowing singleton-dependent calls to run only after native engagement completes. Engagement failures reject the promise.
+- iOS: `Mapp.onInitCompletedListener()` now returns a `Promise<boolean>` instead of `null`.
+- iOS: The promise resolves immediately when the SDK is already ready, or waits for the existing `com.mapp.init` event while initialization is in progress.
+- Android: Preserved the existing native `AppoxeeObserver` implementation and behavior.
+- Android/iOS: Preserved the public `Mapp.onInitCompletedListener(): Promise<boolean>` API with consistent initialization-waiting behavior on both platforms.
+
+***Tests***
+
+- Added coverage for an already-ready iOS SDK, waiting for the iOS initialization event, and readiness changing while the event listener is being registered.
+- Updated platform-dispatch coverage for the cross-platform implementation.
+
+## Version 1.4.2
+
+***Dependency Updates***
+
+- Android: Aligned with Mapp Engage Android SDK 7.1.2.
+
 ## Version 1.4.1
 
 ***Dependency Updates***

package/Mapp.js

@@ -130,11 +130,7 @@ export class Mapp {
     server: string,
     appID: string,
     tenantID: string
-  ) {
-    if (Platform.OS == "ios") {
-      RNMappPluginModule.autoengage(server);
-      return RNMappPluginModule.engageInapp(server);
-    }
+  ): Promise<boolean> {
     return RNMappPluginModule.engage(
       sdkKey,
       googleProjectId,
@@ -170,10 +166,38 @@ export class Mapp {
    * @return {Promise.<boolean>} A promise with the result.
    */
   static onInitCompletedListener(): Promise<boolean> {
-    if (Platform.OS == "android") {
+    if (Platform.OS === "android") {
       return RNMappPluginModule.onInitCompletedListener();
     }
-    return null;
+
+    return RNMappPluginModule.isReady().then((ready) => {
+      if (ready) {
+        return true;
+      }
+
+      return new Promise((resolve, reject) => {
+        let settled = false;
+        let subscription;
+        const finish = () => {
+          if (settled) return;
+          settled = true;
+          if (subscription) subscription.remove();
+          resolve(true);
+        };
+
+        subscription = EventEmitter.addListener(IOS_INIT, finish);
+
+        // Close the race between the first readiness check and registration.
+        RNMappPluginModule.isReady().then((isReady) => {
+          if (isReady) finish();
+        }, (error) => {
+          if (settled) return;
+          settled = true;
+          if (subscription) subscription.remove();
+          reject(error);
+        });
+      });
+    });
   }
 
   /**

package/README.md

@@ -87,7 +87,9 @@ cd ios && pod install
 ```javascript
 import Mapp from 'react-native-mapp-plugin';
 
-// TODO: What to do with the module?
-Mapp;
+await Mapp.engage('SDK_KEY', 'FCM_PROJECT_ID', 'EMC', 'APP_ID', 'TENANT_ID');
+await Mapp.onInitCompletedListener();
 ```
+
+Always await `Mapp.engage(...)` before calling APIs that use the native Mapp singleton. The promise resolves after native engagement and bridge setup complete.
   

package/RNMappPlugin.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,c,m,swift}"
   s.exclude_files = "ios/RNMappPluginTests/**/*"
-  s.vendored_framework = "ios/Frameworks/AppoxeeSDK.xcframework", "ios/Frameworks/AppoxeeLocationServices.xcframework", "ios/Frameworks/AppoxeeInapp.xcframework"
+  s.vendored_framework = "ios/Frameworks/AppoxeeLocationServices.xcframework", "ios/Frameworks/AppoxeeInapp.xcframework"
   s.resources = "ios/Frameworks/AppoxeeSDKResources.bundle", "ios/Frameworks/AppoxeeInappResources.bundle"
   s.preserve_path = "ios/Frameworks/"
   s.public_header_files = "ios/Frameworks/AppoxeeSDK.xcframework/ios-arm64/Headers/", "ios/Frameworks/AppoxeeLocationServices.xcframework/ios-arm64/Headers/", "ios/Frameworks/AppoxeeInapp.xcframework/ios-arm64/Headers/"

package/android/build.gradle

@@ -53,7 +53,7 @@ dependencies {
     api('com.google.android.gms:play-services-location:21.3.0')
     implementation 'androidx.media:media:1.8.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation("com.mapp.sdk:engage-android:7.1.1")
+    implementation("com.mapp.sdk:engage-android:7.1.2")
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.23.0'
     testImplementation 'org.mockito:mockito-inline:5.2.0'

package/android/src/main/java/com/reactlibrary/NativeRNMappPluginModuleSpec.java

@@ -76,7 +76,7 @@ public abstract class NativeRNMappPluginModuleSpec extends ReactContextBaseJavaM
 
   @ReactMethod
   @DoNotStrip
-  public abstract void engage(String sdkKey, String googleProjectId, String server, String appID, String tenantID);
+  public abstract void engage(String sdkKey, String googleProjectId, String server, String appID, String tenantID, Promise promise);
 
   @ReactMethod
   @DoNotStrip

package/android/src/main/java/com/reactlibrary/RNMappPluginModule.java

@@ -322,21 +322,42 @@ public class RNMappPluginModule extends NativeRNMappPluginModuleSpec implements
     }
 
     @ReactMethod
-    public void engage(String sdkKey, String googleProjectId, String server, String appID, String tenantID) {
-        AppoxeeOptions opt = createOptions(server, sdkKey, appID, tenantID);
-        opt.setNotificationMode(NotificationMode.BACKGROUND_AND_FOREGROUND);
+    public void engage(String sdkKey, String googleProjectId, String server, String appID,
+                       String tenantID, Promise promise) {
+        final AppoxeeOptions opt;
+        try {
+            opt = createOptions(server, sdkKey, appID, tenantID);
+            opt.setNotificationMode(NotificationMode.BACKGROUND_AND_FOREGROUND);
+        } catch (RuntimeException error) {
+            promise.reject("MAPP_ENGAGE_INVALID_CONFIGURATION", error.getMessage(), error);
+            return;
+        }
 
-        new Handler(Looper.getMainLooper()).post(() -> {
-            Appoxee.engage(Objects.requireNonNull(application), opt);
+        Runnable operation = () -> {
+            try {
+                Appoxee.engage(Objects.requireNonNull(application), opt);
 
-            Appoxee.instance().subscribe(new AppoxeeObserver() {
-                @Override
-                public void onReadyStatusChanged(boolean status, MappResult<DevicePayload> result) {
-                }
-            });
+                Appoxee.instance().subscribe(new AppoxeeObserver() {
+                    @Override
+                    public void onReadyStatusChanged(boolean status, MappResult<DevicePayload> result) {
+                    }
+                });
 
-            Appoxee.instance().setPushBroadcast(MyPushBroadcastReceiver.class);
-        });
+                Appoxee.instance().setPushBroadcast(MyPushBroadcastReceiver.class);
+                promise.resolve(true);
+            } catch (Exception error) {
+                promise.reject("MAPP_ENGAGE_FAILED", "Mapp initialization failed", error);
+            }
+        };
+
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            operation.run();
+        } else if (!new Handler(Looper.getMainLooper()).post(operation)) {
+            promise.reject(
+                    "MAPP_ENGAGE_FAILED",
+                    "Unable to post Mapp initialization to the main looper"
+            );
+        }
     }
 
     @ReactMethod

package/android/src/main/jni/RNMappPlugin-generated.cpp

@@ -64,7 +64,7 @@ static facebook::jsi::Value __hostFunction_NativeRNMappPluginModuleSpecJSI_engag
 
 static facebook::jsi::Value __hostFunction_NativeRNMappPluginModuleSpecJSI_engage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, VoidKind, "engage", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", args, count, cachedMethodId);
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "engage", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
 }
 
 static facebook::jsi::Value __hostFunction_NativeRNMappPluginModuleSpecJSI_engageTestServer(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {

package/android/src/main/jni/react/renderer/components/RNMappPlugin/RNMappPluginJSI.h

@@ -154,12 +154,12 @@ private:
     static_assert(
       bridging::getParameterCount(&T::engage) == 6,
       "Expected engage(...) to have 6 parameters");
-    bridging::callFromJs<void>(rt, &T::engage,  static_cast<NativeRNMappPluginModuleCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
+    return bridging::callFromJs<jsi::Value>(rt, &T::engage,  static_cast<NativeRNMappPluginModuleCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
       count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
       count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt),
       count <= 2 ? throw jsi::JSError(rt, "Expected argument in position 2 to be passed") : args[2].asString(rt),
       count <= 3 ? throw jsi::JSError(rt, "Expected argument in position 3 to be passed") : args[3].asString(rt),
-      count <= 4 ? throw jsi::JSError(rt, "Expected argument in position 4 to be passed") : args[4].asString(rt));return jsi::Value::undefined();
+      count <= 4 ? throw jsi::JSError(rt, "Expected argument in position 4 to be passed") : args[4].asString(rt));
   }
 
   static jsi::Value __engageTestServer(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {

package/ios/RNMappPluginModule.m

@@ -37,9 +37,23 @@ RCT_EXPORT_METHOD(removeListeners:(NSInteger)count) {
 
 #pragma mark Exported methods - Notifications
 
-RCT_EXPORT_METHOD(engage: (NSString *)sdkKey projectId: (NSString *)projectId cepUrl:(NSString *)cepUrl appID:(NSString *)appID tenantID:(NSString *)tenantID) {
-    SERVER serv = [self getServerKeyFor:cepUrl];
-    [[Appoxee shared] engageWithLaunchOptions:nil andDelegate:[RNMappEventEmmiter shared] andSDKID:sdkKey with: serv];
+RCT_EXPORT_METHOD(engage:(NSString *)sdkKey
+                  googleProjectId:(NSString *)projectId
+                  server:(NSString *)server
+                  appID:(NSString *)appID
+                  tenantID:(NSString *)tenantID
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+    @try {
+        SERVER serv = [self getServerKeyFor:server];
+        [[Appoxee shared] engageAndAutoIntegrateWithLaunchOptions:nil andDelegate:[RNMappEventEmmiter shared] with:serv];
+        [[Appoxee shared] addObserver:[RNMappEventEmmiter shared] forKeyPath:@"isReady" options:NSKeyValueObservingOptionNew context:nil];
+        [[AppoxeeInapp shared] engageWithDelegate:[RNMappEventEmmiter shared] with:[self getInappServerKeyFor:server]];
+        resolve(@YES);
+    } @catch (NSException *exception) {
+        NSString *message = exception.reason ?: @"Mapp initialization failed";
+        reject(@"MAPP_ENGAGE_FAILED", message, nil);
+    }
 }
 
 RCT_REMAP_METHOD(autoengage,engage:(NSString *) server) {
@@ -371,4 +385,3 @@ RCT_EXPORT_METHOD(stopGeoFencing) {
 
 
 @end
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mapp-plugin",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "Mapp SDK for React Native.",
   "main": "index.js",
   "files": [

package/specs/NativeRNMappPluginModule.js

@@ -15,7 +15,7 @@ export interface Spec extends TurboModule {
   setAliasWithResend(alias: string, resendCustomAttributes: boolean): Promise<boolean>;
   getAlias(): Promise<string>;
   engage2(): void;
-  engage(sdkKey: string, googleProjectId: string, server: string, appID: string, tenantID: string): void;
+  engage(sdkKey: string, googleProjectId: string, server: string, appID: string, tenantID: string): Promise<boolean>;
   engageTestServer(cepURl: string, sdkKey: string, googleProjectId: string, server: string, appID: string, tenantID: string): void;
   onInitCompletedListener(): Promise<boolean>;
   isReady(): Promise<boolean>;