react-native-iap 12.0.0 → 12.0.1

package/README.md

@@ -28,7 +28,9 @@ Please [fund the project](https://opencollective.com/react-native-iap) if you ar
 
 ## Announcement
 
-- Version `11.0.0` is currently in alpha candidate. The module migrates OS sdk to [storekit2](https://developer.apple.com/videos/play/wwdc2021/10114). [andresesfm](https://github.com/andresesfm) is working hard on this.
+- Version `12.0.0`: Implements Amazon 3.x SDK including the new DRM verification.
+
+- Version `11.0.0`: The module migrates OS sdk to [storekit2](https://developer.apple.com/videos/play/wwdc2021/10114). [andresesfm](https://github.com/andresesfm) is working hard on this.
 
   ```
   yarn add react-native-iap@next

package/ios/IapTypes.swift

@@ -33,3 +33,24 @@ enum IapErrors: String, CaseIterable {
         return IapErrors.allCases.firstIndex(of: self)!
     }
 }
+
+// Based on https://stackoverflow.com/a/40135192/570612
+extension Date {
+    var millisecondsSince1970: Int64 {
+        return Int64((self.timeIntervalSince1970 * 1000.0).rounded())
+    }
+
+    var millisecondsSince1970String: String {
+        return String((self.timeIntervalSince1970 * 1000.0).rounded())
+    }
+
+    init(milliseconds: Int64) {
+        self = Date(timeIntervalSince1970: TimeInterval(milliseconds) / 1000)
+    }
+}
+
+extension SKProductsRequest {
+    var key: String {
+        return String(self.hashValue)
+    }
+}

package/ios/RNIapIos.swift

@@ -1,27 +1,6 @@
 import React
 import StoreKit
 
-// Based on https://stackoverflow.com/a/40135192/570612
-extension Date {
-    var millisecondsSince1970: Int64 {
-        return Int64((self.timeIntervalSince1970 * 1000.0).rounded())
-    }
-
-    var millisecondsSince1970String: String {
-        return String((self.timeIntervalSince1970 * 1000.0).rounded())
-    }
-
-    init(milliseconds: Int64) {
-        self = Date(timeIntervalSince1970: TimeInterval(milliseconds) / 1000)
-    }
-}
-
-extension SKProductsRequest {
-    var key: String {
-        return String(self.hashValue)
-    }
-}
-
 @objc(RNIapIos)
 class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver, SKProductsRequestDelegate {
     private var promisesByKey: [String: [RNIapIosPromise]]
@@ -29,7 +8,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
     private var hasListeners = false
     private var pendingTransactionWithAutoFinish = false
     private var receiptBlock: ((Data?, Error?) -> Void)? // Block to handle request the receipt async from delegate
-    private var validProducts: [SKProduct]
+    private var validProducts: [String: SKProduct]
     private var promotedPayment: SKPayment?
     private var promotedProduct: SKProduct?
     private var productsRequest: SKProductsRequest?
@@ -40,7 +19,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
         promisesByKey = [String: [RNIapIosPromise]]()
         pendingTransactionWithAutoFinish = false
         myQueue = DispatchQueue(label: "reject")
-        validProducts = [SKProduct]()
+        validProducts = [String: SKProduct]()
         super.init()
         addTransactionObserver()
     }
@@ -212,16 +191,8 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
         reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
     ) {
         pendingTransactionWithAutoFinish = andDangerouslyFinishTransactionAutomatically
-        var product: SKProduct?
-        let lockQueue = DispatchQueue(label: "validProducts")
-        lockQueue.sync {
-            for p in validProducts {
-                if sku == p.productIdentifier {
-                    product = p
-                    break
-                }
-            }
-        }
+        var product: SKProduct? = validProducts[sku]
+
         if let prod = product {
             addPromise(forKey: prod.productIdentifier, resolve: resolve, reject: reject)
 
@@ -391,12 +362,8 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
         }
 
         var items: [[String: Any?]] = [[:]]
-        let lockQueue = DispatchQueue(label: "validProducts")
-
-        lockQueue.sync {
-            for product in validProducts {
-                items.append(getProductObject(product))
-            }
+        for product in validProducts.values {
+            items.append(getProductObject(product))
         }
 
         resolvePromises(forKey: request.key, value: items)
@@ -405,25 +372,8 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
     // Add to valid products from Apple server response. Allowing getProducts, getSubscriptions call several times.
     // Doesn't allow duplication. Replace new product.
     func add(_ aProd: SKProduct) {
-        let lockQueue = DispatchQueue(label: "validProducts")
-
-        lockQueue.sync {
-            debugMessage("Add new object: \(aProd.productIdentifier)")
-            var delTar = -1
-
-            for k in 0..<validProducts.count {
-                let cur = validProducts[k]
-                if cur.productIdentifier == aProd.productIdentifier {
-                    delTar = k
-                }
-            }
-
-            if delTar >= 0 {
-                validProducts.remove(at: delTar)
-            }
-
-            validProducts.append(aProd)
-        }
+        debugMessage("Add new object: \(aProd.productIdentifier)")
+        validProducts[aProd.productIdentifier] = aProd
     }
 
     func request(_ request: SKRequest, didFailWithError error: Error) {

package/ios/RNIapIosSk2.m

@@ -85,5 +85,9 @@ RCT_EXTERN_METHOD(presentCodeRedemptionSheet:
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(clearTransaction:
+                  (RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
 @end
 #endif

package/ios/RNIapIosSk2.swift

@@ -85,6 +85,11 @@ protocol Sk2Delegate {
         reject: @escaping RCTPromiseRejectBlock
     )
 
+    func clearTransaction(
+        _ resolve: @escaping RCTPromiseResolveBlock,
+        reject: @escaping RCTPromiseRejectBlock
+    )
+
     func startObserving()
     func stopObserving()
 }
@@ -203,6 +208,10 @@ class DummySk2: Sk2Delegate {
         reject(errorCode, errorMessage, nil)
     }
 
+    func clearTransaction(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        reject(errorCode, errorMessage, nil)
+    }
+
     func startObserving() {
     }
 
@@ -361,6 +370,12 @@ class RNIapIosSk2: RCTEventEmitter, Sk2Delegate {
     ) {
         delegate.presentCodeRedemptionSheet(resolve, reject: reject)
     }
+
+    @objc func clearTransaction(
+        _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }) {
+        delegate.clearTransaction(resolve, reject: reject)
+    }
 }
 
 @available(iOS 15.0, tvOS 15.0, *)
@@ -810,4 +825,22 @@ class RNIapIosSk2iOS15: Sk2Delegate {
         reject(IapErrors.E_USER_CANCELLED.rawValue, "This method is not available on tvOS", nil)
         #endif
     }
+
+    func clearTransaction(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        Task {
+            for await result in Transaction.unfinished {
+                do {
+                    // Check whether the transaction is verified. If it isn’t, catch `failedVerification` error.
+                    let transaction = try checkVerified(result)
+                    debugMessage("Finishing transaction")
+                    await transaction.finish()
+                    debugMessage("Finished transaction")
+                    transactions.removeValue(forKey: String(transaction.id))
+                } catch {
+                    debugMessage("Failed to finish transaction")
+                }
+            }
+            resolve(nil)
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "description": "React Native In App Purchase Module.",
   "repository": "https://github.com/dooboolab/react-native-iap",
   "author": "dooboolab <support@dooboolab.com> (https://github.com/dooboolab)",