Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

using the proper data structure #2019

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions ios/IapTypes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
66 changes: 8 additions & 58 deletions ios/RNIapIos.swift
Original file line number Diff line number Diff line change
@@ -1,35 +1,14 @@
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]]
private var myQueue: DispatchQueue
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?
Expand All @@ -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()
}
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand All @@ -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) {
Expand Down