rampkit-expo-dev 0.0.71 → 0.0.73

package/build/RampKit.js

@@ -297,6 +297,8 @@ class RampKitCore {
                     var _a;
                     // Track onboarding completed - trigger: finished
                     EventManager_1.eventManager.trackOnboardingCompleted("finished", screens.length, screens.length, onboardingId);
+                    // Auto-recheck transactions after onboarding finishes (catches purchases made during onboarding)
+                    RampKitNative_1.TransactionObserver.recheck().catch(() => { });
                     try {
                         (_a = this.onOnboardingFinished) === null || _a === void 0 ? void 0 : _a.call(this, payload);
                     }
@@ -306,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 {
@@ -323,6 +327,8 @@ class RampKitCore {
                 onCloseAction: (screenIndex, _screenId) => {
                     // Track onboarding completed - trigger: closed
                     EventManager_1.eventManager.trackOnboardingCompleted("closed", screenIndex + 1, screens.length, onboardingId);
+                    // Auto-recheck transactions after onboarding closes (catches purchases made before closing)
+                    RampKitNative_1.TransactionObserver.recheck().catch(() => { });
                 },
             });
         }

package/ios/RampKitModule.swift

@@ -486,10 +486,25 @@ public class RampKitModule: Module {
   /// Check all current entitlements and track any we haven't seen before
   /// This catches purchases made by Superwall/RevenueCat before our observer started
   /// 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
+  /// in UserDefaults ONLY after a successful send.
   @available(iOS 15.0, *)
   private func checkAndTrackCurrentEntitlements() async -> [String: Any] {
-    print("[RampKit] 🔍 Checking current entitlements for missed purchases...")
-    print("[RampKit] 📚 Currently have \(trackedTransactionIds.count) tracked transaction IDs in storage")
+    print("[RampKit] ")
+    print("[RampKit] ════════════════════════════════════════════════════════════")
+    print("[RampKit] 🔍 CHECKING ENTITLEMENTS FOR UNSENT PURCHASES")
+    print("[RampKit] ════════════════════════════════════════════════════════════")
+    print("[RampKit] ")
+    print("[RampKit] 📚 Tracked transaction IDs in storage: \(trackedTransactionIds.count)")
+    if !trackedTransactionIds.isEmpty {
+      print("[RampKit]    These IDs were SUCCESSFULLY sent to backend (HTTP 2xx):")
+      for id in trackedTransactionIds {
+        print("[RampKit]    - \(id)")
+      }
+    }
+    print("[RampKit] ")
 
     let formatter = ISO8601DateFormatter()
     formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
@@ -537,25 +552,35 @@ public class RampKitModule: Module {
       print("[RampKit]    - purchaseDate: \(formatter.string(from: transaction.purchaseDate))")
 
       // Check if we've already tracked this transaction
-      if trackedTransactionIds.contains(originalId) {
+      // "Tracked" means we successfully sent a purchase_completed event to the backend
+      // 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 (originalTransactionId in tracked set)")
+        print("[RampKit]    ✅ STATUS: ALREADY SENT TO BACKEND")
+        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)
@@ -567,10 +592,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")
@@ -578,15 +603,19 @@ public class RampKitModule: Module {
     }
 
     print("[RampKit] ")
-    print("[RampKit] 🔍 ═══════════════════════════════════════════")
-    print("[RampKit] 🔍 ENTITLEMENT CHECK SUMMARY:")
-    print("[RampKit] 🔍 ═══════════════════════════════════════════")
-    print("[RampKit]    Total entitlements found: \(foundCount)")
-    print("[RampKit]    Already sent to backend:  \(trackedCount)")
-    print("[RampKit]    Skipped (renewal/revoked): \(skippedReasons.count)")
-    print("[RampKit]    NEW events sent:          \(newCount)")
-    print("[RampKit]    Tracked IDs in storage:   \(trackedTransactionIds.count)")
-    print("[RampKit] 🔍 ═══════════════════════════════════════════")
+    print("[RampKit] ════════════════════════════════════════════════════════════")
+    print("[RampKit] 📊 ENTITLEMENT CHECK SUMMARY")
+    print("[RampKit] ════════════════════════════════════════════════════════════")
+    print("[RampKit]    Total entitlements 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)")
+    print("[RampKit]    Total tracked IDs in storage: \(trackedTransactionIds.count)")
+    if newCount == 0 && foundCount > 0 {
+      print("[RampKit] ")
+      print("[RampKit]    ℹ️  All purchases already sent or skipped - nothing new to send")
+    }
+    print("[RampKit] ════════════════════════════════════════════════════════════")
 
     return [
       "totalFound": foundCount,
@@ -620,39 +649,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)")
         }
@@ -914,8 +942,8 @@ public class RampKitModule: Module {
     }
   }
   
-  private func sendPurchaseEvent(appId: String, userId: String, eventName: String, properties: [String: Any]) async {
-    let _ = await sendPurchaseEventWithResult(appId: appId, userId: userId, eventName: eventName, properties: properties)
+  private func sendPurchaseEvent(appId: String, userId: String, eventName: String, properties: [String: Any], paywallId: String? = nil) async {
+    let _ = await sendPurchaseEventWithResult(appId: appId, userId: userId, eventName: eventName, properties: properties, paywallId: paywallId)
   }
 
   private struct SendEventResult {
@@ -924,7 +952,16 @@ public class RampKitModule: Module {
     let error: String?
   }
 
-  private func sendPurchaseEventWithResult(appId: String, userId: String, eventName: String, properties: [String: Any]) async -> SendEventResult {
+  private func sendPurchaseEventWithResult(appId: String, userId: String, eventName: String, properties: [String: Any], paywallId: String? = nil) async -> SendEventResult {
+    // Build context with optional paywallId for attribution
+    var context: [String: Any] = [
+      "locale": Locale.current.identifier,
+      "regionCode": Locale.current.regionCode as Any
+    ]
+    if let paywallId = paywallId {
+      context["paywallId"] = paywallId
+    }
+
     let event: [String: Any] = [
       "appId": appId,
       "appUserId": userId,
@@ -937,17 +974,53 @@ public class RampKitModule: Module {
         "platformVersion": UIDevice.current.systemVersion,
         "deviceModel": getDeviceModelIdentifier(),
         "sdkVersion": "1.0.0",
-        "appVersion": Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String,
-        "buildNumber": Bundle.main.infoDictionary?["CFBundleVersion"] as? String
-      ],
-      "context": [
-        "locale": Locale.current.identifier,
-        "regionCode": Locale.current.regionCode
+        "appVersion": Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "unknown",
+        "buildNumber": Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "unknown"
       ],
+      "context": context,
       "properties": properties
     ]
 
+    // DETAILED LOGGING: Log the full request body
+    print("[RampKit] ")
+    print("[RampKit] ════════════════════════════════════════════════════════════")
+    print("[RampKit] 📤 SENDING PURCHASE EVENT TO BACKEND")
+    print("[RampKit] ════════════════════════════════════════════════════════════")
+    print("[RampKit] URL: https://uustlzuvjmochxkxatfx.supabase.co/functions/v1/app-user-events")
+    print("[RampKit] Method: POST")
+    print("[RampKit] ")
+    print("[RampKit] 📋 REQUEST BODY:")
+    print("[RampKit]    appId: \(appId)")
+    print("[RampKit]    appUserId: \(userId)")
+    print("[RampKit]    eventName: \(eventName)")
+    if let originalTxId = properties["originalTransactionId"] {
+      print("[RampKit]    properties.originalTransactionId: \(originalTxId) ✓ (CRITICAL for attribution)")
+    } else {
+      print("[RampKit]    ⚠️ WARNING: properties.originalTransactionId is MISSING!")
+    }
+    if let productId = properties["productId"] {
+      print("[RampKit]    properties.productId: \(productId)")
+    }
+    if let amount = properties["amount"], let currency = properties["currency"] {
+      print("[RampKit]    properties.amount: \(amount) \(currency)")
+    }
+    if let paywallId = paywallId {
+      print("[RampKit]    context.paywallId: \(paywallId) ✓")
+    }
+
+    // Log full JSON for debugging
+    if let jsonData = try? JSONSerialization.data(withJSONObject: event, options: .prettyPrinted),
+       let jsonString = String(data: jsonData, encoding: .utf8) {
+      print("[RampKit] ")
+      print("[RampKit] 📄 FULL JSON PAYLOAD:")
+      for line in jsonString.components(separatedBy: "\n") {
+        print("[RampKit]    \(line)")
+      }
+    }
+    print("[RampKit] ════════════════════════════════════════════════════════════")
+
     guard let url = URL(string: "https://uustlzuvjmochxkxatfx.supabase.co/functions/v1/app-user-events") else {
+      print("[RampKit] ❌ SEND FAILED: Invalid URL")
       return SendEventResult(success: false, statusCode: 0, error: "Invalid URL")
     }
 
@@ -959,15 +1032,40 @@ public class RampKitModule: Module {
 
     do {
       request.httpBody = try JSONSerialization.data(withJSONObject: event)
-      let (_, response) = try await URLSession.shared.data(for: request)
+      let (data, response) = try await URLSession.shared.data(for: request)
+
       if let httpResponse = response as? HTTPURLResponse {
-        print("[RampKit] Purchase event sent: \(eventName) - Status: \(httpResponse.statusCode)")
         let success = httpResponse.statusCode >= 200 && httpResponse.statusCode < 300
-        return SendEventResult(success: success, statusCode: httpResponse.statusCode, error: success ? nil : "HTTP \(httpResponse.statusCode)")
+        let responseBody = String(data: data, encoding: .utf8) ?? "(empty)"
+
+        // DETAILED LOGGING: Log the response
+        print("[RampKit] ")
+        print("[RampKit] 📥 RESPONSE FROM BACKEND:")
+        print("[RampKit]    HTTP Status: \(httpResponse.statusCode)")
+        print("[RampKit]    Success: \(success ? "✅ YES" : "❌ NO")")
+        print("[RampKit]    Response Body: \(responseBody)")
+
+        if success {
+          print("[RampKit] ")
+          print("[RampKit] ✅ EVENT SENT SUCCESSFULLY!")
+          print("[RampKit]    originalTransactionId \(properties["originalTransactionId"] ?? "unknown") will be marked as SENT")
+          print("[RampKit] ════════════════════════════════════════════════════════════")
+        } else {
+          print("[RampKit] ")
+          print("[RampKit] ❌ EVENT SEND FAILED!")
+          print("[RampKit]    Will retry on next app launch")
+          print("[RampKit] ════════════════════════════════════════════════════════════")
+        }
+
+        return SendEventResult(success: success, statusCode: httpResponse.statusCode, error: success ? nil : "HTTP \(httpResponse.statusCode): \(responseBody)")
       }
+      print("[RampKit] ❌ SEND FAILED: No HTTP response")
       return SendEventResult(success: false, statusCode: 0, error: "No HTTP response")
     } catch {
-      print("[RampKit] Failed to send purchase event: \(error)")
+      print("[RampKit] ")
+      print("[RampKit] ❌ SEND FAILED: Network error")
+      print("[RampKit]    Error: \(error.localizedDescription)")
+      print("[RampKit] ════════════════════════════════════════════════════════════")
       return SendEventResult(success: false, statusCode: 0, error: error.localizedDescription)
     }
   }

package/package.json

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