@umituz/react-native-subscription 3.1.8 → 3.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "3.1.8",
+  "version": "3.1.10",
   "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/application/CreditsInitializer.ts

@@ -2,7 +2,8 @@ import type { CreditsConfig } from "../core/Credits";
 import { getAppVersion, validatePlatform } from "../../../utils/appUtils";
 
 import type { InitializeCreditsMetadata, InitializationResult } from "../../subscription/application/SubscriptionInitializerTypes";
-import { runTransaction, type Transaction, type DocumentReference, type Firestore } from "@umituz/react-native-firebase";
+import { runTransaction, type DocumentReference } from "firebase/firestore";
+import type { Firestore } from "@umituz/react-native-firebase";
 import { getCreditDocumentOrDefault } from "./creditDocumentHelpers";
 import { calculateNewCredits, buildCreditsData } from "./creditOperationUtils";
 import { CreditLimitService } from "../domain/services/CreditLimitService";
@@ -39,7 +40,7 @@ export async function initializeCreditsTransaction(
     const platform = validatePlatform();
     const appVersion = getAppVersion();
 
-    return runTransaction(async (transaction: Transaction) => {
+    return runTransaction(_db, async (transaction) => {
         const creditsDoc = await transaction.get(creditsRef);
 
         const existingData = getCreditDocumentOrDefault(creditsDoc, platform);

package/src/domains/credits/application/DeductCreditsCommand.ts

@@ -1,4 +1,5 @@
-import { runTransaction, serverTimestamp, type Transaction, type DocumentReference, type Firestore } from "@umituz/react-native-firebase";
+import { runTransaction, serverTimestamp, type DocumentReference } from "firebase/firestore";
+import type { Firestore } from "@umituz/react-native-firebase";
 import type { DeductCreditsResult } from "../core/Credits";
 import { CREDIT_ERROR_CODES, MAX_SINGLE_DEDUCTION } from "../core/CreditsConstants";
 
@@ -33,7 +34,7 @@ export async function deductCreditsOperation(
   try {
     if (__DEV__) console.log('[DeductCreditsCommand] >>> starting transaction', { userId, cost, creditsRefPath: creditsRef.path });
 
-    const remaining = await runTransaction(async (tx: Transaction) => {
+    const remaining = await runTransaction(_db, async (tx) => {
       const docSnap = await tx.get(creditsRef);
 
       if (__DEV__) console.log('[DeductCreditsCommand] doc exists:', docSnap.exists());
@@ -66,7 +67,7 @@ export async function deductCreditsOperation(
 
     return {
       success: true,
-      remainingCredits: remaining,
+      remainingCredits: remaining as number,
       error: null
     };
   } catch (e: unknown) {

package/src/domains/credits/application/PurchaseMetadataGenerator.ts

@@ -1,4 +1,4 @@
-import { Timestamp } from "@umituz/react-native-firebase";
+import { Timestamp } from "firebase/firestore";
 import type {
   PurchaseType,
   PurchaseMetadata,

package/src/domains/credits/application/RefundCreditsCommand.ts

@@ -1,4 +1,5 @@
-import { runTransaction, serverTimestamp, type Transaction, type DocumentReference, type Firestore } from "@umituz/react-native-firebase";
+import { runTransaction, serverTimestamp, type DocumentReference } from "firebase/firestore";
+import type { Firestore } from "@umituz/react-native-firebase";
 import type { DeductCreditsResult } from "../core/Credits";
 import { CREDIT_ERROR_CODES } from "../core/CreditsConstants";
 
@@ -31,7 +32,7 @@ export async function refundCreditsOperation(
   }
 
   try {
-    const remaining = await runTransaction(async (tx: Transaction) => {
+    const remaining = await runTransaction(_db, async (tx) => {
       const docSnap = await tx.get(creditsRef);
 
       if (!docSnap.exists()) {
@@ -54,7 +55,7 @@ export async function refundCreditsOperation(
 
     return {
       success: true,
-      remainingCredits: remaining,
+      remainingCredits: remaining as number,
       error: null
     };
   } catch (e: unknown) {

package/src/domains/credits/application/creditDocumentHelpers.ts

@@ -1,5 +1,6 @@
 import type { UserCreditsDocumentRead, FirestoreTimestamp } from "../core/UserCreditsDocument";
-import { serverTimestamp, type DocumentSnapshot } from "@umituz/react-native-firebase";
+import { serverTimestamp } from "firebase/firestore";
+import type { DocumentSnapshot } from "firebase/firestore";
 import { SUBSCRIPTION_STATUS, type Platform } from "../../subscription/core/SubscriptionConstants";
 
 export function getCreditDocumentOrDefault(

package/src/domains/credits/infrastructure/CreditsRepository.ts

@@ -1,4 +1,5 @@
-import type { Firestore, DocumentReference } from "@umituz/react-native-firebase";
+import type { DocumentReference } from "firebase/firestore";
+import type { Firestore } from "@umituz/react-native-firebase";
 import { BaseRepository } from "@umituz/react-native-firebase";
 import type { CreditsConfig, CreditsResult, DeductCreditsResult } from "../core/Credits";
 import type { PurchaseSource } from "../core/UserCreditsDocument";
@@ -86,12 +87,12 @@ export class CreditsRepository extends BaseRepository {
 
   async syncExpiredStatus(userId: string): Promise<void> {
     const db = requireFirestore();
-    await syncExpiredStatus(this.getRef(db, userId));
+    await syncExpiredStatus(db, this.getRef(db, userId));
   }
 
   async syncPremiumMetadata(userId: string, metadata: SubscriptionMetadata): Promise<void> {
     const db = requireFirestore();
-    await syncPremiumMetadata(this.getRef(db, userId), metadata);
+    await syncPremiumMetadata(db, this.getRef(db, userId), metadata);
   }
 
   async ensurePremiumCreditsExist(

package/src/domains/credits/infrastructure/operations/CreditsFetcher.ts

@@ -1,5 +1,4 @@
-import { getDoc } from "firebase/firestore";
-import type { DocumentReference } from "@umituz/react-native-firebase";
+import { getDoc, type DocumentReference } from "firebase/firestore";
 import type { CreditsResult } from "../../core/Credits";
 import type { UserCreditsDocumentRead } from "../../core/UserCreditsDocument";
 import { mapCreditsDocumentToEntity } from "../../core/CreditsMapper";

package/src/domains/credits/infrastructure/operations/CreditsInitializer.ts

@@ -1,4 +1,5 @@
-import type { Firestore, DocumentReference } from "@umituz/react-native-firebase";
+import type { DocumentReference } from "firebase/firestore";
+import type { Firestore } from "@umituz/react-native-firebase";
 import type { CreditsConfig, CreditsResult } from "../../core/Credits";
 import type { PurchaseSource } from "../../core/UserCreditsDocument";
 import { initializeCreditsTransaction } from "../../application/CreditsInitializer";

package/src/domains/credits/infrastructure/operations/CreditsWriter.ts

@@ -1,5 +1,5 @@
-import type { DocumentReference, Transaction } from "@umituz/react-native-firebase";
-import { runTransaction, serverTimestamp } from "@umituz/react-native-firebase";
+import { runTransaction, serverTimestamp, type DocumentReference } from "firebase/firestore";
+import type { Firestore } from "@umituz/react-native-firebase";
 import { getDoc, setDoc } from "firebase/firestore";
 import { SUBSCRIPTION_STATUS } from "../../../subscription/core/SubscriptionConstants";
 import { resolveSubscriptionStatus } from "../../../subscription/core/SubscriptionStatus";
@@ -11,8 +11,8 @@ import { getAppVersion, validatePlatform } from "../../../../utils/appUtils";
 // Fix: was getDoc+setDoc (non-atomic) — now uses runTransaction so concurrent
 // initializeCreditsTransaction and deductCreditsOperation no longer see stale
 // updateTime preconditions that produce failed-precondition errors.
-export async function syncExpiredStatus(ref: DocumentReference): Promise<void> {
-  await runTransaction(async (tx: Transaction) => {
+export async function syncExpiredStatus(db: Firestore, ref: DocumentReference): Promise<void> {
+  await runTransaction(db, async (tx) => {
     const doc = await tx.get(ref);
     if (!doc.exists()) return;
 
@@ -27,10 +27,11 @@ export async function syncExpiredStatus(ref: DocumentReference): Promise<void> {
 
 // Fix: was getDoc+setDoc (non-atomic) — now uses runTransaction.
 export async function syncPremiumMetadata(
+  db: Firestore,
   ref: DocumentReference,
   metadata: SubscriptionMetadata
 ): Promise<void> {
-  await runTransaction(async (tx: Transaction) => {
+  await runTransaction(db, async (tx) => {
     const doc = await tx.get(ref);
     if (!doc.exists()) return;
 

package/src/domains/credits/presentation/useCreditsRealTime.ts

@@ -1,10 +1,10 @@
-import { useEffect, useState, useCallback } from "react";
-import { onSnapshot } from "firebase/firestore";
-import type { UserCredits } from "../core/Credits";
+import { useMemo } from "react";
+import type { DocumentReference } from "firebase/firestore";
+import type { UserCreditsDocumentRead } from "../core/UserCreditsDocument";
 import { getCreditsConfig } from "../infrastructure/CreditsRepositoryManager";
 import { mapCreditsDocumentToEntity } from "../core/CreditsMapper";
-import { requireFirestore, buildDocRef, type CollectionConfig } from "../../../shared/infrastructure/firestore/collectionUtils";
-import type { UserCreditsDocumentRead } from "../core/UserCreditsDocument";
+import { requireFirestore, buildDocRef } from "../../../shared/infrastructure/firestore/collectionUtils";
+import { useFirestoreDocumentRealTime } from "../../../shared/presentation/hooks/useFirestoreRealTime";
 
 /**
  * Real-time sync for credits using Firestore onSnapshot.
@@ -20,76 +20,29 @@ import type { UserCreditsDocumentRead } from "../core/UserCreditsDocument";
  * @returns Credits state and loading status
  */
 export function useCreditsRealTime(userId: string | null | undefined) {
-  const [credits, setCredits] = useState<UserCredits | null>(null);
-  const [isLoading, setIsLoading] = useState(true);
-  const [error, setError] = useState<Error | null>(null);
-
-  useEffect(() => {
-    // Reset state when userId changes
-    if (!userId) {
-      setCredits(null);
-      setIsLoading(false);
-      setError(null);
-      return;
-    }
-
-    setIsLoading(true);
-    setError(null);
+  // Build document reference
+  const docRef = useMemo(() => {
+    if (!userId) return null;
 
-    try {
-      const db = requireFirestore();
-      const config = getCreditsConfig();
-
-      // Build doc ref using same logic as repository
-      const collectionConfig: CollectionConfig = {
-        collectionName: config.collectionName,
-        useUserSubcollection: config.useUserSubcollection,
-      };
-      const docRef = buildDocRef(db, userId, "balance", collectionConfig);
-
-      // Real-time listener
-      const unsubscribe = onSnapshot(
-        docRef,
-        (snapshot) => {
-          if (snapshot.exists()) {
-            const entity = mapCreditsDocumentToEntity(snapshot.data() as UserCreditsDocumentRead);
-            setCredits(entity);
-          } else {
-            setCredits(null);
-          }
-          setIsLoading(false);
-        },
-        (err) => {
-          console.error("[useCreditsRealTime] Snapshot error:", err);
-          setError(err as Error);
-          setIsLoading(false);
-        }
-      );
-
-      return () => {
-        unsubscribe();
-      };
-    } catch (err) {
-      const error = err instanceof Error ? err : new Error(String(err));
-      console.error("[useCreditsRealTime] Setup error:", err);
-      setError(error);
-      setIsLoading(false);
-    }
+    const db = requireFirestore();
+    const config = getCreditsConfig();
+    const ref = buildDocRef(db, userId, "balance", config);
+    return ref as DocumentReference<UserCreditsDocumentRead>;
   }, [userId]);
 
-  const refetch = useCallback(() => {
-    // Real-time sync doesn't need refetch, but keep for API compatibility
-    // The snapshot listener will automatically update when data changes
-    if (__DEV__) {
-      console.warn("[useCreditsRealTime] Refetch called - not needed for real-time sync");
-    }
-  }, []);
+  // Use generic real-time sync hook
+  const { data, isLoading, error, refetch } = useFirestoreDocumentRealTime(
+    userId,
+    docRef,
+    mapCreditsDocumentToEntity,
+    "useCreditsRealTime"
+  );
 
   return {
-    credits,
+    credits: data,
     isLoading,
     error,
-    refetch, // No-op but kept for compatibility
+    refetch,
   };
 }
 

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

@@ -0,0 +1,22 @@
+/**
+ * Subscription Flow Initial State
+ *
+ * Default state for the subscription flow state machine.
+ */
+
+import { SubscriptionFlowStatus, SyncStatus, type SubscriptionFlowState } from "./flowTypes";
+
+/**
+ * Initial state for the subscription flow store.
+ * Represents a fresh install scenario.
+ */
+export const initialFlowState: SubscriptionFlowState = {
+  status: SubscriptionFlowStatus.INITIALIZING,
+  syncStatus: SyncStatus.IDLE,
+  syncError: null,
+  isOnboardingComplete: false,
+  paywallShown: false,
+  showFeedback: false,
+  isAuthModalOpen: false,
+  isInitialized: false,
+};

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

@@ -0,0 +1,106 @@
+/**
+ * Subscription Flow State Machine Types
+ *
+ * Type definitions for the subscription flow state machine.
+ * Separated from implementation for better maintainability.
+ */
+
+/**
+ * States in the subscription flow.
+ * Represents the user's journey from first launch to premium access.
+ */
+export enum SubscriptionFlowStatus {
+  /** App is initializing, determining next state */
+  INITIALIZING = "INITIALIZING",
+  /** User is seeing onboarding for the first time */
+  ONBOARDING = "ONBOARDING",
+  /** Checking if user has premium access */
+  CHECK_PREMIUM = "CHECK_PREMIUM",
+  /** Showing paywall after onboarding */
+  POST_ONBOARDING_PAYWALL = "POST_ONBOARDING_PAYWALL",
+  /** App is ready to use */
+  READY = "READY",
+}
+
+/**
+ * Sync status for subscription/credits data.
+ */
+export enum SyncStatus {
+  /** No sync in progress */
+  IDLE = "IDLE",
+  /** Syncing data from RevenueCat/Firestore */
+  SYNCING = "SYNCING",
+  /** Sync completed successfully */
+  SUCCESS = "SUCCESS",
+  /** Sync failed with error */
+  ERROR = "ERROR",
+}
+
+/**
+ * Complete state shape for the subscription flow store.
+ */
+export interface SubscriptionFlowState {
+  /** Current flow status */
+  status: SubscriptionFlowStatus;
+
+  /** Sync status for subscription/credits data */
+  syncStatus: SyncStatus;
+
+  /** Error message from last sync failure */
+  syncError: string | null;
+
+  /** Whether user has completed onboarding */
+  isOnboardingComplete: boolean;
+
+  /** Whether paywall has been shown at least once */
+  paywallShown: boolean;
+
+  /** Whether to show feedback screen */
+  showFeedback: boolean;
+
+  /** Whether auth modal is currently open */
+  isAuthModalOpen: boolean;
+
+  /** Whether store has been initialized */
+  isInitialized: boolean;
+}
+
+/**
+ * Actions available on the subscription flow store.
+ */
+export interface SubscriptionFlowActions {
+  /** Mark onboarding as complete and transition to CHECK_PREMIUM */
+  completeOnboarding: () => void;
+
+  /** Show paywall and transition to POST_ONBOARDING_PAYWALL */
+  showPaywall: () => void;
+
+  /** Complete paywall interaction and transition to READY */
+  completePaywall: (purchased: boolean) => void;
+
+  /** Show feedback screen */
+  showFeedbackScreen: () => void;
+
+  /** Hide feedback screen */
+  hideFeedback: () => void;
+
+  /** Open/close auth modal */
+  setAuthModalOpen: (open: boolean) => void;
+
+  /** Update sync status */
+  setSyncStatus: (status: SyncStatus, error?: string | null) => void;
+
+  /** Set initialized flag (internal use) */
+  setInitialized: (initialized: boolean) => void;
+
+  /** Set flow status (internal use) */
+  setStatus: (status: SubscriptionFlowStatus) => void;
+
+  /** Reset flow to initial state */
+  resetFlow: () => void;
+}
+
+/**
+ * Combined store type with state and actions.
+ */
+export type SubscriptionFlowStore = SubscriptionFlowState & SubscriptionFlowActions;

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

@@ -5,6 +5,9 @@ import {
   useRestorePurchase,
 } from '../infrastructure/hooks/useSubscriptionQueries';
 import { usePaywallVisibility } from './usePaywallVisibility';
+import { createLogger } from '../../../shared/utils/logger';
+
+const logger = createLogger('usePremiumActions');
 
 export interface PremiumActions {
   purchasePackage: (pkg: PurchasesPackage) => Promise<boolean>;
@@ -38,9 +41,7 @@ export function usePremiumActions(): PremiumActions {
         const result = await purchaseMutation.mutateAsync(pkg);
         return result.success;
       } catch (error) {
-        if (__DEV__) {
-          console.error('[usePremiumActions] Purchase failed:', error);
-        }
+        logger.error('Purchase failed', error, { packageId: pkg.identifier });
         return false;
       }
     },
@@ -52,9 +53,7 @@ export function usePremiumActions(): PremiumActions {
       const result = await restoreMutation.mutateAsync();
       return result.success;
     } catch (error) {
-      if (__DEV__) {
-        console.error('[usePremiumActions] Restore failed:', error);
-      }
+      logger.error('Restore failed', error);
       return false;
     }
   }, [restoreMutation]);

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

@@ -3,109 +3,35 @@
  *
  * Single source of truth for app flow state.
  * Clean state transitions without complex if/else logic.
+ *
+ * State transition rules:
+ * - INITIALIZING -> ONBOARDING (first launch)
+ * - INITIALIZING -> CHECK_PREMIUM (onboarding already done)
+ * - ONBOARDING -> CHECK_PREMIUM (onboarding completed)
+ * - CHECK_PREMIUM -> READY (user is premium)
+ * - CHECK_PREMIUM -> POST_ONBOARDING_PAYWALL (user not premium, paywall not shown)
+ * - CHECK_PREMIUM -> READY (user not premium but paywall already shown)
+ * - POST_ONBOARDING_PAYWALL -> READY (paywall closed)
+ * - READY -> READY (stays ready, shows overlays when needed)
  */
 
 import { createStore } from "@umituz/react-native-design-system/storage";
 import { subscriptionEventBus, FLOW_EVENTS } from "../../../shared/infrastructure/SubscriptionEventBus";
+import {
+  SubscriptionFlowStatus,
+  SyncStatus,
+  type SubscriptionFlowState,
+  type SubscriptionFlowActions,
+} from "./flowTypes";
+import { initialFlowState } from "./flowInitialState";
 
-export enum SubscriptionFlowStatus {
-  INITIALIZING = "INITIALIZING",
-  ONBOARDING = "ONBOARDING",
-  CHECK_PREMIUM = "CHECK_PREMIUM",
-  POST_ONBOARDING_PAYWALL = "POST_ONBOARDING_PAYWALL",
-  READY = "READY",
-}
-
-export enum SyncStatus {
-  IDLE = "IDLE",
-  SYNCING = "SYNCING",
-  SUCCESS = "SUCCESS",
-  ERROR = "ERROR",
-}
-
-export interface SubscriptionFlowState {
-  // Flow state
-  status: SubscriptionFlowStatus;
-
-  // Sync state
-  syncStatus: SyncStatus;
-  syncError: string | null;
-
-  // Onboarding state
-  isOnboardingComplete: boolean;
-
-  // Paywall state
-  paywallShown: boolean;
-
-  // Feedback state
-  showFeedback: boolean;
-
-  // Auth modal state
-  isAuthModalOpen: boolean;
-
-  // Initialization flag
-  isInitialized: boolean;
-}
-
-export interface SubscriptionFlowActions {
-  // Flow actions
-  completeOnboarding: () => void;
-  showPaywall: () => void;
-  completePaywall: (purchased: boolean) => void;
-  showFeedbackScreen: () => void;
-  hideFeedback: () => void;
-
-  // Auth actions
-  setAuthModalOpen: (open: boolean) => void;
-
-  // Sync actions
-  setSyncStatus: (status: SyncStatus, error?: string | null) => void;
-
-  // State setters (for internal use)
-  setInitialized: (initialized: boolean) => void;
-  setStatus: (status: SubscriptionFlowStatus) => void;
-
-  // Reset
-  resetFlow: () => void;
-}
-
-export type SubscriptionFlowStore = SubscriptionFlowState & SubscriptionFlowActions;
-
-const initialState: SubscriptionFlowState = {
-  status: SubscriptionFlowStatus.INITIALIZING,
-  syncStatus: SyncStatus.IDLE,
-  syncError: null,
-  isOnboardingComplete: false,
-  paywallShown: false,
-  showFeedback: false,
-  isAuthModalOpen: false,
-  isInitialized: false,
-};
-
-/**
- * State transition rules:
- *
- * INITIALIZING -> ONBOARDING (first launch)
- * INITIALIZING -> CHECK_PREMIUM (onboarding already done)
- *
- * ONBOARDING -> CHECK_PREMIUM (onboarding completed)
- *
- * CHECK_PREMIUM -> READY (user is premium)
- * CHECK_PREMIUM -> POST_ONBOARDING_PAYWALL (user not premium, paywall not shown)
- * CHECK_PREMIUM -> READY (user not premium but paywall already shown)
- *
- * POST_ONBOARDING_PAYWALL -> READY (paywall closed)
- *
- * READY -> READY (stays ready, shows overlays when needed)
- */
 export const useSubscriptionFlowStore = createStore<SubscriptionFlowState, SubscriptionFlowActions>({
   name: "subscription-flow-storage",
-  initialState,
+  initialState: initialFlowState,
   persist: true,
   onRehydrate: (state) => {
     if (!state.isInitialized) {
       state.setInitialized(true);
-
       // First time: show onboarding
       state.setStatus(SubscriptionFlowStatus.INITIALIZING);
     } else if (state.isOnboardingComplete) {
@@ -176,3 +102,10 @@ export const useSubscriptionFlowStore = createStore<SubscriptionFlowState, Subsc
     },
   }),
 });
+
+// Re-export types for convenience
+export type { SubscriptionFlowState, SubscriptionFlowActions } from "./flowTypes";
+export { SubscriptionFlowStatus, SyncStatus } from "./flowTypes";
+
+// Re-export store type inferred from createStore
+export type SubscriptionFlowStore = ReturnType<typeof useSubscriptionFlowStore>;