@umituz/react-native-subscription 2.14.47 → 2.14.48

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

@@ -4,251 +4,122 @@
  */
 
 import Purchases, { LOG_LEVEL } from "react-native-purchases";
-import type { InitializeResult } from '../../application/ports/IRevenueCatService';
-import type { RevenueCatConfig } from '../../domain/value-objects/RevenueCatConfig';
-import { getErrorMessage } from '../../domain/types/RevenueCatTypes';
-import { resolveApiKey } from '../utils/ApiKeyResolver';
+import type { InitializeResult } from "../../application/ports/IRevenueCatService";
+import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
+import { getErrorMessage } from "../../domain/types/RevenueCatTypes";
+import { resolveApiKey } from "../utils/ApiKeyResolver";
 
 export interface InitializerDeps {
-  config: RevenueCatConfig;
-  isUsingTestStore: () => boolean;
-  isInitialized: () => boolean;
-  getCurrentUserId: () => string | null;
-  setInitialized: (value: boolean) => void;
-  setCurrentUserId: (userId: string) => void;
+    config: RevenueCatConfig;
+    isUsingTestStore: () => boolean;
+    isInitialized: () => boolean;
+    getCurrentUserId: () => string | null;
+    setInitialized: (value: boolean) => void;
+    setCurrentUserId: (userId: string) => void;
 }
 
-// Track if Purchases.configure has been called globally
 let isPurchasesConfigured = false;
 let isLogHandlerConfigured = false;
 
-/**
- * Configures custom log handler to filter StoreKit 2 internal errors
- * These errors occur on simulator when no prior purchases exist
- */
 function configureLogHandler(): void {
-  if (isLogHandlerConfigured) return;
-
-  Purchases.setLogHandler((logLevel, message) => {
-    // Filter out StoreKit 2 AppTransaction errors (normal on simulator)
-    const isAppTransactionError =
-      message.includes("Purchase was cancelled") ||
-      message.includes("AppTransaction") ||
-      message.includes("Couldn't find previous transactions");
-
-    if (isAppTransactionError) {
-      // Downgrade to debug level - only show in __DEV__
-      if (__DEV__) {
-        console.debug("[RevenueCat] (filtered)", message);
-      }
-      return;
-    }
+    if (isLogHandlerConfigured) return;
 
-    // Normal logging for other messages
-    switch (logLevel) {
-      case LOG_LEVEL.VERBOSE:
-      case LOG_LEVEL.DEBUG:
-        if (__DEV__) console.debug("[RevenueCat]", message);
-        break;
-      case LOG_LEVEL.INFO:
-        if (__DEV__) console.info("[RevenueCat]", message);
-        break;
-      case LOG_LEVEL.WARN:
-        if (__DEV__) console.warn("[RevenueCat]", message);
-        break;
-      case LOG_LEVEL.ERROR:
-        console.error("[RevenueCat]", message);
-        break;
-    }
-  });
+    Purchases.setLogHandler((logLevel, message) => {
+        const isAppTransactionError =
+            message.includes("Purchase was cancelled") ||
+            message.includes("AppTransaction") ||
+            message.includes("Couldn't find previous transactions");
 
-  isLogHandlerConfigured = true;
-}
+        if (isAppTransactionError) {
+            return;
+        }
 
-export async function initializeSDK(
-  deps: InitializerDeps,
-  userId: string,
-  apiKey?: string
-): Promise<InitializeResult> {
-  if (__DEV__) {
-    console.log('[DEBUG RevenueCatInitializer] initializeSDK called', {
-      userId,
-      hasApiKey: !!apiKey,
-      isAlreadyConfigured: isPurchasesConfigured,
-      isInitialized: deps.isInitialized(),
-      currentUserId: deps.getCurrentUserId(),
+        switch (logLevel) {
+            case LOG_LEVEL.ERROR:
+                break;
+            default:
+                break;
+        }
     });
-  }
 
-    userId,
-    hasApiKey: !!apiKey,
-    isAlreadyConfigured: isPurchasesConfigured,
-  });
-
-  // Case 1: Already initialized with the same user ID
-  if (deps.isInitialized() && deps.getCurrentUserId() === userId) {
+    isLogHandlerConfigured = true;
+}
 
-    try {
-      const [customerInfo, offerings] = await Promise.all([
-        Purchases.getCustomerInfo(),
-        Purchases.getOfferings(),
-      ]);
-      const entitlementId = deps.config.entitlementIdentifier;
-      const hasPremium = !!customerInfo.entitlements.active[entitlementId];
-      return { success: true, offering: offerings.current, hasPremium };
-    } catch (error) {
-        error instanceof Error ? error : new Error(String(error)),
-        {
-          packageName: "subscription",
-          operation: "get_current_state",
-          userId,
+export async function initializeSDK(
+    deps: InitializerDeps,
+    userId: string,
+    apiKey?: string
+): Promise<InitializeResult> {
+    // Case 1: Already initialized with the same user ID
+    if (deps.isInitialized() && deps.getCurrentUserId() === userId) {
+        try {
+            const [customerInfo, offerings] = await Promise.all([
+                Purchases.getCustomerInfo(),
+                Purchases.getOfferings(),
+            ]);
+            const entitlementId = deps.config.entitlementIdentifier;
+            const hasPremium = !!customerInfo.entitlements.active[entitlementId];
+            return { success: true, offering: offerings.current, hasPremium };
+        } catch {
+            return { success: false, offering: null, hasPremium: false };
         }
-      );
-      return { success: false, offering: null, hasPremium: false };
     }
-  }
 
-  // Case 2: Already configured but different user or re-initializing
-  if (isPurchasesConfigured) {
-    try {
-      // Check if we're already logged in with this user ID
-      const currentAppUserId = await Purchases.getAppUserID();
-      
-      if (__DEV__) {
-        console.log('[DEBUG RevenueCatInitializer] Current app user ID check', {
-          currentAppUserId,
-          requestedUserId: userId,
-          needsLogin: currentAppUserId !== userId,
-        });
-      }
-
-      // Only call logIn if the user ID is different
-      let customerInfo;
-      if (currentAppUserId !== userId) {
-        if (__DEV__) {
-          console.log('[DEBUG RevenueCatInitializer] User ID changed, calling logIn');
-        }
-        const result = await Purchases.logIn(userId);
-        customerInfo = result.customerInfo;
-      } else {
-        if (__DEV__) {
-          console.log('[DEBUG RevenueCatInitializer] Already logged in with same user ID, skipping logIn');
+    // Case 2: Already configured but different user or re-initializing
+    if (isPurchasesConfigured) {
+        try {
+            const currentAppUserId = await Purchases.getAppUserID();
+
+            let customerInfo;
+            if (currentAppUserId !== userId) {
+                const result = await Purchases.logIn(userId);
+                customerInfo = result.customerInfo;
+            } else {
+                customerInfo = await Purchases.getCustomerInfo();
+            }
+
+            deps.setInitialized(true);
+            deps.setCurrentUserId(userId);
+
+            const offerings = await Purchases.getOfferings();
+            const entitlementId = deps.config.entitlementIdentifier;
+            const hasPremium = !!customerInfo.entitlements.active[entitlementId];
+
+            return { success: true, offering: offerings.current, hasPremium };
+        } catch {
+            return { success: false, offering: null, hasPremium: false };
         }
-        customerInfo = await Purchases.getCustomerInfo();
-      }
-
-      deps.setInitialized(true);
-      deps.setCurrentUserId(userId);
-
-      const offerings = await Purchases.getOfferings();
-      const entitlementId = deps.config.entitlementIdentifier;
-      const hasPremium = !!customerInfo.entitlements.active[entitlementId];
-
-      return { success: true, offering: offerings.current, hasPremium };
-    } catch {
-      // If logIn fails, we don't necessarily want to re-configure if it's already configured
-      // But we can return failure
-      return { success: false, offering: null, hasPremium: false };
     }
-  }
-
-  // Case 3: First time configuration
-  const key = apiKey || resolveApiKey(deps.config);
-  if (__DEV__) {
-    console.log('[DEBUG RevenueCatInitializer] Resolved API key', {
-      hasKey: !!key,
-      keyPrefix: key ? key.substring(0, 10) + '...' : 'null',
-      isTestStore: deps.isUsingTestStore(),
-      configApiKey: deps.config.apiKey ? deps.config.apiKey.substring(0, 10) + '...' : 'null',
-      configTestStoreKey: deps.config.testStoreKey ? deps.config.testStoreKey.substring(0, 10) + '...' : 'null',
-    });
-  }
 
-  if (!key) {
-    if (__DEV__) {
-      console.log('[DEBUG RevenueCatInitializer] ERROR: No API key available!');
-    }
-    const error = new Error("No RevenueCat API key available");
-      packageName: "subscription",
-      operation: "sdk_init_no_key",
-      userId,
-    });
-    return { success: false, offering: null, hasPremium: false };
-  }
-
-  try {
-    // Configure log handler before SDK initialization
-    configureLogHandler();
-
-    if (__DEV__) {
-      console.log('[DEBUG RevenueCatInitializer] Calling Purchases.configure', {
-        apiKey: key.substring(0, 10) + '...',
-        appUserID: userId,
-      });
-    }
-    await Purchases.configure({ 
-      apiKey: key, 
-      appUserID: userId,
-    });
-    isPurchasesConfigured = true;
-    deps.setInitialized(true);
-    deps.setCurrentUserId(userId);
+    // Case 3: First time configuration
+    const key = apiKey || resolveApiKey(deps.config);
 
-    if (__DEV__) {
-      console.log('[DEBUG RevenueCatInitializer] Purchases.configure succeeded, fetching data...');
+    if (!key) {
+        return { success: false, offering: null, hasPremium: false };
     }
 
-    const [customerInfo, offerings] = await Promise.all([
-      Purchases.getCustomerInfo(),
-      Purchases.getOfferings(),
-    ]);
-
-    const packagesCount = offerings.current?.availablePackages?.length ?? 0;
-
-    if (__DEV__) {
-      console.log('[DEBUG RevenueCatInitializer] Data fetched', {
-        hasCurrent: !!offerings.current,
-        currentIdentifier: offerings.current?.identifier,
-        packagesCount,
-        allOfferingsCount: Object.keys(offerings.all).length,
-        allOfferingIds: Object.keys(offerings.all),
-        packages: offerings.current?.availablePackages?.map(p => ({
-          identifier: p.identifier,
-          packageType: p.packageType,
-        })),
-      });
-    }
+    try {
+        configureLogHandler();
 
-      userId,
-      hasCurrent: !!offerings.current,
-      packagesCount,
-      allOfferingsCount: Object.keys(offerings.all).length,
-    });
+        await Purchases.configure({
+            apiKey: key,
+            appUserID: userId,
+        });
+        isPurchasesConfigured = true;
+        deps.setInitialized(true);
+        deps.setCurrentUserId(userId);
 
-    const entitlementId = deps.config.entitlementIdentifier;
-    const hasPremium = !!customerInfo.entitlements.active[entitlementId];
+        const [customerInfo, offerings] = await Promise.all([
+            Purchases.getCustomerInfo(),
+            Purchases.getOfferings(),
+        ]);
 
-    return { success: true, offering: offerings.current, hasPremium };
-  } catch (error) {
-    const errorMessage = getErrorMessage(error, "RevenueCat init failed");
+        const entitlementId = deps.config.entitlementIdentifier;
+        const hasPremium = !!customerInfo.entitlements.active[entitlementId];
 
-    if (__DEV__) {
-      console.log('[DEBUG RevenueCatInitializer] ERROR during initialization', {
-        error,
-        errorMessage,
-        errorType: error instanceof Error ? error.constructor.name : typeof error,
-      });
+        return { success: true, offering: offerings.current, hasPremium };
+    } catch (error) {
+        getErrorMessage(error, "RevenueCat init failed");
+        return { success: false, offering: null, hasPremium: false };
     }
-
-      error instanceof Error ? error : new Error(errorMessage),
-      {
-        packageName: "subscription",
-        operation: "sdk_init",
-        userId,
-        errorMessage,
-      }
-    );
-
-    return { success: false, offering: null, hasPremium: false };
-  }
 }

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

@@ -4,15 +4,19 @@
  */
 
 import Purchases from "react-native-purchases";
-import type { PurchasesOffering, PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type {
-  IRevenueCatService,
-  InitializeResult,
-  PurchaseResult,
-  RestoreResult,
-} from '../../application/ports/IRevenueCatService';
-import type { RevenueCatConfig } from '../../domain/value-objects/RevenueCatConfig';
-import { resolveApiKey } from '../utils/ApiKeyResolver';
+    PurchasesOffering,
+    PurchasesPackage,
+    CustomerInfo,
+} from "react-native-purchases";
+import type {
+    IRevenueCatService,
+    InitializeResult,
+    PurchaseResult,
+    RestoreResult,
+} from "../../application/ports/IRevenueCatService";
+import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
+import { resolveApiKey } from "../utils/ApiKeyResolver";
 import { initializeSDK } from "./RevenueCatInitializer";
 import { fetchOfferings } from "./OfferingsFetcher";
 import { handlePurchase } from "./PurchaseHandler";
@@ -21,146 +25,137 @@ import { CustomerInfoListenerManager } from "./CustomerInfoListenerManager";
 import { ServiceStateManager } from "./ServiceStateManager";
 
 export class RevenueCatService implements IRevenueCatService {
-  private stateManager: ServiceStateManager;
-  private listenerManager: CustomerInfoListenerManager;
-
-  constructor(config: RevenueCatConfig) {
-    this.stateManager = new ServiceStateManager(config);
-    this.listenerManager = new CustomerInfoListenerManager(
-      config.entitlementIdentifier
-    );
-  }
-
-  getRevenueCatKey(): string | null {
-    return resolveApiKey(this.stateManager.getConfig());
-  }
-
-  isInitialized(): boolean {
-    return this.stateManager.isInitialized();
-  }
-
-  isUsingTestStore(): boolean {
-    return this.stateManager.isUsingTestStore();
-  }
-
-  getCurrentUserId(): string | null {
-    return this.stateManager.getCurrentUserId();
-  }
-
-  async initialize(userId: string, apiKey?: string): Promise<InitializeResult> {
-    if (this.isInitialized() && this.getCurrentUserId() === userId) {
-      return { success: true, offering: (await this.fetchOfferings()), hasPremium: false };
+    private stateManager: ServiceStateManager;
+    private listenerManager: CustomerInfoListenerManager;
+
+    constructor(config: RevenueCatConfig) {
+        this.stateManager = new ServiceStateManager(config);
+        this.listenerManager = new CustomerInfoListenerManager(
+            config.entitlementIdentifier
+        );
+    }
+
+    getRevenueCatKey(): string | null {
+        return resolveApiKey(this.stateManager.getConfig());
+    }
+
+    isInitialized(): boolean {
+        return this.stateManager.isInitialized();
+    }
+
+    isUsingTestStore(): boolean {
+        return this.stateManager.isUsingTestStore();
     }
 
+    getCurrentUserId(): string | null {
+        return this.stateManager.getCurrentUserId();
+    }
+
+    async initialize(userId: string, apiKey?: string): Promise<InitializeResult> {
+        if (this.isInitialized() && this.getCurrentUserId() === userId) {
+            return {
+                success: true,
+                offering: await this.fetchOfferings(),
+                hasPremium: false,
+            };
+        }
+
+        try {
+            const result = await initializeSDK(
+                {
+                    config: this.stateManager.getConfig(),
+                    isUsingTestStore: () => this.isUsingTestStore(),
+                    isInitialized: () => this.isInitialized(),
+                    getCurrentUserId: () => this.stateManager.getCurrentUserId(),
+                    setInitialized: (value) => this.stateManager.setInitialized(value),
+                    setCurrentUserId: (id) => this.stateManager.setCurrentUserId(id),
+                },
+                userId,
+                apiKey
+            );
+
+            if (result.success) {
+                this.listenerManager.setUserId(userId);
+                this.listenerManager.setupListener(this.stateManager.getConfig());
+            }
+
+            return result;
+        } catch (error) {
+            throw error;
+        }
+    }
 
-    try {
-      const result = await initializeSDK(
-        {
-          config: this.stateManager.getConfig(),
-          isUsingTestStore: () => this.isUsingTestStore(),
-          isInitialized: () => this.isInitialized(),
-          getCurrentUserId: () => this.stateManager.getCurrentUserId(),
-          setInitialized: (value) => this.stateManager.setInitialized(value),
-          setCurrentUserId: (id) => this.stateManager.setCurrentUserId(id),
-        },
-        userId,
-        apiKey
-      );
-
-      if (result.success) {
-        this.listenerManager.setUserId(userId);
-        this.listenerManager.setupListener(this.stateManager.getConfig());
-      } else {
-          userId,
-          hasOffering: !!result.offering,
+    async fetchOfferings(): Promise<PurchasesOffering | null> {
+        return fetchOfferings({
+            isInitialized: () => this.isInitialized(),
+            isUsingTestStore: () => this.isUsingTestStore(),
         });
-      }
-
-      return result;
-    } catch (error) {
-        packageName: "subscription",
-        operation: "initialize",
-        userId,
-      });
-      throw error;
     }
-  }
-
-  async fetchOfferings(): Promise<PurchasesOffering | null> {
-    return fetchOfferings({
-      isInitialized: () => this.isInitialized(),
-      isUsingTestStore: () => this.isUsingTestStore(),
-    });
-  }
-
-  async purchasePackage(
-    pkg: PurchasesPackage,
-    userId: string
-  ): Promise<PurchaseResult> {
-    return handlePurchase(
-      {
-        config: this.stateManager.getConfig(),
-        isInitialized: () => this.isInitialized(),
-        isUsingTestStore: () => this.isUsingTestStore(),
-      },
-      pkg,
-      userId
-    );
-  }
-
-  async restorePurchases(userId: string): Promise<RestoreResult> {
-    return handleRestore(
-      {
-        config: this.stateManager.getConfig(),
-        isInitialized: () => this.isInitialized(),
-        isUsingTestStore: () => this.isUsingTestStore(),
-      },
-      userId
-    );
-  }
-
-  async getCustomerInfo(): Promise<CustomerInfo | null> {
-    if (!this.isInitialized()) {
-      return null;
+
+    async purchasePackage(
+        pkg: PurchasesPackage,
+        userId: string
+    ): Promise<PurchaseResult> {
+        return handlePurchase(
+            {
+                config: this.stateManager.getConfig(),
+                isInitialized: () => this.isInitialized(),
+                isUsingTestStore: () => this.isUsingTestStore(),
+            },
+            pkg,
+            userId
+        );
     }
-    return Purchases.getCustomerInfo();
-  }
 
-  async reset(): Promise<void> {
-    if (!this.isInitialized()) {
-      return;
+    async restorePurchases(userId: string): Promise<RestoreResult> {
+        return handleRestore(
+            {
+                config: this.stateManager.getConfig(),
+                isInitialized: () => this.isInitialized(),
+                isUsingTestStore: () => this.isUsingTestStore(),
+            },
+            userId
+        );
     }
 
-      userId: this.getCurrentUserId(),
-    });
+    async getCustomerInfo(): Promise<CustomerInfo | null> {
+        if (!this.isInitialized()) {
+            return null;
+        }
+        return Purchases.getCustomerInfo();
+    }
+
+    async reset(): Promise<void> {
+        if (!this.isInitialized()) {
+            return;
+        }
 
-    this.listenerManager.destroy();
+        this.listenerManager.destroy();
 
-    try {
-      await Purchases.logOut();
-      this.stateManager.setInitialized(false);
-    } catch (error) {
-        error: error instanceof Error ? error.message : String(error),
-      });
+        try {
+            await Purchases.logOut();
+            this.stateManager.setInitialized(false);
+        } catch {
+            // Silent error handling
+        }
     }
-  }
 }
 
 let revenueCatServiceInstance: RevenueCatService | null = null;
 
 export function initializeRevenueCatService(
-  config: RevenueCatConfig
+    config: RevenueCatConfig
 ): RevenueCatService {
-  if (!revenueCatServiceInstance) {
-    revenueCatServiceInstance = new RevenueCatService(config);
-  }
-  return revenueCatServiceInstance;
+    if (!revenueCatServiceInstance) {
+        revenueCatServiceInstance = new RevenueCatService(config);
+    }
+    return revenueCatServiceInstance;
 }
 
 export function getRevenueCatService(): RevenueCatService | null {
-  return revenueCatServiceInstance;
+    return revenueCatServiceInstance;
 }
 
 export function resetRevenueCatService(): void {
-  revenueCatServiceInstance = null;
+    revenueCatServiceInstance = null;
 }