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

package/ios/NamiCustomerManager.swift

@@ -9,17 +9,26 @@ import Foundation
 import NamiApple
 import React
 
-// #if RCT_NEW_ARCH_ENABLED
-//    extension RNNamiCustomerManager: RCTTurboModule {}
-// #endif
-
 @objc(RNNamiCustomerManager)
 class RNNamiCustomerManager: RCTEventEmitter {
     public static var shared: RNNamiCustomerManager?
 
     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 +55,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 +89,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 +191,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

@@ -9,10 +9,6 @@ import Foundation
 import NamiApple
 import React
 
-// #if RCT_NEW_ARCH_ENABLED
-//     extension RNNamiEntitlementManager: RCTTurboModule {}
-// #endif
-
 @objc(RNNamiEntitlementManager)
 class RNNamiEntitlementManager: RCTEventEmitter {
     public static var shared: RNNamiEntitlementManager?
@@ -22,8 +18,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 +80,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 +88,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

@@ -9,21 +9,26 @@ import Foundation
 import NamiApple
 import React
 
-// #if RCT_NEW_ARCH_ENABLED
-//     extension RNNamiFlowManager: RCTTurboModule {}
-// #endif
-
 @objc(RNNamiFlowManager)
 class RNNamiFlowManager: RCTEventEmitter {
     public static var shared: RNNamiFlowManager?
 
     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 +44,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/NamiOverlayControlBridge.m

@@ -0,0 +1,17 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+
+@interface RCT_EXTERN_MODULE(RNNamiOverlayControl, RCTEventEmitter)
+
+RCT_EXTERN_METHOD(presentOverlay:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(finishOverlay:(NSDictionary *)result
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
++ (BOOL)requiresMainQueueSetup {
+  return YES;
+}
+
+@end

package/ios/NamiOverlayControlBridge.swift

@@ -0,0 +1,132 @@
+import Foundation
+import React
+import UIKit
+
+@objc(RNNamiOverlayControl)
+class NamiOverlayControlBridge: RCTEventEmitter {
+    private var overlayViewController: UIViewController?
+    private var hasListeners = false
+    private var isPresenting = false
+    private var isDismissing = false
+
+    override static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
+
+    override func supportedEvents() -> [String]! {
+        return ["NamiOverlayReady", "NamiOverlayResult"]
+    }
+
+    override func startObserving() { hasListeners = true }
+    override func stopObserving() { hasListeners = false }
+
+    private func safeSend(withName name: String, body: Any?) {
+        guard hasListeners else {
+            print("[RNNamiOverlayControl] Warning: no listeners, so event not being sent to JS.")
+            return
+        }
+        sendEvent(withName: name, body: body)
+    }
+
+    @objc func presentOverlay(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        DispatchQueue.main.async {
+            // If we're already presenting or dismissing, wait and retry
+            if self.isPresenting || self.isDismissing {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+                    self.presentOverlay(resolve, rejecter: reject)
+                }
+                return
+            }
+
+            // Find the root view controller more reliably
+            var rootViewController: UIViewController?
+
+            if #available(iOS 13.0, *) {
+                rootViewController = UIApplication.shared.connectedScenes
+                    .compactMap { $0 as? UIWindowScene }
+                    .flatMap { $0.windows }
+                    .first(where: { $0.isKeyWindow })?.rootViewController
+            } else {
+                rootViewController = UIApplication.shared.keyWindow?.rootViewController
+            }
+
+            guard let rootVC = rootViewController else {
+                reject("NO_ROOT_VIEW_CONTROLLER", "No root view controller available", nil)
+                return
+            }
+
+            // Create a React Native view controller for the overlay
+            guard let bridge = self.bridge else {
+                reject("NO_BRIDGE", "React Native bridge not available", nil)
+                return
+            }
+
+            let rootView = RCTRootView(
+                bridge: bridge,
+                moduleName: "NamiOverlayHost",
+                initialProperties: [:]
+            )
+
+            let overlayViewController = UIViewController()
+            overlayViewController.view = rootView
+            overlayViewController.modalPresentationStyle = .overFullScreen
+            overlayViewController.modalTransitionStyle = .crossDissolve
+            overlayViewController.view.backgroundColor = UIColor.clear
+
+            self.overlayViewController = overlayViewController
+
+            // Find the top-most presented view controller
+            var topController = rootVC
+            while let presented = topController.presentedViewController {
+                topController = presented
+            }
+
+            // Check if the top controller can present (not already in the process of presenting/dismissing)
+            if topController.isBeingPresented || topController.isBeingDismissed {
+                // Wait longer and try again
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                    self.presentOverlay(resolve, rejecter: reject)
+                }
+                return
+            }
+
+            self.isPresenting = true
+
+            topController.present(overlayViewController, animated: false) {
+                self.isPresenting = false
+                // Emit ready event after presentation completes
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                    if self.hasListeners {
+                        self.safeSend(withName: "NamiOverlayReady", body: nil)
+                    }
+                }
+                resolve(nil)
+            }
+        }
+    }
+
+    @objc func finishOverlay(_ result: NSDictionary?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter _: @escaping RCTPromiseRejectBlock) {
+        DispatchQueue.main.async {
+            guard let overlayViewController = self.overlayViewController else {
+                resolve(nil)
+                return
+            }
+
+            // Emit result to listeners
+            if self.hasListeners {
+                self.safeSend(withName: "NamiOverlayResult", body: result)
+            }
+
+            self.isDismissing = true
+
+            overlayViewController.dismiss(animated: false) {
+                self.overlayViewController = nil
+                self.isDismissing = false
+                // Add a longer delay before resolving to ensure the view controller is fully dismissed
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
+                    resolve(nil)
+                }
+            }
+        }
+    }
+}

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

@@ -9,17 +9,26 @@ import Foundation
 import NamiApple
 import React
 
-// #if RCT_NEW_ARCH_ENABLED
-//     extension RNNamiPaywallManager: RCTTurboModule {}
-// #endif
-
 @objc(RNNamiPaywallManager)
 class RNNamiPaywallManager: RCTEventEmitter {
     public static var shared: RNNamiPaywallManager?
 
     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 +89,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 +97,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 +105,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 +113,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

@@ -9,17 +9,26 @@ import Foundation
 import NamiApple
 import React
 
-// #if RCT_NEW_ARCH_ENABLED
-//     extension RNNamiPurchaseManager: RCTTurboModule {}
-// #endif
-
 @objc(RNNamiPurchaseManager)
 class RNNamiPurchaseManager: RCTEventEmitter {
     public static var shared: RNNamiPurchaseManager?
 
     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 +167,7 @@ class RNNamiPurchaseManager: RCTEventEmitter {
                 "purchaseState": stateString,
                 "error": error?.localizedDescription,
             ]
-            self.sendEvent(withName: "PurchasesChanged", body: payload)
+            self.safeSend(withName: "PurchasesChanged", body: payload)
         }
     }
 
@@ -187,7 +196,7 @@ class RNNamiPurchaseManager: RCTEventEmitter {
                 "newPurchases": newPurchasesDictionaries,
                 "oldPurchases": oldPurchasesDictionaries,
             ]
-            RNNamiPurchaseManager.shared?.sendEvent(withName: "RestorePurchasesStateChanged", body: payload)
+            self.safeSend(withName: "RestorePurchasesStateChanged", body: payload)
         }
     }
 
@@ -216,7 +225,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,17 +1,24 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.3.2",
-  "description": "React Native Module for Nami - Easy subscriptions & in-app purchases, with powerful built-in paywalls and A/B testing.",
+  "version": "3.3.3-1",
+  "description": "React Native SDK for Nami - No-code paywall management with A/B testing.",
   "main": "index.ts",
   "types": "dist/index.d.ts",
   "codegenConfig": {
-    "name": "Nami",
+    "name": "NativeNamiSpec",
     "type": "modules",
     "jsSrcsDir": "./specs",
     "android": {
       "javaPackageName": "com.namiml.reactnative"
     }
   },
+  "react-native": {
+    "android": {
+      "sourceDir": "android",
+      "packageImportPath": "com.namiml.reactnative.NamiBridgePackage",
+      "libraryName": "react-native-nami-sdk"
+    }
+  },
   "scripts": {
     "build": "tsc",
     "generate:version": "ts-node scripts/generate-version.ts",