Skip to content

fix(google): guard billing callbacks against double resume #159

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
hyochan merged 1 commit into from
May 19, 2026
Merged

fix(google): guard billing callbacks against double resume #159

Show file tree
Hide file tree
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
77 changes: 49 additions & 28 deletions packages/google/openiap/src/horizon/java/dev/hyo/openiap/OpenIapModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import dev.hyo.openiap.helpers.restorePurchasesHorizon
import dev.hyo.openiap.helpers.queryPurchasesHorizon
import dev.hyo.openiap.helpers.ProductManager
import dev.hyo.openiap.helpers.queryProductDetailsHorizon
import dev.hyo.openiap.helpers.resumeGuard
import dev.hyo.openiap.utils.HorizonBillingConverters.toActiveSubscription
import dev.hyo.openiap.utils.HorizonBillingConverters.toInAppProduct
import dev.hyo.openiap.utils.HorizonBillingConverters.toPurchase
Expand All @@ -48,9 +49,8 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.suspendCancellableCoroutine
import kotlinx.coroutines.withContext
import java.lang.ref.WeakReference
import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.atomic.AtomicReference
import kotlin.coroutines.resume
import kotlin.coroutines.resumeWithException

private const val TAG = "OpenIapModule"

Expand Down Expand Up @@ -129,6 +129,7 @@ class OpenIapModule(
override val initConnection: MutationInitConnectionHandler = {
withContext(Dispatchers.IO) {
suspendCancellableCoroutine<Boolean> { continuation ->
val resumer = continuation.resumeGuard()
OpenIapLog.i("=== INIT CONNECTION ===", TAG)

// CRITICAL FIX: Rebuild BillingClient if it was destroyed by endConnection
Expand All @@ -141,7 +142,7 @@ class OpenIapModule(

val client = billingClient ?: run {
OpenIapLog.w("Failed to build BillingClient", TAG)
if (continuation.isActive) continuation.resume(false)
resumer.resume(false)
return@suspendCancellableCoroutine
}

Expand All @@ -153,7 +154,7 @@ class OpenIapModule(
} else {
OpenIapLog.i("Horizon billing connected successfully", TAG)
}
if (continuation.isActive) continuation.resume(ok)
resumer.resume(ok)
}

override fun onBillingServiceDisconnected() {
Expand Down Expand Up @@ -379,15 +380,23 @@ class OpenIapModule(
}

suspendCancellableCoroutine<List<Purchase>> { continuation ->
var callbackRef: ((Result<List<Purchase>>) -> Unit)? = null
val resumer = continuation.resumeGuard {
callbackRef?.let { currentPurchaseCallback.compareAndSet(it, null) }
}
val callback: (Result<List<Purchase>>) -> Unit = { result ->
if (continuation.isActive) continuation.resume(result.getOrDefault(emptyList()))
resumer.resume(result.getOrDefault(emptyList()))
}
callbackRef = callback
if (!currentPurchaseCallback.compareAndSet(null, callback)) {
OpenIapLog.w("requestPurchase rejected: another purchase is already in progress", TAG)
if (continuation.isActive) continuation.resumeWithException(OpenIapError.DeveloperError())
resumer.resumeWithException(OpenIapError.DeveloperError())
return@suspendCancellableCoroutine
}
if (!continuation.isActive) {
currentPurchaseCallback.compareAndSet(callback, null)
return@suspendCancellableCoroutine
}
continuation.invokeOnCancellation { currentPurchaseCallback.compareAndSet(callback, null) }

val desiredType = if (androidArgs.type == ProductQueryType.Subs) BillingClient.ProductType.SUBS else BillingClient.ProductType.INAPP

Expand Down Expand Up @@ -570,7 +579,10 @@ class OpenIapModule(
.setProductList(productList)
.build()

val didHandleProductDetails = AtomicBoolean(false)
client.queryProductDetailsAsync(params) { billingResult, productDetailsList ->
if (!didHandleProductDetails.compareAndSet(false, true)) return@queryProductDetailsAsync

if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
val err = OpenIapError.QueryProduct.withDiagnostics(
responseCode = billingResult.responseCode,
Expand Down Expand Up @@ -618,21 +630,23 @@ class OpenIapModule(
if (isConsumable == true) {
val params = ConsumeParams.newBuilder().setPurchaseToken(token).build()
suspendCancellableCoroutine<Unit> { continuation ->
val resumer = continuation.resumeGuard()
client.consumeAsync(params) { result, _ ->
if (result.responseCode != BillingClient.BillingResponseCode.OK) {
OpenIapLog.w("Failed to consume Horizon purchase: ${result.debugMessage}", TAG)
}
if (continuation.isActive) continuation.resume(Unit)
resumer.resume(Unit)
}
}
} else {
val params = AcknowledgePurchaseParams.newBuilder().setPurchaseToken(token).build()
suspendCancellableCoroutine<Unit> { continuation ->
val resumer = continuation.resumeGuard()
client.acknowledgePurchase(params) { result ->
if (result.responseCode != BillingClient.BillingResponseCode.OK) {
OpenIapLog.w("Failed to acknowledge Horizon purchase: ${result.debugMessage}", TAG)
}
if (continuation.isActive) continuation.resume(Unit)
resumer.resume(Unit)
}
}
}
Expand All @@ -644,12 +658,13 @@ class OpenIapModule(
val client = billingClient ?: throw OpenIapError.NotPrepared
val params = AcknowledgePurchaseParams.newBuilder().setPurchaseToken(purchaseToken).build()
suspendCancellableCoroutine<Boolean> { continuation ->
val resumer = continuation.resumeGuard()
client.acknowledgePurchase(params) { result ->
val success = result.responseCode == BillingClient.BillingResponseCode.OK
if (!success) {
OpenIapLog.w("Horizon acknowledge failed: ${result.debugMessage}", TAG)
}
if (continuation.isActive) continuation.resume(success)
resumer.resume(success)
}
}
}
Expand All @@ -660,12 +675,13 @@ class OpenIapModule(
val client = billingClient ?: throw OpenIapError.NotPrepared
val params = ConsumeParams.newBuilder().setPurchaseToken(purchaseToken).build()
suspendCancellableCoroutine<Boolean> { continuation ->
val resumer = continuation.resumeGuard()
client.consumeAsync(params) { result, _ ->
val success = result.responseCode == BillingClient.BillingResponseCode.OK
if (!success) {
OpenIapLog.w("Horizon consume failed: ${result.debugMessage}", TAG)
}
if (continuation.isActive) continuation.resume(success)
resumer.resume(success)
}
}
}
Expand Down Expand Up @@ -800,20 +816,21 @@ class OpenIapModule(
suspend fun getStorefront(): String = withContext(Dispatchers.IO) {
val client = billingClient ?: return@withContext ""
suspendCancellableCoroutine { continuation ->
val resumer = continuation.resumeGuard()
runCatching {
client.getBillingConfigAsync(
GetBillingConfigParams.newBuilder().build()
) { result, config ->
if (continuation.isActive) {
val code = if (result.responseCode == BillingClient.BillingResponseCode.OK) {
config?.countryCode.orEmpty()
} else ""
continuation.resume(code)
val code = if (result.responseCode == BillingClient.BillingResponseCode.OK) {
config?.countryCode.orEmpty()
} else {
""
}
resumer.resume(code)
}
}.onFailure { error ->
OpenIapLog.w("Horizon getStorefront failed: ${error.message}", TAG)
if (continuation.isActive) continuation.resume("")
resumer.resume("")
}
}
}
Expand Down Expand Up @@ -931,6 +948,7 @@ class OpenIapModule(
skus: List<String>,
productType: String
): List<HorizonProductDetails> = suspendCancellableCoroutine { continuation ->
val resumer = continuation.resumeGuard()
val products = skus.map { sku ->
QueryProductDetailsParams.Product.newBuilder()
.setProductId(sku)
Expand All @@ -940,10 +958,10 @@ class OpenIapModule(
val params = QueryProductDetailsParams.newBuilder().setProductList(products).build()
client.queryProductDetailsAsync(params) { result, details ->
if (result.responseCode == BillingClient.BillingResponseCode.OK) {
if (continuation.isActive) continuation.resume(details ?: emptyList())
resumer.resume(details ?: emptyList())
} else {
OpenIapLog.w("Horizon queryProductDetails failed: ${result.debugMessage}", TAG)
if (continuation.isActive) continuation.resume(emptyList())
resumer.resume(emptyList())
}
}
}
Expand Down Expand Up @@ -992,17 +1010,18 @@ class OpenIapModule(

// Try to call the alternative billing method
val result = suspendCancellableCoroutine<BillingResult> { cont ->
val resumer = cont.resumeGuard()
try {
client.isAlternativeBillingOnlyAvailableAsync { billingResult ->
cont.resume(billingResult)
resumer.resume(billingResult)
}
} catch (e: NoSuchMethodError) {
// Method doesn't exist in Horizon library
OpenIapLog.w("Alternative Billing not supported by Horizon library", TAG)
cont.resumeWithException(Exception("Feature not supported"))
resumer.resumeWithException(Exception("Feature not supported"))
} catch (e: Exception) {
OpenIapLog.e("Error checking alternative billing: ${e.message}", e, TAG)
cont.resumeWithException(e)
resumer.resumeWithException(e)
}
}

Expand All @@ -1025,9 +1044,10 @@ class OpenIapModule(
val currentActivity = activityRef.get() ?: throw Exception("Activity not available")

val result = suspendCancellableCoroutine<BillingResult> { cont ->
val resumer = cont.resumeGuard()
try {
val listener = AlternativeBillingOnlyInformationDialogListener { billingResult ->
cont.resume(billingResult)
resumer.resume(billingResult)
}
currentActivity.runOnUiThread {
client.showAlternativeBillingOnlyInformationDialog(
Expand All @@ -1037,10 +1057,10 @@ class OpenIapModule(
}
} catch (e: NoSuchMethodError) {
OpenIapLog.w("showAlternativeBillingOnlyInformationDialog not supported", TAG)
cont.resumeWithException(Exception("Feature not supported"))
resumer.resumeWithException(Exception("Feature not supported"))
} catch (e: Exception) {
OpenIapLog.e("Error showing alternative billing dialog: ${e.message}", e, TAG)
cont.resumeWithException(e)
resumer.resumeWithException(e)
}
}

Expand All @@ -1060,16 +1080,17 @@ class OpenIapModule(
val client = billingClient ?: throw Exception("Not connected")

val result = suspendCancellableCoroutine<Pair<BillingResult, AlternativeBillingOnlyReportingDetails?>> { cont ->
val resumer = cont.resumeGuard()
try {
client.createAlternativeBillingOnlyReportingDetailsAsync { billingResult, details ->
cont.resume(Pair(billingResult, details))
resumer.resume(Pair(billingResult, details))
}
} catch (e: NoSuchMethodError) {
OpenIapLog.w("createAlternativeBillingOnlyReportingDetails not supported", TAG)
cont.resumeWithException(Exception("Feature not supported"))
resumer.resumeWithException(Exception("Feature not supported"))
} catch (e: Exception) {
OpenIapLog.e("Error creating alternative billing token: ${e.message}", e, TAG)
cont.resumeWithException(e)
resumer.resumeWithException(e)
}
}

Expand Down
10 changes: 5 additions & 5 deletions packages/google/openiap/src/horizon/java/dev/hyo/openiap/helpers/Helpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import dev.hyo.openiap.OpenIapLog
import dev.hyo.openiap.Purchase
import dev.hyo.openiap.utils.HorizonBillingConverters.toPurchase
import kotlinx.coroutines.suspendCancellableCoroutine
import kotlin.coroutines.resume

private const val TAG = "Helpers"

Expand Down Expand Up @@ -43,18 +42,19 @@ internal suspend fun queryPurchasesHorizon(
client: BillingClient?,
productType: String
): List<Purchase> = suspendCancellableCoroutine { continuation ->
val resumer = continuation.resumeGuard()
OpenIapLog.d("queryPurchasesHorizon: type=$productType", TAG)

val billingClient = client ?: run {
OpenIapLog.w("queryPurchasesHorizon: BillingClient is null", TAG)
continuation.resume(emptyList())
resumer.resume(emptyList())
return@suspendCancellableCoroutine
}

// CRITICAL FIX: Check if BillingClient is ready before querying
if (!billingClient.isReady()) {
OpenIapLog.w("queryPurchasesHorizon: BillingClient is not ready", TAG)
continuation.resume(emptyList())
resumer.resume(emptyList())
return@suspendCancellableCoroutine
}

Expand All @@ -73,10 +73,10 @@ internal suspend fun queryPurchasesHorizon(
it.toPurchase()
} ?: emptyList()
OpenIapLog.d("queryPurchasesHorizon: Returning ${mapped.size} mapped purchases", TAG)
continuation.resume(mapped)
resumer.resume(mapped)
} else {
OpenIapLog.w("queryPurchasesHorizon: Failed with code=${result.responseCode}", TAG)
continuation.resume(emptyList())
resumer.resume(emptyList())
}
}
}
Expand Down
17 changes: 10 additions & 7 deletions packages/google/openiap/src/horizon/java/dev/hyo/openiap/helpers/ProductManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import com.meta.horizon.billingclient.api.ProductDetails as HorizonProductDetail
import dev.hyo.openiap.OpenIapLog
import kotlinx.coroutines.suspendCancellableCoroutine
import java.util.concurrent.ConcurrentHashMap
import kotlin.coroutines.resume
import java.util.concurrent.atomic.AtomicBoolean

private const val TAG = "ProductManager"

Expand Down Expand Up @@ -50,7 +50,7 @@ internal class ProductManager {

// Check which products are missing or have incomplete data
val needsQuery = mutableListOf<String>()
val validCached = mutableListOf<HorizonProductDetails>()
var validCachedCount = 0

productIds.distinct().forEach { productId ->
val cached = cache[CacheKey(productId, productType)]
Expand All @@ -69,7 +69,7 @@ internal class ProductManager {
}

if (isComplete) {
validCached.add(cached)
validCachedCount += 1
} else {
OpenIapLog.w("Cached ProductDetails for '$productId' has incomplete data, will re-query", TAG)
needsQuery.add(productId)
Expand All @@ -78,7 +78,7 @@ internal class ProductManager {
}
}

OpenIapLog.d("getOrQuery: needsQuery=$needsQuery, validCached=${validCached.size}", TAG)
OpenIapLog.d("getOrQuery: needsQuery=$needsQuery, validCached=$validCachedCount", TAG)

if (needsQuery.isEmpty()) {
val cached = productIds.mapNotNull { cache[CacheKey(it, productType)] }
Expand All @@ -99,8 +99,11 @@ internal class ProductManager {
OpenIapLog.d("getOrQuery: Querying ${needsQuery.size} products from Horizon API", TAG)

return suspendCancellableCoroutine { cont ->
cont.invokeOnCancellation { OpenIapLog.d("getOrQuery: cancelled", TAG) }
val resumer = cont.resumeGuard { OpenIapLog.d("getOrQuery: cancelled", TAG) }
val didHandleProductDetails = AtomicBoolean(false)
client.queryProductDetailsAsync(params) { billingResult, result ->
if (!didHandleProductDetails.compareAndSet(false, true)) return@queryProductDetailsAsync

OpenIapLog.d(
"getOrQuery: Response code=${billingResult.responseCode}, " +
"message=${billingResult.debugMessage}, " +
Expand All @@ -116,7 +119,7 @@ internal class ProductManager {
)
// Return whatever we have in cache instead of crashing
val cached = productIds.mapNotNull { cache[CacheKey(it, productType)] }
if (cont.isActive) cont.resume(cached)
resumer.resume(cached)
return@queryProductDetailsAsync
}

Expand Down Expand Up @@ -150,7 +153,7 @@ internal class ProductManager {
// Preserve requested order and include cached + newly-fetched
val finalList = productIds.mapNotNull { cache[CacheKey(it, productType)] }
OpenIapLog.d("getOrQuery: Returning ${finalList.size} total products", TAG)
if (cont.isActive) cont.resume(finalList)
resumer.resume(finalList)
}
}
}
Expand Down
Loading