react-native-nami-sdk 3.3.2-1 → 3.3.2-4

package/android/build.gradle

@@ -85,8 +85,8 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    playImplementation "com.namiml:sdk-android:3.3.2.2"
-    amazonImplementation "com.namiml:sdk-amazon:3.3.2.2"
+    playImplementation "com.namiml:sdk-android:3.3.2.3"
+    amazonImplementation "com.namiml:sdk-amazon:3.3.2.3"
 
     implementation "com.facebook.react:react-native:+"  // From node_modules
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4"

package/dist/src/version.d.ts

@@ -2,4 +2,4 @@
  * Auto-generated file. Do not edit manually.
  * React Native Nami SDK version.
  */
-export declare const NAMI_REACT_NATIVE_VERSION = "3.3.2-1";
+export declare const NAMI_REACT_NATIVE_VERSION = "3.3.2-4";

package/ios/Nami.swift

@@ -63,20 +63,37 @@ class RNNami: NSObject {
             config.initialConfig = initialConfig
         }
 
+        var didCallBack = false
         Nami.configure(with: config) { sdkConfigured in
-            resolve(["success": sdkConfigured])
+            didCallBack = true
+            NSLog("RNNami: configure() completion called, sdkConfigured: \(sdkConfigured)")
+            DispatchQueue.main.async {
+                resolve(["success": sdkConfigured])
+            }
+        }
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + 10) {
+            if !didCallBack {
+                NSLog("RNNami: configure() completion NEVER CALLED, reporting failure.")
+                resolve(["success": false])
+            }
         }
     }
 
     @objc
-    func sdkConfigured(_ resolve: RCTPromiseResolveBlock, rejecter _: RCTPromiseRejectBlock) {
-        resolve(Nami.sdkConfigured())
+    func sdkConfigured(_ resolve: @escaping RCTPromiseResolveBlock, rejecter _: RCTPromiseRejectBlock) {
+        let sdkConfigured = Nami.sdkConfigured()
+        DispatchQueue.main.async {
+            resolve(sdkConfigured)
+        }
     }
 
     @objc(sdkVersion:rejecter:)
     func sdkVersion(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
         let version = Nami.sdkVersion()
-        resolve(version)
+        DispatchQueue.main.async {
+            resolve(version)
+        }
     }
 
     func isNewArchitectureEnabled() -> Bool {

package/ios/NamiCampaignManagerBridge.m

@@ -6,8 +6,9 @@
 //
 
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 
-@interface RCT_EXTERN_MODULE(RNNamiCampaignManager, NSObject)
+@interface RCT_EXTERN_MODULE(RNNamiCampaignManager, RCTEventEmitter)
 
 RCT_EXTERN_METHOD(launch:(nullable NSString *)label withUrl:(nullable NSString *)withUrl context:(nullable NSDictionary *)context completion:(RCTResponseSenderBlock)callback paywallCompletion:(RCTResponseSenderBlock)paywallCallback);
 
@@ -20,7 +21,7 @@ RCT_EXTERN_METHOD(refresh:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRe
 RCT_EXTERN_METHOD(registerAvailableCampaignsHandler)
 
 + (BOOL)requiresMainQueueSetup {
-  return NO;
+  return YES;
 }
 
 @end

package/ios/NamiCampaignManagerBridge.swift

@@ -20,7 +20,20 @@ class RNNamiCampaignManager: RCTEventEmitter {
 
     override init() {
         super.init()
-        RNNamiCampaignManager.shared = self
+    }
+
+    override class func requiresMainQueueSetup() -> Bool { true }
+
+    private var hasListeners = false
+    override func startObserving() { hasListeners = true }
+    override func stopObserving() { hasListeners = false }
+
+    private func safeSend(withName name: String, body: Any?) {
+        guard hasListeners else {
+            print("[RNNamiCampaignManager] Warning: no listeners, so event not being sent to JS.")
+            return
+        } // optional but avoids warnings
+        sendEvent(withName: name, body: body)
     }
 
     override func supportedEvents() -> [String]! {
@@ -138,9 +151,7 @@ class RNNamiCampaignManager: RCTEventEmitter {
             "timeSpentOnPaywall": paywallEvent.timeSpentOnPaywall,
         ]
 
-        DispatchQueue.main.async {
-            RNNamiCampaignManager.shared?.sendEvent(withName: "NamiPaywallEvent", body: payload)
-        }
+        safeSend(withName: "NamiPaywallEvent", body: payload)
     }
 
     func handleLaunch(callback: RCTResponseSenderBlock?, success: Bool, error: Error?) {
@@ -294,9 +305,7 @@ class RNNamiCampaignManager: RCTEventEmitter {
     func registerForAvailableCampaigns() {
         NamiCampaignManager.registerAvailableCampaignsHandler { availableCampaigns in
             let dictionaries = availableCampaigns.map { campaign in self.campaignInToDictionary(campaign) }
-            DispatchQueue.main.async {
-                RNNamiCampaignManager.shared?.sendEvent(withName: "AvailableCampaignsChanged", body: dictionaries)
-            }
+            self.safeSend(withName: "AvailableCampaignsChanged", body: dictionaries)
         }
     }
 }

package/ios/NamiCustomerManager.m

@@ -6,8 +6,9 @@
 //
 
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 
-@interface RCT_EXTERN_MODULE(RNNamiCustomerManager, NSObject)
+@interface RCT_EXTERN_MODULE(RNNamiCustomerManager, RCTEventEmitter)
 
 RCT_EXTERN_METHOD(setCustomerAttribute:(NSString *)key value:(NSString *)value)
 
@@ -43,7 +44,7 @@ RCT_EXTERN_METHOD(registerAccountStateHandler)
 
 
 + (BOOL)requiresMainQueueSetup {
-  return NO;
+  return YES;
 }
 
 @end

package/ios/NamiCustomerManager.swift

@@ -19,7 +19,20 @@ class RNNamiCustomerManager: RCTEventEmitter {
 
     override init() {
         super.init()
-        RNNamiCustomerManager.shared = self
+    }
+
+    override class func requiresMainQueueSetup() -> Bool { true }
+
+    private var hasListeners = false
+    override func startObserving() { hasListeners = true }
+    override func stopObserving() { hasListeners = false }
+
+    private func safeSend(withName name: String, body: Any?) {
+        guard hasListeners else {
+            print("[RNNamiCustomerManager] Warning: no listeners, so event not being sent to JS.")
+            return
+        } // optional but avoids warnings
+        sendEvent(withName: name, body: body)
     }
 
     override func supportedEvents() -> [String]! {
@@ -46,8 +59,10 @@ class RNNamiCustomerManager: RCTEventEmitter {
 
     @objc(getCustomerAttribute:resolver:rejecter:)
     func getCustomerAttribute(key: String, resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
-        let customerAttribute = NamiCustomerManager.getCustomerAttribute(key: key)
-        resolve(customerAttribute)
+        DispatchQueue.main.async {
+            let customerAttribute = NamiCustomerManager.getCustomerAttribute(key: key)
+            resolve(customerAttribute)
+        }
     }
 
     @objc(clearCustomerAttribute:)
@@ -78,54 +93,68 @@ class RNNamiCustomerManager: RCTEventEmitter {
     @objc(inAnonymousMode:rejecter:)
     func inAnonymousMode(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
         let inAnonymousMode: Bool = NamiCustomerManager.inAnonymousMode()
-        resolve(inAnonymousMode)
+        DispatchQueue.main.async {
+            resolve(inAnonymousMode)
+        }
     }
 
     @objc(journeyState:rejecter:)
     func journeyState(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
         if let journeyState = NamiCustomerManager.journeyState() {
             let dictionary = journeyStateToDictionary(journeyState)
-            resolve(dictionary)
+            DispatchQueue.main.async {
+                resolve(dictionary)
+            }
         } else {
-            resolve(nil)
+            DispatchQueue.main.async {
+                resolve(nil)
+            }
         }
     }
 
     @objc(isLoggedIn:rejecter:)
     func isLoggedIn(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
         let isLoggedIn = NamiCustomerManager.isLoggedIn()
-        resolve(isLoggedIn)
+        DispatchQueue.main.async {
+            resolve(isLoggedIn)
+        }
     }
 
     @objc(loggedInId:rejecter:)
     func loggedInId(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
         let id = NamiCustomerManager.loggedInId()
-        resolve(id)
+        DispatchQueue.main.async {
+            resolve(id)
+        }
     }
 
     @objc(deviceId:rejecter:)
     func deviceId(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
         let id = NamiCustomerManager.deviceId()
-        resolve(id)
+        DispatchQueue.main.async {
+            resolve(id)
+        }
     }
 
     @objc(login:)
     func login(customerId: String) {
-        NamiCustomerManager.login(withId: customerId)
+        DispatchQueue.main.async {
+            NamiCustomerManager.login(withId: customerId)
+        }
     }
 
     @objc(logout)
     func logout() {
-        NamiCustomerManager.logout()
+        DispatchQueue.main.async {
+            NamiCustomerManager.logout()
+        }
     }
 
     @objc(registerJourneyStateHandler)
     func registerJourneyStateHandler() {
         NamiCustomerManager.registerJourneyStateHandler { journeyState in
             let dictionary = self.journeyStateToDictionary(journeyState)
-            DispatchQueue.main.async {
-                RNNamiCustomerManager.shared?.sendEvent(withName: "JourneyStateChanged", body: dictionary)
-            }
+            self.safeSend(withName: "JourneyStateChanged", body: dictionary)
         }
     }
 
@@ -166,9 +195,7 @@ class RNNamiCustomerManager: RCTEventEmitter {
                 "success": success,
                 "error": error?._code as Any,
             ]
-            DispatchQueue.main.async {
-                RNNamiCustomerManager.shared?.sendEvent(withName: "AccountStateChanged", body: payload)
-            }
+            self.safeSend(withName: "AccountStateChanged", body: payload)
         }
     }
 }

package/ios/NamiEntitlementManagerBridge.m

@@ -6,8 +6,9 @@
 //
 
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 
-@interface RCT_EXTERN_MODULE(RNNamiEntitlementManager, NSObject)
+@interface RCT_EXTERN_MODULE(RNNamiEntitlementManager, RCTEventEmitter)
 
 RCT_EXTERN_METHOD(isEntitlementActive:(nullable NSString *)referenceId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
@@ -20,7 +21,7 @@ RCT_EXTERN_METHOD(registerActiveEntitlementsHandler)
 RCT_EXTERN_METHOD(clearProvisionalEntitlementGrants)
 
 + (BOOL)requiresMainQueueSetup {
-  return NO;
+  return YES;
 }
 
 @end

package/ios/NamiEntitlementManagerBridge.swift

@@ -22,8 +22,18 @@ class RNNamiEntitlementManager: RCTEventEmitter {
         RNNamiEntitlementManager.shared = self
     }
 
-    override static func requiresMainQueueSetup() -> Bool {
-        return false
+    override class func requiresMainQueueSetup() -> Bool { true }
+
+    private var hasListeners = false
+    override func startObserving() { hasListeners = true }
+    override func stopObserving() { hasListeners = false }
+
+    private func safeSend(withName name: String, body: Any?) {
+        guard hasListeners else {
+            print("[RNNamiEntitlementManager] Warning: no listeners, so event not being sent to JS.")
+            return
+        }
+        sendEvent(withName: name, body: body)
     }
 
     override func supportedEvents() -> [String]! {
@@ -74,9 +84,7 @@ class RNNamiEntitlementManager: RCTEventEmitter {
     func refresh() {
         NamiEntitlementManager.refresh { entitlements in
             let dicts = entitlements.map { self.entitlementToDictionary($0) }
-            DispatchQueue.main.async {
-                RNNamiEntitlementManager.shared?.sendEvent(withName: "EntitlementsChanged", body: dicts)
-            }
+            self.safeSend(withName: "EntitlementsChanged", body: dicts)
         }
     }
 
@@ -84,9 +92,7 @@ class RNNamiEntitlementManager: RCTEventEmitter {
     func registerActiveEntitlementsHandler() {
         NamiEntitlementManager.registerActiveEntitlementsHandler { entitlements in
             let dicts = entitlements.map { self.entitlementToDictionary($0) }
-            DispatchQueue.main.async {
-                RNNamiEntitlementManager.shared?.sendEvent(withName: "EntitlementsChanged", body: dicts)
-            }
+            self.safeSend(withName: "EntitlementsChanged", body: dicts)
         }
     }
 

package/ios/NamiFlowManagerBridge.m

@@ -17,7 +17,7 @@ RCT_EXTERN_METHOD(finish)
 RCT_EXTERN_METHOD(isFlowOpen:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
 + (BOOL)requiresMainQueueSetup {
-  return NO;
+  return YES;
 }
 
 @end

package/ios/NamiFlowManagerBridge.swift

@@ -19,11 +19,20 @@ class RNNamiFlowManager: RCTEventEmitter {
 
     override init() {
         super.init()
-        RNNamiFlowManager.shared = self
     }
 
-    override static func requiresMainQueueSetup() -> Bool {
-        return false
+    override class func requiresMainQueueSetup() -> Bool { true }
+
+    private var hasListeners = false
+    override func startObserving() { hasListeners = true }
+    override func stopObserving() { hasListeners = false }
+
+    private func safeSend(withName name: String, body: Any?) {
+        guard hasListeners else {
+            print("[RNNamiFlowManager] Warning: no listeners, so event not being sent to JS.")
+            return
+        }
+        sendEvent(withName: name, body: body)
     }
 
     override func supportedEvents() -> [String]! {
@@ -39,36 +48,26 @@ class RNNamiFlowManager: RCTEventEmitter {
                 payload["handoffData"] = data
             }
 
-            DispatchQueue.main.async {
-                RNNamiFlowManager.shared?.sendEvent(withName: "Handoff", body: payload)
-            }
+            self.safeSend(withName: "Handoff", body: payload)
         }
     }
 
     @objc func registerEventHandler() {
         NamiFlowManager.registerEventHandler { payload in
-            DispatchQueue.main.async {
-                RNNamiFlowManager.shared?.sendEvent(withName: "FlowEvent", body: payload)
-            }
+            self.safeSend(withName: "FlowEvent", body: payload)
         }
     }
 
     @objc func resume() {
-        DispatchQueue.main.async {
-            NamiFlowManager.resume()
-        }
+        NamiFlowManager.resume()
     }
 
     @objc func pause() {
-        DispatchQueue.main.async {
-            NamiFlowManager.pause()
-        }
+        NamiFlowManager.pause()
     }
 
     @objc func finish() {
-        DispatchQueue.main.async {
-            NamiFlowManager.finish()
-        }
+        NamiFlowManager.finish()
     }
 
     @objc func isFlowOpen(_ resolve: @escaping RCTPromiseResolveBlock, rejecter _: @escaping RCTPromiseRejectBlock) {

package/ios/NamiPaywallManagerBridge.m

@@ -13,7 +13,7 @@
 
 #import "React/RCTViewManager.h"
 
-@interface RCT_EXTERN_MODULE(RNNamiPaywallManager, NSObject)
+@interface RCT_EXTERN_MODULE(RNNamiPaywallManager, RCTEventEmitter)
 
 RCT_EXTERN_METHOD(buySkuComplete:(NSDictionary)dict)
 
@@ -46,7 +46,7 @@ RCT_EXTERN_METHOD(setAppSuppliedVideoDetails:(NSString *)url name:(nullable NSSt
 RCT_EXTERN_METHOD(allowUserInteraction:(BOOL *)allowed)
 
 + (BOOL)requiresMainQueueSetup {
-  return NO;
+  return YES;
 }
 
 @end

package/ios/NamiPaywallManagerBridge.swift

@@ -19,7 +19,20 @@ class RNNamiPaywallManager: RCTEventEmitter {
 
     override init() {
         super.init()
-        RNNamiPaywallManager.shared = self
+    }
+
+    override class func requiresMainQueueSetup() -> Bool { true }
+
+    private var hasListeners = false
+    override func startObserving() { hasListeners = true }
+    override func stopObserving() { hasListeners = false }
+
+    private func safeSend(withName name: String, body: Any?) {
+        guard hasListeners else {
+            print("[RNNamiPaywallManager] Warning: no listeners, so event not being sent to JS.")
+            return
+        } // optional but avoids warnings
+        sendEvent(withName: name, body: body)
     }
 
     override func supportedEvents() -> [String]! {
@@ -80,9 +93,7 @@ class RNNamiPaywallManager: RCTEventEmitter {
     func registerBuySkuHandler() {
         NamiPaywallManager.registerBuySkuHandler { sku in
             let dictionary = RNNamiPurchaseManager.skuToSKUDict(sku)
-            DispatchQueue.main.async {
-                RNNamiPaywallManager.shared?.sendEvent(withName: "RegisterBuySKU", body: dictionary)
-            }
+            self.safeSend(withName: "RegisterBuySKU", body: dictionary)
         }
     }
 
@@ -90,9 +101,7 @@ class RNNamiPaywallManager: RCTEventEmitter {
     func registerCloseHandler() {
         NamiPaywallManager.registerCloseHandler { _ in
             let dictionary = NSDictionary(dictionary: ["PaywallCloseRequested": true].compactMapValues { $0 })
-            DispatchQueue.main.async {
-                RNNamiPaywallManager.shared?.sendEvent(withName: "PaywallCloseRequested", body: dictionary)
-            }
+            self.safeSend(withName: "PaywallCloseRequested", body: dictionary)
         }
     }
 
@@ -100,9 +109,7 @@ class RNNamiPaywallManager: RCTEventEmitter {
     func registerSignInHandler() {
         NamiPaywallManager.registerSignInHandler { _ in
             let dictionary = NSDictionary(dictionary: ["PaywallSignInRequested": true].compactMapValues { $0 })
-            DispatchQueue.main.async {
-                RNNamiPaywallManager.shared?.sendEvent(withName: "PaywallSignInRequested", body: dictionary)
-            }
+            self.safeSend(withName: "PaywallSignInRequested", body: dictionary)
         }
     }
 
@@ -110,18 +117,14 @@ class RNNamiPaywallManager: RCTEventEmitter {
     func registerRestoreHandler() {
         NamiPaywallManager.registerRestoreHandler {
             let dictionary = NSDictionary(dictionary: ["PaywallRestoreRequested": true].compactMapValues { $0 })
-            DispatchQueue.main.async {
-                RNNamiPaywallManager.shared?.sendEvent(withName: "PaywallRestoreRequested", body: dictionary)
-            }
+            self.safeSend(withName: "PaywallRestoreRequested", body: dictionary)
         }
     }
 
     @objc(registerDeeplinkActionHandler)
     func registerDeeplinkActionHandler() {
         NamiPaywallManager.registerDeeplinkActionHandler { url in
-            DispatchQueue.main.async {
-                RNNamiPaywallManager.shared?.sendEvent(withName: "PaywallDeeplinkAction", body: url)
-            }
+            self.safeSend(withName: "PaywallDeeplinkAction", body: url)
         }
     }
 

package/ios/NamiPurchaseManagerBridge.m

@@ -13,7 +13,7 @@
 
 #import "React/RCTViewManager.h"
 
-@interface RCT_EXTERN_MODULE(RNNamiPurchaseManager, NSObject)
+@interface RCT_EXTERN_MODULE(RNNamiPurchaseManager, RCTEventEmitter)
 
 RCT_EXTERN_METHOD(allPurchases:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
@@ -30,7 +30,7 @@ RCT_EXTERN_METHOD(presentCodeRedemptionSheet)
 RCT_EXTERN_METHOD(restorePurchases)
 
 + (BOOL)requiresMainQueueSetup {
-  return NO;
+  return YES;
 }
 
 @end

package/ios/NamiPurchaseManagerBridge.swift

@@ -19,7 +19,20 @@ class RNNamiPurchaseManager: RCTEventEmitter {
 
     override init() {
         super.init()
-        RNNamiPurchaseManager.shared = self
+    }
+
+    override class func requiresMainQueueSetup() -> Bool { true }
+
+    private var hasListeners = false
+    override func startObserving() { hasListeners = true }
+    override func stopObserving() { hasListeners = false }
+
+    private func safeSend(withName name: String, body: Any?) {
+        guard hasListeners else {
+            print("[RNNamiPurchaseManager] Warning: no listeners, so event not being sent to JS.")
+            return
+        }
+        sendEvent(withName: name, body: body)
     }
 
     override func supportedEvents() -> [String]! {
@@ -158,7 +171,7 @@ class RNNamiPurchaseManager: RCTEventEmitter {
                 "purchaseState": stateString,
                 "error": error?.localizedDescription,
             ]
-            self.sendEvent(withName: "PurchasesChanged", body: payload)
+            self.safeSend(withName: "PurchasesChanged", body: payload)
         }
     }
 
@@ -187,7 +200,7 @@ class RNNamiPurchaseManager: RCTEventEmitter {
                 "newPurchases": newPurchasesDictionaries,
                 "oldPurchases": oldPurchasesDictionaries,
             ]
-            RNNamiPurchaseManager.shared?.sendEvent(withName: "RestorePurchasesStateChanged", body: payload)
+            self.safeSend(withName: "RestorePurchasesStateChanged", body: payload)
         }
     }
 
@@ -216,7 +229,7 @@ class RNNamiPurchaseManager: RCTEventEmitter {
                 "newPurchases": newPurchasesDictionaries,
                 "oldPurchases": oldPurchasesDictionaries,
             ]
-            RNNamiPurchaseManager.shared?.sendEvent(withName: "RestorePurchasesStateChanged", body: payload)
+            self.safeSend(withName: "RestorePurchasesStateChanged", body: payload)
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.3.2-1",
+  "version": "3.3.2-4",
   "description": "React Native Module for Nami - Easy subscriptions & in-app purchases, with powerful built-in paywalls and A/B testing.",
   "main": "index.ts",
   "types": "dist/index.d.ts",

package/react-native-nami-sdk.podspec

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.requires_arc  = true
   s.swift_version = '5.0'  # or your supported version
 
-  s.dependency 'Nami', '3.3.2.3'
+  s.dependency 'Nami', '3.3.2.10'
   s.dependency 'React'
 
   s.pod_target_xcconfig = {

package/src/version.ts

@@ -2,4 +2,4 @@
  * Auto-generated file. Do not edit manually.
  * React Native Nami SDK version.
  */
-export const NAMI_REACT_NATIVE_VERSION = '3.3.2-1';
+export const NAMI_REACT_NATIVE_VERSION = '3.3.2-4';