@umituz/react-native-subscription 2.39.8 → 2.39.10

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

@@ -1,71 +1,64 @@
+interface CacheEntry {
+    promise: Promise<boolean>;
+    resolvedUserId: string | null;
+    completed: boolean;
+}
+
 export class InitializationCache {
-    private initPromise: Promise<boolean> | null = null;
-    private cacheKey: string | null = null;
-    private promiseCacheKey: string | null = null;
-    private resolvedUserId: string | null = null;
-    private promiseCompleted = true;
-    private pendingQueue: Map<string, Promise<boolean>> = new Map();
+    private entries: Map<string, CacheEntry> = new Map();
 
     tryAcquireInitialization(cacheKey: string): { shouldInit: boolean; existingPromise: Promise<boolean> | null } {
-        const queuedPromise = this.pendingQueue.get(cacheKey);
-        if (queuedPromise) {
-            return { shouldInit: false, existingPromise: queuedPromise };
-        }
-
-        if (
-            this.initPromise &&
-            this.cacheKey === cacheKey &&
-            this.promiseCompleted &&
-            this.promiseCacheKey === cacheKey
-        ) {
-            return { shouldInit: false, existingPromise: this.initPromise };
+        const entry = this.entries.get(cacheKey);
+        if (entry) {
+            return { shouldInit: false, existingPromise: entry.promise };
         }
 
         return { shouldInit: true, existingPromise: null };
     }
 
     setPromise(promise: Promise<boolean>, cacheKey: string, realUserId: string | null): void {
-        this.promiseCacheKey = cacheKey;
-        this.promiseCompleted = false;
+        const entry: CacheEntry = {
+            promise: null as any, // Placeholder to be assigned immediately
+            resolvedUserId: realUserId,
+            completed: false,
+        };
 
         const chain: Promise<boolean> = promise
             .then((result) => {
-                if (result && this.promiseCacheKey === cacheKey) {
-                    this.cacheKey = cacheKey;
-                    this.resolvedUserId = realUserId;
+                const currentEntry = this.entries.get(cacheKey);
+                if (currentEntry === entry) {
+                    currentEntry.completed = true;
+                    if (!result) {
+                        this.entries.delete(cacheKey);
+                    }
                 }
-                this.promiseCompleted = true;
                 return result;
             })
             .catch((error) => {
-                if (this.promiseCacheKey === cacheKey) {
-                    this.initPromise = null;
-                    this.promiseCacheKey = null;
-                    this.cacheKey = null;
-                    this.resolvedUserId = null;
+                if (this.entries.get(cacheKey) === entry) {
+                    this.entries.delete(cacheKey);
                 }
-                this.promiseCompleted = true;
                 console.error('[InitializationCache] Initialization failed', { cacheKey, error });
                 return false;
-            })
-            .finally(() => {
-                this.pendingQueue.delete(cacheKey);
             });
 
-        this.initPromise = chain;
-        this.pendingQueue.set(cacheKey, chain);
+        entry.promise = chain;
+        this.entries.set(cacheKey, entry);
     }
 
     getCurrentUserId(): string | null {
-        return this.resolvedUserId;
+        // Find the first completed entry. This assumes we usually only have one active at a time,
+        // but it's much safer than shared state variables. 
+        // In reality, SubscriptionManager.reset() clears this map on user switch.
+        for (const entry of this.entries.values()) {
+            if (entry.completed) {
+                return entry.resolvedUserId;
+            }
+        }
+        return null;
     }
 
     reset(): void {
-        this.initPromise = null;
-        this.cacheKey = null;
-        this.promiseCacheKey = null;
-        this.resolvedUserId = null;
-        this.promiseCompleted = true;
-        this.pendingQueue.clear();
+        this.entries.clear();
     }
 }

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

@@ -1,8 +1,8 @@
 import type { CustomerInfo } from "react-native-purchases";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
 import type { PurchaseSource } from "../../core/SubscriptionConstants";
-import type { PackageType } from "../../../revenuecat/core/types";
-import { getPremiumEntitlement } from "../../../revenuecat/core/types";
+import type { PackageType } from "../../../revenuecat/core/types/RevenueCatTypes";
+import { getPremiumEntitlement } from "../../../revenuecat/core/types/RevenueCatTypes";
 
 export async function syncPremiumStatus(
     config: RevenueCatConfig,

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

@@ -1,5 +1,5 @@
 import type { SubscriptionStatusType } from "./PremiumStatusBadge.types";
-import type { CreditInfo } from "../../../core/types";
+import type { CreditInfo } from "../../../core/types/CreditInfo";
 
 export type { CreditInfo };
 

package/src/domains/subscription/presentation/components/sections/SubscriptionSection.types.ts

@@ -1,6 +1,6 @@
 import type { StyleProp, ViewStyle } from "react-native";
 import type { SubscriptionStatusType } from "../../../core/SubscriptionConstants";
-import type { CreditInfo } from "../../../core/types";
+import type { CreditInfo } from "../../../core/types/CreditInfo";
 import type { PremiumDetailsTranslations } from "../details/PremiumDetailsCardTypes";
 
 export interface SubscriptionSectionConfig {

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

@@ -5,7 +5,7 @@ import { AtomicIcon, AtomicText } from "@umituz/react-native-design-system/atoms
 import { NavigationHeader } from "@umituz/react-native-design-system/molecules";
 import { useAppDesignTokens } from "@umituz/react-native-design-system/theme";
 import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
-import { ScreenLayout } from "../../../../shared/presentation";
+import { ScreenLayout } from "../../../../shared/presentation/layouts/ScreenLayout";
 import { getCreditsRepository } from "../../../credits/infrastructure/CreditsRepositoryManager";
 import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../../shared/infrastructure/SubscriptionEventBus";
 import { SubscriptionHeader } from "./components/SubscriptionHeader";

package/src/domains/subscription/presentation/screens/SubscriptionDetailScreen.types.ts

@@ -1,5 +1,5 @@
 import type { SubscriptionStatusType } from "../../core/SubscriptionConstants";
-import type { CreditInfo } from "../../core/types";
+import type { CreditInfo } from "../../core/types/CreditInfo";
 
 export type { CreditInfo };
 

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

@@ -7,7 +7,6 @@ interface PurchaseLoadingState {
 interface PurchaseLoadingActions {
   startPurchase: (productId: string, source: "manual" | "auto-execution") => void;
   endPurchase: (productId: string) => void;
-  isPurchasing: (productId?: string) => boolean;
   reset: () => void;
 }
 
@@ -17,7 +16,7 @@ const createInitialState = (): PurchaseLoadingState => ({
   activePurchases: new Map(),
 });
 
-export const usePurchaseLoadingStore = create<PurchaseLoadingStore>((set, get) => ({
+export const usePurchaseLoadingStore = create<PurchaseLoadingStore>((set) => ({
   ...createInitialState(),
 
   startPurchase: (productId, source) => {
@@ -36,15 +35,19 @@ export const usePurchaseLoadingStore = create<PurchaseLoadingStore>((set, get) =
     });
   },
 
-  isPurchasing: (productId) => {
-    const state = get();
-    if (productId) return state.activePurchases.has(productId);
-    return state.activePurchases.size > 0;
-  },
-
   reset: () => {
     set(createInitialState());
   },
 }));
 
+/**
+ * Optimized selector for purchasing state.
+ * Use this to avoid re-renders when other parts of the state change.
+ */
 export const selectIsPurchasing = (state: PurchaseLoadingStore) => state.activePurchases.size > 0;
+
+/**
+ * Optimized selector for a specific product's purchasing state.
+ */
+export const selectIsProductPurchasing = (productId: string) => (state: PurchaseLoadingStore) => 
+  state.activePurchases.has(productId);

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

@@ -1,4 +1,4 @@
-import type { PremiumStatus } from "../core/types";
+import type { PremiumStatus } from "../core/types/PremiumStatus";
 
 export interface SubscriptionStatusResult extends PremiumStatus {
   isLoading: boolean;

package/src/domains/subscription/utils/featureGateUtils.ts

@@ -0,0 +1,37 @@
+export const DEFAULT_REQUIRED_CREDITS = 1;
+
+/**
+ * Checks if an action that requires auth-based credits can be executed.
+ */
+export function canExecuteAuthAction(
+  isWaitingForAuthCredits: boolean,
+  isCreditsLoaded: boolean,
+  hasPendingAction: boolean,
+  hasSubscription: boolean,
+  creditBalance: number,
+  requiredCredits: number
+): boolean {
+  if (!isWaitingForAuthCredits || !isCreditsLoaded || !hasPendingAction) {
+    return false;
+  }
+  return hasSubscription || creditBalance >= requiredCredits;
+}
+
+/**
+ * Checks if a purchase action can be executed, typically after a purchase flow.
+ */
+export function canExecutePurchaseAction(
+  isWaitingForPurchase: boolean,
+  creditBalance: number,
+  prevBalance: number,
+  hasSubscription: boolean,
+  prevHasSubscription: boolean,
+  hasPendingAction: boolean
+): boolean {
+  if (!isWaitingForPurchase || !hasPendingAction) {
+    return false;
+  }
+  const creditsIncreased = creditBalance > prevBalance;
+  const subscriptionAcquired = hasSubscription && !prevHasSubscription;
+  return creditsIncreased || subscriptionAcquired;
+}

package/src/domains/subscription/utils/packageTypeFormatter.ts

@@ -1,4 +1,4 @@
-import type { PackageType } from "../../revenuecat/core/types";
+import type { PackageType } from "../../revenuecat/core/types/RevenueCatTypes";
 
 export function formatPackageTypeForDisplay(packageType: PackageType | string | null | undefined): string {
   if (!packageType) {

package/src/domains/wallet/infrastructure/repositories/transaction/CollectionBuilder.ts

@@ -1,4 +1,4 @@
-import { buildCollectionRef, type CollectionConfig } from "../../../../../shared/infrastructure/firestore";
+import { buildCollectionRef, type CollectionConfig } from "../../../../../shared/infrastructure/firestore/collectionUtils";
 import type { Firestore } from "@umituz/react-native-firebase";
 import type { TransactionRepositoryConfig } from "../../../domain/types/transaction.types";
 

package/src/domains/wallet/infrastructure/repositories/transaction/TransactionFetcher.ts

@@ -13,7 +13,8 @@ import type {
   TransactionResult,
 } from "../../../domain/types/transaction.types";
 import { TransactionMapper } from "../../../domain/mappers/TransactionMapper";
-import { requireFirestore, mapErrorToResult } from "../../../../../shared/infrastructure/firestore";
+import { requireFirestore } from "../../../../../shared/infrastructure/firestore/collectionUtils";
+import { mapErrorToResult } from "../../../../../shared/infrastructure/firestore/resultUtils";
 import { getCollectionRef } from "./CollectionBuilder";
 
 export async function fetchTransactions(

package/src/domains/wallet/infrastructure/repositories/transaction/TransactionWriter.ts

@@ -7,7 +7,8 @@ import type {
   TransactionReason,
 } from "../../../domain/types/transaction.types";
 import { TransactionMapper } from "../../../domain/mappers/TransactionMapper";
-import { requireFirestore, mapErrorToResult } from "../../../../../shared/infrastructure/firestore";
+import { requireFirestore } from "../../../../../shared/infrastructure/firestore/collectionUtils";
+import { mapErrorToResult } from "../../../../../shared/infrastructure/firestore/resultUtils";
 import { getCollectionRef } from "./CollectionBuilder";
 
 export async function addTransaction(

package/src/domains/wallet/presentation/screens/WalletScreen.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { View, StyleSheet, TouchableOpacity } from "react-native";
 import { AtomicText, AtomicIcon, AtomicSpinner } from "@umituz/react-native-design-system/atoms";
 import { useAppDesignTokens } from "@umituz/react-native-design-system/theme";
-import { ScreenLayout } from "../../../../shared/presentation";
+import { ScreenLayout } from "../../../../shared/presentation/layouts/ScreenLayout";
 import { useNavigation } from "@react-navigation/native";
 import { useWallet } from "../hooks/useWallet";
 import { getWalletConfig } from "../../infrastructure/config/walletConfig";

package/src/index.ts

@@ -1,6 +1,8 @@
 // Domain Layer - Constants & Types
 export * from "./domains/subscription/core/SubscriptionConstants";
-export type { SubscriptionMetadata, PremiumStatus, CreditInfo } from "./domains/subscription/core/types";
+export type { SubscriptionMetadata } from "./domains/subscription/core/types/SubscriptionMetadata";
+export type { PremiumStatus } from "./domains/subscription/core/types/PremiumStatus";
+export type { CreditInfo } from "./domains/subscription/core/types/CreditInfo";
 export {
   createDefaultSubscriptionStatus,
   isSubscriptionValid,
@@ -25,7 +27,8 @@ export {
 export type { Result, Success, Failure } from "./shared/utils/Result";
 
 // Infrastructure Layer (Services & Repositories)
-export { initializeSubscription, type SubscriptionInitConfig, type CreditPackageConfig } from "./domains/subscription/application/initializer";
+export { initializeSubscription } from "./domains/subscription/application/initializer/SubscriptionInitializer";
+export type { SubscriptionInitConfig, CreditPackageConfig } from "./domains/subscription/application/SubscriptionInitializerTypes";
 
 export { CreditsRepository } from "./domains/credits/infrastructure/CreditsRepository";
 export { 

package/src/init/createSubscriptionInitModule.ts

@@ -1,5 +1,6 @@
 import type { InitModule } from '@umituz/react-native-design-system/init';
-import { initializeSubscription, type SubscriptionInitConfig } from '../domains/subscription/application/initializer';
+import { initializeSubscription } from "../domains/subscription/application/initializer/SubscriptionInitializer";
+import type { SubscriptionInitConfig } from "../domains/subscription/application/SubscriptionInitializerTypes";
 
 export interface SubscriptionInitModuleConfig extends Omit<SubscriptionInitConfig, 'apiKey'> {
   getApiKey: () => string | undefined;

package/src/shared/infrastructure/SubscriptionEventBus.ts

@@ -2,7 +2,7 @@ type EventCallback<T = unknown> = (data: T) => void;
 
 class SubscriptionEventBus {
   private static instance: SubscriptionEventBus;
-  private listeners: Record<string, EventCallback[]> = {};
+  private listeners: Map<string, Set<EventCallback>> = new Map();
 
   private constructor() {}
 
@@ -14,52 +14,58 @@ class SubscriptionEventBus {
   }
 
   on<T>(event: string, callback: EventCallback<T>): () => void {
-    if (!this.listeners[event]) {
-      this.listeners[event] = [];
+    if (!this.listeners.has(event)) {
+      this.listeners.set(event, new Set());
     }
-    this.listeners[event].push(callback as EventCallback);
+    
+    const eventSet = this.listeners.get(event)!;
+    eventSet.add(callback as EventCallback);
 
     return () => {
-      const listeners = this.listeners[event];
+      const listeners = this.listeners.get(event);
       if (listeners) {
-        this.listeners[event] = listeners.filter(l => l !== callback);
-
-        if (this.listeners[event].length === 0) {
-          delete this.listeners[event];
+        listeners.delete(callback as EventCallback);
+        if (listeners.size === 0) {
+          this.listeners.delete(event);
         }
       }
     };
   }
 
   emit<T>(event: string, data: T): void {
-    if (!this.listeners[event]) return;
+    const listeners = this.listeners.get(event);
+    if (!listeners || listeners.size === 0) return;
 
-    this.listeners[event].forEach(callback => {
-      Promise.resolve().then(() => {
+    // Use microtask for async execution to not block main thread
+    // but keep it fast.
+    listeners.forEach(callback => {
+      queueMicrotask(() => {
         try {
           callback(data);
         } catch (error) {
           console.error('[SubscriptionEventBus] Listener error for event:', event, { error });
         }
-      }).catch(error => {
-        console.error('[SubscriptionEventBus] Async listener error for event:', event, { error });
       });
     });
   }
 
   clear(event?: string): void {
     if (event) {
-      delete this.listeners[event];
+      this.listeners.delete(event);
     } else {
-      this.listeners = {};
+      this.listeners.clear();
     }
   }
 
   getListenerCount(event?: string): number {
     if (event) {
-      return this.listeners[event]?.length ?? 0;
+      return this.listeners.get(event)?.size ?? 0;
     }
-    return Object.values(this.listeners).reduce((total, arr) => total + arr.length, 0);
+    let total = 0;
+    this.listeners.forEach(set => {
+      total += set.size;
+    });
+    return total;
   }
 }
 

package/src/domains/revenuecat/core/errors/index.ts

@@ -1,3 +0,0 @@
-export * from "./RevenueCatError";
-export * from "./RevenueCatErrorMessages";
-export * from "./RevenueCatErrorHandler";

package/src/domains/revenuecat/core/types/index.ts

@@ -1,3 +0,0 @@
-export * from "./RevenueCatTypes";
-export * from "./RevenueCatConfig";
-export * from "./RevenueCatData";

package/src/domains/subscription/application/initializer/index.ts

@@ -1,2 +0,0 @@
-export { initializeSubscription } from "./SubscriptionInitializer";
-export type { CreditPackageConfig, SubscriptionInitConfig } from "../SubscriptionInitializerTypes";

package/src/domains/subscription/core/types/index.ts

@@ -1,3 +0,0 @@
-export type { SubscriptionMetadata } from "./SubscriptionMetadata";
-export type { PremiumStatus } from "./PremiumStatus";
-export type { CreditInfo } from "./CreditInfo";

package/src/domains/subscription/infrastructure/handlers/package-operations/index.ts

@@ -1,4 +0,0 @@
-export type { RestoreResultInfo } from "./types";
-export { fetchPackages } from "./PackageFetcher";
-export { executePurchase } from "./PackagePurchaser";
-export { restorePurchases } from "./PackageRestorer";

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

@@ -1,3 +0,0 @@
-export type { RenewalState } from "./types";
-export { detectRenewal } from "./RenewalDetector";
-export { updateRenewalState } from "./RenewalStateUpdater";

package/src/shared/infrastructure/firestore/index.ts

@@ -1,2 +0,0 @@
-export * from "./collectionUtils";
-export * from "./resultUtils";

package/src/shared/presentation/index.ts

@@ -1 +0,0 @@
-export * from "./layouts/ScreenLayout";