@umituz/react-native-subscription 2.37.48 → 2.37.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.37.48",
+  "version": "2.37.50",
   "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/UserSwitchMutex.ts

@@ -1,10 +1,10 @@
 class UserSwitchMutexImpl {
-  private activeSwitchPromise: Promise<any> | null = null;
+  private activeSwitchPromise: Promise<unknown> | null = null;
   private activeUserId: string | null = null;
   private lastSwitchTime = 0;
   private readonly MIN_SWITCH_INTERVAL_MS = 1000;
 
-  async acquire(userId: string): Promise<{ shouldProceed: boolean; existingPromise?: Promise<any> }> {
+  async acquire(userId: string): Promise<{ shouldProceed: boolean; existingPromise?: Promise<unknown> }> {
     if (this.activeSwitchPromise && this.activeUserId === userId) {
       if (typeof __DEV__ !== 'undefined' && __DEV__) {
         console.log('[UserSwitchMutex] Switch already in progress for this user, returning existing promise');
@@ -43,7 +43,7 @@ class UserSwitchMutexImpl {
     return { shouldProceed: true };
   }
 
-  setPromise(promise: Promise<any>): void {
+  setPromise(promise: Promise<unknown>): void {
     this.activeSwitchPromise = promise;
     this.lastSwitchTime = Date.now();
 

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

@@ -4,6 +4,9 @@ import type { InitializerDeps } from "./RevenueCatInitializer.types";
 import { FAILED_INITIALIZATION_RESULT } from "./initializerConstants";
 import { UserSwitchMutex } from "./UserSwitchMutex";
 import { getPremiumEntitlement } from "../../core/types";
+import type { PeriodType } from "../../../subscription/core/SubscriptionConstants";
+
+const ANONYMOUS_CACHE_KEY = '__anonymous__';
 
 declare const __DEV__: boolean;
 
@@ -29,7 +32,7 @@ async function fetchOfferingsSafe(): Promise<PurchasesOfferings | null> {
 }
 
 function normalizeUserId(userId: string): string | null {
-  return (userId && userId.length > 0 && userId !== "__anonymous__") ? userId : null;
+  return (userId && userId.length > 0 && userId !== ANONYMOUS_CACHE_KEY) ? userId : null;
 }
 
 function isAnonymousId(userId: string): boolean {
@@ -40,7 +43,7 @@ export async function handleUserSwitch(
   deps: InitializerDeps,
   userId: string
 ): Promise<InitializeResult> {
-  const mutexKey = userId || '__anonymous__';
+  const mutexKey = userId || ANONYMOUS_CACHE_KEY;
 
   // Acquire mutex to prevent concurrent Purchases.logIn() calls
   const { shouldProceed, existingPromise } = await UserSwitchMutex.acquire(mutexKey);
@@ -49,7 +52,7 @@ export async function handleUserSwitch(
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
       console.log('[UserSwitchHandler] Using result from active switch operation');
     }
-    return existingPromise;
+    return existingPromise as Promise<InitializeResult>;
   }
 
   const switchOperation = performUserSwitch(deps, userId);
@@ -190,7 +193,7 @@ export async function handleInitialConfiguration(
             premiumEntitlement.productIdentifier,
             premiumEntitlement.expirationDate ?? undefined,
             premiumEntitlement.willRenew,
-            premiumEntitlement.periodType as "NORMAL" | "INTRO" | undefined
+            premiumEntitlement.periodType as PeriodType | undefined
           );
         } else {
           await deps.config.onPremiumStatusChanged(

package/src/domains/subscription/application/SubscriptionSyncService.ts

@@ -39,6 +39,7 @@ export class SubscriptionSyncService {
         newExpirationDate,
         error: error instanceof Error ? error.message : String(error)
       });
+      throw error;
     }
   }
 
@@ -60,6 +61,7 @@ export class SubscriptionSyncService {
         productId,
         error: error instanceof Error ? error.message : String(error)
       });
+      throw error;
     }
   }
 }

package/src/domains/subscription/application/SubscriptionSyncUtils.ts

@@ -19,8 +19,6 @@ export const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId:
 
   const entitlement = customerInfo.entitlements.active[entitlementId];
 
-  const isPremium = !!customerInfo.entitlements.active[entitlementId];
-
   if (!entitlement) {
     return {
       expirationDate: null,
@@ -36,13 +34,15 @@ export const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId:
     };
   }
 
+  const subscription = customerInfo.subscriptionsByProductIdentifier?.[entitlement.productIdentifier];
+
   return {
     expirationDate: entitlement.expirationDate ?? null,
     willRenew: entitlement.willRenew ?? null,
-    originalTransactionId: entitlement.originalPurchaseDate ?? null,
+    originalTransactionId: subscription?.storeTransactionId ?? null,
     periodType: validatePeriodType(entitlement.periodType),
     packageType: null,
-    isPremium,
+    isPremium: true,
     unsubscribeDetectedAt: entitlement.unsubscribeDetectedAt ?? null,
     billingIssueDetectedAt: entitlement.billingIssueDetectedAt ?? null,
     store: entitlement.store ?? null,

package/src/domains/subscription/infrastructure/handlers/PackageHandler.ts

@@ -1,11 +1,10 @@
 import type { PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type { IRevenueCatService } from "../../../../shared/application/ports/IRevenueCatService";
-import type { PremiumStatus } from "./PurchaseStatusResolver";
+import { PurchaseStatusResolver, type PremiumStatus } from "./PurchaseStatusResolver";
 import {
   fetchPackages,
   executePurchase,
   restorePurchases,
-  checkPremiumStatus,
   type RestoreResultInfo,
 } from "./package-operations";
 
@@ -33,6 +32,6 @@ export class PackageHandler {
   }
 
   checkPremiumStatusFromInfo(customerInfo: CustomerInfo): PremiumStatus {
-    return checkPremiumStatus(customerInfo, this.entitlementId);
+    return PurchaseStatusResolver.resolve(customerInfo, this.entitlementId);
   }
 }

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

@@ -2,4 +2,3 @@ export type { RestoreResultInfo } from "./types";
 export { fetchPackages } from "./PackageFetcher";
 export { executePurchase } from "./PackagePurchaser";
 export { restorePurchases } from "./PackageRestorer";
-export { checkPremiumStatus } from "./PremiumStatusChecker";

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

@@ -10,6 +10,8 @@ import { getPackagesOperation, purchasePackageOperation, restoreOperation } from
 import { performServiceInitialization } from "./initializationHandler";
 import { initializationState } from "../state/initializationState";
 
+const ANONYMOUS_CACHE_KEY = '__anonymous__';
+
 class SubscriptionManagerImpl {
   private managerConfig: SubscriptionManagerConfig | null = null;
   private serviceInstance: IRevenueCatService | null = null;
@@ -43,7 +45,7 @@ class SubscriptionManagerImpl {
       });
     }
 
-    const cacheKey = actualUserId || '__anonymous__';
+    const cacheKey = actualUserId || ANONYMOUS_CACHE_KEY;
     const { shouldInit, existingPromise } = this.state.initCache.tryAcquireInitialization(cacheKey);
 
     if (!shouldInit && existingPromise) {
@@ -62,8 +64,6 @@ class SubscriptionManagerImpl {
   }
 
   private async performInitialization(userId: string): Promise<boolean> {
-    this.ensureConfigured();
-
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
       console.log('[SubscriptionManager] performInitialization:', {
         userId: userId || '(empty - anonymous)',
@@ -74,13 +74,8 @@ class SubscriptionManagerImpl {
     this.serviceInstance = service ?? null;
     this.ensurePackageHandlerInitialized();
 
-    // Always notify reactive state when service is available, even if offerings fetch failed.
-    // This ensures React components (useSubscriptionPackages, useSubscriptionStatus) are unblocked.
-    // The service IS configured and usable - empty offerings is not a fatal error.
     const notifyUserId = (userId && userId.length > 0) ? userId : null;
-    if (service) {
-      initializationState.markInitialized(notifyUserId);
-    } else if (success) {
+    if (service || success) {
       initializationState.markInitialized(notifyUserId);
     }
 
@@ -142,7 +137,7 @@ class SubscriptionManagerImpl {
 
   getEntitlementId(): string {
     this.ensureConfigured();
-    return this.managerConfig!.config.entitlementIdentifier ?? '';
+    return this.managerConfig!.config.entitlementIdentifier;
   }
 }
 

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

@@ -11,7 +11,7 @@ export function ensureConfigured(config: SubscriptionManagerConfig | null): void
 
 export function getCurrentUserIdOrThrow(state: SubscriptionInternalState): string {
     const userId = state.initCache.getCurrentUserId();
-    if (userId === null || userId === undefined) {
+    if (userId == null) {
         throw new Error("SubscriptionManager not initialized - no current user ID available");
     }
     return userId;

package/src/domains/subscription/infrastructure/services/listeners/CustomerInfoHandler.ts

@@ -113,5 +113,5 @@ export async function processCustomerInfo(
     await handlePremiumStatusSync(config, userId, customerInfo);
   }
 
-  return updateRenewalState(renewalState, renewalResult);
+  return updateRenewalState(renewalResult);
 }

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

@@ -27,28 +27,26 @@ export class InitializationCache {
         this.promiseUserId = userId;
         this.promiseCompleted = false;
 
-        const targetUserId = userId;
-
         const chain: Promise<boolean> = promise
             .then((result) => {
-                if (result && this.promiseUserId === targetUserId) {
-                    this.currentUserId = targetUserId;
+                if (result && this.promiseUserId === userId) {
+                    this.currentUserId = userId;
                 }
                 this.promiseCompleted = true;
                 return result;
             })
             .catch((error) => {
-                if (this.promiseUserId === targetUserId) {
+                if (this.promiseUserId === userId) {
                     this.initPromise = null;
                     this.promiseUserId = null;
                     this.currentUserId = null;
                 }
                 this.promiseCompleted = true;
-                console.error('[InitializationCache] Initialization failed', { userId: targetUserId, error });
-                return false as boolean;
+                console.error('[InitializationCache] Initialization failed', { userId, error });
+                return false;
             })
             .finally(() => {
-                this.pendingQueue.delete(targetUserId);
+                this.pendingQueue.delete(userId);
             });
 
         this.initPromise = chain;

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

@@ -1,7 +1,6 @@
-import type { RenewalState, RenewalDetectionResult } from "./types";
+import type { RenewalDetectionResult, RenewalState } from "./types";
 
 export function updateRenewalState(
-  _state: RenewalState,
   result: RenewalDetectionResult
 ): RenewalState {
   return {

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

@@ -41,12 +41,7 @@ export const useSubscriptionStatus = (): SubscriptionStatusResult => {
         return null;
       }
 
-      try {
-        const result = await SubscriptionManager.checkPremiumStatus();
-        return result;
-      } catch {
-        return null;
-      }
+      return SubscriptionManager.checkPremiumStatus();
     },
     enabled: queryEnabled,
     ...NO_CACHE_QUERY_CONFIG,

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

@@ -1,4 +1,5 @@
 import { buildCollectionRef, type CollectionConfig } from "../../../../../shared/infrastructure/firestore";
+import type { Firestore } from "@umituz/react-native-firebase";
 import type { TransactionRepositoryConfig } from "../../../domain/types/transaction.types";
 
 function getCollectionConfig(config: TransactionRepositoryConfig): CollectionConfig {
@@ -8,7 +9,7 @@ function getCollectionConfig(config: TransactionRepositoryConfig): CollectionCon
   };
 }
 
-export function getCollectionRef(db: any, userId: string, config: TransactionRepositoryConfig) {
+export function getCollectionRef(db: Firestore, userId: string, config: TransactionRepositoryConfig) {
   const collectionConfig = getCollectionConfig(config);
   return buildCollectionRef(db, userId, collectionConfig);
 }

package/src/init/createSubscriptionInitModule.ts

@@ -34,7 +34,7 @@ export function createSubscriptionInitModule(config: SubscriptionInitModuleConfi
         return true;
       } catch (error) {
         console.error('[SubscriptionInitModule] Initialization failed:', error instanceof Error ? error.message : String(error));
-        return false;
+        throw error;
       }
     },
   };

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<any>[]> = {};
+  private listeners: Record<string, EventCallback[]> = {};
 
   private constructor() {}
 
@@ -17,7 +17,7 @@ class SubscriptionEventBus {
     if (!this.listeners[event]) {
       this.listeners[event] = [];
     }
-    this.listeners[event].push(callback);
+    this.listeners[event].push(callback as EventCallback);
 
     return () => {
       const listeners = this.listeners[event];

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

@@ -1,9 +0,0 @@
-import type { CustomerInfo } from "react-native-purchases";
-import { PurchaseStatusResolver, type PremiumStatus } from "../PurchaseStatusResolver";
-
-export function checkPremiumStatus(
-  customerInfo: CustomerInfo,
-  entitlementId: string
-): PremiumStatus {
-  return PurchaseStatusResolver.resolve(customerInfo, entitlementId);
-}