Skip to content

Wrap transactions dictionary in ThreadSafe type #6

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.

Sign up for GitHub

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

Merged
pmick merged 1 commit into from
Jun 5, 2026
Merged

Wrap transactions dictionary in ThreadSafe type #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions ios/RNIapIosSk2.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ class RNIapIosSk2: RCTEventEmitter, Sk2Delegate {
class RNIapIosSk2iOS15: Sk2Delegate {
private var _hasListeners = false
private let _hasListenersQueue = DispatchQueue(label: "com.dooboolab.rniap.hasListenersQueue", attributes: .concurrent)
private var transactions: [String: Transaction]
private var transactions: ThreadSafe<[String: Transaction]>
private var updateListenerTask: Task<Void, Error>?
private var storefrontListenerTask: Task<Void, Error>?
fileprivate var sendEvent: ((String?, Any?) -> Void)?
Expand All @@ -465,7 +465,7 @@ class RNIapIosSk2iOS15: Sk2Delegate {
}
init(sendEvent: ((String?, Any?) -> Void)? ) {
self.sendEvent = sendEvent
transactions = [String: Transaction]()
transactions = ThreadSafe<[String: Transaction]>([:])
}

deinit {
Expand Down Expand Up @@ -524,7 +524,7 @@ class RNIapIosSk2iOS15: Sk2Delegate {

func addTransaction(_ transaction: Transaction) {
let transactionId = String(transaction.id)
self.transactions[transactionId] = transaction
self.transactions.atomically { $0[transactionId] = transaction }
}

func listenForStorefrontChanges() -> Task<Void, Error> {
Expand Down Expand Up @@ -597,7 +597,7 @@ class RNIapIosSk2iOS15: Sk2Delegate {
Task {
await productStore.removeAll()
}
transactions.removeAll()
transactions.atomically { $0.removeAll() }
removeTransactionObserver()
resolve(nil)
}
Expand Down Expand Up @@ -962,11 +962,11 @@ class RNIapIosSk2iOS15: Sk2Delegate {
reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
) {
Task {
if let transaction = transactions[transactionIdentifier] {
if let transaction = transactions.value[transactionIdentifier] {
debugMessage("Finishing transaction")
await transaction.finish()
debugMessage("Finished transaction")
transactions.removeValue(forKey: transactionIdentifier)
transactions.atomically { $0.removeValue(forKey: transactionIdentifier) }
resolve(nil)
} else {
reject(IapErrors.E_DEVELOPER_ERROR.rawValue, "Invalid transaction Id", nil)
Expand All @@ -978,7 +978,7 @@ class RNIapIosSk2iOS15: Sk2Delegate {
_ resolve: @escaping RCTPromiseResolveBlock = { _ in },
reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
) {
resolve(transactions.values.map({(t: Transaction) in serialize(t)}))
resolve(transactions.value.values.map({(t: Transaction) in serialize(t)}))
}

public func sync(
Expand Down Expand Up @@ -1048,7 +1048,7 @@ class RNIapIosSk2iOS15: Sk2Delegate {
debugMessage("Finishing transaction")
await transaction.finish()
debugMessage("Finished transaction")
transactions.removeValue(forKey: String(transaction.id))
transactions.atomically { $0.removeValue(forKey: String(transaction.id)) }
} catch {
debugMessage("Failed to finish transaction")
}
Expand Down
Loading