@umituz/react-native-subscription 2.17.6 → 2.17.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.17.6",
+  "version": "2.17.7",
   "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/paywall/hooks/usePaywallActions.ts

@@ -2,14 +2,12 @@ import { useCallback } from "react";
 import type { PurchasesPackage } from "react-native-purchases";
 import { usePurchasePackage } from "../../../revenuecat/presentation/hooks/usePurchasePackage";
 import { useRestorePurchase } from "../../../revenuecat/presentation/hooks/useRestorePurchase";
-import { usePendingPurchase } from "../../../presentation/hooks/usePendingPurchase";
 
 declare const __DEV__: boolean;
 
 interface UsePaywallActionsProps {
   userId?: string;
   isAnonymous: boolean;
-  source?: "postOnboarding" | "inApp";
   onPurchaseSuccess?: () => void;
   onPurchaseError?: (error: string) => void;
   onAuthRequired?: () => void;
@@ -19,7 +17,6 @@ interface UsePaywallActionsProps {
 export const usePaywallActions = ({
   userId,
   isAnonymous,
-  source = "inApp",
   onPurchaseSuccess,
   onPurchaseError,
   onAuthRequired,
@@ -27,12 +24,10 @@ export const usePaywallActions = ({
 }: UsePaywallActionsProps) => {
   const { mutateAsync: purchasePackage } = usePurchasePackage(userId);
   const { mutateAsync: restorePurchases } = useRestorePurchase(userId);
-  const { pendingPackage, setPendingPurchase, clearPendingPurchase } = usePendingPurchase();
 
   const handlePurchase = useCallback(async (pkg: PurchasesPackage) => {
     if (isAnonymous) {
-      if (__DEV__) console.log("[PaywallActions] Anonymous user, storing package:", pkg.product.identifier, "source:", source);
-      setPendingPurchase(pkg, source);
+      if (__DEV__) console.log("[PaywallActions] Anonymous user, redirecting to auth");
       onAuthRequired?.();
       return;
     }
@@ -44,10 +39,11 @@ export const usePaywallActions = ({
         onPurchaseSuccess?.();
         onClose();
       }
-    } catch (err: any) {
-      onPurchaseError?.(err.message || String(err));
+    } catch (err: unknown) {
+      const message = err instanceof Error ? err.message : String(err);
+      onPurchaseError?.(message);
     }
-  }, [isAnonymous, source, purchasePackage, onClose, onPurchaseSuccess, onPurchaseError, onAuthRequired, setPendingPurchase]);
+  }, [isAnonymous, purchasePackage, onClose, onPurchaseSuccess, onPurchaseError, onAuthRequired]);
 
   const handleRestore = useCallback(async () => {
     try {
@@ -57,10 +53,11 @@ export const usePaywallActions = ({
         onPurchaseSuccess?.();
         onClose();
       }
-    } catch (err: any) {
-      onPurchaseError?.(err.message || String(err));
+    } catch (err: unknown) {
+      const message = err instanceof Error ? err.message : String(err);
+      onPurchaseError?.(message);
     }
   }, [restorePurchases, onClose, onPurchaseSuccess, onPurchaseError]);
 
-  return { handlePurchase, handleRestore, pendingPackage, clearPendingPurchase, purchasePackage };
+  return { handlePurchase, handleRestore, purchasePackage };
 };

package/src/presentation/hooks/index.ts

@@ -8,8 +8,6 @@ export * from "./useDeductCredit";
 export * from "./useInitializeCredits";
 export * from "./useDevTestCallbacks";
 export * from "./useFeatureGate";
-export * from "./usePendingPurchase";
-export * from "./useCompletePendingPurchase";
 export * from "./usePaywallVisibility";
 export * from "./usePremium";
 export * from "./usePremiumGate";

package/src/revenuecat/infrastructure/handlers/PackageHandler.ts

@@ -58,6 +58,15 @@ export class PackageHandler {
   }
 
   async purchase(pkg: PurchasesPackage, userId: string): Promise<boolean> {
+    if (__DEV__) {
+      console.log('[DEBUG PackageHandler] purchase() called', {
+        productId: pkg.product.identifier,
+        userId,
+        serviceExists: !!this.service,
+        isInitialized: this.service?.isInitialized(),
+      });
+    }
+
     if (!this.service?.isInitialized()) {
       if (__DEV__) {
         console.log('[DEBUG PackageHandler] Service not initialized', {
@@ -68,7 +77,17 @@ export class PackageHandler {
     }
 
     try {
+      if (__DEV__) {
+        console.log('[DEBUG PackageHandler] Calling service.purchasePackage...');
+      }
       const result = await this.service.purchasePackage(pkg, userId);
+      if (__DEV__) {
+        console.log('[DEBUG PackageHandler] Purchase result:', {
+          success: result.success,
+          productId: pkg.product.identifier,
+          isPremium: result.isPremium,
+        });
+      }
       return result.success;
     } catch (error) {
       if (__DEV__) {

package/src/revenuecat/infrastructure/managers/SubscriptionManager.ts

@@ -4,6 +4,8 @@
  * Coordinates UserIdProvider, InitializationCache, and PackageHandler
  */
 
+declare const __DEV__: boolean;
+
 import type { PurchasesPackage } from "react-native-purchases";
 import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
 import type { IRevenueCatService } from "../../application/ports/IRevenueCatService";
@@ -100,9 +102,24 @@ class SubscriptionManagerImpl {
   }
 
   async purchasePackage(pkg: PurchasesPackage): Promise<boolean> {
+    if (__DEV__) {
+      console.log('[DEBUG SubscriptionManager] purchasePackage called', {
+        productId: pkg.product.identifier,
+        isConfigured: this.isConfigured(),
+        isInitialized: this.isInitialized(),
+      });
+    }
     this.ensureConfigured();
     const userId = this.initCache.getCurrentUserId();
-    if (!userId) return false;
+    if (__DEV__) {
+      console.log('[DEBUG SubscriptionManager] userId from cache:', userId);
+    }
+    if (!userId) {
+      if (__DEV__) {
+        console.log('[DEBUG SubscriptionManager] No userId, returning false');
+      }
+      return false;
+    }
     return this.packageHandler!.purchase(pkg, userId);
   }
 

package/src/revenuecat/infrastructure/services/PurchaseHandler.ts

@@ -37,12 +37,25 @@ function isConsumableProduct(
 /**
  * Handle package purchase - supports both subscriptions and consumables
  */
+declare const __DEV__: boolean;
+
 export async function handlePurchase(
     deps: PurchaseHandlerDeps,
     pkg: PurchasesPackage,
     userId: string
 ): Promise<PurchaseResult> {
+    if (__DEV__) {
+        console.log('[DEBUG PurchaseHandler] handlePurchase called', {
+            productId: pkg.product.identifier,
+            userId,
+            isInitialized: deps.isInitialized(),
+        });
+    }
+
     if (!deps.isInitialized()) {
+        if (__DEV__) {
+            console.log('[DEBUG PurchaseHandler] Not initialized, throwing error');
+        }
         throw new RevenueCatInitializationError();
     }
 
@@ -50,10 +63,23 @@ export async function handlePurchase(
     const isConsumable = isConsumableProduct(pkg, consumableIds);
 
     try {
+        if (__DEV__) {
+            console.log('[DEBUG PurchaseHandler] Calling Purchases.purchasePackage...');
+        }
         const purchaseResult = await Purchases.purchasePackage(pkg);
         const customerInfo = purchaseResult.customerInfo;
 
+        if (__DEV__) {
+            console.log('[DEBUG PurchaseHandler] Purchase completed', {
+                productId: pkg.product.identifier,
+                activeEntitlements: Object.keys(customerInfo.entitlements.active),
+            });
+        }
+
         if (isConsumable) {
+            if (__DEV__) {
+                console.log('[DEBUG PurchaseHandler] Consumable purchase SUCCESS');
+            }
             await notifyPurchaseCompleted(
                 deps.config,
                 userId,
@@ -72,7 +98,18 @@ export async function handlePurchase(
         const entitlementIdentifier = deps.config.entitlementIdentifier;
         const isPremium = !!customerInfo.entitlements.active[entitlementIdentifier];
 
+        if (__DEV__) {
+            console.log('[DEBUG PurchaseHandler] Checking premium status', {
+                entitlementIdentifier,
+                isPremium,
+                allEntitlements: customerInfo.entitlements.active,
+            });
+        }
+
         if (isPremium) {
+            if (__DEV__) {
+                console.log('[DEBUG PurchaseHandler] Premium purchase SUCCESS');
+            }
             await syncPremiumStatus(deps.config, userId, customerInfo);
             await notifyPurchaseCompleted(
                 deps.config,
@@ -86,6 +123,9 @@ export async function handlePurchase(
         // In Preview API mode (Expo Go), purchases complete but entitlements aren't active
         // Treat the purchase as successful for testing purposes
         if (deps.isUsingTestStore()) {
+            if (__DEV__) {
+                console.log('[DEBUG PurchaseHandler] Test store purchase SUCCESS');
+            }
             await notifyPurchaseCompleted(
                 deps.config,
                 userId,
@@ -95,15 +135,30 @@ export async function handlePurchase(
             return { success: true, isPremium: false, customerInfo };
         }
 
+        if (__DEV__) {
+            console.log('[DEBUG PurchaseHandler] Purchase FAILED - no entitlement');
+        }
         throw new RevenueCatPurchaseError(
             "Purchase completed but premium entitlement not active",
             pkg.product.identifier
         );
     } catch (error) {
+        if (__DEV__) {
+            console.error('[DEBUG PurchaseHandler] Purchase error caught', {
+                error,
+                isUserCancelled: isUserCancelledError(error),
+            });
+        }
         if (isUserCancelledError(error)) {
+            if (__DEV__) {
+                console.log('[DEBUG PurchaseHandler] User cancelled');
+            }
             return { success: false, isPremium: false };
         }
         const errorMessage = getErrorMessage(error, "Purchase failed");
+        if (__DEV__) {
+            console.error('[DEBUG PurchaseHandler] Throwing error:', errorMessage);
+        }
         throw new RevenueCatPurchaseError(errorMessage, pkg.product.identifier);
     }
 }

package/src/revenuecat/presentation/hooks/usePurchasePackage.ts

@@ -6,6 +6,7 @@
 
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import type { PurchasesPackage } from "react-native-purchases";
+import { useAlert } from "@umituz/react-native-design-system";
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { creditsQueryKeys } from "../../../presentation/hooks/useCredits";
@@ -17,31 +18,6 @@ export interface PurchaseResult {
   productId: string;
 }
 
-/**
- * Global purchase lock to prevent double purchases
- */
-let purchaseInProgress = false;
-let purchaseProductId: string | null = null;
-
-export const purchaseLock = {
-  isLocked: () => purchaseInProgress,
-  getProductId: () => purchaseProductId,
-  acquire: (productId: string): boolean => {
-    if (purchaseInProgress) {
-      if (__DEV__) {
-        console.log('[PurchaseLock] Already in progress:', purchaseProductId);
-      }
-      return false;
-    }
-    purchaseInProgress = true;
-    purchaseProductId = productId;
-    return true;
-  },
-  release: () => {
-    purchaseInProgress = false;
-    purchaseProductId = null;
-  },
-};
 
 /**
  * Purchase a subscription package
@@ -49,6 +25,7 @@ export const purchaseLock = {
  */
 export const usePurchasePackage = (userId: string | undefined) => {
   const queryClient = useQueryClient();
+  const { showSuccess, showError } = useAlert();
 
   return useMutation({
     mutationFn: async (pkg: PurchasesPackage): Promise<PurchaseResult> => {
@@ -58,14 +35,6 @@ export const usePurchasePackage = (userId: string | undefined) => {
 
       const productId = pkg.product.identifier;
 
-      // Check and acquire purchase lock
-      if (!purchaseLock.acquire(productId)) {
-        if (__DEV__) {
-          console.log('[DEBUG usePurchasePackage] Skipping - purchase already in progress');
-        }
-        return { success: false, productId };
-      }
-
       if (__DEV__) {
         console.log('[DEBUG usePurchasePackage] Starting purchase:', {
           packageId: pkg.identifier,
@@ -74,34 +43,25 @@ export const usePurchasePackage = (userId: string | undefined) => {
         });
       }
 
-      try {
-        const success = await SubscriptionManager.purchasePackage(pkg);
-
-        if (success) {
-          if (__DEV__) {
-            console.log('[DEBUG usePurchasePackage] Purchase successful:', {
-              packageId: pkg.identifier,
-              productId,
-              userId,
-            });
-          }
-          // Credits will be initialized by CustomerInfoListener
-        } else {
-          if (__DEV__) {
-            console.log('[DEBUG usePurchasePackage] Purchase failed:', {
-              packageId: pkg.identifier,
-              userId,
-            });
-          }
-        }
+      const success = await SubscriptionManager.purchasePackage(pkg);
 
-        return { success, productId };
-      } finally {
-        purchaseLock.release();
+      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,
         });
@@ -110,15 +70,22 @@ export const usePurchasePackage = (userId: string | undefined) => {
             queryKey: creditsQueryKeys.user(userId),
           });
         }
+      } 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] Purchase mutation failed:', {
+        console.error('[DEBUG usePurchasePackage] onError:', {
           error,
           userId: userId ?? "ANONYMOUS",
         });
       }
+      const message = error instanceof Error ? error.message : "An error occurred";
+      showError("Purchase Error", message);
     },
   });
 };

package/src/presentation/hooks/useCompletePendingPurchase.ts

@@ -1,104 +0,0 @@
-/**
- * Complete Pending Purchase Hook
- * Centralized hook for completing pending purchases after authentication
- * This is the SINGLE source of truth for post-auth purchase completion
- */
-
-import { useCallback, useRef, useEffect } from "react";
-import { usePurchasePackage } from "../../revenuecat/presentation/hooks/usePurchasePackage";
-import { usePendingPurchase, pendingPurchaseControl } from "./usePendingPurchase";
-import { usePaywallVisibility } from "./usePaywallVisibility";
-
-declare const __DEV__: boolean;
-
-export interface UseCompletePendingPurchaseProps {
-  userId: string | undefined;
-  isAnonymous: boolean;
-  onPurchaseSuccess?: () => void;
-  onPurchaseError?: (error: string) => void;
-}
-
-export interface UseCompletePendingPurchaseResult {
-  completePendingPurchase: () => Promise<boolean>;
-  hasPendingPurchase: boolean;
-}
-
-export function useCompletePendingPurchase({
-  userId,
-  isAnonymous,
-  onPurchaseSuccess,
-  onPurchaseError,
-}: UseCompletePendingPurchaseProps): UseCompletePendingPurchaseResult {
-  const { mutateAsync: purchasePackage } = usePurchasePackage(userId);
-  const { clearPendingPurchase, hasPendingPurchase } = usePendingPurchase();
-  const { closePaywall } = usePaywallVisibility();
-
-  const wasAnonymousRef = useRef(isAnonymous);
-  const isProcessingRef = useRef(false);
-
-  const completePendingPurchase = useCallback(async (): Promise<boolean> => {
-    // Get current state directly to avoid stale closure
-    const currentState = pendingPurchaseControl.get();
-
-    if (!currentState.package) {
-      if (__DEV__) console.log("[CompletePendingPurchase] No pending package");
-      return false;
-    }
-
-    if (!userId) {
-      if (__DEV__) console.log("[CompletePendingPurchase] No userId");
-      return false;
-    }
-
-    if (isProcessingRef.current) {
-      if (__DEV__) console.log("[CompletePendingPurchase] Already processing");
-      return false;
-    }
-
-    isProcessingRef.current = true;
-    const pkg = currentState.package;
-    const source = currentState.source;
-
-    if (__DEV__) {
-      console.log("[CompletePendingPurchase] Completing purchase:", {
-        identifier: pkg.product.identifier,
-        source,
-        userId,
-      });
-    }
-
-    // Clear pending and close paywall BEFORE purchase to prevent double processing
-    clearPendingPurchase();
-    closePaywall();
-
-    try {
-      const result = await purchasePackage(pkg);
-
-      if (result.success) {
-        if (__DEV__) console.log("[CompletePendingPurchase] Purchase SUCCESS");
-        onPurchaseSuccess?.();
-        return true;
-      } else {
-        if (__DEV__) console.log("[CompletePendingPurchase] Purchase FAILED");
-        onPurchaseError?.("Purchase failed");
-        return false;
-      }
-    } catch (err: any) {
-      if (__DEV__) console.error("[CompletePendingPurchase] Purchase ERROR:", err);
-      onPurchaseError?.(err.message || String(err));
-      return false;
-    } finally {
-      isProcessingRef.current = false;
-    }
-  }, [userId, purchasePackage, clearPendingPurchase, closePaywall, onPurchaseSuccess, onPurchaseError]);
-
-  // Track auth state for reference (no auto-trigger - caller must explicitly call completePendingPurchase)
-  useEffect(() => {
-    wasAnonymousRef.current = isAnonymous;
-  }, [isAnonymous]);
-
-  return {
-    completePendingPurchase,
-    hasPendingPurchase,
-  };
-}

package/src/presentation/hooks/usePendingPurchase.ts

@@ -1,88 +0,0 @@
-/**
- * Pending Purchase Hook
- * Centralized global state for pending package purchase
- * Used by both post-onboarding paywall and in-app paywall
- */
-
-import { useCallback, useSyncExternalStore } from "react";
-import type { PurchasesPackage } from "react-native-purchases";
-
-type Listener = () => void;
-
-interface PendingPurchaseState {
-  package: PurchasesPackage | null;
-  source: "postOnboarding" | "inApp" | null;
-}
-
-let state: PendingPurchaseState = {
-  package: null,
-  source: null,
-};
-
-const listeners = new Set<Listener>();
-
-const subscribe = (listener: Listener): (() => void) => {
-  listeners.add(listener);
-  return () => listeners.delete(listener);
-};
-
-const getSnapshot = (): PendingPurchaseState => state;
-
-const setState = (newState: Partial<PendingPurchaseState>): void => {
-  state = { ...state, ...newState };
-  listeners.forEach((listener) => listener());
-};
-
-/**
- * Direct pending purchase control for non-React contexts
- */
-export const pendingPurchaseControl = {
-  set: (pkg: PurchasesPackage, source: "postOnboarding" | "inApp") => {
-    if (__DEV__) {
-      console.log("[PendingPurchase] Setting pending package:", {
-        identifier: pkg.product.identifier,
-        source,
-      });
-    }
-    setState({ package: pkg, source });
-  },
-  clear: () => {
-    if (__DEV__) {
-      console.log("[PendingPurchase] Clearing pending package");
-    }
-    setState({ package: null, source: null });
-  },
-  get: () => state,
-  hasPending: () => state.package !== null,
-};
-
-export interface UsePendingPurchaseResult {
-  pendingPackage: PurchasesPackage | null;
-  pendingSource: "postOnboarding" | "inApp" | null;
-  setPendingPurchase: (pkg: PurchasesPackage, source: "postOnboarding" | "inApp") => void;
-  clearPendingPurchase: () => void;
-  hasPendingPurchase: boolean;
-}
-
-export function usePendingPurchase(): UsePendingPurchaseResult {
-  const currentState = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
-
-  const setPendingPurchase = useCallback(
-    (pkg: PurchasesPackage, source: "postOnboarding" | "inApp") => {
-      pendingPurchaseControl.set(pkg, source);
-    },
-    []
-  );
-
-  const clearPendingPurchase = useCallback(() => {
-    pendingPurchaseControl.clear();
-  }, []);
-
-  return {
-    pendingPackage: currentState.package,
-    pendingSource: currentState.source,
-    setPendingPurchase,
-    clearPendingPurchase,
-    hasPendingPurchase: currentState.package !== null,
-  };
-}