@umituz/react-native-subscription 2.37.85 → 2.37.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.37.85",
+  "version": "2.37.87",
   "description": "Complete subscription management with RevenueCat, paywall UI, and credits system for React Native apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/domains/credits/infrastructure/CreditsRepository.ts

@@ -7,7 +7,7 @@ import { deductCreditsOperation } from "../application/DeductCreditsCommand";
 import { refundCreditsOperation } from "../application/RefundCreditsCommand";
 import { PURCHASE_TYPE, type PurchaseType } from "../../subscription/core/SubscriptionConstants";
 import { requireFirestore, buildDocRef, type CollectionConfig } from "../../../shared/infrastructure/firestore";
-import { fetchCredits, checkHasCredits } from "./operations/CreditsFetcher";
+import { fetchCredits, checkHasCredits, documentExists } from "./operations/CreditsFetcher";
 import { syncExpiredStatus, syncPremiumMetadata, createRecoveryCreditsDocument, type PremiumMetadata } from "./operations/CreditsWriter";
 import { initializeCreditsWithRetry } from "./operations/CreditsInitializer";
 import { calculateCreditLimit } from "../application/CreditLimitCalculator";
@@ -71,6 +71,11 @@ export class CreditsRepository extends BaseRepository {
     return checkHasCredits(this.getRef(db, userId), cost);
   }
 
+  async creditsDocumentExists(userId: string): Promise<boolean> {
+    const db = requireFirestore();
+    return documentExists(this.getRef(db, userId));
+  }
+
   async syncExpiredStatus(userId: string): Promise<void> {
     const db = requireFirestore();
     await syncExpiredStatus(this.getRef(db, userId));

package/src/domains/credits/infrastructure/operations/CreditsFetcher.ts

@@ -4,6 +4,11 @@ import type { CreditsResult } from "../../core/Credits";
 import type { UserCreditsDocumentRead } from "../../core/UserCreditsDocument";
 import { mapCreditsDocumentToEntity } from "../../core/CreditsMapper";
 
+export async function documentExists(ref: DocumentReference): Promise<boolean> {
+  const snap = await getDoc(ref);
+  return snap.exists();
+}
+
 export async function fetchCredits(ref: DocumentReference): Promise<CreditsResult> {
   const snap = await getDoc(ref);
 

package/src/domains/credits/infrastructure/operations/CreditsWriter.ts

@@ -10,7 +10,6 @@ import { getAppVersion, validatePlatform } from "../../../../utils/appUtils";
 export async function syncExpiredStatus(ref: DocumentReference): Promise<void> {
   const doc = await getDoc(ref);
   if (!doc.exists()) {
-    console.warn("[CreditsWriter] syncExpiredStatus: credits document does not exist, skipping.", ref.path);
     return;
   }
 
@@ -40,7 +39,6 @@ export async function syncPremiumMetadata(
 ): Promise<void> {
   const doc = await getDoc(ref);
   if (!doc.exists()) {
-    console.warn("[CreditsWriter] syncPremiumMetadata: credits document does not exist, skipping.", ref.path);
     return;
   }
 

package/src/domains/subscription/application/SubscriptionSyncProcessor.ts

@@ -137,9 +137,13 @@ export class SubscriptionSyncProcessor {
     }
 
     if (!isPremium && !productId) {
-      // Cancellation: RevenueCat removed entitlement, no productId available.
-      // Must still update Firestore to reflect expired/canceled status.
-      await handleExpiredSubscription(creditsUserId);
+      // No entitlement and no productId — could be:
+      // 1. Free user who never purchased (no credits doc) → skip
+      // 2. Previously premium user whose entitlement was removed → expire
+      const hasDoc = await getCreditsRepository().creditsDocumentExists(creditsUserId);
+      if (hasDoc) {
+        await handleExpiredSubscription(creditsUserId);
+      }
       return;
     }
 

package/src/domains/subscription/infrastructure/services/PurchaseHandler.ts

@@ -21,6 +21,14 @@ export async function handlePurchase(
   const consumableIds = deps.config.consumableProductIdentifiers || [];
   const isConsumable = isConsumableProduct(pkg, consumableIds);
 
+  if (typeof __DEV__ !== "undefined" && __DEV__) {
+    console.log("[PurchaseHandler] handlePurchase:", {
+      productId: pkg.product.identifier,
+      userId,
+      isConsumable,
+    });
+  }
+
   try {
     const result = await executePurchase(deps.config, userId, pkg, isConsumable);
     return result;

package/src/domains/subscription/infrastructure/services/purchase/PurchaseExecutor.ts

@@ -86,13 +86,44 @@ async function executeSubscriptionPurchase(
   };
 }
 
+/** Default timeout for purchase operations (2 minutes) */
+const PURCHASE_TIMEOUT_MS = 120_000;
+
+function withTimeout<T>(promise: Promise<T>, ms: number, label: string): Promise<T> {
+  return new Promise<T>((resolve, reject) => {
+    const timer = setTimeout(() => {
+      reject(new Error(`[PurchaseExecutor] ${label} timed out after ${ms / 1000}s`));
+    }, ms);
+
+    promise
+      .then((result) => { clearTimeout(timer); resolve(result); })
+      .catch((error) => { clearTimeout(timer); reject(error); });
+  });
+}
+
 export async function executePurchase(
   config: RevenueCatConfig,
   userId: string,
   pkg: PurchasesPackage,
   isConsumable: boolean
 ): Promise<PurchaseResult> {
-  const { customerInfo } = await Purchases.purchasePackage(pkg);
+  if (typeof __DEV__ !== "undefined" && __DEV__) {
+    console.log("[PurchaseExecutor] Starting Purchases.purchasePackage:", {
+      productId: pkg.product.identifier,
+      userId,
+      isConsumable,
+    });
+  }
+
+  const { customerInfo } = await withTimeout(
+    Purchases.purchasePackage(pkg),
+    PURCHASE_TIMEOUT_MS,
+    `Purchases.purchasePackage(${pkg.product.identifier})`
+  );
+
+  if (typeof __DEV__ !== "undefined" && __DEV__) {
+    console.log("[PurchaseExecutor] Purchases.purchasePackage completed successfully");
+  }
 
   const productId = pkg.product.identifier;
   const packageType = pkg.packageType ?? null;