@umituz/react-native-subscription 3.1.34 → 3.1.36

package/src/domains/revenuecat/infrastructure/services/userSwitchCore.ts

@@ -5,7 +5,7 @@
  */
 
 import Purchases, { type CustomerInfo } from "react-native-purchases";
-import type { InitializeResult } from "../../../../shared/application/ports/IRevenueCatService";
+import type { InitializeResult } from "../../../shared/application/ports/IRevenueCatService";
 import type { InitializerDeps } from "./RevenueCatInitializer.types";
 import { FAILED_INITIALIZATION_RESULT } from "./initializerConstants";
 import { UserSwitchMutex } from "./UserSwitchMutex";
@@ -16,8 +16,9 @@ import {
   buildSuccessResult,
   fetchOfferingsSafe,
 } from "./userSwitchHelpers";
+import { createLogger } from "../../../../../shared/utils/logger";
 
-declare const __DEV__: boolean;
+const logger = createLogger("UserSwitchCore");
 
 /**
  * Handle user switch operation with mutex protection.
@@ -31,9 +32,7 @@ export async function handleUserSwitch(
   const { shouldProceed, existingPromise } = await UserSwitchMutex.acquire(mutexKey);
 
   if (!shouldProceed && existingPromise) {
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[UserSwitchCore] Using result from active switch operation');
-    }
+    logger.debug("Using result from active switch operation");
     return existingPromise as Promise<InitializeResult>;
   }
 
@@ -54,38 +53,28 @@ async function performUserSwitch(
     const normalizedUserId = normalizeUserId(userId);
     const normalizedCurrentUserId = isAnonymousId(currentAppUserId) ? null : currentAppUserId;
 
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[UserSwitchCore] performUserSwitch:', {
-        providedUserId: userId,
-        normalizedUserId: normalizedUserId || '(null - anonymous)',
-        currentAppUserId,
-        normalizedCurrentUserId: normalizedCurrentUserId || '(null - anonymous)',
-        needsSwitch: normalizedCurrentUserId !== normalizedUserId,
-      });
-    }
+    logger.debug("performUserSwitch", {
+      providedUserId: userId,
+      normalizedUserId: normalizedUserId || '(null - anonymous)',
+      currentAppUserId,
+      normalizedCurrentUserId: normalizedCurrentUserId || '(null - anonymous)',
+      needsSwitch: normalizedCurrentUserId !== normalizedUserId,
+    });
 
     let customerInfo: CustomerInfo;
 
     if (normalizedCurrentUserId !== normalizedUserId) {
       if (normalizedUserId) {
-        if (typeof __DEV__ !== 'undefined' && __DEV__) {
-          console.log('[UserSwitchCore] Calling Purchases.logIn() to switch from anonymous to:', normalizedUserId);
-        }
+        logger.debug("Calling Purchases.logIn() to switch from anonymous to", normalizedUserId);
         const result = await Purchases.logIn(normalizedUserId!);
         customerInfo = result.customerInfo;
-        if (typeof __DEV__ !== 'undefined' && __DEV__) {
-          console.log('[UserSwitchCore] Purchases.logIn() successful, created:', result.created);
-        }
+        logger.debug("Purchases.logIn() successful, created", result.created);
       } else {
-        if (typeof __DEV__ !== 'undefined' && __DEV__) {
-          console.log('[UserSwitchCore] User is anonymous, fetching customer info');
-        }
+        logger.debug("User is anonymous, fetching customer info");
         customerInfo = await Purchases.getCustomerInfo();
       }
     } else {
-      if (typeof __DEV__ !== 'undefined' && __DEV__) {
-        console.log('[UserSwitchCore] No user switch needed, fetching current customer info');
-      }
+      logger.debug("No user switch needed, fetching current customer info");
       customerInfo = await Purchases.getCustomerInfo();
     }
 
@@ -93,9 +82,7 @@ async function performUserSwitch(
     deps.setCurrentUserId(normalizedUserId || undefined);
     const offerings = await fetchOfferingsSafe();
 
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[UserSwitchCore] User switch completed successfully');
-    }
+    logger.debug("User switch completed successfully");
 
     return buildSuccessResult(deps, customerInfo, offerings);
   } catch (error) {
@@ -106,11 +93,7 @@ async function performUserSwitch(
       // Ignore error in error handler
     }
 
-    console.error('[UserSwitchCore] Failed during user switch or fetch', {
-      userId,
-      currentAppUserId,
-      error
-    });
+    logger.error("Failed during user switch or fetch", error, { userId, currentAppUserId });
     return FAILED_INITIALIZATION_RESULT;
   }
 }

package/src/domains/revenuecat/infrastructure/services/userSwitchHelpers.ts

@@ -5,11 +5,12 @@
  */
 
 import Purchases, { type CustomerInfo, type PurchasesOfferings } from "react-native-purchases";
-import type { InitializeResult } from "../../../../shared/application/ports/IRevenueCatService";
+import type { InitializeResult } from "../../../shared/application/ports/IRevenueCatService";
 import type { InitializerDeps } from "./RevenueCatInitializer.types";
 import { ANONYMOUS_CACHE_KEY } from "../../../subscription/core/SubscriptionConstants";
+import { createLogger } from "../../../../../shared/utils/logger";
 
-declare const __DEV__: boolean;
+const logger = createLogger("UserSwitchHelpers");
 
 /**
  * Normalize user ID to null if empty or anonymous cache key.
@@ -47,9 +48,7 @@ export async function fetchOfferingsSafe(): Promise<PurchasesOfferings | null> {
   try {
     return await Purchases.getOfferings();
   } catch (error) {
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.warn('[UserSwitchHelpers] Offerings fetch failed (non-fatal):', error);
-    }
+    logger.warn("Offerings fetch failed (non-fatal)", error);
     return null;
   }
 }

package/src/domains/revenuecat/infrastructure/services/userSwitchInitializer.ts

@@ -5,7 +5,7 @@
  */
 
 import Purchases, { type CustomerInfo } from "react-native-purchases";
-import type { InitializeResult } from "../../../../shared/application/ports/IRevenueCatService";
+import type { InitializeResult } from "../../../shared/application/ports/IRevenueCatService";
 import type { InitializerDeps } from "./RevenueCatInitializer.types";
 import { FAILED_INITIALIZATION_RESULT } from "./initializerConstants";
 import { getPremiumEntitlement } from "../../core/types/RevenueCatTypes";
@@ -15,8 +15,9 @@ import {
   buildSuccessResult,
   fetchOfferingsSafe,
 } from "./userSwitchHelpers";
+import { createLogger } from "../../../../../shared/utils/logger";
 
-declare const __DEV__: boolean;
+const logger = createLogger("UserSwitchInitializer");
 
 /**
  * Handle initial SDK configuration with API key and user ID.
@@ -29,14 +30,12 @@ export async function handleInitialConfiguration(
   try {
     const normalizedUserId = normalizeUserId(userId);
 
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[UserSwitchInitializer] handleInitialConfiguration:', {
-        providedUserId: userId,
-        normalizedUserId: normalizedUserId || '(null - anonymous)',
-        apiKeyPrefix: apiKey.substring(0, 5) + '...',
-        isTestKey: apiKey.startsWith('test_'),
-      });
-    }
+    logger.debug("handleInitialConfiguration", {
+      providedUserId: userId,
+      normalizedUserId: normalizedUserId || '(null - anonymous)',
+      apiKeyPrefix: apiKey.substring(0, 5) + '...',
+      isTestKey: apiKey.startsWith('test_'),
+    });
 
     Purchases.setLogLevel(
       (typeof __DEV__ !== 'undefined' && __DEV__)
@@ -48,32 +47,25 @@ export async function handleInitialConfiguration(
     deps.setInitialized(true);
     deps.setCurrentUserId(normalizedUserId || undefined);
 
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[UserSwitchInitializer] Purchases.configure() successful');
-    }
+    logger.debug("Purchases.configure() successful");
 
     const [customerInfo, offerings] = await Promise.all([
       Purchases.getCustomerInfo(),
       fetchOfferingsSafe(),
     ]);
 
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      const currentUserId = await Purchases.getAppUserID();
-      console.log('[UserSwitchInitializer] Initial configuration completed:', {
-        revenueCatUserId: currentUserId,
-        activeEntitlements: Object.keys(customerInfo.entitlements.active),
-        offeringsCount: offerings?.all ? Object.keys(offerings.all).length : 0,
-      });
-    }
+    const currentUserId = await Purchases.getAppUserID();
+    logger.debug("Initial configuration completed", {
+      revenueCatUserId: currentUserId,
+      activeEntitlements: Object.keys(customerInfo.entitlements.active),
+      offeringsCount: offerings?.all ? Object.keys(offerings.all).length : 0,
+    });
 
     await syncPremiumStatusIfConfigured(deps, normalizedUserId, customerInfo);
 
     return buildSuccessResult(deps, customerInfo, offerings);
   } catch (error) {
-    console.error('[UserSwitchInitializer] SDK configuration failed', {
-      userId,
-      error
-    });
+    logger.error("SDK configuration failed", error, { userId });
     return FAILED_INITIALIZATION_RESULT;
   }
 }
@@ -89,9 +81,7 @@ export async function fetchCurrentUserData(deps: InitializerDeps): Promise<Initi
     ]);
     return buildSuccessResult(deps, customerInfo, offerings);
   } catch (error) {
-    console.error('[UserSwitchInitializer] Failed to fetch customer info for initialized user', {
-      error
-    });
+    logger.error("Failed to fetch customer info for initialized user", error);
     return FAILED_INITIALIZATION_RESULT;
   }
 }
@@ -138,6 +128,6 @@ async function syncPremiumStatusIfConfigured(
       });
     }
   } catch (error) {
-    console.error('[UserSwitchInitializer] Premium status sync callback failed:', error);
+    logger.error("Premium status sync callback failed", error);
   }
 }

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

@@ -1,6 +1,9 @@
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
 import { getCurrentUserId, setupAuthStateListener } from "../SubscriptionAuthListener";
 import type { SubscriptionInitConfig } from "../SubscriptionInitializerTypes";
+import { createLogger } from "../../../shared/utils/logger";
+
+const logger = createLogger("BackgroundInitializer");
 
 const AUTH_STATE_DEBOUNCE_MS = 500;
 const MAX_RETRY_ATTEMPTS = 3;
@@ -16,18 +19,14 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
   let lastUserId: string | undefined = undefined;
 
   const initializeInBackground = async (revenueCatUserId?: string): Promise<void> => {
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[BackgroundInitializer] initializeInBackground called with userId:', revenueCatUserId || '(undefined - anonymous)');
-    }
+    logger.debug("initializeInBackground called with userId", revenueCatUserId || '(undefined - anonymous)');
     await SubscriptionManager.initialize(revenueCatUserId);
   };
 
   const attemptInitWithRetry = async (revenueCatUserId: string | undefined, attempt: number, sequenceId: number): Promise<void> => {
     // Abort if this is no longer the active sequence (e.g., user changed)
     if (sequenceId !== currentSequenceId) {
-      if (typeof __DEV__ !== 'undefined' && __DEV__) {
-        console.log('[BackgroundInitializer] Aborting retry - sequence changed');
-      }
+      logger.debug("Aborting retry - sequence changed");
       return;
     }
 
@@ -38,23 +37,20 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
       }
     } catch (error) {
       if (sequenceId !== currentSequenceId) return;
-      
+
       lastInitSucceeded = false;
-      console.error('[BackgroundInitializer] Initialization failed:', {
+      logger.error("Initialization failed", error, {
         userId: revenueCatUserId,
         attempt: attempt + 1,
         maxAttempts: MAX_RETRY_ATTEMPTS,
-        error: error instanceof Error ? error.message : String(error)
       });
 
       if (attempt < MAX_RETRY_ATTEMPTS - 1) {
-        if (typeof __DEV__ !== 'undefined' && __DEV__) {
-          console.log('[BackgroundInitializer] Scheduling retry', { attempt: attempt + 2 });
-        }
+        logger.debug("Scheduling retry", { attempt: attempt + 2 });
         retryTimer = setTimeout(() => {
           // Fire and forget promise, but safe because of sequenceId check
           attemptInitWithRetry(revenueCatUserId, attempt + 1, sequenceId).catch(err => {
-              console.error('[BackgroundInitializer] Retry failed unhandled:', err);
+              logger.error("Retry failed unhandled", err);
           });
         }, RETRY_DELAY_MS * (attempt + 1));
       }
@@ -71,9 +67,7 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
     }
 
     if (lastUserId === revenueCatUserId && lastInitSucceeded) {
-      if (typeof __DEV__ !== 'undefined' && __DEV__) {
-        console.log('[BackgroundInitializer] UserId unchanged and init succeeded, skipping');
-      }
+      logger.debug("UserId unchanged and init succeeded, skipping");
       return;
     }
 
@@ -83,15 +77,11 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
       const sequenceId = currentSequenceId;
 
       if (!revenueCatUserId && !lastUserId) {
-        if (typeof __DEV__ !== 'undefined' && __DEV__) {
-          console.log('[BackgroundInitializer] No user and no previous user, waiting for auth');
-        }
+        logger.debug("No user and no previous user, waiting for auth");
         return;
       }
 
-      if (typeof __DEV__ !== 'undefined' && __DEV__) {
-        console.log('[BackgroundInitializer] Auth state listener triggered, reinitializing with userId:', revenueCatUserId || '(undefined - anonymous)');
-      }
+      logger.debug("Auth state listener triggered, reinitializing with userId", revenueCatUserId || '(undefined - anonymous)');
 
       // Important: Always reset on user change, not just on logout.
       // This ensures previous user's cached state is cleared before init.
@@ -104,7 +94,7 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
 
       // Start the retry chain
       attemptInitWithRetry(revenueCatUserId, 0, sequenceId).catch(err => {
-        console.error('[BackgroundInitializer] Init sequence failed unhandled:', err);
+        logger.error("Init sequence failed unhandled", err);
       });
     }, AUTH_STATE_DEBOUNCE_MS);
   };
@@ -117,17 +107,15 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
   const initialRevenueCatUserId = getCurrentUserId(() => auth);
   lastUserId = initialRevenueCatUserId;
 
-  if (typeof __DEV__ !== 'undefined' && __DEV__) {
-    console.log('[BackgroundInitializer] Initial RevenueCat userId:', initialRevenueCatUserId || '(undefined - anonymous)');
-  }
+  logger.debug("Initial RevenueCat userId", initialRevenueCatUserId || '(undefined - anonymous)');
 
   if (initialRevenueCatUserId) {
     currentSequenceId++;
     attemptInitWithRetry(initialRevenueCatUserId, 0, currentSequenceId).catch(err => {
-        console.error('[BackgroundInitializer] Initial sequence failed unhandled:', err);
+        logger.error("Initial sequence failed unhandled", err);
     });
-  } else if (typeof __DEV__ !== 'undefined' && __DEV__) {
-    console.log('[BackgroundInitializer] No user available yet, waiting for auth state');
+  } else {
+    logger.debug("No user available yet, waiting for auth state");
   }
 
   const unsubscribe = setupAuthStateListener(() => auth, debouncedInitialize);

package/src/domains/subscription/application/sync/CreditDocumentOperations.ts

@@ -5,6 +5,9 @@
 
 import { getCreditsRepository } from "../../../credits/infrastructure/CreditsRepositoryManager";
 import type { PremiumStatusChangedEvent } from "../../core/SubscriptionEvents";
+import { createLogger } from "../../../shared/utils/logger";
+
+const logger = createLogger("CreditDocumentOperations");
 
 export class CreditDocumentOperations {
   async expireSubscription(userId: string): Promise<void> {
@@ -14,14 +17,12 @@ export class CreditDocumentOperations {
   async syncPremiumStatus(userId: string, event: PremiumStatusChangedEvent): Promise<void> {
     const repo = getCreditsRepository();
 
-    if (__DEV__) {
-      console.log('[CreditDocumentOperations] 🔵 syncPremiumStatus: Starting', {
-        userId,
-        isPremium: event.isPremium,
-        productId: event.productId,
-        willRenew: event.willRenew,
-      });
-    }
+    logger.debug("syncPremiumStatus: Starting", {
+      userId,
+      isPremium: event.isPremium,
+      productId: event.productId,
+      willRenew: event.willRenew,
+    });
 
     // Ensure premium user has a credits document (recovery)
     if (event.isPremium) {
@@ -32,8 +33,8 @@ export class CreditDocumentOperations {
         event.expirationDate ?? null,
         event.periodType ?? null,
       );
-      if (__DEV__ && created) {
-        console.log('[CreditDocumentOperations] 🟢 Recovery: created missing credits document for premium user', {
+      if (created) {
+        logger.debug("Recovery: created missing credits document for premium user", {
           userId,
           productId: event.productId,
         });
@@ -53,12 +54,10 @@ export class CreditDocumentOperations {
       ownershipType: event.ownershipType ?? null,
     });
 
-    if (__DEV__) {
-      console.log('[CreditDocumentOperations] 🟢 syncPremiumStatus: Completed', {
-        userId,
-        isPremium: event.isPremium,
-        productId: event.productId,
-      });
-    }
+    logger.debug("syncPremiumStatus: Completed", {
+      userId,
+      isPremium: event.isPremium,
+      productId: event.productId,
+    });
   }
 }

package/src/domains/subscription/application/sync/PurchaseSyncHandler.ts

@@ -9,6 +9,9 @@ import { extractRevenueCatData } from "../SubscriptionSyncUtils";
 import { generatePurchaseId } from "../syncIdGenerators";
 import type { PurchaseCompletedEvent } from "../../core/SubscriptionEvents";
 import { UserIdResolver } from "./UserIdResolver";
+import { createLogger } from "../../../shared/utils/logger";
+
+const logger = createLogger("PurchaseSyncHandler");
 
 export class PurchaseSyncHandler {
   private purchaseInProgress = false;
@@ -25,14 +28,12 @@ export class PurchaseSyncHandler {
   async processPurchase(event: PurchaseCompletedEvent): Promise<void> {
     this.purchaseInProgress = true;
 
-    if (__DEV__) {
-      console.log('[PurchaseSyncHandler] 🔵 Starting credit initialization', {
-        productId: event.productId,
-        source: event.source,
-        packageType: event.packageType,
-        activeEntitlements: Object.keys(event.customerInfo.entitlements.active),
-      });
-    }
+    logger.debug("Starting credit initialization", {
+      productId: event.productId,
+      source: event.source,
+      packageType: event.packageType,
+      activeEntitlements: Object.keys(event.customerInfo.entitlements.active),
+    });
 
     try {
       // Extract revenue cat data
@@ -46,14 +47,12 @@ export class PurchaseSyncHandler {
       // Resolve user ID
       const creditsUserId = await this.userIdResolver.resolveCreditsUserId(event.userId);
 
-      if (__DEV__) {
-        console.log('[PurchaseSyncHandler] 🔵 Calling initializeCredits', {
-          creditsUserId,
-          purchaseId,
-          productId: event.productId,
-          revenueCatUserId: revenueCatData.revenueCatUserId,
-        });
-      }
+      logger.debug("Calling initializeCredits", {
+        creditsUserId,
+        purchaseId,
+        productId: event.productId,
+        revenueCatUserId: revenueCatData.revenueCatUserId,
+      });
 
       // Initialize credits
       const result = await getCreditsRepository().initializeCredits(
@@ -69,13 +68,11 @@ export class PurchaseSyncHandler {
         throw new Error(`[PurchaseSyncHandler] Credit initialization failed: ${result.error?.message ?? 'unknown'}`);
       }
 
-      if (__DEV__) {
-        console.log('[PurchaseSyncHandler] 🟢 Credits initialized successfully', {
-          creditsUserId,
-          purchaseId,
-          credits: result.data?.credits,
-        });
-      }
+      logger.debug("Credits initialized successfully", {
+        creditsUserId,
+        purchaseId,
+        credits: result.data?.credits,
+      });
     } finally {
       this.purchaseInProgress = false;
     }

package/src/domains/subscription/application/sync/RenewalSyncHandler.ts

@@ -9,6 +9,9 @@ import { extractRevenueCatData } from "../SubscriptionSyncUtils";
 import { generateRenewalId } from "../syncIdGenerators";
 import type { RenewalDetectedEvent } from "../../core/SubscriptionEvents";
 import { UserIdResolver } from "./UserIdResolver";
+import { createLogger } from "../../../shared/utils/logger";
+
+const logger = createLogger("RenewalSyncHandler");
 
 export class RenewalSyncHandler {
   private renewalInProgress = false;
@@ -55,13 +58,11 @@ export class RenewalSyncHandler {
         throw new Error(`[RenewalSyncHandler] Credit initialization failed: ${result.error?.message ?? 'unknown'}`);
       }
 
-      if (__DEV__) {
-        console.log('[RenewalSyncHandler] 🟢 Renewal credits allocated successfully', {
-          creditsUserId,
-          purchaseId,
-          productId: event.productId,
-        });
-      }
+      logger.debug("Renewal credits allocated successfully", {
+        creditsUserId,
+        purchaseId,
+        productId: event.productId,
+      });
     } finally {
       this.renewalInProgress = false;
     }

package/src/domains/subscription/application/sync/StatusChangeSyncHandler.ts

@@ -8,6 +8,9 @@ import type { PremiumStatusChangedEvent } from "../../core/SubscriptionEvents";
 import { UserIdResolver } from "./UserIdResolver";
 import { CreditDocumentOperations } from "./CreditDocumentOperations";
 import { PurchaseSyncHandler } from "./PurchaseSyncHandler";
+import { createLogger } from "../../../shared/utils/logger";
+
+const logger = createLogger("StatusChangeSyncHandler");
 
 export class StatusChangeSyncHandler {
   constructor(
@@ -19,9 +22,7 @@ export class StatusChangeSyncHandler {
   async processStatusChange(event: PremiumStatusChangedEvent): Promise<void> {
     // If purchase is in progress, only do recovery sync
     if (this.purchaseHandler.isProcessing()) {
-      if (__DEV__) {
-        console.log("[StatusChangeSyncHandler] Purchase in progress - running recovery only");
-      }
+      logger.debug("Purchase in progress - running recovery only");
       if (event.isPremium && event.productId) {
         const creditsUserId = await this.userIdResolver.resolveCreditsUserId(event.userId);
         await this.creditOps.syncPremiumStatus(creditsUserId, event);