@umituz/react-native-subscription 2.27.27 → 2.27.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.27",
+  "version": "2.27.29",
   "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/domain/entities/Credits.ts

@@ -101,4 +101,6 @@ export interface DeductCreditsResult {
 export const DEFAULT_CREDITS_CONFIG: CreditsConfig = {
   collectionName: "user_credits",
   creditLimit: 100,
+  enableFreeCredits: false,
+  freeCredits: 0,
 };

package/src/index.ts

@@ -87,6 +87,8 @@ export type {
   DeductCreditsResult,
   PurchaseSource,
   PurchaseType,
+  CreditAllocation,
+  PackageAllocationMap,
 } from "./domain/entities/Credits";
 export { DEFAULT_CREDITS_CONFIG } from "./domain/entities/Credits";
 export { InsufficientCreditsError } from "./domain/errors/InsufficientCreditsError";

package/src/infrastructure/services/CreditsInitializer.ts

@@ -29,6 +29,7 @@ import { getCreditAllocation } from "../../utils/creditMapper";
 
 interface InitializationResult {
     credits: number;
+    alreadyProcessed?: boolean;
 }
 
 export interface InitializeCreditsMetadata {
@@ -58,7 +59,7 @@ export async function initializeCreditsTransaction(
         let processedPurchases: string[] = existingData?.processedPurchases || [];
 
         if (existingData && purchaseId && processedPurchases.includes(purchaseId)) {
-            return { credits: existingData.credits, alreadyProcessed: true } as InitializationResult & { alreadyProcessed: boolean };
+            return { credits: existingData.credits, alreadyProcessed: true };
         }
 
         if (existingData?.purchasedAt) {
@@ -109,18 +110,31 @@ export async function initializeCreditsTransaction(
 
         const status = resolveSubscriptionStatus({ isPremium, willRenew, isExpired: !isPremium, periodType });
 
+        // Determine if this is a status sync (not a new purchase or renewal)
+        // Status sync should preserve existing credits, only update metadata
+        const isStatusSync = purchaseId?.startsWith("status_sync_") ?? false;
+        const isNewPurchaseOrRenewal = purchaseId?.startsWith("purchase_") || purchaseId?.startsWith("renewal_");
+
         let newCredits = creditLimit;
-        if (status === SUBSCRIPTION_STATUS.TRIAL) newCredits = TRIAL_CONFIG.CREDITS;
-        else if (status === SUBSCRIPTION_STATUS.TRIAL_CANCELED) newCredits = 0;
+        if (status === SUBSCRIPTION_STATUS.TRIAL) {
+            newCredits = TRIAL_CONFIG.CREDITS;
+        } else if (status === SUBSCRIPTION_STATUS.TRIAL_CANCELED) {
+            newCredits = 0;
+        } else if (isStatusSync && existingData?.credits !== undefined && existingData.isPremium) {
+            // Status sync for existing premium user: preserve current credits
+            newCredits = existingData.credits;
+        }
 
         const creditsData: Record<string, unknown> = {
             isPremium,
             status,
             credits: newCredits,
             creditLimit,
+            // Clear free credits flag when user becomes premium
+            isFreeCredits: false,
             purchasedAt,
             lastUpdatedAt: now,
-            lastPurchaseAt: now,
+            lastPurchaseAt: isNewPurchaseOrRenewal ? now : (existingData?.lastPurchaseAt ?? now),
             processedPurchases,
         };
 

package/src/init/index.ts

@@ -6,5 +6,7 @@
 export {
   createSubscriptionInitModule,
   type SubscriptionInitModuleConfig,
-  type InitModule,
 } from './createSubscriptionInitModule';
+
+// Re-export InitModule from design-system for convenience
+export type { InitModule } from '@umituz/react-native-design-system';

package/src/presentation/hooks/useAuthAwarePurchase.ts

@@ -16,23 +16,40 @@ export interface PurchaseAuthProvider {
 }
 
 let globalAuthProvider: PurchaseAuthProvider | null = null;
-let savedPackage: PurchasesPackage | null = null;
-let savedSource: PurchaseSource | null = null;
+
+interface SavedPurchaseState {
+  pkg: PurchasesPackage;
+  source: PurchaseSource;
+  timestamp: number;
+}
+
+const SAVED_PURCHASE_EXPIRY_MS = 5 * 60 * 1000; // 5 minutes
+let savedPurchaseState: SavedPurchaseState | null = null;
 
 export const configureAuthProvider = (provider: PurchaseAuthProvider): void => {
   globalAuthProvider = provider;
 };
 
+const savePurchase = (pkg: PurchasesPackage, source: PurchaseSource): void => {
+  savedPurchaseState = { pkg, source, timestamp: Date.now() };
+};
+
 export const getSavedPurchase = (): { pkg: PurchasesPackage; source: PurchaseSource } | null => {
-  if (savedPackage && savedSource) {
-    return { pkg: savedPackage, source: savedSource };
+  if (!savedPurchaseState) {
+    return null;
+  }
+
+  const isExpired = Date.now() - savedPurchaseState.timestamp > SAVED_PURCHASE_EXPIRY_MS;
+  if (isExpired) {
+    savedPurchaseState = null;
+    return null;
   }
-  return null;
+
+  return { pkg: savedPurchaseState.pkg, source: savedPurchaseState.source };
 };
 
 export const clearSavedPurchase = (): void => {
-  savedPackage = null;
-  savedSource = null;
+  savedPurchaseState = null;
 };
 
 export interface UseAuthAwarePurchaseParams {
@@ -69,8 +86,7 @@ export const useAuthAwarePurchase = (
       const isAuth = globalAuthProvider.isAuthenticated();
 
       if (!isAuth) {
-        savedPackage = pkg;
-        savedSource = source || params?.source || "settings";
+        savePurchase(pkg, source || params?.source || "settings");
         globalAuthProvider.showAuthModal();
         return false;
       }

package/src/presentation/hooks/useCredits.ts

@@ -86,9 +86,9 @@ export const useCredits = (): UseCreditsResult => {
       return result.data || null;
     },
     enabled: queryEnabled,
-    staleTime: 0,
-    gcTime: 0,
-    refetchOnMount: true,
+    staleTime: 30 * 1000, // 30 seconds - data considered fresh
+    gcTime: 5 * 60 * 1000, // 5 minutes - keep in cache after unmount
+    refetchOnMount: "always",
     refetchOnWindowFocus: true,
     refetchOnReconnect: true,
   });

package/src/presentation/hooks/useFreeCreditsInit.ts

@@ -63,6 +63,13 @@ async function initializeFreeCreditsForUser(
 
   const promise = (async () => {
     try {
+      if (!isCreditsRepositoryConfigured()) {
+        if (typeof __DEV__ !== "undefined" && __DEV__) {
+          console.warn("[useFreeCreditsInit] Credits repository not configured");
+        }
+        return false;
+      }
+
       const repository = getCreditsRepository();
       const result = await repository.initializeFreeCredits(userId);
 
@@ -78,6 +85,11 @@ async function initializeFreeCreditsForUser(
         }
         return false;
       }
+    } catch (error) {
+      if (typeof __DEV__ !== "undefined" && __DEV__) {
+        console.error("[useFreeCreditsInit] Unexpected error:", error);
+      }
+      return false;
     } finally {
       freeCreditsInitInProgress.delete(userId);
       initPromises.delete(userId);
@@ -142,7 +154,11 @@ export function useFreeCreditsInit(params: UseFreeCreditsInitParams): UseFreeCre
     if (needsInit) {
       // Double-check inside effect to handle race conditions
       if (!freeCreditsInitAttempted.has(userId)) {
-        initializeFreeCreditsForUser(userId, stableOnComplete);
+        initializeFreeCreditsForUser(userId, stableOnComplete).catch((error) => {
+          if (typeof __DEV__ !== "undefined" && __DEV__) {
+            console.error("[useFreeCreditsInit] Init failed:", error);
+          }
+        });
       }
     } else if (querySuccess && isAnonymous && !hasCredits && isFreeCreditsEnabled) {
       if (typeof __DEV__ !== "undefined" && __DEV__) {

package/src/presentation/hooks/useSubscriptionStatus.ts

@@ -37,9 +37,9 @@ export const useSubscriptionStatus = (): SubscriptionStatusResult => {
       return SubscriptionManager.checkPremiumStatus();
     },
     enabled: !!userId && SubscriptionManager.isInitializedForUser(userId),
-    staleTime: 0,
-    gcTime: 0,
-    refetchOnMount: true,
+    staleTime: 30 * 1000, // 30 seconds
+    gcTime: 5 * 60 * 1000, // 5 minutes
+    refetchOnMount: "always",
     refetchOnWindowFocus: true,
     refetchOnReconnect: true,
   });

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

@@ -7,6 +7,8 @@ import type { PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type { IRevenueCatService } from "../../application/ports/IRevenueCatService";
 import { getPremiumEntitlement } from "../../domain/types/RevenueCatTypes";
 
+declare const __DEV__: boolean;
+
 export interface PremiumStatus {
   isPremium: boolean;
   expirationDate: Date | null;

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

@@ -76,7 +76,13 @@ export class CustomerInfoListenerManager {
 
             this.renewalState = updateRenewalState(this.renewalState, renewalResult);
 
-            syncPremiumStatus(config, this.currentUserId, customerInfo);
+            try {
+                await syncPremiumStatus(config, this.currentUserId, customerInfo);
+            } catch (error) {
+                if (__DEV__) {
+                    console.error("[CustomerInfoListener] syncPremiumStatus failed:", error);
+                }
+            }
         };
 
         Purchases.addCustomerInfoUpdateListener(this.listener);

package/src/revenuecat/infrastructure/utils/PremiumStatusSyncer.ts

@@ -7,6 +7,8 @@ import type { CustomerInfo } from "react-native-purchases";
 import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
 import { getPremiumEntitlement } from "../../domain/types/RevenueCatTypes";
 
+declare const __DEV__: boolean;
+
 export async function syncPremiumStatus(
     config: RevenueCatConfig,
     userId: string,
@@ -34,13 +36,13 @@ export async function syncPremiumStatus(
         } else {
             await config.onPremiumStatusChanged(userId, false, undefined, undefined, undefined, undefined);
         }
-    } catch {
-        // Silent error handling
+    } catch (error) {
+        if (__DEV__) {
+            console.error('[PremiumStatusSyncer] syncPremiumStatus failed:', error);
+        }
     }
 }
 
-declare const __DEV__: boolean;
-
 export async function notifyPurchaseCompleted(
     config: RevenueCatConfig,
     userId: string,
@@ -88,7 +90,9 @@ export async function notifyRestoreCompleted(
 
     try {
         await config.onRestoreCompleted(userId, isPremium, customerInfo);
-    } catch {
-        // Silent error handling
+    } catch (error) {
+        if (__DEV__) {
+            console.error('[PremiumStatusSyncer] notifyRestoreCompleted failed:', error);
+        }
     }
 }