some refactoring

packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/InAppPurchasePlugin.swift

@@ -27,8 +27,9 @@ public class InAppPurchasePlugin: NSObject, FlutterPlugin, InAppPurchaseAPI {
   // This property is optional, as it requires self to exist to be initialized.
   public var paymentQueueHandler: FLTPaymentQueueHandlerProtocol?
 
+  // This should be an Task, but Task is on available >= iOS 13
   var updateListenerTask: Any?
-  var transactionListenerAPI: TransactionCallbacks? = nil
+  var transactionDelegate: InAppPurchase2CallbackAPI? = nil
 
   public static func register(with registrar: FlutterPluginRegistrar) {
     #if os(iOS)
@@ -96,7 +97,7 @@ public class InAppPurchasePlugin: NSObject, FlutterPlugin, InAppPurchaseAPI {
       let messenger = registrar.messenger
     #endif
     setupTransactionObserverChannelIfNeeded(withMessenger: messenger)
-    self.transactionListenerAPI = TransactionCallbacks.init(binaryMessenger: messenger)
+    self.transactionDelegate = InAppPurchase2CallbackAPI(binaryMessenger: messenger)
   }
 
   // MARK: - Pigeon Functions

packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/StoreKit2/InAppPurchaseStoreKit2.swift

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 @available(iOS 15.0, macOS 12.0, *)
-extension InAppPurchasePlugin: @preconcurrency InAppPurchase2API {
+extension InAppPurchasePlugin: InAppPurchase2API {
   // MARK: - Pigeon Functions
 
   /// Wrapper method around StoreKit2's canMakePayments() method
@@ -37,12 +37,12 @@ extension InAppPurchasePlugin: @preconcurrency InAppPurchase2API {
 
   /// Gets the appropriate product, then calls purchase on it.
   /// https://developer.apple.com/documentation/storekit/product/3791971-purchase
-  @MainActor
   func purchase(
     id: String, options: SK2ProductPurchaseOptionsMessage?,
     completion: @escaping (Result<SK2ProductPurchaseResultMessage, Error>) -> Void
   ) {
     Task {
+      @MainActor in
       do {
         let product = try await Product.products(for: [id]).first
         guard let product = product else {
@@ -59,7 +59,7 @@ extension InAppPurchasePlugin: @preconcurrency InAppPurchase2API {
         case .success(let verification):
           switch verification {
           case .verified(let transaction):
-            self.transactionListenerAPI?.transactionUpdated(updatedTransactions: transaction)
+            self.sendTransactionUpdate(transaction: transaction)
             completion(.success(result.convertToPigeon()))
           case .unverified(_, let error):
             completion(.failure(error))
@@ -94,6 +94,7 @@ extension InAppPurchasePlugin: @preconcurrency InAppPurchase2API {
     completion: @escaping (Result<[SK2TransactionMessage], Error>) -> Void
   ) {
     Task {
+      @MainActor in
       do {
         let transactionsMsgs = await rawTransactions().map {
           $0.convertToPigeon()
@@ -117,12 +118,12 @@ extension InAppPurchasePlugin: @preconcurrency InAppPurchase2API {
   /// https://developer.apple.com/documentation/storekit/transaction/3851206-updates
   /// This function should be called as soon as the app starts to avoid missing any Transactions done outside of the app.
   func startListeningToTransactions() throws {
-    self.updateListenerTask = Task {
+    self.updateListenerTask = Task { [weak self] in
       for await verificationResult in Transaction.updates {
         switch verificationResult {
         case .verified(let transaction):
-          self.transactionListenerAPI?.transactionUpdated(updatedTransactions: transaction)
-        case .unverified(_, _):
+          self?.sendTransactionUpdate(transaction: transaction)
+        case .unverified:
           break
         }
       }
@@ -131,18 +132,29 @@ extension InAppPurchasePlugin: @preconcurrency InAppPurchase2API {
 
   /// Stop subscribing to Transaction.updates
   func stopListeningToTransactions() throws {
-    self.updateListenerTask = nil
+    getUpdateListenerTask().cancel()
+  }
+
+  /// Sends an transaction back to Dart. Access these transactions with `purchaseStream`
+  func sendTransactionUpdate(transaction: Transaction) {
+    let transactionMsg = transaction.convertToPigeon()
+    transactionDelegate?.onTransactionsUpdated(newTransaction: transactionMsg) { result in
+      switch result {
+      case .success: break
+      case .failure(let error):
+        print("Failed to send transaction updates: \(error)")
+      }
+    }
   }
 
   /// Helper function that fetches and unwraps all verified transactions
   private func rawTransactions() async -> [Transaction] {
     var transactions: [Transaction] = []
-
     for await verificationResult in Transaction.all {
       switch verificationResult {
       case .verified(let transaction):
         transactions.append(transaction)
-      case .unverified(_, _):
+      case .unverified:
         break
       }
     }
@@ -157,10 +169,15 @@ extension InAppPurchasePlugin: @preconcurrency InAppPurchase2API {
         if transaction.id == id {
           return transaction
         }
-      case .unverified(_, _):
+      case .unverified:
         continue
       }
     }
     return nil
   }
+
+  /// Helper function to cast updateListenerTask to a task
+  func getUpdateListenerTask() -> Task<(), Never> {
+    return self.updateListenerTask as! Task<(), Never>
+  }
 }

packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/StoreKit2/TransactionCallbacks.swift

@@ -1,26 +1,27 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-final class TransactionCallbacks: InAppPurchase2CallbackAPI {
-  let callbackAPI: InAppPurchase2CallbackAPI
-
-  init(binaryMessenger: FlutterBinaryMessenger) {
-    callbackAPI = InAppPurchase2CallbackAPI(binaryMessenger: binaryMessenger)
-    super.init(binaryMessenger: binaryMessenger)
-  }
-
-  @available(iOS 15.0, macOS 12.0, *)
-  func transactionUpdated(updatedTransactions: Transaction, restoring: Bool = false) {
-    let transactionMsg = updatedTransactions.convertToPigeon(
-      restoring: restoring)
-    callbackAPI.onTransactionsUpdated(newTransaction: transactionMsg) { result in
-      switch result {
-      case .success: break
-      case .failure(let error):
-        print("Failed to send transaction updates: \(error)")
-      }
-    }
-  }
-
-}
+//// Copyright 2013 The Flutter Authors. All rights reserved.
+//// Use of this source code is governed by a BSD-style license that can be
+//// found in the LICENSE file.
+//
+///// TODO Move to main plugin
+//final class TransactionCallbacks: InAppPurchase2CallbackAPI {
+//  let callbackAPI: InAppPurchase2CallbackAPI
+//
+//  init(binaryMessenger: FlutterBinaryMessenger) {
+//    callbackAPI = InAppPurchase2CallbackAPI(binaryMessenger: binaryMessenger)
+//    super.init(binaryMessenger: binaryMessenger)
+//  }
+//
+//  @available(iOS 15.0, macOS 12.0, *)
+//  func transactionUpdated(updatedTransactions: Transaction, restoring: Bool = false) {
+//    let transactionMsg = updatedTransactions.convertToPigeon(
+//      restoring: restoring)
+//    callbackAPI.onTransactionsUpdated(newTransaction: transactionMsg) { result in
+//      switch result {
+//      case .success: break
+//      case .failure(let error):
+//        print("Failed to send transaction updates: \(error)")
+//      }
+//    }
+//  }
+//
+//}

packages/in_app_purchase/in_app_purchase_storekit/lib/src/in_app_purchase_storekit_platform.dart

@@ -31,7 +31,7 @@ class InAppPurchaseStoreKitPlatform extends InAppPurchasePlatform {
   InAppPurchaseStoreKitPlatform();
 
   /// Experimental flag for StoreKit2.
-  static bool _useStoreKit2 = true;
+  static bool _useStoreKit2 = false;
 
   /// StoreKit1
   static late SKPaymentQueueWrapper _skPaymentQueueWrapper;