@umituz/react-native-subscription 2.27.96 → 2.27.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.96",
+  "version": "2.27.97",
   "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/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/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/infrastructure/handlers/PackageHandler.ts

@@ -25,21 +25,41 @@ 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) {
+        if (__DEV__) {
+          console.warn("[PackageHandler] No offerings available from RevenueCat");
+        }
+        // Return empty array instead of throwing - allows graceful degradation
+        return [];
+      }
+
+      const packages = offering.availablePackages;
+      if (!packages || packages.length === 0) {
+        if (__DEV__) {
+          console.warn("[PackageHandler] No packages available in offering");
+        }
+        // Return empty array instead of throwing - allows graceful degradation
+        return [];
+      }
+
+      return packages;
+    } catch (error) {
+      if (__DEV__) {
+        console.error("[PackageHandler] Failed to fetch packages:", 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/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/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(

package/src/domains/subscription/presentation/screens/SubscriptionDetailScreen.tsx

@@ -11,22 +11,61 @@ import {
     ScreenLayout,
 } from "@umituz/react-native-design-system";
 import { SubscriptionHeader } from "./components/SubscriptionHeader";
-import { CreditsList } from "./components/CreditsList";
-import { UpgradePrompt } from "./components/UpgradePrompt";
-import { DevTestSection } from "./components/DevTestSection";
-import type { SubscriptionDetailScreenProps } from "../types/SubscriptionDetailTypes";
+import { CreditsList, type CreditItem } from "./components/CreditsList";
+import { UpgradePrompt, type Benefit } from "./components/UpgradePrompt";
+import { DevTestSection, type DevTestActions } from "./components/DevTestSection";
 
-export type {
-  SubscriptionDisplayFlags,
-  SubscriptionDetailTranslations,
-  SubscriptionDetailConfig,
-  SubscriptionDetailScreenProps,
-  DevTestActions,
-  DevToolsConfig,
-  UpgradeBenefit,
-  UpgradePromptConfig,
-  UpgradePromptProps,
-} from "../types/SubscriptionDetailTypes";
+export interface SubscriptionDisplayFlags {
+  showHeader: boolean;
+  showCredits: boolean;
+  showUpgradePrompt: boolean;
+  showExpirationDate: boolean;
+}
+
+export interface SubscriptionDetailTranslations {
+  title: string;
+  statusActive: string;
+  statusExpired: string;
+  statusFree: string;
+  statusCanceled: string;
+  statusLabel: string;
+  lifetimeLabel: string;
+  expiresLabel: string;
+  purchasedLabel: string;
+  usageTitle?: string;
+  creditsTitle: string;
+  creditsResetInfo?: string;
+  remainingLabel?: string;
+  upgradeButton: string;
+}
+
+export interface DevToolsConfig {
+  actions: DevTestActions;
+  title?: string;
+}
+
+export interface UpgradePromptConfig {
+  title: string;
+  subtitle?: string;
+  benefits?: readonly Benefit[];
+}
+
+export interface SubscriptionDetailConfig {
+  display: SubscriptionDisplayFlags;
+  statusType: "active" | "expired" | "none" | "canceled";
+  isLifetime: boolean;
+  expirationDate?: string;
+  purchaseDate?: string;
+  daysRemaining?: number | null;
+  credits?: readonly CreditItem[];
+  translations: SubscriptionDetailTranslations;
+  upgradePrompt?: UpgradePromptConfig & { onUpgrade?: () => void };
+  devTools?: DevToolsConfig;
+}
+
+export interface SubscriptionDetailScreenProps {
+  config: SubscriptionDetailConfig;
+}
 
 export const SubscriptionDetailScreen: React.FC<
   SubscriptionDetailScreenProps
@@ -98,7 +137,7 @@ export const SubscriptionDetailScreen: React.FC<
             subtitle={config.upgradePrompt.subtitle}
             benefits={config.upgradePrompt.benefits}
             upgradeButtonLabel={config.translations.upgradeButton}
-            onUpgrade={config.onUpgrade}
+            onUpgrade={config.upgradePrompt.onUpgrade ?? (() => {})}
           />
         )}
       </View>

package/src/domains/subscription/presentation/screens/components/CreditsList.tsx

@@ -7,7 +7,20 @@ import React, { useMemo } from "react";
 import { View, StyleSheet } from "react-native";
 import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
 import { CreditRow } from "../../components/details/CreditRow";
-import type { CreditsListProps } from "../../types/SubscriptionDetailTypes";
+
+export interface CreditItem {
+  id: string;
+  label: string;
+  current: number;
+  total: number;
+}
+
+export interface CreditsListProps {
+  credits: readonly CreditItem[];
+  title?: string;
+  description?: string;
+  remainingLabel?: string;
+}
 
 export const CreditsList: React.FC<CreditsListProps> = ({
   credits,

package/src/domains/subscription/presentation/screens/components/DevTestSection.tsx

@@ -7,9 +7,17 @@
 import React, { useMemo } from "react";
 import { View, TouchableOpacity, StyleSheet } from "react-native";
 import { AtomicText, useAppDesignTokens } from "@umituz/react-native-design-system";
-import type { DevTestSectionProps } from "../../types/SubscriptionDetailTypes";
 
-export type { DevTestActions, DevTestSectionProps } from "../../types/SubscriptionDetailTypes";
+export interface DevTestActions {
+  onTestRenewal: () => void;
+  onCheckCredits: () => void;
+  onTestDuplicate: () => void;
+}
+
+export interface DevTestSectionProps {
+  actions: DevTestActions;
+  title?: string;
+}
 
 /** Dev test button translations */
 export interface DevTestTranslations {

package/src/domains/subscription/presentation/screens/components/SubscriptionActions.tsx

@@ -6,7 +6,12 @@
 import React, { useMemo } from "react";
 import { View, StyleSheet, TouchableOpacity } from "react-native";
 import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
-import type { SubscriptionActionsProps } from "../../types/SubscriptionDetailTypes";
+
+export interface SubscriptionActionsProps {
+  isPremium: boolean;
+  upgradeButtonLabel?: string;
+  onUpgrade?: () => void;
+}
 
 export const SubscriptionActions: React.FC<SubscriptionActionsProps> = ({
   isPremium,

package/src/domains/subscription/presentation/screens/components/SubscriptionHeader.tsx

@@ -8,7 +8,26 @@ import { View, StyleSheet } from "react-native";
 import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
 import { PremiumStatusBadge } from "../../components/details/PremiumStatusBadge";
 import { DetailRow } from "../../components/details/DetailRow";
-import type { SubscriptionHeaderProps } from "../../types/SubscriptionDetailTypes";
+
+export interface SubscriptionHeaderProps {
+  statusType: "active" | "expired" | "none" | "canceled";
+  showExpirationDate: boolean;
+  isLifetime: boolean;
+  expirationDate?: string;
+  purchaseDate?: string;
+  daysRemaining?: number | null;
+  translations: {
+    title: string;
+    statusActive: string;
+    statusExpired: string;
+    statusFree: string;
+    statusCanceled: string;
+    statusLabel: string;
+    lifetimeLabel: string;
+    expiresLabel: string;
+    purchasedLabel: string;
+  };
+}
 
 export const SubscriptionHeader: React.FC<SubscriptionHeaderProps> = ({
   statusType,

package/src/domains/subscription/presentation/screens/components/UpgradePrompt.tsx

@@ -10,7 +10,19 @@ import {
     AtomicText,
     AtomicIcon,
 } from "@umituz/react-native-design-system";
-import type { UpgradePromptProps } from "../../types/SubscriptionDetailTypes";
+
+export interface Benefit {
+  icon?: string;
+  text: string;
+}
+
+export interface UpgradePromptProps {
+  title: string;
+  subtitle?: string;
+  benefits?: readonly Benefit[];
+  upgradeButtonLabel: string;
+  onUpgrade: () => void;
+}
 
 export const UpgradePrompt: React.FC<UpgradePromptProps> = ({
   title,

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

@@ -6,7 +6,7 @@
 import { useCallback } from "react";
 import type { PurchasesPackage } from "react-native-purchases";
 import { usePremium } from "./usePremium";
-import type { PurchaseSource } from "../../credits/core/Credits";
+import type { PurchaseSource } from "../core/SubscriptionConstants";
 
 export interface PurchaseAuthProvider {
   isAuthenticated: () => boolean;

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

@@ -135,9 +135,9 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
       if (typeof __DEV__ !== "undefined" && __DEV__) {
         console.log("[useFeatureGate] requireFeature", {
           isAuthenticated,
-          hasSubscription,
+          hasSubscription: hasSubscriptionRef.current,
           creditBalance: creditBalanceRef.current,
-          requiredCredits,
+          requiredCredits: requiredCreditsRef.current,
           isCreditsLoaded,
         });
       }
@@ -155,25 +155,29 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
         return;
       }
 
-      if (hasSubscription) {
+      // Use ref values to avoid stale closure
+      const currentHasSubscription = hasSubscriptionRef.current;
+      const currentBalance = creditBalanceRef.current;
+      const currentRequiredCredits = requiredCreditsRef.current;
+
+      if (currentHasSubscription) {
         action();
         return;
       }
 
-      const currentBalance = creditBalanceRef.current;
-      if (currentBalance < requiredCredits) {
+      if (currentBalance < currentRequiredCredits) {
         if (typeof __DEV__ !== "undefined" && __DEV__) {
           console.log("[useFeatureGate] No credits, showing paywall");
         }
         pendingActionRef.current = action;
         isWaitingForPurchaseRef.current = true;
-        onShowPaywall(requiredCredits);
+        onShowPaywallRef.current(currentRequiredCredits);
         return;
       }
 
       action();
     },
-    [isAuthenticated, hasSubscription, requiredCredits, onShowAuthModal, onShowPaywall, isCreditsLoaded]
+    [isAuthenticated, onShowAuthModal, isCreditsLoaded]
   );
 
   const hasCredits = creditBalance >= requiredCredits;

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

@@ -5,7 +5,7 @@
  */
 
 import { useCallback, useSyncExternalStore } from "react";
-import type { PurchaseSource } from "../../credits/core/Credits";
+import type { PurchaseSource } from "../core/SubscriptionConstants";
 
 type Listener = () => void;
 

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

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

package/src/init/index.ts

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

package/src/presentation/hooks/index.ts

@@ -1,13 +1,9 @@
 export * from "../../domains/subscription/presentation/useAuthAwarePurchase";
-export * from "../../domains/subscription/presentation/useAuthSubscriptionSync";
-export * from "../../domains/subscription/presentation/useSavedPurchaseAutoExecution";
 export * from "../../domains/credits/presentation/useCredits";
 export * from "../../domains/credits/presentation/useDeductCredit";
 export * from "../../domains/subscription/presentation/useFeatureGate";
 export * from "../../domains/subscription/presentation/usePaywallVisibility";
 export * from "../../domains/subscription/presentation/usePremium";
-export * from "../../domains/subscription/presentation/usePremiumGate";
-export * from "../../domains/subscription/presentation/useSubscriptionSettingsConfig";
 export * from "../../domains/subscription/presentation/useSubscriptionStatus";
 export * from "./feedback/usePaywallFeedback";
 export * from "./feedback/useFeedbackSubmit";

package/src/shared/infrastructure/SubscriptionEventBus.ts

@@ -28,6 +28,11 @@ export class SubscriptionEventBus {
       const listeners = this.listeners[event];
       if (listeners) {
         this.listeners[event] = listeners.filter(l => l !== callback);
+
+        // Clean up empty event arrays to prevent memory leak
+        if (this.listeners[event].length === 0) {
+          delete this.listeners[event];
+        }
       }
     };
   }
@@ -42,6 +47,28 @@ export class SubscriptionEventBus {
       }
     });
   }
+
+  /**
+   * Clear all listeners for a specific event or all events
+   * Useful for cleanup during testing or app state reset
+   */
+  clear(event?: string): void {
+    if (event) {
+      delete this.listeners[event];
+    } else {
+      this.listeners = {};
+    }
+  }
+
+  /**
+   * Get listener count for debugging
+   */
+  getListenerCount(event?: string): number {
+    if (event) {
+      return this.listeners[event]?.length ?? 0;
+    }
+    return Object.values(this.listeners).reduce((total, arr) => total + arr.length, 0);
+  }
 }
 
 export const subscriptionEventBus = SubscriptionEventBus.getInstance();

package/src/utils/packageTypeDetector.ts

@@ -7,10 +7,6 @@ import { PACKAGE_TYPE, type PackageType } from "../domains/subscription/core/Sub
 
 export type SubscriptionPackageType = PackageType;
 
-/**
- * Check if identifier is a credit package (consumable purchase)
- * Credit packages use a different system and don't need type detection
- */
 /**
  * Check if identifier is a credit package (consumable purchase)
  * Credit packages use a different system and don't need type detection

package/src/domains/subscription/presentation/types/README.md

@@ -1,22 +0,0 @@
-# Presentation Types
-
-TypeScript type definitions and interfaces for the presentation layer.
-
-## Overview
-
-This directory contains all type definitions used by presentation components and hooks.
-
-## Contents
-
-### Subscription Types
-
-- **SubscriptionSettingsTypes.ts** - Configuration types for subscription settings UI
-- **PaywallTypes.ts** - Paywall component types
-- **SubscriptionTypes.ts** - General subscription UI types
-
-## Key Exports
-
-## Related
-
-- [Hooks](../hooks/README.md)
-- [Components](../components/README.md)