@umituz/react-native-subscription 2.27.91 → 2.27.93

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

@@ -14,7 +14,7 @@ import { SubscriptionInternalState } from "./SubscriptionInternalState";
 export interface SubscriptionManagerConfig {
   config: RevenueCatConfig;
   apiKey: string;
-  getAnonymousUserId?: () => Promise<string>;
+  getAnonymousUserId: () => Promise<string>;
 }
 
 class SubscriptionManagerImpl {
@@ -25,97 +25,161 @@ class SubscriptionManagerImpl {
 
   configure(config: SubscriptionManagerConfig): void {
     this.managerConfig = config;
-    this.packageHandler = new PackageHandler(null, config.config.entitlementIdentifier);
-    if (config.getAnonymousUserId) this.state.userIdProvider.configure(config.getAnonymousUserId);
+    this.state.userIdProvider.configure(config.getAnonymousUserId);
+  }
+
+  private ensurePackageHandlerInitialized(): void {
+    if (this.packageHandler) {
+      return;
+    }
+
+    if (!this.serviceInstance) {
+      throw new Error("Service instance not available");
+    }
+
+    if (!this.managerConfig) {
+      throw new Error("Manager not configured");
+    }
+
+    this.packageHandler = new PackageHandler(
+      this.serviceInstance,
+      this.managerConfig.config.entitlementIdentifier
+    );
   }
 
   private ensureConfigured(): void {
-    if (!this.managerConfig || !this.packageHandler) throw new Error("SubscriptionManager not configured");
+    if (!this.managerConfig) {
+      throw new Error("SubscriptionManager not configured");
+    }
   }
 
-  async initialize(userId?: string): Promise<boolean> {
+  async initialize(userId: string): Promise<boolean> {
     this.ensureConfigured();
-    const effectiveUserId = userId || (await this.state.userIdProvider.getOrCreateAnonymousUserId());
-    const { shouldInit, existingPromise } = this.state.initCache.tryAcquireInitialization(effectiveUserId);
 
-    if (!shouldInit && existingPromise) return existingPromise;
+    const { shouldInit, existingPromise } = this.state.initCache.tryAcquireInitialization(userId);
+
+    if (!shouldInit && existingPromise) {
+      return existingPromise;
+    }
 
     const promise = (async () => {
-        try {
-          await initializeRevenueCatService(this.managerConfig!.config);
-          this.serviceInstance = getRevenueCatService();
-          if (!this.serviceInstance) {
-            if (__DEV__) {
-              console.error('[SubscriptionManager] Service instance not available after initialization');
-            }
-            return false;
-          }
-          this.packageHandler!.setService(this.serviceInstance);
-          const result = await this.serviceInstance.initialize(effectiveUserId);
-          return result.success;
-        } catch (error) {
-          if (__DEV__) {
-            console.error('[SubscriptionManager] Initialization failed:', error);
-          }
-          return false;
+        await initializeRevenueCatService(this.managerConfig!.config);
+        this.serviceInstance = getRevenueCatService();
+
+        if (!this.serviceInstance) {
+          throw new Error("Service instance not available after initialization");
         }
+
+        this.ensurePackageHandlerInitialized();
+        const result = await this.serviceInstance.initialize(userId);
+        return result.success;
     })();
 
-    this.state.initCache.setPromise(promise, effectiveUserId);
+    this.state.initCache.setPromise(promise, userId);
     return promise;
   }
 
   isInitializedForUser(userId: string): boolean {
-    return this.serviceInstance?.isInitialized() === true && this.state.initCache.getCurrentUserId() === userId;
+    if (!this.serviceInstance) {
+      return false;
+    }
+
+    if (!this.serviceInstance.isInitialized()) {
+      return false;
+    }
+
+    return this.state.initCache.getCurrentUserId() === userId;
   }
 
   async getPackages(): Promise<PurchasesPackage[]> {
     this.ensureConfigured();
+
     if (!this.serviceInstance) {
       this.serviceInstance = getRevenueCatService();
-      this.packageHandler!.setService(this.serviceInstance);
     }
+
+    if (!this.serviceInstance) {
+      throw new Error("Service instance not available");
+    }
+
+    this.ensurePackageHandlerInitialized();
     return this.packageHandler!.fetchPackages();
   }
 
   async purchasePackage(pkg: PurchasesPackage): Promise<boolean> {
     this.ensureConfigured();
+
     const userId = this.state.initCache.getCurrentUserId();
-    if (!userId) return false;
+    if (!userId) {
+      throw new Error("No current user found");
+    }
+
+    this.ensurePackageHandlerInitialized();
     return this.packageHandler!.purchase(pkg, userId);
   }
 
   async restore(): Promise<RestoreResultInfo> {
     this.ensureConfigured();
+
     const userId = this.state.initCache.getCurrentUserId();
-    if (!userId) return { success: false, productId: null };
+    if (!userId) {
+      throw new Error("No current user found");
+    }
+
+    this.ensurePackageHandlerInitialized();
     return this.packageHandler!.restore(userId);
   }
 
   async checkPremiumStatus(): Promise<PremiumStatus> {
     this.ensureConfigured();
+
     const userId = this.state.initCache.getCurrentUserId();
-    if (!userId) return { isPremium: false, expirationDate: null };
+    if (!userId) {
+      throw new Error("No current user found");
+    }
+
+    if (!this.serviceInstance) {
+      throw new Error("Service instance not available");
+    }
+
+    const customerInfo = await this.serviceInstance.getCustomerInfo();
 
-    try {
-      const customerInfo = await this.serviceInstance?.getCustomerInfo();
-      if (customerInfo) return this.packageHandler!.checkPremiumStatusFromInfo(customerInfo);
-    } catch (error) {
-      throw error;
+    if (!customerInfo) {
+      throw new Error("Customer info not available");
     }
-    return { isPremium: false, expirationDate: null };
+
+    this.ensurePackageHandlerInitialized();
+    return this.packageHandler!.checkPremiumStatusFromInfo(customerInfo);
   }
 
   async reset(): Promise<void> {
-    if (this.serviceInstance) await this.serviceInstance.reset();
+    if (this.serviceInstance) {
+      await this.serviceInstance.reset();
+    }
+
     this.state.reset();
     this.serviceInstance = null;
   }
 
-  // Helper status checks
-  isConfigured = () => !!this.managerConfig;
-  isInitialized = () => this.serviceInstance?.isInitialized() ?? false;
-  getEntitlementId = () => this.managerConfig?.config.entitlementIdentifier || null;
+  isConfigured(): boolean {
+    return this.managerConfig !== null;
+  }
+
+  isInitialized(): boolean {
+    if (!this.serviceInstance) {
+      return false;
+    }
+
+    return this.serviceInstance.isInitialized();
+  }
+
+  getEntitlementId(): string {
+    if (!this.managerConfig) {
+      throw new Error("SubscriptionManager not configured");
+    }
+
+    return this.managerConfig.config.entitlementIdentifier;
+  }
 }
 
 export const SubscriptionManager = new SubscriptionManagerImpl();

package/src/domains/subscription/infrastructure/services/RestoreHandler.ts

@@ -15,14 +15,16 @@ export async function handleRestore(deps: RestoreHandlerDeps, userId: string): P
 
   try {
     const customerInfo = await Purchases.restorePurchases();
-    const isPremium = !!customerInfo.entitlements.active[deps.config.entitlementIdentifier];
+    const entitlement = customerInfo.entitlements.active[deps.config.entitlementIdentifier];
+    const isPremium = !!entitlement;
+    const productId = entitlement?.productIdentifier ?? null;
 
     if (isPremium) {
       await syncPremiumStatus(deps.config, userId, customerInfo);
     }
     await notifyRestoreCompleted(deps.config, userId, isPremium, customerInfo);
 
-    return { success: true, isPremium, customerInfo };
+    return { success: true, isPremium, productId, customerInfo };
   } catch (error) {
     throw new RevenueCatRestoreError(getErrorMessage(error, "Restore failed"));
   }

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

@@ -19,8 +19,7 @@ const configurationState = {
     configurationPromise: null as Promise<ReturnType<typeof initializeSDK>> | null,
 };
 
-// Simple lock mechanism to prevent concurrent configurations
-let configurationLocks = new Set<string>();
+// Simple lock mechanism to prevent concurrent configurations (implementation deferred)
 
 function configureLogHandler(): void {
   if (configurationState.isLogHandlerConfigured) return;

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

@@ -5,7 +5,7 @@
  */
 
 import type { CustomerInfo } from "react-native-purchases";
-import { detectPackageType, type SubscriptionPackageType } from "../../../../utils/packageTypeDetector";
+import { detectPackageType } from "../../../../utils/packageTypeDetector";
 
 export interface RenewalState {
   previousExpirationDate: string | null;

package/src/{presentation → domains/subscription/presentation}/components/details/PremiumStatusBadge.tsx

@@ -6,10 +6,12 @@
 import React, { useMemo } from "react";
 import { View, StyleSheet } from "react-native";
 import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
-import { 
-  SUBSCRIPTION_STATUS, 
-  type SubscriptionStatusType 
-} from "../../../domains/subscription/core/SubscriptionConstants";
+import {
+  SUBSCRIPTION_STATUS,
+  type SubscriptionStatusType
+} from "../../../core/SubscriptionConstants";
+
+export type { SubscriptionStatusType };
 
 export interface PremiumStatusBadgeProps {
   status: SubscriptionStatusType;

package/src/{presentation → domains/subscription/presentation}/components/feedback/PaywallFeedbackModal.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from "react";
 import { View, TouchableOpacity, TextInput } from "react-native";
 import { AtomicText, BaseModal, useAppDesignTokens } from "@umituz/react-native-design-system";
-import { usePaywallFeedback } from "../../hooks/feedback/usePaywallFeedback";
+import { usePaywallFeedback } from "../../../../../presentation/hooks/feedback/usePaywallFeedback";
 import { createPaywallFeedbackStyles } from "./paywallFeedbackStyles";
 
 const FEEDBACK_OPTION_IDS = [

package/src/{presentation → domains/subscription/presentation}/types/SubscriptionDetailTypes.ts

@@ -3,7 +3,7 @@
  * Type definitions for subscription detail screen and components
  */
 
-import type { SubscriptionStatusType } from "../../domains/subscription/core/SubscriptionStatus";
+import type { SubscriptionStatusType } from "../../core/SubscriptionStatus";
 import type { CreditInfo } from "../components/details/PremiumDetailsCardTypes";
 
 export type { SubscriptionStatusType, CreditInfo };
@@ -16,6 +16,8 @@ export interface SubscriptionDetailTranslations {
   statusExpired: string;
   statusInactive: string;
   statusCanceled: string;
+  /** Free status label */
+  statusFree: string;
   /** Trial status label (defaults to statusActive if not provided) */
   statusTrial?: string;
   /** Trial canceled status label (defaults to statusCanceled if not provided) */
@@ -109,7 +111,7 @@ export interface SubscriptionHeaderProps {
     | "expiresLabel"
     | "purchasedLabel"
     | "lifetimeLabel"
-  >;
+  > & { statusFree: string };
 }
 
 /** Props for credits list component */

package/src/{presentation → domains/subscription/presentation}/types/SubscriptionSettingsTypes.ts

@@ -3,7 +3,7 @@
  * Type definitions for subscription settings configuration
  */
 
-import type { SubscriptionStatusType } from "../../domains/subscription/core/SubscriptionConstants";
+import type { SubscriptionStatusType } from "../../core/SubscriptionConstants";
 import type {
   SubscriptionDetailConfig,
   UpgradePromptConfig,

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

@@ -27,7 +27,7 @@
  * ```
  */
 
-import { useCallback, useEffect } from "react";
+import { useCallback } from "react";
 import { useSubscriptionStatus } from "./useSubscriptionStatus";
 import { paywallControl } from "./usePaywallVisibility";
 

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

@@ -12,7 +12,7 @@ import {
 import { getSavedPurchase, clearSavedPurchase } from "./useAuthAwarePurchase";
 import { usePremium } from "./usePremium";
 import { SubscriptionManager } from "../infrastructure/managers/SubscriptionManager";
-import { usePurchaseLoadingStore } from "../../../presentation/stores";
+import { usePurchaseLoadingStore } from "./stores";
 
 export interface UseSavedPurchaseAutoExecutionParams {
   onSuccess?: () => void;

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

@@ -7,21 +7,21 @@ import { useMemo, useCallback } from "react";
 import { useCredits } from "../../credits/presentation/useCredits";
 import { usePaywallVisibility } from "./usePaywallVisibility";
 import { calculateDaysRemaining } from "../core/SubscriptionStatus";
-import { formatDate } from "../../../presentation/utils/subscriptionDateUtils";
+import { formatDate } from "./utils/subscriptionDateUtils";
 import { useCreditsArray, getSubscriptionStatusType } from "./useSubscriptionSettingsConfig.utils";
 import { getCreditsConfig } from "../../credits/infrastructure/CreditsRepositoryProvider";
 import type {
   SubscriptionSettingsConfig,
   SubscriptionStatusType,
   UseSubscriptionSettingsConfigParams,
-} from "../../../presentation/types/SubscriptionSettingsTypes";
+} from "./types/SubscriptionSettingsTypes";
 
 export type {
   SubscriptionSettingsConfig,
   SubscriptionSettingsItemConfig,
   SubscriptionSettingsTranslations,
   UseSubscriptionSettingsConfigParams,
-} from "../../../presentation/types/SubscriptionSettingsTypes";
+} from "./types/SubscriptionSettingsTypes";
 
 export const useSubscriptionSettingsConfig = (
   params: Omit<UseSubscriptionSettingsConfigParams, 'userId'>
@@ -95,6 +95,7 @@ export const useSubscriptionSettingsConfig = (
         statusExpired: translations.statusExpired,
         statusInactive: translations.statusInactive,
         statusCanceled: translations.statusCanceled,
+        statusFree: translations.statusInactive,
         expiresLabel: translations.expiresLabel,
         purchasedLabel: translations.purchasedLabel,
         lifetimeLabel: translations.lifetimeLabel,

package/src/domains/subscription/presentation/useSubscriptionSettingsConfig.utils.ts

@@ -6,7 +6,7 @@
 import { useMemo } from "react";
 import type { UserCredits } from "../../credits/core/Credits";
 import { resolveSubscriptionStatus, type PeriodType, type SubscriptionStatusType } from "../core/SubscriptionStatus";
-import type { SubscriptionSettingsTranslations } from "../types/SubscriptionSettingsTypes";
+import type { SubscriptionSettingsTranslations } from "./types/SubscriptionSettingsTypes";
 
 export interface CreditsInfo {
   id: string;

package/src/domains/trial/application/TrialEligibilityService.ts

@@ -1,4 +1,4 @@
-import type { TrialEligibilityResult, DeviceTrialRecord } from "./TrialTypes";
+import type { TrialEligibilityResult, DeviceTrialRecord } from "../core/TrialTypes";
 
 export class TrialEligibilityService {
   static check(

package/src/domains/trial/infrastructure/DeviceTrialRepository.ts

@@ -1,6 +1,6 @@
-import { doc, getDoc, setDoc, serverTimestamp, arrayUnion, type Firestore } from "firebase/firestore";
+import { doc, getDoc, setDoc, serverTimestamp, type Firestore } from "firebase/firestore";
 import { getFirestore } from "@umituz/react-native-firebase";
-import type { DeviceTrialRecord } from "./TrialTypes";
+import type { DeviceTrialRecord } from "../core/TrialTypes";
 
 const DEVICE_TRIALS_COLLECTION = "device_trials";
 

package/src/index.ts

@@ -54,11 +54,11 @@ export {
 export * from "./presentation/hooks";
 
 // Presentation Layer - Components
-export * from "./presentation/components/details/PremiumDetailsCard";
-export * from "./presentation/components/details/PremiumStatusBadge";
-export * from "./presentation/components/sections/SubscriptionSection";
-export * from "./presentation/components/feedback/PaywallFeedbackModal";
-export * from "./presentation/screens/SubscriptionDetailScreen";
+export * from "./domains/subscription/presentation/components/details/PremiumDetailsCard";
+export * from "./domains/subscription/presentation/components/details/PremiumStatusBadge";
+export * from "./domains/subscription/presentation/components/sections/SubscriptionSection";
+export * from "./domains/subscription/presentation/components/feedback/PaywallFeedbackModal";
+export * from "./domains/subscription/presentation/screens/SubscriptionDetailScreen";
 export * from "./domains/paywall/components/PaywallContainer";
 
 export type {

package/src/shared/application/ports/IRevenueCatService.ts

@@ -21,6 +21,8 @@ export interface PurchaseResult {
 export interface RestoreResult {
     success: boolean;
     productId: string | null;
+    isPremium?: boolean;
+    customerInfo?: CustomerInfo;
 }
 
 export interface IRevenueCatService {

package/src/shared/infrastructure/SubscriptionEventBus.ts

@@ -22,10 +22,13 @@ export class SubscriptionEventBus {
       this.listeners[event] = [];
     }
     this.listeners[event].push(callback);
-    
+
     // Return unsubscribe function
     return () => {
-      this.listeners[event] = this.listeners[event].filter(l => l !== callback);
+      const listeners = this.listeners[event];
+      if (listeners) {
+        this.listeners[event] = listeners.filter(l => l !== callback);
+      }
     };
   }
 

package/src/utils/tierUtils.ts

@@ -4,7 +4,7 @@
  * Core logic for determining user tier and premium status
  */
 
-import type { UserTierInfo } from './types';
+import { USER_TIER, type UserTierInfo } from './types';
 
 
 export function getUserTierInfo(
@@ -14,7 +14,7 @@ export function getUserTierInfo(
 ): UserTierInfo {
   if (isAnonymous || userId === null) {
     return {
-      tier: 'anonymous',
+      tier: USER_TIER.ANONYMOUS,
       isPremium: false,
       isAnonymous: true,
       isAuthenticated: false,
@@ -23,7 +23,7 @@ export function getUserTierInfo(
   }
 
   return {
-    tier: isPremium ? 'premium' : 'freemium',
+    tier: isPremium ? USER_TIER.PREMIUM : USER_TIER.FREEMIUM,
     isPremium,
     isAnonymous: false,
     isAuthenticated: true,

package/src/utils/types.ts

@@ -4,7 +4,10 @@
  * Type definitions for user tier system
  */
 
-export type UserTier = 'anonymous' | 'freemium' | 'premium';
+import { USER_TIER, type UserTierType } from '../domains/subscription/core/SubscriptionConstants';
+
+export type UserTier = UserTierType;
+export { USER_TIER };
 
 export interface UserTierInfo {
   /** User tier classification */

package/src/utils/validation.ts

@@ -4,10 +4,10 @@
  * Type guards and validation functions for user tier system
  */
 
-import type { UserTier, UserTierInfo } from './types';
+import { USER_TIER, type UserTier, type UserTierInfo } from './types';
 
 export function isValidUserTier(value: unknown): value is UserTier {
-  return value === 'anonymous' || value === 'freemium' || value === 'premium';
+  return value === USER_TIER.ANONYMOUS || value === USER_TIER.FREEMIUM || value === USER_TIER.PREMIUM;
 }
 
 export function isUserTierInfo(value: unknown): value is UserTierInfo {

package/src/domains/config/README.md

@@ -1,100 +0,0 @@
-# Config Domain
-
-Central configuration system for subscription plans, product configurations, and package management.
-
-## Location
-
-- **Base Path**: `/Users/umituz/Desktop/github/umituz/apps/artificial_intelligence/npm-packages/react-native-subscription/src/domains/config/`
-- **Domain**: `src/domains/config/domain/`
-- **Entities**: `src/domains/config/domain/entities/`
-
-## Strategy
-
-### Plan Management
-
-Comprehensive subscription plan configuration system.
-
-- **Plan Types**: Monthly, annual, and lifetime plan configurations
-- **Product Metadata**: RevenueCat product metadata management
-- **Validation**: Configuration validation and type safety
-- **Helper Functions**: Plan comparison and filtering utilities
-
-### Configuration Objects
-
-Structured configuration for different aspects of the system.
-
-- **SubscriptionConfig**: Main subscription configuration
-- **WalletConfig**: Credit system configuration
-- **Plan Entities**: Individual plan definitions
-- **Validation Rules**: Configuration validation schemas
-
-### Helper Utilities
-
-Plan comparison and manipulation functions.
-
-- **Plan Comparison**: Value comparison between plans
-- **Price Formatting**: Currency-aware price formatting
-- **Discount Calculation**: Savings and discount calculations
-- **Package Filtering**: Type-based package filtering
-
-### Validation System
-
-Comprehensive configuration validation.
-
-- **Plan Validation**: Plan entity validation rules
-- **Config Validation**: Complete configuration validation
-- **Type Safety**: TypeScript type definitions
-- **Error Messages**: Detailed validation error reporting
-
-## Restrictions
-
-### REQUIRED
-
-- **Type Safety**: Always use TypeScript type definitions
-- **Validation**: Validate configurations before runtime use
-- **Default Values**: Provide meaningful default values
-- **Immutable Updates**: Create new copies instead of modifying
-
-### PROHIBITED
-
-- **Invalid Prices**: Negative or zero prices not allowed
-- **Missing IDs**: All plans must have valid IDs
-- **Duplicate Plans**: No duplicate plan IDs allowed
-- **Hardcoded Values**: Use configuration system
-
-### CRITICAL
-
-- **Configuration Integrity**: All configurations must be valid
-- **Plan Consistency**: Related plans must be consistent
-- **Currency Handling**: Proper currency code usage
-- **Feature Lists**: Accurate feature mapping
-
-## AI Agent Guidelines
-
-### When Modifying Configuration System
-
-1. **Type Definitions**: Update TypeScript types for new config
-2. **Validation Rules**: Add validation for new fields
-3. **Default Values**: Provide sensible defaults
-4. **Documentation**: Document configuration options
-
-### When Adding New Plan Types
-
-1. **Entity Pattern**: Follow existing entity patterns
-2. **Validation**: Add validation rules
-3. **Helper Functions**: Create helper functions
-4. **Testing**: Test with various configurations
-
-### When Fixing Configuration Bugs
-
-1. **Validation Logic**: Check validation rules
-2. **Type Definitions**: Verify type correctness
-3. **Default Values**: Ensure proper defaults
-4. **Edge Cases**: Test boundary conditions
-
-## Related Documentation
-
-- [Paywall Domain](/Users/umituz/Desktop/github/umituz/apps/artificial_intelligence/npm-packages/react-native-subscription/src/domains/paywall/README.md)
-- [Wallet Domain](/Users/umituz/Desktop/github/umituz/apps/artificial_intelligence/npm-packages/react-native-subscription/src/domains/wallet/README.md)
-- [RevenueCat Integration](/Users/umituz/Desktop/github/umituz/apps/artificial_intelligence/npm-packages/react-native-subscription/src/revenuecat/README.md)
-- [Domain Layer](/Users/umituz/Desktop/github/umituz/apps/artificial_intelligence/npm-packages/react-native-subscription/src/domain/README.md)