@capgo/native-purchases 0.0.30 → 0.0.33

package/android/src/main/java/ee/forgr/nativepurchases/NativePurchasesPlugin.java

@@ -27,11 +27,17 @@ import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import org.json.JSONArray;
 import org.json.JSONException;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 
 @CapacitorPlugin(name = "NativePurchases")
 public class NativePurchasesPlugin extends Plugin {
 
   public final String PLUGIN_VERSION = "0.0.25";
+  public static final String TAG = "NativePurchases";
+  private static final Phaser semaphoreReady = new Phaser(1);
   private BillingClient billingClient;
 
   private void isBillingSupported(PluginCall call) {
@@ -40,6 +46,59 @@ public class NativePurchasesPlugin extends Plugin {
     call.resolve();
   }
 
+  @Override
+  public void load() {
+    super.load();
+    Log.i(NativePurchasesPlugin.TAG, "load");
+    semaphoreDown();
+  }
+
+  private void semaphoreWait(Number waitTime) {
+    Log.i(NativePurchasesPlugin.TAG, "semaphoreWait " + waitTime);
+    try {
+      //        Log.i(CapacitorUpdater.TAG, "semaphoreReady count " + CapacitorUpdaterPlugin.this.semaphoreReady.getCount());
+      NativePurchasesPlugin.this.semaphoreReady.awaitAdvanceInterruptibly(
+          NativePurchasesPlugin.this.semaphoreReady.getPhase(),
+          waitTime.longValue(),
+          TimeUnit.SECONDS
+        );
+      //        Log.i(CapacitorUpdater.TAG, "semaphoreReady await " + res);
+      Log.i(
+        NativePurchasesPlugin.TAG,
+        "semaphoreReady count " +
+        NativePurchasesPlugin.this.semaphoreReady.getPhase()
+      );
+    } catch (InterruptedException e) {
+      Log.i(NativePurchasesPlugin.TAG, "semaphoreWait InterruptedException");
+      e.printStackTrace();
+    } catch (TimeoutException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private void semaphoreUp() {
+    Log.i(NativePurchasesPlugin.TAG, "semaphoreUp");
+    NativePurchasesPlugin.this.semaphoreReady.register();
+  }
+
+  private void semaphoreDown() {
+    Log.i(NativePurchasesPlugin.TAG, "semaphoreDown");
+    Log.i(
+      NativePurchasesPlugin.TAG,
+      "semaphoreDown count " +
+      NativePurchasesPlugin.this.semaphoreReady.getPhase()
+    );
+    NativePurchasesPlugin.this.semaphoreReady.arriveAndDeregister();
+  }
+
+  private void closeBillingClient() {
+    if (billingClient != null) {
+      billingClient.endConnection();
+      billingClient = null;
+      semaphoreDown();
+    }
+  }
+
   private void handlePurchase(Purchase purchase, PluginCall purchaseCall) {
     if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) {
       // Grant entitlement to the user, then acknowledge the purchase
@@ -78,7 +137,7 @@ public class NativePurchasesPlugin extends Plugin {
         public void onAcknowledgePurchaseResponse(BillingResult billingResult) {
           // Handle the result of the acknowledge purchase
           Log.i(
-            "NativePurchases",
+            NativePurchasesPlugin.TAG,
             "onAcknowledgePurchaseResponse" + billingResult
           );
         }
@@ -87,10 +146,9 @@ public class NativePurchasesPlugin extends Plugin {
   }
 
   private void initBillingClient(PluginCall purchaseCall) {
-    if (billingClient != null) {
-      billingClient.endConnection();
-      billingClient = null;
-    }
+    semaphoreWait(10);
+    closeBillingClient();
+    semaphoreUp();
     CountDownLatch semaphoreReady = new CountDownLatch(1);
     billingClient =
       BillingClient
@@ -102,7 +160,7 @@ public class NativePurchasesPlugin extends Plugin {
               BillingResult billingResult,
               List<Purchase> purchases
             ) {
-              Log.i("NativePurchases", "onPurchasesUpdated" + billingResult);
+              Log.i(NativePurchasesPlugin.TAG, "onPurchasesUpdated" + billingResult);
               if (
                 billingResult.getResponseCode() ==
                 BillingClient.BillingResponseCode.OK &&
@@ -114,13 +172,12 @@ public class NativePurchasesPlugin extends Plugin {
                 handlePurchase(purchases.get(0), purchaseCall);
               } else {
                 // Handle any other error codes.
-                Log.i("NativePurchases", "onPurchasesUpdated" + billingResult);
+                Log.i(NativePurchasesPlugin.TAG, "onPurchasesUpdated" + billingResult);
                 if (purchaseCall != null) {
                   purchaseCall.reject("Purchase is not purchased");
                 }
               }
-              billingClient.endConnection();
-              billingClient = null;
+              closeBillingClient();
               return;
             }
           }
@@ -209,66 +266,70 @@ public class NativePurchasesPlugin extends Plugin {
       .setProductList(productList)
       .build();
     this.initBillingClient(call);
-    billingClient.queryProductDetailsAsync(
-      params,
-      new ProductDetailsResponseListener() {
-        public void onProductDetailsResponse(
-          BillingResult billingResult,
-          List<ProductDetails> productDetailsList
-        ) {
-          if (productDetailsList.size() == 0) {
-            billingClient.endConnection();
-            billingClient = null;
-            call.reject("Product not found");
-            return;
-          }
-          // Process the result
-          List<BillingFlowParams.ProductDetailsParams> productDetailsParamsList = new ArrayList<>();
-          for (ProductDetails productDetailsItem : productDetailsList) {
-            BillingFlowParams.ProductDetailsParams.Builder productDetailsParams = BillingFlowParams.ProductDetailsParams
-              .newBuilder()
-              .setProductDetails(productDetailsItem);
-            if (productType.equals("subs")) {
-              // list the SubscriptionOfferDetails and find the one who match the planIdentifier if not found get the first one
-              ProductDetails.SubscriptionOfferDetails selectedOfferDetails =
-                null;
-              for (ProductDetails.SubscriptionOfferDetails offerDetails : productDetailsItem.getSubscriptionOfferDetails()) {
-                if (offerDetails.getOfferId().equals(planIdentifier)) {
-                  selectedOfferDetails = offerDetails;
-                  break;
+    try {
+      billingClient.queryProductDetailsAsync(
+        params,
+        new ProductDetailsResponseListener() {
+          public void onProductDetailsResponse(
+            BillingResult billingResult,
+            List<ProductDetails> productDetailsList
+          ) {
+            if (productDetailsList.size() == 0) {
+              closeBillingClient();
+              call.reject("Product not found");
+              return;
+            }
+            // Process the result
+            List<BillingFlowParams.ProductDetailsParams> productDetailsParamsList = new ArrayList<>();
+            for (ProductDetails productDetailsItem : productDetailsList) {
+              BillingFlowParams.ProductDetailsParams.Builder productDetailsParams = BillingFlowParams.ProductDetailsParams
+                .newBuilder()
+                .setProductDetails(productDetailsItem);
+              if (productType.equals("subs")) {
+                // list the SubscriptionOfferDetails and find the one who match the planIdentifier if not found get the first one
+                ProductDetails.SubscriptionOfferDetails selectedOfferDetails =
+                  null;
+                for (ProductDetails.SubscriptionOfferDetails offerDetails : productDetailsItem.getSubscriptionOfferDetails()) {
+                  if (offerDetails.getOfferId().equals(planIdentifier)) {
+                    selectedOfferDetails = offerDetails;
+                    break;
+                  }
                 }
+                if (selectedOfferDetails == null) {
+                  selectedOfferDetails =
+                    productDetailsItem.getSubscriptionOfferDetails().get(0);
+                }
+                productDetailsParams.setOfferToken(
+                  selectedOfferDetails.getOfferToken()
+                );
               }
-              if (selectedOfferDetails == null) {
-                selectedOfferDetails =
-                  productDetailsItem.getSubscriptionOfferDetails().get(0);
-              }
-              productDetailsParams.setOfferToken(
-                selectedOfferDetails.getOfferToken()
-              );
+              productDetailsParamsList.add(productDetailsParams.build());
             }
-            productDetailsParamsList.add(productDetailsParams.build());
+            BillingFlowParams billingFlowParams = BillingFlowParams
+              .newBuilder()
+              .setProductDetailsParamsList(productDetailsParamsList)
+              .build();
+            // Launch the billing flow
+            BillingResult billingResult2 = billingClient.launchBillingFlow(
+              getActivity(),
+              billingFlowParams
+            );
+            Log.i(
+              NativePurchasesPlugin.TAG,
+              "onProductDetailsResponse2" + billingResult2
+            );
           }
-          BillingFlowParams billingFlowParams = BillingFlowParams
-            .newBuilder()
-            .setProductDetailsParamsList(productDetailsParamsList)
-            .build();
-          // Launch the billing flow
-          BillingResult billingResult2 = billingClient.launchBillingFlow(
-            getActivity(),
-            billingFlowParams
-          );
-          Log.i(
-            "NativePurchases",
-            "onProductDetailsResponse2" + billingResult2
-          );
         }
-      }
-    );
+      );
+    } catch (Exception e) {
+      closeBillingClient();
+      call.reject(e.getMessage());
+    }
   }
 
   @PluginMethod
   public void restorePurchases(PluginCall call) {
-    Log.d("NativePurchases", "restorePurchases");
+    Log.d(NativePurchasesPlugin.TAG, "restorePurchases");
     this.initBillingClient(null);
     call.resolve();
   }
@@ -283,7 +344,9 @@ public class NativePurchasesPlugin extends Plugin {
       call.reject("planIdentifier cannot be empty if productType is subs");
       return;
     }
-    if (productIdentifiersArray == null || productIdentifiersArray.length() == 0) {
+    if (
+      productIdentifiersArray == null || productIdentifiersArray.length() == 0
+    ) {
       call.reject("productIdentifiers array missing");
       return;
     }
@@ -297,7 +360,7 @@ public class NativePurchasesPlugin extends Plugin {
       }
     }
 
-    Log.d("NativePurchases", "getProducts: " + productIdentifiers);
+    Log.d(NativePurchasesPlugin.TAG, "getProducts: " + productIdentifiers);
     List<QueryProductDetailsParams.Product> productList = new ArrayList<>();
     for (String productIdentifier : productIdentifiers) {
       productList.add(
@@ -319,109 +382,114 @@ public class NativePurchasesPlugin extends Plugin {
       .setProductList(productList)
       .build();
     this.initBillingClient(call);
-    billingClient.queryProductDetailsAsync(
-      params,
-      new ProductDetailsResponseListener() {
-        public void onProductDetailsResponse(
-          BillingResult billingResult,
-          List<ProductDetails> productDetailsList
-        ) {
-          if (productDetailsList.size() == 0) {
-            billingClient.endConnection();
-            billingClient = null;
-            call.reject("Product not found");
-            return;
-          }
-          Log.i(
-            "NativePurchases",
-            "onProductDetailsResponse" + billingResult + productDetailsList
-          );
-          // Process the result
-          JSObject ret = new JSObject();
-          JSONArray products = new JSONArray();
-          Number productIdIndex = 0;
-          for (ProductDetails productDetails : productDetailsList) {
-            JSObject product = new JSObject();
-            product.put("identifier", productDetails.getProductId());
-            product.put("title", productDetails.getTitle());
-            product.put("description", productDetails.getDescription());
-            if (productType.equals("inapp")) {
-              product.put(
-                "price",
-                productDetails
-                  .getOneTimePurchaseOfferDetails()
-                  .getPriceAmountMicros() /
-                1000000.0
-              );
-              product.put(
-                "priceString",
-                productDetails
-                  .getOneTimePurchaseOfferDetails()
-                  .getFormattedPrice()
-              );
-              product.put(
-                "currencyCode",
-                productDetails
-                  .getOneTimePurchaseOfferDetails()
-                  .getPriceCurrencyCode()
-              );
-            } else {
-              // productIdIndex is used to get the correct SubscriptionOfferDetails by productIdentifiersArray index and increment it
-              String subscriptionOfferIdentifier = productIdentifiers.get(
-                productIdIndex.intValue()
-              );
-              productIdIndex = productIdIndex.intValue() + 1;
-              // get the SubscriptionOfferDetails who match the subscriptionOfferIdentifier
-              ProductDetails.SubscriptionOfferDetails selectedOfferDetails =
-                null;
-              for (ProductDetails.SubscriptionOfferDetails offerDetails : productDetails.getSubscriptionOfferDetails()) {
-                if (
-                  offerDetails.getOfferId().equals(subscriptionOfferIdentifier)
-                ) {
-                  selectedOfferDetails = offerDetails;
-                  break;
+    try {
+      billingClient.queryProductDetailsAsync(
+        params,
+        new ProductDetailsResponseListener() {
+          public void onProductDetailsResponse(
+            BillingResult billingResult,
+            List<ProductDetails> productDetailsList
+          ) {
+            if (productDetailsList.size() == 0) {
+              closeBillingClient();
+              call.reject("Product not found");
+              return;
+            }
+            Log.i(
+              NativePurchasesPlugin.TAG,
+              "onProductDetailsResponse" + billingResult + productDetailsList
+            );
+            // Process the result
+            JSObject ret = new JSObject();
+            JSONArray products = new JSONArray();
+            Number productIdIndex = 0;
+            for (ProductDetails productDetails : productDetailsList) {
+              JSObject product = new JSObject();
+              product.put("identifier", productDetails.getProductId());
+              product.put("title", productDetails.getTitle());
+              product.put("description", productDetails.getDescription());
+              if (productType.equals("inapp")) {
+                product.put(
+                  "price",
+                  productDetails
+                    .getOneTimePurchaseOfferDetails()
+                    .getPriceAmountMicros() /
+                  1000000.0
+                );
+                product.put(
+                  "priceString",
+                  productDetails
+                    .getOneTimePurchaseOfferDetails()
+                    .getFormattedPrice()
+                );
+                product.put(
+                  "currencyCode",
+                  productDetails
+                    .getOneTimePurchaseOfferDetails()
+                    .getPriceCurrencyCode()
+                );
+              } else {
+                // productIdIndex is used to get the correct SubscriptionOfferDetails by productIdentifiersArray index and increment it
+                String subscriptionOfferIdentifier = productIdentifiers.get(
+                  productIdIndex.intValue()
+                );
+                productIdIndex = productIdIndex.intValue() + 1;
+                // get the SubscriptionOfferDetails who match the subscriptionOfferIdentifier
+                ProductDetails.SubscriptionOfferDetails selectedOfferDetails =
+                  null;
+                for (ProductDetails.SubscriptionOfferDetails offerDetails : productDetails.getSubscriptionOfferDetails()) {
+                  if (
+                    offerDetails
+                      .getOfferId()
+                      .equals(subscriptionOfferIdentifier)
+                  ) {
+                    selectedOfferDetails = offerDetails;
+                    break;
+                  }
                 }
+                if (selectedOfferDetails == null) {
+                  selectedOfferDetails =
+                    productDetails.getSubscriptionOfferDetails().get(0);
+                }
+                product.put(
+                  "price",
+                  selectedOfferDetails
+                    .getPricingPhases()
+                    .getPricingPhaseList()
+                    .get(0)
+                    .getPriceAmountMicros() /
+                  1000000.0
+                );
+                product.put(
+                  "priceString",
+                  selectedOfferDetails
+                    .getPricingPhases()
+                    .getPricingPhaseList()
+                    .get(0)
+                    .getFormattedPrice()
+                );
+                product.put(
+                  "currencyCode",
+                  selectedOfferDetails
+                    .getPricingPhases()
+                    .getPricingPhaseList()
+                    .get(0)
+                    .getPriceCurrencyCode()
+                );
               }
-              if (selectedOfferDetails == null) {
-                selectedOfferDetails =
-                  productDetails.getSubscriptionOfferDetails().get(0);
-              }
-              product.put(
-                "price",
-                selectedOfferDetails
-                  .getPricingPhases()
-                  .getPricingPhaseList()
-                  .get(0)
-                  .getPriceAmountMicros() /
-                1000000.0
-              );
-              product.put(
-                "priceString",
-                selectedOfferDetails
-                  .getPricingPhases()
-                  .getPricingPhaseList()
-                  .get(0)
-                  .getFormattedPrice()
-              );
-              product.put(
-                "currencyCode",
-                selectedOfferDetails
-                  .getPricingPhases()
-                  .getPricingPhaseList()
-                  .get(0)
-                  .getPriceCurrencyCode()
-              );
-            }
 
-            product.put("isFamilyShareable", false);
-            products.put(product);
+              product.put("isFamilyShareable", false);
+              products.put(product);
+            }
+            ret.put("products", products);
+            closeBillingClient();
+            call.resolve(ret);
           }
-          ret.put("products", products);
-          billingClient.endConnection();
-          billingClient = null;
-          call.resolve(ret);
         }
-      }
-    );
+      );
+    } catch (Exception e) {
+      closeBillingClient();
+      call.reject(e.getMessage());
+    }
   }
 }

package/ios/Plugin/NativePurchasesPlugin.swift

@@ -82,6 +82,10 @@ public class NativePurchasesPlugin: CAPPlugin {
                 Task {
                     do {
                         try await AppStore.sync()
+                        // make finish() calls for all transactions
+                        // for transaction in AppStore.transactions {
+                        //     await transaction.finish()
+                        // }
                         call.resolve()
                     } catch {
                         call.reject(error.localizedDescription)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/native-purchases",
-  "version": "0.0.30",
+  "version": "0.0.33",
   "description": "In-app Subscriptions Made Easy",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",