rampkit-expo-dev 0.0.72 → 0.0.74

package/build/RampKit.js

@@ -308,6 +308,8 @@ class RampKitCore {
                     // Track onboarding completed - trigger: paywall_shown
                     EventManager_1.eventManager.trackOnboardingCompleted("paywall_shown", screens.length, // We don't know exact step, use total
                     screens.length, onboardingId);
+                    // Auto-recheck transactions after paywall shown (catches purchases made during onboarding)
+                    RampKitNative_1.TransactionObserver.recheck().catch(() => { });
                     // Call the original callback
                     const paywallCallback = (opts === null || opts === void 0 ? void 0 : opts.onShowPaywall) || (opts === null || opts === void 0 ? void 0 : opts.showPaywall) || this.onShowPaywall;
                     try {

package/ios/RampKitModule.swift

@@ -483,18 +483,23 @@ public class RampKitModule: Module {
     return result
   }
 
-  /// Check all current entitlements and track any we haven't seen before
-  /// This catches purchases made by Superwall/RevenueCat before our observer started
+  /// Check ALL transactions (not just current entitlements) and track any we haven't seen before
+  /// This catches ALL purchases including expired/superseded ones made by Superwall/RevenueCat
   /// Returns a dictionary with the results for JavaScript logging
   ///
   /// IMPORTANT: "Already sent" means we previously sent this transaction to the backend
-  /// and received a successful HTTP 2xx response. The originalTransactionId is stored
+  /// and received a successful HTTP 2xx response. The transactionId is stored
   /// in UserDefaults ONLY after a successful send.
+  ///
+  /// NOTE: We use Transaction.all instead of Transaction.currentEntitlements because
+  /// currentEntitlements only returns ACTIVE entitlements. If a user purchases a subscription
+  /// and it expires, or if they upgrade (superseding the old transaction), currentEntitlements
+  /// will NOT include the original purchase. Transaction.all returns the complete history.
   @available(iOS 15.0, *)
   private func checkAndTrackCurrentEntitlements() async -> [String: Any] {
     print("[RampKit] ")
     print("[RampKit] ════════════════════════════════════════════════════════════")
-    print("[RampKit] 🔍 CHECKING ENTITLEMENTS FOR UNSENT PURCHASES")
+    print("[RampKit] 🔍 CHECKING ALL TRANSACTIONS FOR UNSENT PURCHASES")
     print("[RampKit] ════════════════════════════════════════════════════════════")
     print("[RampKit] ")
     print("[RampKit] 📚 Tracked transaction IDs in storage: \(trackedTransactionIds.count)")
@@ -518,11 +523,11 @@ public class RampKitModule: Module {
     var skippedReasons: [[String: Any]] = []
     var alreadyTrackedDetails: [[String: Any]] = []  // NEW: Details of already-tracked transactions
 
-    for await result in Transaction.currentEntitlements {
+    for await result in Transaction.all {
       foundCount += 1
 
       guard case .verified(let transaction) = result else {
-        print("[RampKit] ⚠️ Unverified entitlement skipped")
+        print("[RampKit] ⚠️ Unverified transaction skipped")
         skippedReasons.append(["productId": "unknown", "reason": "unverified"])
         continue
       }
@@ -545,7 +550,7 @@ public class RampKitModule: Module {
         txDetails["environment"] = transaction.environment.rawValue
       }
 
-      print("[RampKit] 📦 Found entitlement:")
+      print("[RampKit] 📦 Found transaction:")
       print("[RampKit]    - productId: \(transaction.productID)")
       print("[RampKit]    - transactionId: \(transactionId)")
       print("[RampKit]    - originalTransactionId: \(originalId)")
@@ -553,30 +558,34 @@ public class RampKitModule: Module {
 
       // Check if we've already tracked this transaction
       // "Tracked" means we successfully sent a purchase_completed event to the backend
-      // and received an HTTP 2xx response. We store the originalTransactionId after success.
-      if trackedTransactionIds.contains(originalId) {
+      // and received an HTTP 2xx response. We store the transactionId after success.
+      // NOTE: We track by transactionId (not originalTransactionId) so renewals are also sent.
+      if trackedTransactionIds.contains(transactionId) {
         trackedCount += 1
         txDetails["status"] = "already_sent"
         alreadyTrackedDetails.append(txDetails)
         print("[RampKit]    ✅ STATUS: ALREADY SENT TO BACKEND")
-        print("[RampKit]       (originalTransactionId \(originalId) is in our sent-transactions storage)")
+        print("[RampKit]       (transactionId \(transactionId) is in our sent-transactions storage)")
         print("[RampKit]       This means we previously sent a purchase_completed event")
         print("[RampKit]       and received a successful HTTP 2xx response.")
         print("[RampKit] ")
         continue
       }
 
-      // Skip renewals and revocations
-      guard transaction.originalID == transaction.id,
-            transaction.revocationDate == nil else {
-        let reason = transaction.revocationDate != nil ? "revoked" : "renewal"
+      // Skip revocations only (NOT renewals - we want to track renewals too!)
+      if transaction.revocationDate != nil {
         txDetails["status"] = "skipped"
-        txDetails["reason"] = reason
+        txDetails["reason"] = "revoked"
         skippedReasons.append(txDetails)
-        print("[RampKit] ⏭️ STATUS: Skipped (\(reason))")
+        print("[RampKit] ⏭️ STATUS: Skipped (revoked)")
         continue
       }
 
+      // Log if this is a renewal
+      if transaction.originalID != transaction.id {
+        print("[RampKit]    ℹ️  This is a RENEWAL (originalID != transactionID)")
+      }
+
       // NEW transaction we haven't seen!
       newCount += 1
       newProductIds.append(transaction.productID)
@@ -588,10 +597,10 @@ public class RampKitModule: Module {
 
       // Only mark as tracked if send succeeded
       if let status = sendResult["status"] as? String, status == "sent" {
-        trackedTransactionIds.insert(originalId)
+        trackedTransactionIds.insert(transactionId)
         saveTrackedTransactions()
         print("[RampKit] ✅ Event sent successfully! HTTP status: \(sendResult["httpStatus"] ?? "unknown")")
-        print("[RampKit] ✅ Marked originalTransactionId \(originalId) as tracked")
+        print("[RampKit] ✅ Marked transactionId \(transactionId) as tracked")
       } else {
         print("[RampKit] ❌ Send failed: \(sendResult["error"] ?? "unknown error")")
         print("[RampKit] ⚠️ Will retry on next app launch")
@@ -600,9 +609,9 @@ public class RampKitModule: Module {
 
     print("[RampKit] ")
     print("[RampKit] ════════════════════════════════════════════════════════════")
-    print("[RampKit] 📊 ENTITLEMENT CHECK SUMMARY")
+    print("[RampKit] 📊 TRANSACTION CHECK SUMMARY")
     print("[RampKit] ════════════════════════════════════════════════════════════")
-    print("[RampKit]    Total entitlements found:     \(foundCount)")
+    print("[RampKit]    Total transactions found:     \(foundCount)")
     print("[RampKit]    Already sent (HTTP 2xx):      \(trackedCount) (no action needed)")
     print("[RampKit]    Skipped (renewal/revoked):    \(skippedReasons.count) (backend gets via S2S)")
     print("[RampKit]    NEW events sent this session: \(newCount)")
@@ -645,39 +654,38 @@ public class RampKitModule: Module {
           continue
         }
 
+        let transactionId = String(transaction.id)
         let originalId = String(transaction.originalID)
 
-        // Skip if already tracked
-        if self.trackedTransactionIds.contains(originalId) {
-          print("[RampKit] ✓ Transaction.updates: Already tracked \(transaction.productID)")
+        // Skip if already tracked (by transactionId, not originalId - so renewals are tracked)
+        if self.trackedTransactionIds.contains(transactionId) {
+          print("[RampKit] ✓ Transaction.updates: Already tracked \(transaction.productID) (txId: \(transactionId))")
           await transaction.finish()
           continue
         }
 
-        // Skip renewals - backend gets these from App Store S2S notifications
-        if transaction.originalID != transaction.id {
-          print("[RampKit] ⏭️ Transaction.updates: skipped (renewal) \(transaction.productID)")
-          await transaction.finish()
-          continue
-        }
-
-        // Skip revocations - backend gets these from S2S notifications
+        // Skip revocations only (NOT renewals - we want to track renewals!)
         if transaction.revocationDate != nil {
           print("[RampKit] ⏭️ Transaction.updates: skipped (revoked) \(transaction.productID)")
           await transaction.finish()
           continue
         }
 
-        print("[RampKit] 🆕 Transaction.updates: NEW purchase \(transaction.productID)")
+        // Log if this is a renewal
+        if transaction.originalID != transaction.id {
+          print("[RampKit] 🔄 Transaction.updates: RENEWAL detected for \(transaction.productID)")
+        }
+
+        print("[RampKit] 🆕 Transaction.updates: NEW transaction \(transaction.productID) (txId: \(transactionId))")
 
         // Track it and check result
         let sendResult = await self.handleTransactionWithResult(transaction)
 
-        // Only mark as tracked if send succeeded
+        // Only mark as tracked if send succeeded (use transactionId for renewals support)
         if let status = sendResult["status"] as? String, status == "sent" {
-          self.trackedTransactionIds.insert(originalId)
+          self.trackedTransactionIds.insert(transactionId)
           self.saveTrackedTransactions()
-          print("[RampKit] ✅ Transaction.updates: Sent and tracked \(transaction.productID)")
+          print("[RampKit] ✅ Transaction.updates: Sent and tracked \(transaction.productID) (txId: \(transactionId))")
         } else {
           print("[RampKit] ⚠️ Transaction.updates: Send failed, will retry \(transaction.productID)")
         }
@@ -1137,10 +1145,10 @@ public class RampKitModule: Module {
   private func trackPurchaseFromProductId(productId: String) async {
     print("[RampKit] 🔍 Looking up transaction for product: \(productId)")
 
-    // Try to find the latest transaction for this product
+    // Try to find the latest transaction for this product (check all transactions, not just current entitlements)
     var latestTransaction: Transaction?
 
-    for await result in Transaction.currentEntitlements {
+    for await result in Transaction.all {
       if case .verified(let transaction) = result {
         if transaction.productID == productId {
           if latestTransaction == nil || transaction.purchaseDate > latestTransaction!.purchaseDate {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rampkit-expo-dev",
-  "version": "0.0.72",
+  "version": "0.0.74",
   "description": "The Expo SDK for RampKit. Build, test, and personalize app onboardings with instant updates.",
   "main": "build/index.js",
   "types": "build/index.d.ts",