@umituz/react-native-subscription 2.31.26 → 2.32.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.31.26",
+  "version": "2.32.0",
   "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/revenuecat/infrastructure/services/ConfigurationStateManager.ts

@@ -0,0 +1,49 @@
+import type { InitializeResult } from "../../../../shared/application/ports/IRevenueCatService";
+
+export class ConfigurationStateManager {
+  private _isPurchasesConfigured = false;
+  private _configurationPromise: Promise<InitializeResult> | null = null;
+  private _resolveConfiguration: ((value: InitializeResult) => void) | null = null;
+
+  get isPurchasesConfigured(): boolean {
+    return this._isPurchasesConfigured;
+  }
+
+  get configurationPromise(): Promise<InitializeResult> | null {
+    return this._configurationPromise;
+  }
+
+  get isConfiguring(): boolean {
+    return this._configurationPromise !== null;
+  }
+
+  startConfiguration(): (value: InitializeResult) => void {
+    if (this._configurationPromise) {
+      throw new Error('Configuration already in progress');
+    }
+
+    this._configurationPromise = new Promise((resolve) => {
+      this._resolveConfiguration = resolve;
+    });
+
+    return (value: InitializeResult) => {
+      if (this._resolveConfiguration) {
+        this._resolveConfiguration(value);
+      }
+    };
+  }
+
+  completeConfiguration(success: boolean): void {
+    this._isPurchasesConfigured = success;
+    this._configurationPromise = null;
+    this._resolveConfiguration = null;
+  }
+
+  reset(): void {
+    this._isPurchasesConfigured = false;
+    this._configurationPromise = null;
+    this._resolveConfiguration = null;
+  }
+}
+
+export const configState = new ConfigurationStateManager();

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

@@ -1,133 +1,25 @@
-import Purchases, { type CustomerInfo, type PurchasesOfferings } from "react-native-purchases";
 import type { InitializeResult } from "../../../../shared/application/ports/IRevenueCatService";
 import { resolveApiKey } from "../utils/ApiKeyResolver";
 import type { InitializerDeps } from "./RevenueCatInitializer.types";
 import { FAILED_INITIALIZATION_RESULT, CONFIGURATION_RETRY_DELAY_MS, MAX_INIT_RETRIES } from "./initializerConstants";
+import { configState } from "./ConfigurationStateManager";
+import { handleUserSwitch, handleInitialConfiguration, fetchCurrentUserData } from "./userSwitchHandler";
 
 export type { InitializerDeps } from "./RevenueCatInitializer.types";
 
-/**
- * Thread-safe configuration state manager
- * Prevents race conditions during concurrent initialization attempts
- */
-class ConfigurationStateManager {
-  private _isPurchasesConfigured = false;
-  private _configurationPromise: Promise<InitializeResult> | null = null;
-  private _resolveConfiguration: ((value: InitializeResult) => void) | null = null;
-
-  get isPurchasesConfigured(): boolean {
-    return this._isPurchasesConfigured;
-  }
-
-  get configurationPromise(): Promise<InitializeResult> | null {
-    return this._configurationPromise;
-  }
-
-  get isConfiguring(): boolean {
-    return this._configurationPromise !== null;
-  }
-
-  /**
-   * Starts a new configuration process
-   * @throws Error if configuration is already in progress
-   */
-  startConfiguration(): (value: InitializeResult) => void {
-    if (this._configurationPromise) {
-      throw new Error('Configuration already in progress');
-    }
-
-    this._configurationPromise = new Promise((resolve) => {
-      this._resolveConfiguration = resolve;
-    });
-
-    return (value: InitializeResult) => {
-      if (this._resolveConfiguration) {
-        this._resolveConfiguration(value);
-      }
-    };
-  }
-
-  /**
-   * Completes the configuration process
-   */
-  completeConfiguration(success: boolean): void {
-    this._isPurchasesConfigured = success;
-    this._configurationPromise = null;
-    this._resolveConfiguration = null;
-  }
-
-  /**
-   * Resets the configuration state
-   */
-  reset(): void {
-    this._isPurchasesConfigured = false;
-    this._configurationPromise = null;
-    this._resolveConfiguration = null;
-  }
-}
-
-const configState = new ConfigurationStateManager();
-
-function buildSuccessResult(deps: InitializerDeps, customerInfo: CustomerInfo, offerings: PurchasesOfferings): InitializeResult {
-  const isPremium = !!customerInfo.entitlements.active[deps.config.entitlementIdentifier];
-  return { success: true, offering: offerings.current, isPremium };
-}
-
 export async function initializeSDK(
   deps: InitializerDeps,
   userId: string,
   apiKey?: string
 ): Promise<InitializeResult> {
   if (deps.isInitialized() && deps.getCurrentUserId() === userId) {
-    try {
-      const [customerInfo, offerings] = await Promise.all([
-        Purchases.getCustomerInfo(),
-        Purchases.getOfferings(),
-      ]);
-      return buildSuccessResult(deps, customerInfo, offerings);
-    } catch (error) {
-      console.error('[RevenueCatInitializer] Failed to fetch customer info/offerings for initialized user', {
-        userId,
-        error
-      });
-      return FAILED_INITIALIZATION_RESULT;
-    }
+    return fetchCurrentUserData(deps);
   }
 
   if (configState.isPurchasesConfigured) {
-    try {
-      const currentAppUserId = await Purchases.getAppUserID();
-      let customerInfo;
-
-      // Handle user switching
-      if (currentAppUserId !== userId) {
-        if (userId) {
-          // Switch to authenticated user
-          const result = await Purchases.logIn(userId);
-          customerInfo = result.customerInfo;
-        } else {
-          // User logged out - switch to anonymous
-          customerInfo = await Purchases.logOut();
-        }
-      } else {
-        customerInfo = await Purchases.getCustomerInfo();
-      }
-
-      deps.setInitialized(true);
-      deps.setCurrentUserId(userId ?? null);
-      const offerings = await Purchases.getOfferings();
-      return buildSuccessResult(deps, customerInfo, offerings);
-    } catch (error) {
-      console.error('[RevenueCatInitializer] Failed during user switch or fetch', {
-        userId,
-        currentAppUserId: await Purchases.getAppUserID().catch(() => 'unknown'),
-        error
-      });
-      return FAILED_INITIALIZATION_RESULT;
-    }
+    return handleUserSwitch(deps, userId);
   }
 
-  // Wait for ongoing configuration with retry limit
   if (configState.isConfiguring) {
     let retryCount = 0;
     while (configState.isConfiguring && retryCount < MAX_INIT_RETRIES) {
@@ -144,7 +36,6 @@ export async function initializeSDK(
       return FAILED_INITIALIZATION_RESULT;
     }
 
-    // Configuration completed, try again
     return initializeSDK(deps, userId, apiKey);
   }
 
@@ -161,36 +52,12 @@ export async function initializeSDK(
       userId,
       error
     });
-    // Configuration already in progress, wait and retry
     await new Promise(resolve => setTimeout(resolve, CONFIGURATION_RETRY_DELAY_MS));
     return initializeSDK(deps, userId, apiKey);
   }
 
-  try {
-    // Configure with null appUserID for anonymous users (generates RevenueCat anonymous ID)
-    // For authenticated users, use their userId
-    await Purchases.configure({ apiKey: key, appUserID: userId ?? null });
-    deps.setInitialized(true);
-    deps.setCurrentUserId(userId ?? null);
-
-    const [customerInfo, offerings] = await Promise.all([
-      Purchases.getCustomerInfo(),
-      Purchases.getOfferings(),
-    ]);
-
-    const result = buildSuccessResult(deps, customerInfo, offerings);
-    configState.completeConfiguration(true);
-    resolveConfig(result);
-    return result;
-  } catch (error) {
-    console.error('[RevenueCatInitializer] SDK configuration failed', {
-      userId,
-      apiKey: apiKey ? 'provided' : 'from config',
-      error
-    });
-    configState.completeConfiguration(false);
-    resolveConfig(FAILED_INITIALIZATION_RESULT);
-    return FAILED_INITIALIZATION_RESULT;
-  }
+  const result = await handleInitialConfiguration(deps, userId, key);
+  configState.completeConfiguration(result.success);
+  resolveConfig(result);
+  return result;
 }
-

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

@@ -0,0 +1,94 @@
+import Purchases, { type CustomerInfo } from "react-native-purchases";
+import type { InitializeResult } from "../../../../shared/application/ports/IRevenueCatService";
+import type { InitializerDeps } from "./RevenueCatInitializer.types";
+import { FAILED_INITIALIZATION_RESULT } from "./initializerConstants";
+
+function buildSuccessResult(deps: InitializerDeps, customerInfo: CustomerInfo, offerings: any): InitializeResult {
+  const isPremium = !!customerInfo.entitlements.active[deps.config.entitlementIdentifier];
+  return { success: true, offering: offerings.current, isPremium };
+}
+
+function normalizeUserId(userId: string): string | null {
+  return (userId && userId.length > 0) ? userId : null;
+}
+
+function isAnonymousId(userId: string): boolean {
+  return userId.startsWith('$RCAnonymous');
+}
+
+export async function handleUserSwitch(
+  deps: InitializerDeps,
+  userId: string
+): Promise<InitializeResult> {
+  try {
+    const currentAppUserId = await Purchases.getAppUserID();
+    let customerInfo;
+
+    const normalizedUserId = normalizeUserId(userId);
+    const normalizedCurrentUserId = isAnonymousId(currentAppUserId) ? null : currentAppUserId;
+
+    if (normalizedCurrentUserId !== normalizedUserId) {
+      if (normalizedUserId) {
+        const result = await Purchases.logIn(normalizedUserId);
+        customerInfo = result.customerInfo;
+      } else {
+        customerInfo = await Purchases.getCustomerInfo();
+      }
+    } else {
+      customerInfo = await Purchases.getCustomerInfo();
+    }
+
+    deps.setInitialized(true);
+    deps.setCurrentUserId(normalizedUserId);
+    const offerings = await Purchases.getOfferings();
+    return buildSuccessResult(deps, customerInfo, offerings);
+  } catch (error) {
+    console.error('[UserSwitchHandler] Failed during user switch or fetch', {
+      userId,
+      currentAppUserId: await Purchases.getAppUserID().catch(() => 'unknown'),
+      error
+    });
+    return FAILED_INITIALIZATION_RESULT;
+  }
+}
+
+export async function handleInitialConfiguration(
+  deps: InitializerDeps,
+  userId: string,
+  apiKey: string
+): Promise<InitializeResult> {
+  try {
+    const normalizedUserId = normalizeUserId(userId);
+    await Purchases.configure({ apiKey, appUserID: normalizedUserId });
+    deps.setInitialized(true);
+    deps.setCurrentUserId(normalizedUserId);
+
+    const [customerInfo, offerings] = await Promise.all([
+      Purchases.getCustomerInfo(),
+      Purchases.getOfferings(),
+    ]);
+
+    return buildSuccessResult(deps, customerInfo, offerings);
+  } catch (error) {
+    console.error('[UserSwitchHandler] SDK configuration failed', {
+      userId,
+      error
+    });
+    return FAILED_INITIALIZATION_RESULT;
+  }
+}
+
+export async function fetchCurrentUserData(deps: InitializerDeps): Promise<InitializeResult> {
+  try {
+    const [customerInfo, offerings] = await Promise.all([
+      Purchases.getCustomerInfo(),
+      Purchases.getOfferings(),
+    ]);
+    return buildSuccessResult(deps, customerInfo, offerings);
+  } catch (error) {
+    console.error('[UserSwitchHandler] Failed to fetch customer info/offerings for initialized user', {
+      error
+    });
+    return FAILED_INITIALIZATION_RESULT;
+  }
+}

package/src/domains/subscription/infrastructure/managers/SubscriptionManager.ts

@@ -34,21 +34,30 @@ class SubscriptionManagerImpl {
   async initialize(userId?: string): Promise<boolean> {
     this.ensureConfigured();
 
-    const actualUserId = userId ?? (await this.managerConfig.getAnonymousUserId()) ?? '';
-    const { shouldInit, existingPromise } = this.state.initCache.tryAcquireInitialization(actualUserId);
+    let actualUserId: string | null = null;
+
+    if (userId && userId.length > 0) {
+      actualUserId = userId;
+    } else {
+      const anonymousId = await this.managerConfig.getAnonymousUserId();
+      actualUserId = (anonymousId && anonymousId.length > 0) ? anonymousId : null;
+    }
+
+    const cacheKey = actualUserId ?? '__anonymous__';
+    const { shouldInit, existingPromise } = this.state.initCache.tryAcquireInitialization(cacheKey);
 
     if (!shouldInit && existingPromise) {
       return existingPromise;
     }
 
     const promise = this.performInitialization(actualUserId);
-    this.state.initCache.setPromise(promise, actualUserId);
+    this.state.initCache.setPromise(promise, cacheKey);
     return promise;
   }
 
-  private async performInitialization(userId: string): Promise<boolean> {
+  private async performInitialization(userId: string | null): Promise<boolean> {
     this.ensureConfigured();
-    const { service, success } = await performServiceInitialization(this.managerConfig.config, userId);
+    const { service, success } = await performServiceInitialization(this.managerConfig.config, userId ?? '');
     this.serviceInstance = service ?? null;
     this.ensurePackageHandlerInitialized();
     return success;