@umituz/react-native-subscription 2.27.96 → 2.27.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.96",
+  "version": "2.27.98",
   "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/core/Credits.ts

@@ -6,6 +6,7 @@
  */
 
 import type { SubscriptionPackageType } from "../../../utils/packageTypeDetector";
+// Types imported from SubscriptionConstants are used directly in UserCredits interface
 import type {
   SubscriptionStatusType,
   PeriodType,
@@ -15,15 +16,6 @@ import type {
   PurchaseType
 } from "../../subscription/core/SubscriptionConstants";
 
-export type {
-  SubscriptionStatusType,
-  PeriodType,
-  PackageType,
-  Platform,
-  PurchaseSource,
-  PurchaseType
-};
-
 export type CreditType = "text" | "image";
 
 /** Single Source of Truth for user subscription + credits data */
@@ -67,10 +59,10 @@ export interface CreditAllocation {
   credits: number;
 }
 
-export type PackageAllocationMap = Record<
+export type PackageAllocationMap = Partial<Record<
   Exclude<SubscriptionPackageType, "unknown">,
   CreditAllocation
->;
+>>;
 
 export interface CreditsConfig {
   collectionName: string;

package/src/domains/credits/presentation/useDeductCredit.ts

@@ -82,24 +82,20 @@ export const useDeductCredit = ({
 
   const deductCredit = useCallback(async (cost: number = 1): Promise<boolean> => {
     if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[useDeductCredit] Attempting to deduct:", cost);
     }
     try {
       const res = await mutation.mutateAsync(cost);
       if (!res.success) {
         if (typeof __DEV__ !== "undefined" && __DEV__) {
-          console.log("[useDeductCredit] Deduction failed:", res.error?.code, res.error?.message);
         }
         if (res.error?.code === "CREDITS_EXHAUSTED") onCreditsExhausted?.();
         return false;
       }
       if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[useDeductCredit] Deduction successful, remaining:", res.remainingCredits);
       }
       return true;
     } catch (err) {
       if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[useDeductCredit] Deduction error:", err);
       }
       return false;
     }

package/src/domains/paywall/components/PaywallContainer.tsx

@@ -49,9 +49,25 @@ export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
   });
 
   // Check trial eligibility only if trialConfig is enabled
+  // Use ref to track if we've already checked for these packages to avoid redundant calls
+  const checkedPackagesRef = React.useRef<string[]>([]);
+
   useEffect(() => {
     if (!trialConfig?.enabled) return;
     if (packages.length === 0) return;
+    if (isLoading) return; // Wait for packages to fully load
+
+    // Get current package identifiers
+    const currentPackageIds = packages.map((pkg) => pkg.product.identifier);
+    const sortedIds = [...currentPackageIds].sort().join(",");
+
+    // Skip if we've already checked these exact packages
+    if (checkedPackagesRef.current.join(",") === sortedIds) {
+      return;
+    }
+
+    // Update ref
+    checkedPackagesRef.current = currentPackageIds;
 
     // Get all actual product IDs from packages
     const allProductIds = packages.map((pkg) => pkg.product.identifier);
@@ -72,7 +88,7 @@ export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
     if (productIdsToCheck.length > 0) {
       checkEligibility(productIdsToCheck);
     }
-  }, [packages, checkEligibility, trialConfig?.enabled, trialConfig?.eligibleProductIds]);
+  }, [packages, isLoading, checkEligibility, trialConfig?.enabled, trialConfig?.eligibleProductIds]);
 
   // Convert eligibility map to format expected by PaywallModal
   // Only process if trial is enabled

package/src/domains/paywall/components/PaywallContainer.types.ts

@@ -5,7 +5,8 @@
 
 import type { ImageSourcePropType } from "react-native";
 import type { PaywallTranslations, PaywallLegalUrls, SubscriptionFeature } from "../entities/types";
-import type { PurchaseSource, PackageAllocationMap } from "../../credits/core/Credits";
+import type { PurchaseSource } from "../../subscription/core/SubscriptionConstants";
+import type { PackageAllocationMap } from "../../credits/core/Credits";
 
 /**
  * Trial display configuration

package/src/domains/paywall/components/PaywallModal.tsx

@@ -74,7 +74,6 @@ export const PaywallModal: React.FC<PaywallModalProps> = React.memo((props) => {
     if (!selectedPlanId || !onPurchase) return;
 
     if (__DEV__) {
-      console.log("[PaywallModal] handlePurchase starting:", { selectedPlanId });
     }
 
     setIsLocalProcessing(true);
@@ -84,11 +83,9 @@ export const PaywallModal: React.FC<PaywallModalProps> = React.memo((props) => {
       const pkg = packages.find((p) => p.product.identifier === selectedPlanId);
       if (pkg) {
         if (__DEV__) {
-          console.log("[PaywallModal] Calling onPurchase:", { productId: pkg.product.identifier });
         }
         await onPurchase(pkg);
         if (__DEV__) {
-          console.log("[PaywallModal] onPurchase completed");
         }
       }
     } catch (error) {
@@ -100,7 +97,6 @@ export const PaywallModal: React.FC<PaywallModalProps> = React.memo((props) => {
       setIsLocalProcessing(false);
       endPurchase();
       if (__DEV__) {
-        console.log("[PaywallModal] handlePurchase finished");
       }
     }
   }, [selectedPlanId, packages, onPurchase, startPurchase, endPurchase]);
@@ -109,14 +105,12 @@ export const PaywallModal: React.FC<PaywallModalProps> = React.memo((props) => {
     if (!onRestore || isProcessing) return;
 
     if (__DEV__) {
-      console.log("[PaywallModal] handleRestore starting");
     }
 
     setIsLocalProcessing(true);
     try {
       await onRestore();
       if (__DEV__) {
-        console.log("[PaywallModal] handleRestore completed");
       }
     } finally {
       setIsLocalProcessing(false);

package/src/domains/paywall/hooks/usePaywallActions.ts

@@ -2,7 +2,7 @@ import { useCallback } from "react";
 import type { PurchasesPackage } from "react-native-purchases";
 import { useRestorePurchase } from "../../subscription/infrastructure/hooks/useRestorePurchase";
 import { useAuthAwarePurchase } from "../../subscription/presentation/useAuthAwarePurchase";
-import type { PurchaseSource } from "../../credits/core/Credits";
+import type { PurchaseSource } from "../../subscription/core/SubscriptionConstants";
 
 interface UsePaywallActionsProps {
   source?: PurchaseSource;

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

@@ -94,9 +94,6 @@ export const initializeSubscription = async (config: SubscriptionInitConfig): Pr
 
   const initializeInBackground = async (userId?: string): Promise<void> => {
     await SubscriptionManager.initialize(userId);
-    if (__DEV__) {
-      console.log('[SubscriptionInitializer] Background init complete');
-    }
   };
 
   // 5. Start Background Init
@@ -110,9 +107,6 @@ export const initializeSubscription = async (config: SubscriptionInitConfig): Pr
 
   // 6. Listen for Auth Changes
   setupAuthStateListener(() => auth, (newUserId) => {
-    if (__DEV__) {
-      console.log('[SubscriptionInitializer] Auth changed, re-init:', newUserId);
-    }
     initializeInBackground(newUserId);
   });
 };

package/src/domains/subscription/infrastructure/handlers/PackageHandler.ts

@@ -25,21 +25,32 @@ export class PackageHandler {
 
   async fetchPackages(): Promise<PurchasesPackage[]> {
     if (!this.service.isInitialized()) {
-      throw new Error("Service not initialized");
+      throw new Error("Service not initialized. Please initialize before fetching packages.");
     }
 
-    const offering = await this.service.fetchOfferings();
-
-    if (!offering) {
-      throw new Error("No offerings available");
+    try {
+      const offering = await this.service.fetchOfferings();
+
+      if (!offering) {
+        // Return empty array instead of throwing - allows graceful degradation
+        return [];
+      }
+
+      const packages = offering.availablePackages;
+      if (!packages || packages.length === 0) {
+        // Return empty array instead of throwing - allows graceful degradation
+        return [];
+      }
+
+      return packages;
+    } catch (error) {
+      // Re-throw with more context
+      throw new Error(
+        `Failed to fetch subscription packages. ${
+          error instanceof Error ? error.message : "Unknown error"
+        }`
+      );
     }
-
-    const packages = offering.availablePackages;
-    if (!packages) {
-      throw new Error("No packages available in offering");
-    }
-
-    return packages;
   }
 
   async purchase(pkg: PurchasesPackage, userId: string): Promise<boolean> {

package/src/domains/subscription/infrastructure/hooks/subscriptionQueryKeys.ts

@@ -3,6 +3,9 @@
  * TanStack Query keys and constants for subscription state
  */
 
+/** Query cache time constants */
+
+
 /**
  * Query keys for TanStack Query
  */
@@ -12,7 +15,4 @@ export const SUBSCRIPTION_QUERY_KEYS = {
     ["subscription", "initialized", userId] as const,
 } as const;
 
-// No cache - always fetch fresh data for subscription packages
-// This ensures users always see real-time subscription status
-export const STALE_TIME = 0; // Always stale - refetch immediately
-export const GC_TIME = 0; // Don't cache - garbage collect immediately
+

package/src/domains/subscription/infrastructure/hooks/useCustomerInfo.ts

@@ -71,23 +71,10 @@ export function useCustomerInfo(): UseCustomerInfoResult {
       const info = await Purchases.getCustomerInfo();
 
       setCustomerInfo(info);
-
-      if (__DEV__) {
-        console.log('[DEBUG useCustomerInfo] Fetched:', {
-          hasActiveEntitlements: Object.keys(info.entitlements.active).length > 0,
-          latestExpiration: info.latestExpirationDate || "none",
-        });
-      }
     } catch (err) {
       const errorMessage =
         err instanceof Error ? err.message : "Failed to fetch customer info";
       setError(errorMessage);
-
-      if (__DEV__) {
-        console.error('[DEBUG useCustomerInfo] Error:', {
-          error: err,
-        });
-      }
     } finally {
       setLoading(false);
       setIsFetching(false);
@@ -100,12 +87,6 @@ export function useCustomerInfo(): UseCustomerInfoResult {
 
     // Listen for real-time updates (renewals, purchases, restore)
     const listener = (info: CustomerInfo) => {
-      if (__DEV__) {
-        console.log('[DEBUG useCustomerInfo] Listener update:', {
-          hasActiveEntitlements: Object.keys(info.entitlements.active).length > 0,
-        });
-      }
-
       setCustomerInfo(info);
       setError(null);
     };

package/src/domains/subscription/infrastructure/hooks/useInitializeSubscription.ts

@@ -19,10 +19,6 @@ export const useInitializeSubscription = (userId: string | undefined) => {
         throw new Error("User not authenticated");
       }
 
-      if (__DEV__) {
-        console.log('[DEBUG useInitializeSubscription] Initializing:', { userId });
-      }
-
       return SubscriptionManager.initialize(userId);
     },
     onSuccess: () => {
@@ -30,18 +26,6 @@ export const useInitializeSubscription = (userId: string | undefined) => {
         queryClient.invalidateQueries({
           queryKey: SUBSCRIPTION_QUERY_KEYS.packages,
         });
-
-        if (__DEV__) {
-          console.log('[DEBUG useInitializeSubscription] Success:', { userId });
-        }
-      }
-    },
-    onError: (error) => {
-      if (__DEV__) {
-        console.error('[DEBUG useInitializeSubscription] Error:', {
-          error,
-          userId: userId ?? "ANONYMOUS",
-        });
       }
     },
   });

package/src/domains/subscription/infrastructure/hooks/usePurchasePackage.ts

@@ -40,33 +40,12 @@ export const usePurchasePackage = () => {
       }
 
       const productId = pkg.product.identifier;
-
-      if (__DEV__) {
-        console.log('[DEBUG usePurchasePackage] Starting purchase:', {
-          packageId: pkg.identifier,
-          productId,
-          userId,
-        });
-      }
-
       const success = await SubscriptionManager.purchasePackage(pkg);
 
-      if (__DEV__) {
-        console.log('[DEBUG usePurchasePackage] Purchase result:', {
-          success,
-          packageId: pkg.identifier,
-          productId,
-          userId,
-        });
-      }
-
       return { success, productId };
     },
     onSuccess: (result) => {
       if (result.success) {
-        if (__DEV__) {
-          console.log('[DEBUG usePurchasePackage] onSuccess - invalidating queries');
-        }
         showSuccess("Purchase Successful", "Your subscription is now active!");
         queryClient.invalidateQueries({
           queryKey: SUBSCRIPTION_QUERY_KEYS.packages,
@@ -77,20 +56,10 @@ export const usePurchasePackage = () => {
           });
         }
       } else {
-        if (__DEV__) {
-          console.log('[DEBUG usePurchasePackage] onSuccess but result.success=false');
-        }
         showError("Purchase Failed", "Unable to complete purchase. Please try again.");
       }
     },
     onError: (error) => {
-      if (__DEV__) {
-        console.error('[DEBUG usePurchasePackage] onError:', {
-          error,
-          userId: userId ?? "ANONYMOUS",
-        });
-      }
-
       let title = "Purchase Error";
       let message = "Unable to complete purchase. Please try again.";
 

package/src/domains/subscription/infrastructure/hooks/useRestorePurchase.ts

@@ -34,26 +34,7 @@ export const useRestorePurchase = () => {
         throw new Error("User not authenticated");
       }
 
-      if (__DEV__) {
-        console.log('[DEBUG useRestorePurchase] Starting restore:', { userId });
-      }
-
       const result = await SubscriptionManager.restore();
-
-      if (result.success) {
-        if (__DEV__) {
-          console.log('[DEBUG useRestorePurchase] Restore successful:', {
-            userId,
-            productId: result.productId,
-          });
-        }
-        // Credits will be initialized by CustomerInfoListener
-      } else {
-        if (__DEV__) {
-          console.log('[DEBUG useRestorePurchase] Restore failed:', { userId });
-        }
-      }
-
       return result;
     },
     onSuccess: (result) => {
@@ -68,13 +49,5 @@ export const useRestorePurchase = () => {
         }
       }
     },
-    onError: (error) => {
-      if (__DEV__) {
-        console.error('[DEBUG useRestorePurchase] Restore mutation failed:', {
-          error,
-          userId: userId ?? "ANONYMOUS",
-        });
-      }
-    },
   });
 };

package/src/domains/subscription/infrastructure/hooks/useRevenueCatTrialEligibility.ts

@@ -85,9 +85,6 @@ export function useRevenueCatTrialEligibility(): UseRevenueCatTrialEligibilityRe
 
     const service = getRevenueCatService();
     if (!service || !service.isInitialized()) {
-      if (__DEV__) {
-        console.log("[TrialEligibility] RevenueCat not initialized");
-      }
       return;
     }
 
@@ -109,12 +106,6 @@ export function useRevenueCatTrialEligibility(): UseRevenueCatTrialEligibilityRe
           eligible: isEligible,
           trialDurationDays: 7, // Default to 7 days as configured in App Store Connect
         };
-
-        if (__DEV__) {
-          console.log(
-            `[TrialEligibility] ${productId}: ${isEligible ? "ELIGIBLE" : "NOT_ELIGIBLE"}`
-          );
-        }
       }
 
       // Update cache
@@ -127,9 +118,6 @@ export function useRevenueCatTrialEligibility(): UseRevenueCatTrialEligibilityRe
         setEligibilityMap((prev) => ({ ...prev, ...newMap }));
       }
     } catch (error) {
-      if (__DEV__) {
-        console.log("[TrialEligibility] Error checking eligibility:", error);
-      }
       // On error, default to eligible (better UX)
       const fallbackMap: TrialEligibilityMap = {};
       for (const productId of productIds) {

package/src/domains/subscription/infrastructure/hooks/useSubscriptionPackages.ts

@@ -12,8 +12,6 @@ import {
 import { SubscriptionManager } from '../../infrastructure/managers/SubscriptionManager';
 import {
   SUBSCRIPTION_QUERY_KEYS,
-  STALE_TIME,
-  GC_TIME,
 } from "./subscriptionQueryKeys";
 
 /**
@@ -41,11 +39,7 @@ export const useSubscriptionPackages = () => {
 
       return SubscriptionManager.getPackages();
     },
-    staleTime: STALE_TIME,
-    gcTime: GC_TIME,
     enabled: isConfigured,
-    refetchOnMount: true,
-    refetchOnWindowFocus: true, // Refetch when app becomes active
-    refetchOnReconnect: true, // Refetch when network reconnects
+
   });
 };

package/src/domains/subscription/infrastructure/hooks/useSubscriptionQueries.ts

@@ -6,8 +6,6 @@
 
 export {
   SUBSCRIPTION_QUERY_KEYS,
-  STALE_TIME,
-  GC_TIME,
 } from "./subscriptionQueryKeys";
 export { useInitializeSubscription } from "./useInitializeSubscription";
 export { useSubscriptionPackages } from "./useSubscriptionPackages";

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

@@ -58,14 +58,6 @@ export class CustomerInfoListenerManager {
 
             // Handle renewal (same product, extended expiration)
             if (renewalResult.isRenewal && config.onRenewalDetected) {
-                if (__DEV__) {
-                    console.log("[CustomerInfoListener] Renewal detected:", {
-                        userId: this.currentUserId,
-                        productId: renewalResult.productId,
-                        newExpiration: renewalResult.newExpirationDate,
-                    });
-                }
-
                 try {
                     await config.onRenewalDetected(
                         this.currentUserId,
@@ -82,16 +74,6 @@ export class CustomerInfoListenerManager {
 
             // Handle plan change (upgrade/downgrade)
             if (renewalResult.isPlanChange && config.onPlanChanged) {
-                if (__DEV__) {
-                    console.log("[CustomerInfoListener] Plan change detected:", {
-                        userId: this.currentUserId,
-                        previousProductId: renewalResult.previousProductId,
-                        newProductId: renewalResult.productId,
-                        isUpgrade: renewalResult.isUpgrade,
-                        isDowngrade: renewalResult.isDowngrade,
-                    });
-                }
-
                 try {
                     await config.onPlanChanged(
                         this.currentUserId,
@@ -133,9 +115,6 @@ export class CustomerInfoListenerManager {
     }
 
     destroy(): void {
-        if (__DEV__) {
-            console.log('[CustomerInfoListenerManager] Destroying listener manager');
-        }
         this.removeListener();
         this.clearUserId();
         // Reset renewal state to ensure clean state

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

@@ -85,15 +85,12 @@ export async function initializeSDK(
 
   const key = apiKey || resolveApiKey(deps.config);
   if (!key) {
-    if (__DEV__) console.log('[RevenueCat] No API key');
     return { success: false, offering: null, isPremium: false };
   }
 
   configurationState.configurationInProgress = true;
   try {
     configureLogHandler();
-    if (__DEV__) console.log('[RevenueCat] Configuring:', key.substring(0, 10) + '...');
-
     await Purchases.configure({ apiKey: key, appUserID: userId });
     configurationState.isPurchasesConfigured = true;
     deps.setInitialized(true);
@@ -104,14 +101,8 @@ export async function initializeSDK(
       Purchases.getOfferings(),
     ]);
 
-    if (__DEV__) {
-      console.log('[RevenueCat] Initialized', {
-        packages: offerings.current?.availablePackages?.length ?? 0,
-      });
-    }
     return buildSuccessResult(deps, customerInfo, offerings);
   } catch (error) {
-    if (__DEV__) console.error('[RevenueCat] Init failed:', error);
     return { success: false, offering: null, isPremium: false };
   } finally {
     configurationState.configurationInProgress = false;

package/src/domains/subscription/infrastructure/utils/InitializationCache.ts

@@ -11,6 +11,8 @@ export class InitializationCache {
     private initializationInProgress = false;
     // Track which userId the promise is for (separate from currentUserId which is set after completion)
     private promiseUserId: string | null = null;
+    // Track promise completion state to avoid returning failed promises
+    private promiseCompleted = true;
 
     /**
      * Atomically check if reinitialization is needed AND reserve the slot
@@ -22,17 +24,24 @@ export class InitializationCache {
             return { shouldInit: false, existingPromise: this.initPromise };
         }
 
-        // If already initialized for this user and promise resolved successfully, return it
-        if (this.initPromise && this.currentUserId === userId && !this.initializationInProgress) {
+        // If already initialized for this user and promise completed successfully, return it
+        // Only return cached promise if it completed AND it's for the same user
+        if (this.initPromise && this.currentUserId === userId && !this.initializationInProgress && this.promiseCompleted) {
             return { shouldInit: false, existingPromise: this.initPromise };
         }
 
-        // Different user or no initialization - need to reinitialize
-        // Atomically set the flag
-        this.initializationInProgress = true;
-        this.promiseUserId = userId;
+        // Different user, no initialization, or failed promise - need to reinitialize
+        // Atomically set the flag and clear previous state if needed
+        if (!this.initializationInProgress) {
+            this.initializationInProgress = true;
+            this.promiseUserId = userId;
+            this.promiseCompleted = false;
+            return { shouldInit: true, existingPromise: null };
+        }
 
-        return { shouldInit: true, existingPromise: null };
+        // If we reach here, initialization is in progress for a different user
+        // Wait for current initialization to complete
+        return { shouldInit: false, existingPromise: this.initPromise };
     }
 
     setPromise(promise: Promise<boolean>, userId: string): void {
@@ -45,6 +54,7 @@ export class InitializationCache {
                 if (result && this.promiseUserId === userId) {
                     this.currentUserId = userId;
                 }
+                this.promiseCompleted = true;
                 return result;
             })
             .catch(() => {
@@ -52,7 +62,9 @@ export class InitializationCache {
                 if (this.promiseUserId === userId) {
                     this.initPromise = null;
                     this.promiseUserId = null;
+                    this.currentUserId = null; // Clear user on failure
                 }
+                this.promiseCompleted = true;
             })
             .finally(() => {
                 // Always release the mutex
@@ -71,5 +83,6 @@ export class InitializationCache {
         this.currentUserId = null;
         this.initializationInProgress = false;
         this.promiseUserId = null;
+        this.promiseCompleted = true;
     }
 }

package/src/domains/subscription/infrastructure/utils/PremiumStatusSyncer.ts

@@ -5,7 +5,7 @@
 
 import type { CustomerInfo } from "react-native-purchases";
 import type { RevenueCatConfig } from "../../core/RevenueCatConfig";
-import type { PurchaseSource } from "../../../credits/core/Credits";
+import type { PurchaseSource } from "../../../subscription/core/SubscriptionConstants";
 import { getPremiumEntitlement } from "../../core/RevenueCatTypes";
 
 export async function syncPremiumStatus(
@@ -49,27 +49,12 @@ export async function notifyPurchaseCompleted(
     customerInfo: CustomerInfo,
     source?: PurchaseSource
 ): Promise<void> {
-    if (__DEV__) {
-        console.log('[PremiumStatusSyncer] notifyPurchaseCompleted called:', {
-            userId,
-            productId,
-            source,
-            hasCallback: !!config.onPurchaseCompleted,
-        });
-    }
-
     if (!config.onPurchaseCompleted) {
-        if (__DEV__) {
-            console.warn('[PremiumStatusSyncer] No onPurchaseCompleted callback configured!');
-        }
         return;
     }
 
     try {
         await config.onPurchaseCompleted(userId, productId, customerInfo, source);
-        if (__DEV__) {
-            console.log('[PremiumStatusSyncer] onPurchaseCompleted callback executed successfully');
-        }
     } catch (error) {
         if (__DEV__) {
             console.error('[PremiumStatusSyncer] onPurchaseCompleted callback failed:', error);