Merge pull request #424 from superwall/develop

4.12.8

Author: yusuftor

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 The changelog for `SuperwallKit`. Also see the [releases](https://github.com/superwall/Superwall-iOS/releases) on GitHub.
 
+## 4.12.8
+
+### Enhancements
+
+- Exposes the `introOfferToken` on `StoreProduct` so that those using a PurchaseController can take advantage of the introductory offer eligiblity override.
+
+### Fixes
+
+- Stop logging `paywallWebviewLoad_timeout` events because they were confusing.
+- Only refreshes terminated webviews once to avoid infinite reloading loops on low RAM devices.
+
 ## 4.12.7
 
 ### Fixes

Sources/SuperwallKit/Misc/Constants.swift

@@ -18,5 +18,5 @@ let sdkVersion = """
 */
 
 let sdkVersion = """
-4.12.7
+4.12.8
 """

Sources/SuperwallKit/Models/Paywall/IntroOfferToken.swift

@@ -15,9 +15,16 @@ struct IntroOfferTokenWrapper: Codable {
   }
 }
 
-struct IntroOfferToken: Codable {
-  let token: String
-  let expiry: Date
+/// A token used to override Apple's automatic intro offer eligibility determination.
+///
+/// Use this token with StoreKit 2's `.introductoryOfferEligibility(compactJWS:)`
+/// purchase option to apply intro offer eligibility on iOS 18.2+.
+public struct IntroOfferToken: Codable, Sendable {
+  /// The JWT token string to pass to StoreKit.
+  public let token: String
+
+  /// The expiration date of the token.
+  public let expiry: Date
 
   enum CodingKeys: String, CodingKey {
     case token
@@ -29,15 +36,15 @@ struct IntroOfferToken: Codable {
     self.expiry = expiry
   }
 
-  init(from decoder: Decoder) throws {
+  public init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
     token = try container.decode(String.self, forKey: .token)
 
     let timestamp = try container.decode(Milliseconds.self, forKey: .expiry)
     expiry = Date(timeIntervalSince1970: timestamp / 1000)
   }
 
-  func encode(to encoder: Encoder) throws {
+  public func encode(to encoder: Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
     try container.encode(token, forKey: .token)
     try container.encode(expiry.timeIntervalSince1970 * 1000, forKey: .expiry)

Sources/SuperwallKit/Paywall/View Controller/PaywallViewController.swift

@@ -621,14 +621,6 @@ public class PaywallViewController: UIViewController, LoadingDelegate {
         self.exitButton.isHidden = false
         self.exitButton.alpha = 0.0
 
-        Task(priority: .utility) {
-          let webviewTimeout = await InternalSuperwallEvent.PaywallWebviewLoad(
-            state: .timeout,
-            paywallInfo: self.info
-          )
-          await Superwall.shared.track(webviewTimeout)
-        }
-
         UIView.springAnimate(withDuration: 2) {
           self.refreshPaywallButton.alpha = 1.0
           self.exitButton.alpha = 1.0

Sources/SuperwallKit/Paywall/View Controller/Web View/SWWebView.swift

@@ -45,6 +45,14 @@ class SWWebView: WKWebView {
   private var completion: ((Error?) -> Void)?
   private let enableIframeNavigation: Bool
 
+  /// Tracks the number of times the WebView process has terminated and been reloaded.
+  /// Used to prevent infinite reload loops on memory-constrained devices.
+  private var processTerminationRetryCount = 0
+
+  /// Maximum number of automatic reloads after process termination.
+  /// After this limit, the WebView will be reloaded when presented instead.
+  private let maxProcessTerminationRetries = 1
+
   init(
     isMac: Bool,
     messageHandler: PaywallMessageHandler,
@@ -231,6 +239,8 @@ extension SWWebView: WKNavigationDelegate {
   }
 
   func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+    // Reset retry count on successful load
+    processTerminationRetryCount = 0
     completion?(nil)
   }
 
@@ -251,7 +261,17 @@ extension SWWebView: WKNavigationDelegate {
   }
 
   func webViewWebContentProcessDidTerminate(_ webView: WKWebView) {
-    webView.reload()
+    // Only reload if we haven't exceeded the retry limit.
+    // This prevents infinite reload loops on memory-constrained devices
+    // where iOS keeps terminating the WebView process.
+    if processTerminationRetryCount < maxProcessTerminationRetries {
+      processTerminationRetryCount += 1
+      webView.reload()
+    } else {
+      // Mark as failed so the WebView will be reloaded when presented again
+      // via PaywallViewController.viewWillAppear checking didFailToLoad.
+      loadingHandler.didFailToLoad = true
+    }
 
     Task {
       guard let paywallInfo = delegate?.info else {

Sources/SuperwallKit/StoreKit/Products/StoreProduct/StoreProduct.swift

@@ -29,6 +29,22 @@ public typealias SK2Product = StoreKit.Product
 public final class StoreProduct: NSObject, StoreProductType, Sendable {
   let product: StoreProductType
 
+  /// The intro offer eligibility token for this product, if available.
+  ///
+  /// Use this token with StoreKit 2's `.introductoryOfferEligibility(compactJWS:)`
+  /// purchase option to override Apple's automatic eligibility determination.
+  ///
+  /// This property is only populated when purchasing from a Superwall paywall and
+  /// is only applicable on iOS 18.2+.
+  ///
+  /// Example usage in a custom `PurchaseController`:
+  /// ```swift
+  /// if let token = product.introOfferToken {
+  ///   options.insert(.introductoryOfferEligibility(compactJWS: token.token))
+  /// }
+  /// ```
+  public nonisolated(unsafe) var introOfferToken: IntroOfferToken?
+
   /// A `Set` of ``Entitlements`` associated with the product.
   public var entitlements: Set<Entitlement> {
     product.entitlements

Sources/SuperwallKit/StoreKit/Transactions/Purchasing/StoreKit 2/ProductPurchaserSK2.swift

@@ -83,7 +83,7 @@ final class ProductPurchaserSK2: Purchasing {
   }
 
   func purchase(product: StoreProduct) async -> PurchaseResult {
-    guard let product = product.sk2Product else {
+    guard let sk2Product = product.sk2Product else {
       return .cancelled
     }
     do {
@@ -95,8 +95,7 @@ final class ProductPurchaserSK2: Purchasing {
       #if compiler(>=6.1)
       // Add intro offer eligibility token if available for this product
       // This allows overriding Apple's automatic eligibility determination
-      if let paywallViewController = Superwall.shared.paywallViewController,
-        let token = await paywallViewController.introOfferTokenManager.getValidToken(for: product.id) {
+      if let token = product.introOfferToken {
         options.insert(.introductoryOfferEligibility(compactJWS: token.token))
       }
       #endif
@@ -110,9 +109,9 @@ final class ProductPurchaserSK2: Purchasing {
       guard let scene = await sharedApplication.connectedScenes.first else {
         return .cancelled
       }
-      result = try await product.purchase(confirmIn: scene, options: options)
+      result = try await sk2Product.purchase(confirmIn: scene, options: options)
       #else
-      result = try await product.purchase(options: options)
+      result = try await sk2Product.purchase(options: options)
       #endif
 
       switch result {

Sources/SuperwallKit/StoreKit/Transactions/TransactionManager.swift

@@ -428,6 +428,13 @@ final class TransactionManager {
     _ product: StoreProduct,
     purchaseSource: PurchaseSource
   ) async -> PurchaseResult {
+    // Attach intro offer token if available from the paywall
+    if case .internal(_, let paywallViewController, _) = purchaseSource {
+      product.introOfferToken = await paywallViewController
+        .introOfferTokenManager
+        .getValidToken(for: product.productIdentifier)
+    }
+
     switch purchaseSource {
     case .internal:
       return await purchaseController.purchase(product: product)

SuperwallKit.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 	s.name         = "SuperwallKit"
-  s.version      = "4.12.7"
+  s.version      = "4.12.8"
 	s.summary      = "Superwall: In-App Paywalls Made Easy"
 	s.description  = "Paywall infrastructure for mobile apps :) we make things like editing your paywall and running price tests as easy as clicking a few buttons. superwall.com"