@umituz/react-native-subscription 2.37.39 → 2.37.41

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

@@ -1,19 +1,6 @@
-/**
- * Subscription Query Keys
- * TanStack Query keys and constants for subscription state
- */
-
-/** Query cache time constants */
-
-
-/**
- * Query keys for TanStack Query
- */
 export const SUBSCRIPTION_QUERY_KEYS = {
   packages: ["subscription", "packages"] as const,
   initialized: (userId: string) =>
     ["subscription", "initialized", userId] as const,
   customerInfo: ["subscription", "customerInfo"] as const,
 } as const;
-
-

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

@@ -1,10 +1,3 @@
-/**
- * Purchase Package Hook
- * TanStack mutation for purchasing subscription packages
- * Credits are initialized by CustomerInfoListener (not here to avoid duplicates)
- * Auth info automatically read from @umituz/react-native-auth
- */
-
 import { useMutation, useQueryClient } from "@umituz/react-native-design-system";
 import type { PurchasesPackage } from "react-native-purchases";
 import { useAlert } from "@umituz/react-native-design-system";
@@ -19,17 +12,11 @@ import { subscriptionStatusQueryKeys } from "../../presentation/useSubscriptionS
 import { creditsQueryKeys } from "../../../credits/presentation/creditsQueryKeys";
 import { getErrorMessage } from "../../../revenuecat/core/errors";
 
-/** Purchase mutation result - simplified for presentation layer */
 interface PurchaseMutationResult {
   success: boolean;
   productId: string;
 }
 
-/**
- * Purchase a subscription package
- * Credits are initialized by CustomerInfoListener when entitlement becomes active
- * Auth info automatically read from auth store
- */
 export const usePurchasePackage = () => {
   const userId = useAuthStore(selectUserId);
   const isAnonymous = useAuthStore(selectIsAnonymous);
@@ -51,13 +38,11 @@ export const usePurchasePackage = () => {
         console.log(`[Purchase] Initializing and purchasing. User: ${userId}`);
       }
 
-      await SubscriptionManager.initialize(userId);
       const success = await SubscriptionManager.purchasePackage(pkg, userId);
 
       return { success, productId };
     },
     onSuccess: (result) => {
-
       if (result.success) {
         showSuccess("Purchase Successful", "Your subscription is now active!");
         queryClient.invalidateQueries({
@@ -76,11 +61,8 @@ export const usePurchasePackage = () => {
       }
     },
     onError: (error) => {
-
-      // Use map-based lookup - O(1) complexity
       const errorInfo = getErrorMessage(error);
 
-      // Don't show alert for user cancellation
       if (!errorInfo.shouldShowAlert) {
         return;
       }

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

@@ -1,15 +1,9 @@
-/**
- * Restore Purchase Hook
- * TanStack mutation for restoring previous purchases
- * Credits are initialized by CustomerInfoListener (not here to avoid duplicates)
- * Auth info automatically read from @umituz/react-native-auth
- */
-
 import { useMutation, useQueryClient } from "@umituz/react-native-design-system";
 import { useAlert } from "@umituz/react-native-design-system";
 import {
   useAuthStore,
   selectUserId,
+  selectIsAnonymous,
 } from "@umituz/react-native-auth";
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
@@ -22,29 +16,23 @@ interface RestoreResult {
   productId: string | null;
 }
 
-/**
- * Restore previous purchases
- * Credits are initialized by CustomerInfoListener when entitlement becomes active
- * Auth info automatically read from auth store
- */
 export const useRestorePurchase = () => {
   const userId = useAuthStore(selectUserId);
+  const isAnonymous = useAuthStore(selectIsAnonymous);
   const queryClient = useQueryClient();
   const { showSuccess, showInfo, showError } = useAlert();
 
   return useMutation({
     mutationFn: async (): Promise<RestoreResult> => {
-      if (!userId) {
+      if (!userId || isAnonymous) {
         throw new Error("User not authenticated");
       }
 
-      await SubscriptionManager.initialize(userId);
       const result = await SubscriptionManager.restore(userId);
       return result;
     },
     onSuccess: (result) => {
       if (result.success) {
-        // Invalidate queries to refresh data
         queryClient.invalidateQueries({
           queryKey: SUBSCRIPTION_QUERY_KEYS.packages,
         });
@@ -57,7 +45,6 @@ export const useRestorePurchase = () => {
           });
         }
 
-        // Show user feedback
         if (result.productId) {
           showSuccess("Restore Successful", "Your subscription has been restored!");
         } else {
@@ -66,7 +53,6 @@ export const useRestorePurchase = () => {
       }
     },
     onError: (error) => {
-      // Use map-based lookup - O(1) complexity
       const errorInfo = getErrorMessage(error);
       showError(errorInfo.title, errorInfo.message);
     },

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

@@ -1,9 +1,3 @@
-/**
- * useRevenueCatTrialEligibility Hook
- * Checks if user is eligible for introductory offers via RevenueCat
- * Uses Apple's native mechanism for trial eligibility
- */
-
 import { useState, useEffect, useCallback, useRef } from "react";
 import { getRevenueCatService } from "../services/RevenueCatService";
 import {
@@ -14,24 +8,14 @@ import {
   type TrialEligibilityMap,
 } from "../utils/trialEligibilityUtils";
 
-
 interface UseRevenueCatTrialEligibilityResult {
-  /** Map of product IDs to their trial eligibility */
   eligibilityMap: TrialEligibilityMap;
-  /** Whether eligibility check is in progress */
   isLoading: boolean;
-  /** Whether any product has an eligible trial */
   hasEligibleTrial: boolean;
-  /** Check eligibility for specific product IDs */
   checkEligibility: (productIds: string[]) => Promise<void>;
-  /** Get eligibility for a specific product */
   getProductEligibility: (productId: string) => ProductTrialEligibility | null;
 }
 
-/**
- * Hook to check trial eligibility via RevenueCat
- * Uses Apple's introductory offer eligibility system
- */
 export function useRevenueCatTrialEligibility(): UseRevenueCatTrialEligibilityResult {
   const [eligibilityMap, setEligibilityMap] = useState<TrialEligibilityMap>({});
   const [isLoading, setIsLoading] = useState(false);
@@ -95,4 +79,3 @@ export function useRevenueCatTrialEligibility(): UseRevenueCatTrialEligibilityRe
     getProductEligibility,
   };
 }
-

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

@@ -1,13 +1,3 @@
-/**
- * Subscription Packages Hook
- * TanStack query for fetching available packages (offerings)
- * Auth info automatically read from @umituz/react-native-auth
- *
- * IMPORTANT: Packages (offerings) are NOT user-specific - they're the same
- * for all users. We only need RevenueCat to be initialized, not necessarily
- * for a specific user. User-specific checks belong in useSubscriptionStatus.
- */
-
 import { useQuery, useQueryClient } from "@umituz/react-native-design-system";
 import { useEffect, useRef, useSyncExternalStore } from "react";
 import {
@@ -20,27 +10,18 @@ import {
   SUBSCRIPTION_QUERY_KEYS,
 } from "./subscriptionQueryKeys";
 
-/**
- * Fetch available subscription packages
- * Works for both authenticated and anonymous users
- * Auth info automatically read from auth store
- */
 export const useSubscriptionPackages = () => {
   const userId = useAuthStore(selectUserId);
   const isConfigured = SubscriptionManager.isConfigured();
   const queryClient = useQueryClient();
   const prevUserIdRef = useRef(userId);
 
-  // Reactive initialization state - triggers re-render when BackgroundInitializer completes
   const initState = useSyncExternalStore(
     initializationState.subscribe,
     initializationState.getSnapshot,
     initializationState.getSnapshot,
   );
 
-  // Packages (offerings) are NOT user-specific - same for all users.
-  // We only need RevenueCat to be initialized at all.
-  // Use reactive state OR direct manager check for backwards compatibility.
   const isInitialized = initState.initialized || SubscriptionManager.isInitialized();
 
   const query = useQuery({

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

@@ -1,9 +1,3 @@
-/**
- * Subscription TanStack Query Hooks
- * Server state management for RevenueCat subscriptions
- * Generic hooks for 100+ apps
- */
-
 export { useSubscriptionPackages } from "./useSubscriptionPackages";
 export { usePurchasePackage } from "./usePurchasePackage";
 export { useRestorePurchase } from "./useRestorePurchase";

package/src/domains/subscription/infrastructure/managers/subscriptionManagerUtils.ts

@@ -1,25 +1,14 @@
-/**
- * Subscription Manager Utilities
- * Validation and helper functions for SubscriptionManager
- */
-
 import type { SubscriptionManagerConfig } from "./SubscriptionManager.types";
 
 import type { IRevenueCatService } from "../../../../shared/application/ports/IRevenueCatService";
 import { SubscriptionInternalState } from "./SubscriptionInternalState";
 
-/**
- * Validate that manager is configured
- */
 export function ensureConfigured(config: SubscriptionManagerConfig | null): void {
     if (!config) {
         throw new Error("SubscriptionManager not configured");
     }
 }
 
-/**
- * Get current user ID or throw
- */
 export function getCurrentUserIdOrThrow(state: SubscriptionInternalState): string {
     const userId = state.initCache.getCurrentUserId();
     if (userId === null || userId === undefined) {
@@ -28,9 +17,6 @@ export function getCurrentUserIdOrThrow(state: SubscriptionInternalState): strin
     return userId;
 }
 
-/**
- * Get service instance or initialize
- */
 export function getOrCreateService(
     currentInstance: IRevenueCatService | null
 ): IRevenueCatService {
@@ -48,9 +34,6 @@ export function getOrCreateService(
     return serviceInstance;
 }
 
-/**
- * Validate service is available
- */
 export function ensureServiceAvailable(service: IRevenueCatService | null): void {
     if (!service) {
         throw new Error("Service instance not available");

package/src/domains/subscription/infrastructure/state/initializationState.ts

@@ -1,17 +1,3 @@
-/**
- * Reactive Initialization State
- * Uses useSyncExternalStore pattern to make SubscriptionManager
- * initialization state reactive for React components.
- *
- * Problem: SubscriptionManager.isInitializedForUser() is a plain method call.
- * When BackgroundInitializer completes (500ms+ after auth), React components
- * don't re-render because there's no reactive state change.
- *
- * Solution: This module provides a subscribe/getSnapshot interface that
- * React's useSyncExternalStore can use to trigger re-renders when
- * initialization completes.
- */
-
 type Listener = () => void;
 
 interface InitState {
@@ -34,27 +20,16 @@ export const initializationState = {
 
   getSnapshot: (): InitState => state,
 
-  /**
-   * Called by SubscriptionManager after successful initialization.
-   * Triggers re-render in all subscribed React components.
-   */
   markInitialized: (userId: string | null): void => {
     state = { initialized: true, userId };
     notifyListeners();
   },
 
-  /**
-   * Called when initialization starts for a new user (e.g., user switch).
-   * Resets the state so queries know they need to wait.
-   */
   markPending: (): void => {
     state = { initialized: false, userId: null };
     notifyListeners();
   },
 
-  /**
-   * Check if initialized for a specific user.
-   */
   isInitializedForUser: (userId: string | null): boolean => {
     return state.initialized && state.userId === userId;
   },

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

@@ -1,31 +1,16 @@
-/**
- * Initialization Cache
- * Manages promise caching and user state for initialization
- * Thread-safe: Uses atomic promise-based locking pattern
- */
-
 export class InitializationCache {
     private initPromise: Promise<boolean> | null = null;
     private currentUserId: string | null = null;
-    // Track which userId the promise is for
     private promiseUserId: string | null = null;
-    // Track promise completion state
     private promiseCompleted = true;
-    // Pending initialization queue
     private pendingQueue: Map<string, Promise<boolean>> = new Map();
 
-    /**
-     * Atomically check if reinitialization is needed AND reserve the slot
-     * Returns: { shouldInit: boolean, existingPromise: Promise | null }
-     */
     tryAcquireInitialization(userId: string): { shouldInit: boolean; existingPromise: Promise<boolean> | null } {
-        // Check if there's already a pending promise for this user in the queue
         const queuedPromise = this.pendingQueue.get(userId);
         if (queuedPromise) {
             return { shouldInit: false, existingPromise: queuedPromise };
         }
 
-        // If already initialized for this user and promise completed successfully
         if (
             this.initPromise &&
             this.currentUserId === userId &&
@@ -35,7 +20,6 @@ export class InitializationCache {
             return { shouldInit: false, existingPromise: this.initPromise };
         }
 
-        // Different user or not initialized - need to initialize
         return { shouldInit: true, existingPromise: null };
     }
 
@@ -45,9 +29,6 @@ export class InitializationCache {
 
         const targetUserId = userId;
 
-        // Build the handled chain that ALWAYS resolves (never rejects).
-        // This is critical: pendingQueue must store a non-rejectable promise so that
-        // callers who receive it via tryAcquireInitialization never get an unhandled rejection.
         const chain: Promise<boolean> = promise
             .then((result) => {
                 if (result && this.promiseUserId === targetUserId) {
@@ -67,11 +48,9 @@ export class InitializationCache {
                 return false as boolean;
             })
             .finally(() => {
-                // Remove from queue when complete
                 this.pendingQueue.delete(targetUserId);
             });
 
-        // Store the chain (not the original promise) so callers never receive a rejection
         this.initPromise = chain;
         this.pendingQueue.set(userId, chain);
     }

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

@@ -1,8 +1,3 @@
-/**
- * Premium Status Syncer
- * Syncs premium status to database via callbacks
- */
-
 import type { CustomerInfo } from "react-native-purchases";
 import type { RevenueCatConfig, PackageType } from "../../../revenuecat/core/types";
 import type { PurchaseSource } from "../../../subscription/core/SubscriptionConstants";
@@ -85,7 +80,7 @@ export async function notifyRestoreCompleted(
 
     try {
         await config.onRestoreCompleted(userId, isPremium, customerInfo);
-    } catch (_error) {
-        // Silently fail callback notifications to prevent crashing the main flow
+    } catch (error) {
+        console.error('[PremiumStatusSyncer] Restore callback failed:', error instanceof Error ? error.message : String(error));
     }
 }

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

@@ -1,8 +1,3 @@
-/**
- * Auth Purchase State Manager
- * Manages global state for auth-aware purchase operations
- */
-
 import type { PurchasesPackage } from "react-native-purchases";
 import type { PurchaseSource } from "../../core/SubscriptionConstants";
 
@@ -15,9 +10,12 @@ interface SavedPurchaseState {
   pkg: PurchasesPackage;
   source: PurchaseSource;
   timestamp: number;
+  sessionId: string;
 }
 
-const SAVED_PURCHASE_EXPIRY_MS = 5 * 60 * 1000;
+const SAVED_PURCHASE_EXPIRY_MS = 2 * 60 * 1000;
+
+let currentSessionId = "";
 
 class AuthPurchaseStateManager {
   private authProvider: PurchaseAuthProvider | null = null;
@@ -31,11 +29,16 @@ class AuthPurchaseStateManager {
     return this.authProvider;
   }
 
+  setSessionId(sessionId: string): void {
+    currentSessionId = sessionId;
+  }
+
   savePurchase(pkg: PurchasesPackage, source: PurchaseSource): void {
     this.savedPurchaseState = {
       pkg,
       source,
       timestamp: Date.now(),
+      sessionId: currentSessionId,
     };
   }
 
@@ -44,6 +47,11 @@ class AuthPurchaseStateManager {
       return null;
     }
 
+    if (this.savedPurchaseState.sessionId !== currentSessionId) {
+      this.savedPurchaseState = null;
+      return null;
+    }
+
     const isExpired = Date.now() - this.savedPurchaseState.timestamp > SAVED_PURCHASE_EXPIRY_MS;
     if (isExpired) {
       this.savedPurchaseState = null;
@@ -60,9 +68,14 @@ class AuthPurchaseStateManager {
     this.savedPurchaseState = null;
   }
 
+  onUserChanged(): void {
+    this.savedPurchaseState = null;
+  }
+
   cleanup(): void {
     this.authProvider = null;
     this.savedPurchaseState = null;
+    currentSessionId = "";
   }
 }
 

package/src/domains/subscription/infrastructure/utils/renewal/PackageTierComparator.ts

@@ -4,6 +4,7 @@ const PACKAGE_TIER_ORDER: Record<string, number> = {
   weekly: 1,
   monthly: 2,
   yearly: 3,
+  lifetime: 4,
   unknown: 0,
 };
 

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

@@ -1,29 +1,18 @@
-/**
- * Trial Eligibility Utilities
- * Business logic for checking trial eligibility
- */
-
 import Purchases, {
   type IntroEligibility,
   INTRO_ELIGIBILITY_STATUS,
 } from "react-native-purchases";
 
-/** Trial eligibility info for a single product */
 export interface ProductTrialEligibility {
   productId: string;
   eligible: boolean;
   trialDurationDays?: number;
 }
 
-/** Map of product ID to eligibility */
 export type TrialEligibilityMap = Record<string, ProductTrialEligibility>;
 
-/** Default trial duration in days */
 const DEFAULT_TRIAL_DURATION_DAYS = 7;
 
-/**
- * Check trial eligibility for product IDs
- */
 export async function checkTrialEligibility(
   productIds: string[]
 ): Promise<TrialEligibilityMap> {
@@ -47,10 +36,6 @@ export async function checkTrialEligibility(
   return result;
 }
 
-/**
- * Create fallback eligibility map (all eligible)
- * Used when eligibility check fails
- */
 export function createFallbackEligibilityMap(
   productIds: string[]
 ): TrialEligibilityMap {
@@ -67,9 +52,6 @@ export function createFallbackEligibilityMap(
   return result;
 }
 
-/**
- * Check if any product has eligible trial
- */
 export function hasAnyEligibleTrial(
   eligibilityMap: TrialEligibilityMap
 ): boolean {

package/src/domains/subscription/presentation/components/details/PremiumDetailsCard.styles.ts

@@ -1,8 +1,3 @@
-/**
- * Premium Details Card Styles
- * StyleSheet for PremiumDetailsCard component
- */
-
 import { StyleSheet } from "react-native";
 
 export const styles = StyleSheet.create({

package/src/domains/subscription/presentation/components/details/PremiumDetailsCardTypes.ts

@@ -1,8 +1,3 @@
-/**
- * Premium Details Card Types
- * Type definitions for premium subscription details display
- */
-
 import type { SubscriptionStatusType } from "./PremiumStatusBadge";
 
 export interface CreditInfo {

package/src/domains/subscription/presentation/components/feedback/paywallFeedbackStyles.ts

@@ -1,8 +1,3 @@
-/**
- * Paywall Feedback Styles
- * Generates styles based on design tokens
- */
-
 import { StyleSheet } from "react-native";
 import type { DesignTokens } from "@umituz/react-native-design-system";
 

package/src/domains/subscription/presentation/stores/index.ts

@@ -1,7 +1,3 @@
-/**
- * Presentation Layer - Stores
- */
-
 export {
   usePurchaseLoadingStore,
   selectIsPurchasing,

package/src/domains/subscription/presentation/stores/purchaseLoadingStore.ts

@@ -1,25 +1,13 @@
-/**
- * Purchase Loading Store
- * Global state for tracking purchase loading across the app
- * Supports concurrent purchases via Map-based tracking
- * Used by both PaywallModal and useSavedPurchaseAutoExecution
- */
-
 import { create } from "zustand";
 
 interface PurchaseLoadingState {
-  /** Map of product IDs to purchase sources (supports concurrent purchases) */
   activePurchases: Map<string, "manual" | "auto-execution">;
 }
 
 interface PurchaseLoadingActions {
-  /** Start purchase loading state for a product */
   startPurchase: (productId: string, source: "manual" | "auto-execution") => void;
-  /** End purchase loading state for a product */
   endPurchase: (productId: string) => void;
-  /** Check if any purchase is in progress, or if a specific product is being purchased */
   isPurchasing: (productId?: string) => boolean;
-  /** Reset all state */
   reset: () => void;
 }
 
@@ -59,5 +47,4 @@ export const usePurchaseLoadingStore = create<PurchaseLoadingStore>((set, get) =
   },
 }));
 
-// Selectors for optimized re-renders
 export const selectIsPurchasing = (state: PurchaseLoadingStore) => state.activePurchases.size > 0;

package/src/domains/subscription/presentation/useAuthAwarePurchase.ts

@@ -1,9 +1,4 @@
-/**
- * Auth-Aware Purchase Hook
- * Handles purchase flow with authentication requirement
- */
-
-import { useCallback } from "react";
+import { useCallback, useEffect, useRef } from "react";
 import type { PurchasesPackage } from "react-native-purchases";
 import { usePremium } from "./usePremium";
 import type { PurchaseSource } from "../core/SubscriptionConstants";
@@ -35,10 +30,43 @@ export const useAuthAwarePurchase = (
   params?: UseAuthAwarePurchaseParams
 ): UseAuthAwarePurchaseResult => {
   const { purchasePackage, restorePurchase } = usePremium();
+  const isExecutingSavedRef = useRef(false);
+
+  const executeSavedPurchase = useCallback(async (): Promise<boolean> => {
+    const saved = authPurchaseStateManager.getSavedPurchase();
+    if (!saved) {
+      return false;
+    }
+
+    try {
+      const result = await purchasePackage(saved.pkg);
+      if (result) {
+        authPurchaseStateManager.clearSavedPurchase();
+      }
+      return result;
+    } catch {
+      authPurchaseStateManager.clearSavedPurchase();
+      return false;
+    }
+  }, [purchasePackage]);
+
+  useEffect(() => {
+    const authProvider = authPurchaseStateManager.getProvider();
+    if (!authProvider) return;
+
+    const isAuth = authProvider.isAuthenticated();
+    const hasSavedPurchase = !!authPurchaseStateManager.getSavedPurchase();
+
+    if (isAuth && hasSavedPurchase && !isExecutingSavedRef.current) {
+      isExecutingSavedRef.current = true;
+      executeSavedPurchase().finally(() => {
+        isExecutingSavedRef.current = false;
+      });
+    }
+  }, [executeSavedPurchase]);
 
   const handlePurchase = useCallback(
     async (pkg: PurchasesPackage, source?: PurchaseSource): Promise<boolean> => {
-
       const authProvider = authPurchaseStateManager.getProvider();
 
       if (!authProvider) {
@@ -61,7 +89,6 @@ export const useAuthAwarePurchase = (
   );
 
   const handleRestore = useCallback(async (): Promise<boolean> => {
-
     const authProvider = authPurchaseStateManager.getProvider();
 
     if (!authProvider) {
@@ -78,19 +105,6 @@ export const useAuthAwarePurchase = (
     return result;
   }, [restorePurchase]);
 
-  const executeSavedPurchase = useCallback(async (): Promise<boolean> => {
-    const saved = authPurchaseStateManager.getSavedPurchase();
-    if (!saved) {
-      return false;
-    }
-
-    const result = await purchasePackage(saved.pkg);
-    if (result) {
-      authPurchaseStateManager.clearSavedPurchase();
-    }
-    return result;
-  }, [purchasePackage]);
-
   return {
     handlePurchase,
     handleRestore,