@umituz/react-native-subscription 2.37.70 → 2.37.72

package/package.json

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

@@ -8,8 +8,9 @@ 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 { syncExpiredStatus, syncPremiumMetadata, type PremiumMetadata } from "./operations/CreditsWriter";
+import { syncExpiredStatus, syncPremiumMetadata, createRecoveryCreditsDocument, type PremiumMetadata } from "./operations/CreditsWriter";
 import { initializeCreditsWithRetry } from "./operations/CreditsInitializer";
+import { calculateCreditLimit } from "../application/CreditLimitCalculator";
 
 export class CreditsRepository extends BaseRepository {
   constructor(private config: CreditsConfig) {
@@ -79,6 +80,25 @@ export class CreditsRepository extends BaseRepository {
     const db = requireFirestore();
     await syncPremiumMetadata(this.getRef(db, userId), metadata);
   }
+
+  async ensurePremiumCreditsExist(
+    userId: string,
+    productId: string,
+    willRenew: boolean,
+    expirationDate: string | null,
+    periodType: string | null,
+  ): Promise<boolean> {
+    const db = requireFirestore();
+    const creditLimit = calculateCreditLimit(productId, this.config);
+    return createRecoveryCreditsDocument(
+      this.getRef(db, userId),
+      creditLimit,
+      productId,
+      willRenew,
+      expirationDate,
+      periodType,
+    );
+  }
 }
 
 export function createCreditsRepository(config: CreditsConfig): CreditsRepository {

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

@@ -5,6 +5,7 @@ import { SUBSCRIPTION_STATUS } from "../../../subscription/core/SubscriptionCons
 import { resolveSubscriptionStatus } from "../../../subscription/core/SubscriptionStatus";
 import { toTimestamp } from "../../../../shared/utils/dateConverter";
 import { isPast } from "../../../../utils/dateUtils";
+import { getAppVersion, validatePlatform } from "../../../../utils/appUtils";
 
 export async function syncExpiredStatus(ref: DocumentReference): Promise<void> {
   const doc = await getDoc(ref);
@@ -62,3 +63,52 @@ export async function syncPremiumMetadata(
     ...(metadata.ownershipType && { ownershipType: metadata.ownershipType }),
   }, { merge: true });
 }
+
+/**
+ * Recovery: creates a credits document for premium users who don't have one.
+ * This handles edge cases like test store purchases, reinstalls, or failed initializations.
+ * Returns true if a new document was created, false if one already existed.
+ */
+export async function createRecoveryCreditsDocument(
+  ref: DocumentReference,
+  creditLimit: number,
+  productId: string,
+  willRenew: boolean,
+  expirationDate: string | null,
+  periodType: string | null,
+): Promise<boolean> {
+  const doc = await getDoc(ref);
+  if (doc.exists()) return false;
+
+  const platform = validatePlatform();
+  const appVersion = getAppVersion();
+
+  const isExpired = expirationDate ? isPast(expirationDate) : false;
+  const status = resolveSubscriptionStatus({
+    isPremium: true,
+    willRenew,
+    isExpired,
+    periodType: periodType ?? undefined,
+  });
+
+  const expirationTimestamp = expirationDate ? toTimestamp(expirationDate) : null;
+
+  await setDoc(ref, {
+    credits: creditLimit,
+    creditLimit,
+    isPremium: true,
+    status,
+    willRenew,
+    productId,
+    platform,
+    appVersion,
+    processedPurchases: [],
+    purchaseHistory: [],
+    createdAt: serverTimestamp(),
+    lastUpdatedAt: serverTimestamp(),
+    recoveryInitialized: true,
+    ...(expirationTimestamp && { expirationDate: expirationTimestamp }),
+  });
+
+  return true;
+}

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

@@ -10,6 +10,8 @@ import { handleExpiredSubscription, handlePremiumStatusSync } from "./statusChan
 import type { PackageType } from "../../revenuecat/core/types";
 
 export class SubscriptionSyncProcessor {
+  private purchaseInProgress = false;
+
   constructor(
     private entitlementId: string,
     private getAnonymousUserId: () => Promise<string>
@@ -35,43 +37,53 @@ export class SubscriptionSyncProcessor {
   }
 
   async processPurchase(userId: string, productId: string, customerInfo: CustomerInfo, source?: PurchaseSource, packageType?: PackageType | null) {
-    const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
-    revenueCatData.packageType = packageType ?? null;
-    revenueCatData.revenueCatUserId = await this.getRevenueCatAppUserId();
-    const purchaseId = generatePurchaseId(revenueCatData.originalTransactionId, productId);
-
-    const creditsUserId = await this.getCreditsUserId(userId);
-
-    await getCreditsRepository().initializeCredits(
-      creditsUserId,
-      purchaseId,
-      productId,
-      source ?? PURCHASE_SOURCE.SETTINGS,
-      revenueCatData,
-      PURCHASE_TYPE.INITIAL
-    );
-
-    emitCreditsUpdated(creditsUserId);
+    this.purchaseInProgress = true;
+    try {
+      const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
+      revenueCatData.packageType = packageType ?? null;
+      revenueCatData.revenueCatUserId = await this.getRevenueCatAppUserId();
+      const purchaseId = generatePurchaseId(revenueCatData.originalTransactionId, productId);
+
+      const creditsUserId = await this.getCreditsUserId(userId);
+
+      await getCreditsRepository().initializeCredits(
+        creditsUserId,
+        purchaseId,
+        productId,
+        source ?? PURCHASE_SOURCE.SETTINGS,
+        revenueCatData,
+        PURCHASE_TYPE.INITIAL
+      );
+
+      emitCreditsUpdated(creditsUserId);
+    } finally {
+      this.purchaseInProgress = false;
+    }
   }
 
   async processRenewal(userId: string, productId: string, newExpirationDate: string, customerInfo: CustomerInfo) {
-    const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
-    revenueCatData.expirationDate = newExpirationDate ?? revenueCatData.expirationDate;
-    revenueCatData.revenueCatUserId = await this.getRevenueCatAppUserId();
-    const purchaseId = generateRenewalId(revenueCatData.originalTransactionId, productId, newExpirationDate);
-
-    const creditsUserId = await this.getCreditsUserId(userId);
-
-    await getCreditsRepository().initializeCredits(
-      creditsUserId,
-      purchaseId,
-      productId,
-      PURCHASE_SOURCE.RENEWAL,
-      revenueCatData,
-      PURCHASE_TYPE.RENEWAL
-    );
-
-    emitCreditsUpdated(creditsUserId);
+    this.purchaseInProgress = true;
+    try {
+      const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
+      revenueCatData.expirationDate = newExpirationDate ?? revenueCatData.expirationDate;
+      revenueCatData.revenueCatUserId = await this.getRevenueCatAppUserId();
+      const purchaseId = generateRenewalId(revenueCatData.originalTransactionId, productId, newExpirationDate);
+
+      const creditsUserId = await this.getCreditsUserId(userId);
+
+      await getCreditsRepository().initializeCredits(
+        creditsUserId,
+        purchaseId,
+        productId,
+        PURCHASE_SOURCE.RENEWAL,
+        revenueCatData,
+        PURCHASE_TYPE.RENEWAL
+      );
+
+      emitCreditsUpdated(creditsUserId);
+    } finally {
+      this.purchaseInProgress = false;
+    }
   }
 
   async processStatusChange(
@@ -82,6 +94,16 @@ export class SubscriptionSyncProcessor {
     willRenew?: boolean,
     periodType?: PeriodType
   ) {
+    // Skip if a purchase is already handling the credits document.
+    // Both PurchaseExecutor and CustomerInfoListener fire after a purchase —
+    // the purchase handler writes credits + metadata, so the status handler can skip.
+    if (this.purchaseInProgress) {
+      if (typeof __DEV__ !== "undefined" && __DEV__) {
+        console.log("[SubscriptionSyncProcessor] Skipping status change - purchase in progress");
+      }
+      return;
+    }
+
     const creditsUserId = await this.getCreditsUserId(userId);
 
     if (!isPremium && productId) {

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

@@ -19,7 +19,24 @@ export const handlePremiumStatusSync = async (
   store?: string | null,
   ownershipType?: string | null
 ): Promise<void> => {
-  await getCreditsRepository().syncPremiumMetadata(userId, {
+  const repo = getCreditsRepository();
+
+  // Recovery: if premium user has no credits document, create one.
+  // Handles edge cases like test store, reinstalls, or failed purchase initialization.
+  if (isPremium) {
+    const created = await repo.ensurePremiumCreditsExist(
+      userId,
+      productId,
+      willRenew,
+      expiresAt,
+      periodType,
+    );
+    if (__DEV__ && created) {
+      console.log('[handlePremiumStatusSync] Recovery: created missing credits document for premium user', { userId, productId });
+    }
+  }
+
+  await repo.syncPremiumMetadata(userId, {
     isPremium,
     willRenew,
     expirationDate: expiresAt,