@umituz/react-native-subscription 2.37.72 → 2.37.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.37.72",
+  "version": "2.37.74",
   "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/application/RefundCreditsCommand.ts

@@ -39,8 +39,10 @@ export async function refundCreditsOperation(
         throw new Error(CREDIT_ERROR_CODES.NO_CREDITS);
       }
 
-      const current = docSnap.data().credits as number;
-      const updated = current + amount;
+      const data = docSnap.data();
+      const current = data.credits as number;
+      const creditLimit = (data.creditLimit as number) ?? Infinity;
+      const updated = Math.min(current + amount, creditLimit);
 
       tx.update(creditsRef, {
         credits: updated,

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

@@ -9,7 +9,10 @@ import { getAppVersion, validatePlatform } from "../../../../utils/appUtils";
 
 export async function syncExpiredStatus(ref: DocumentReference): Promise<void> {
   const doc = await getDoc(ref);
-  if (!doc.exists()) return;
+  if (!doc.exists()) {
+    console.warn("[CreditsWriter] syncExpiredStatus: credits document does not exist, skipping.", ref.path);
+    return;
+  }
 
   await setDoc(ref, {
     isPremium: false,
@@ -36,7 +39,10 @@ export async function syncPremiumMetadata(
   metadata: PremiumMetadata
 ): Promise<void> {
   const doc = await getDoc(ref);
-  if (!doc.exists()) return;
+  if (!doc.exists()) {
+    console.warn("[CreditsWriter] syncPremiumMetadata: credits document does not exist, skipping.", ref.path);
+    return;
+  }
 
   const isExpired = metadata.expirationDate ? isPast(metadata.expirationDate) : false;
   const status = resolveSubscriptionStatus({

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

@@ -25,15 +25,19 @@ export class SubscriptionSyncProcessor {
     }
   }
 
-  private async getCreditsUserId(revenueCatUserId: string): Promise<string> {
-    if (!revenueCatUserId || revenueCatUserId.trim().length === 0) {
-      const anonymousId = await this.getAnonymousUserId();
-      if (!anonymousId || anonymousId.trim().length === 0) {
-        throw new Error("[SubscriptionSyncProcessor] Cannot resolve credits userId: both revenueCatUserId and anonymousUserId are empty");
-      }
-      return anonymousId;
+  private async getCreditsUserId(revenueCatUserId: string | null | undefined): Promise<string> {
+    const trimmed = revenueCatUserId?.trim();
+    if (trimmed && trimmed.length > 0) {
+      return trimmed;
+    }
+
+    console.warn("[SubscriptionSyncProcessor] revenueCatUserId is empty/null, falling back to anonymousUserId");
+    const anonymousId = await this.getAnonymousUserId();
+    const trimmedAnonymous = anonymousId?.trim();
+    if (!trimmedAnonymous || trimmedAnonymous.length === 0) {
+      throw new Error("[SubscriptionSyncProcessor] Cannot resolve credits userId: both revenueCatUserId and anonymousUserId are empty");
     }
-    return revenueCatUserId;
+    return trimmedAnonymous;
   }
 
   async processPurchase(userId: string, productId: string, customerInfo: CustomerInfo, source?: PurchaseSource, packageType?: PackageType | null) {
@@ -41,7 +45,8 @@ export class SubscriptionSyncProcessor {
     try {
       const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
       revenueCatData.packageType = packageType ?? null;
-      revenueCatData.revenueCatUserId = await this.getRevenueCatAppUserId();
+      const revenueCatAppUserId = await this.getRevenueCatAppUserId();
+      revenueCatData.revenueCatUserId = revenueCatAppUserId ?? userId;
       const purchaseId = generatePurchaseId(revenueCatData.originalTransactionId, productId);
 
       const creditsUserId = await this.getCreditsUserId(userId);
@@ -66,7 +71,8 @@ export class SubscriptionSyncProcessor {
     try {
       const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
       revenueCatData.expirationDate = newExpirationDate ?? revenueCatData.expirationDate;
-      revenueCatData.revenueCatUserId = await this.getRevenueCatAppUserId();
+      const revenueCatAppUserId = await this.getRevenueCatAppUserId();
+      revenueCatData.revenueCatUserId = revenueCatAppUserId ?? userId;
       const purchaseId = generateRenewalId(revenueCatData.originalTransactionId, productId, newExpirationDate);
 
       const creditsUserId = await this.getCreditsUserId(userId);
@@ -112,6 +118,9 @@ 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);
       return;
     }
 

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

@@ -1,11 +1,13 @@
+const uniqueSuffix = (): string => `${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+
 export const generatePurchaseId = (originalTransactionId: string | null, productId: string): string => {
   return originalTransactionId
     ? `purchase_${originalTransactionId}`
-    : `purchase_${productId}_${Date.now()}`;
+    : `purchase_${productId}_${uniqueSuffix()}`;
 };
 
 export const generateRenewalId = (originalTransactionId: string | null, productId: string, expirationDate: string): string => {
   return originalTransactionId
     ? `renewal_${originalTransactionId}_${expirationDate}`
-    : `renewal_${productId}_${Date.now()}`;
+    : `renewal_${productId}_${uniqueSuffix()}`;
 };

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

@@ -26,9 +26,20 @@ export class CustomerInfoListenerManager {
     this.state.resetRenewalState();
   }
 
-  setupListener(config: RevenueCatConfig): void {
+  setupListener(config: RevenueCatConfig): boolean {
     this.removeListener();
 
+    try {
+      this._createAndAttachListener(config);
+      return true;
+    } catch (error) {
+      console.error("[CustomerInfoListenerManager] Failed to setup listener:", error);
+      this.state.currentUserId = null;
+      return false;
+    }
+  }
+
+  private _createAndAttachListener(config: RevenueCatConfig): void {
     this.state.listener = async (customerInfo: CustomerInfo) => {
       if (typeof __DEV__ !== "undefined" && __DEV__) {
         console.log("[CustomerInfoListener] 🔔 LISTENER TRIGGERED!", {
@@ -43,17 +54,21 @@ export class CustomerInfoListenerManager {
         return;
       }
 
-      const newRenewalState = await processCustomerInfo(
-        customerInfo,
-        capturedUserId,
-        this.state.renewalState,
-        config
-      );
+      try {
+        const newRenewalState = await processCustomerInfo(
+          customerInfo,
+          capturedUserId,
+          this.state.renewalState,
+          config
+        );
 
-      if (this.state.currentUserId === capturedUserId) {
-        this.state.renewalState = newRenewalState;
+        if (this.state.currentUserId === capturedUserId) {
+          this.state.renewalState = newRenewalState;
+        }
+        // else: User switched during async operation, discard stale renewal state
+      } catch (error) {
+        console.error("[CustomerInfoListener] processCustomerInfo failed:", error);
       }
-      // else: User switched during async operation, discard stale renewal state
     };
 
     Purchases.addCustomerInfoUpdateListener(this.state.listener);

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

@@ -13,15 +13,16 @@ async function executeConsumablePurchase(
 ): Promise<PurchaseResult> {
   const savedPurchase = getSavedPurchase();
   const source = savedPurchase?.source;
-  if (savedPurchase) {
-    clearSavedPurchase();
-  }
 
   try {
     await notifyPurchaseCompleted(config, userId, productId, customerInfo, source, packageType);
   } catch (syncError) {
     // Non-fatal: RevenueCat purchase succeeded, credits sync can be recovered on next session
     console.error('[PurchaseExecutor] Post-purchase sync failed (purchase was successful):', syncError);
+  } finally {
+    if (savedPurchase) {
+      clearSavedPurchase();
+    }
   }
 
   return {
@@ -44,9 +45,6 @@ async function executeSubscriptionPurchase(
   const isPremium = !!customerInfo.entitlements.active[entitlementIdentifier];
   const savedPurchase = getSavedPurchase();
   const source = savedPurchase?.source;
-  if (savedPurchase) {
-    clearSavedPurchase();
-  }
 
   if (typeof __DEV__ !== "undefined" && __DEV__) {
     console.log("[PurchaseExecutor] executeSubscriptionPurchase:", {
@@ -65,6 +63,10 @@ async function executeSubscriptionPurchase(
   } catch (syncError) {
     // Non-fatal: RevenueCat purchase succeeded, credits sync can be recovered on next session
     console.error('[PurchaseExecutor] Post-purchase sync failed (purchase was successful):', syncError);
+  } finally {
+    if (savedPurchase) {
+      clearSavedPurchase();
+    }
   }
 
   return {