@umituz/react-native-subscription 2.27.68 → 2.27.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.68",
+  "version": "2.27.70",
   "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/credits/application/CreditLimitCalculator.ts

@@ -1,6 +1,6 @@
-import type { CreditsConfig } from "../../domain/entities/Credits";
-import { detectPackageType } from "../../utils/packageTypeDetector";
-import { getCreditAllocation } from "../../utils/creditMapper";
+import type { CreditsConfig } from "../core/Credits";
+import { detectPackageType } from "../../../utils/packageTypeDetector";
+import { getCreditAllocation } from "../../../utils/creditMapper";
 
 export class CreditLimitCalculator {
   static calculate(productId: string | undefined, config: CreditsConfig): number {

package/src/domains/credits/application/CreditsInitializer.ts

@@ -4,10 +4,10 @@ import {
   runTransaction,
   serverTimestamp,
   Timestamp,
-  type Firestore,
   type Transaction,
   type DocumentReference,
-} from "firebase/firestore";
+  type Firestore,
+} from "@umituz/react-native-firebase";
 import type { CreditsConfig } from "../core/Credits";
 import type { UserCreditsDocumentRead } from "../core/UserCreditsDocument";
 import { resolveSubscriptionStatus } from "../../subscription/core/SubscriptionStatus";
@@ -33,7 +33,7 @@ export async function initializeCreditsTransaction(
         }
 
         const creditLimit = CreditLimitCalculator.calculate(metadata?.productId, config);
-        const { purchaseType, purchaseHistory } = PurchaseMetadataGenerator.generate({
+        const { purchaseHistory } = PurchaseMetadataGenerator.generate({
           productId: metadata?.productId,
           source: metadata?.source,
           type: metadata?.type,
@@ -51,19 +51,22 @@ export async function initializeCreditsTransaction(
         // Resolve credits using Strategy Pattern
         const isStatusSync = purchaseId?.startsWith("status_sync_") ?? false;
         const isSubscriptionActive = isPremium && !isExpired;
+        const productId = metadata?.productId;
 
         const newCredits = creditAllocationContext.allocate({
             status,
             isStatusSync,
             existingData,
             creditLimit,
-            isSubscriptionActive
+            isSubscriptionActive,
+            productId,
         });
 
         const creditsData: Record<string, any> = {
             isPremium, status, credits: newCredits, creditLimit, 
             lastUpdatedAt: now, 
-            processedPurchases: (purchaseId ? [...(existingData?.processedPurchases || []), purchaseId].slice(-10) : existingData?.processedPurchases) || [],
+            // Increase history window to 50 for better idempotency
+            processedPurchases: (purchaseId ? [...(existingData?.processedPurchases || []), purchaseId].slice(-50) : existingData?.processedPurchases) || [],
             purchaseHistory: purchaseHistory.length ? purchaseHistory : undefined
         };
 

package/src/domains/credits/application/DeductCreditsCommand.ts

@@ -1,7 +1,7 @@
 import { runTransaction, serverTimestamp, type Firestore, type Transaction, type DocumentReference } from "firebase/firestore";
 import { getFirestore } from "@umituz/react-native-firebase";
-import type { DeductCreditsResult } from "../../../domain/entities/Credits";
-import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../SubscriptionEventBus";
+import type { DeductCreditsResult } from "../core/Credits";
+import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../shared/infrastructure/SubscriptionEventBus";
 
 export interface IDeductCreditsCommand {
   execute(userId: string, cost: number): Promise<DeductCreditsResult>;

package/src/domains/credits/application/credit-strategies/ICreditStrategy.ts

@@ -1,5 +1,5 @@
-import type { SubscriptionStatusType } from "../../domain/entities/SubscriptionStatus";
-import type { UserCreditsDocumentRead } from "../models/UserCreditsDocument";
+import type { SubscriptionStatusType } from "../../../subscription/core/SubscriptionStatus";
+import type { UserCreditsDocumentRead } from "../../core/UserCreditsDocument";
 
 export interface CreditStrategyParams {
     status: SubscriptionStatusType;
@@ -7,6 +7,7 @@ export interface CreditStrategyParams {
     existingData: UserCreditsDocumentRead | null;
     creditLimit: number;
     isSubscriptionActive: boolean;
+    productId?: string;
 }
 
 export interface ICreditStrategy {

package/src/domains/credits/application/credit-strategies/StandardPurchaseCreditStrategy.ts

@@ -1,8 +1,9 @@
 import { ICreditStrategy, type CreditAllocationParams } from "./ICreditStrategy";
+import { isCreditPackage } from "../../../../utils/packageTypeDetector";
 
 /**
  * Default strategy for new purchases, renewals, or upgrades.
- * Resets credits to the calculated credit limit.
+ * Resets credits for subscriptions, but ADDS credits for consumable packages.
  */
 export class StandardPurchaseCreditStrategy implements ICreditStrategy {
     canHandle(_params: CreditAllocationParams): boolean {
@@ -11,6 +12,13 @@ export class StandardPurchaseCreditStrategy implements ICreditStrategy {
     }
 
     execute(params: CreditAllocationParams): number {
+        // If it's a credit package (consumable), we add to existing balance
+        if (params.productId && isCreditPackage(params.productId)) {
+            const existing = params.existingData?.credits ?? 0;
+            return existing + params.creditLimit;
+        }
+
+        // Standard subscription behavior: Reset to the calculated limit (e.g. 100/mo)
         return params.creditLimit;
     }
 }

package/src/domains/credits/application/credit-strategies/TrialCreditStrategy.ts

@@ -1,6 +1,6 @@
 import { ICreditStrategy, type CreditAllocationParams } from "./ICreditStrategy";
-import { SUBSCRIPTION_STATUS } from "../../../domain/entities/SubscriptionStatus";
-import { TRIAL_CONFIG } from "../TrialService";
+import { SUBSCRIPTION_STATUS } from "../../../subscription/core/SubscriptionConstants";
+import { TRIAL_CONFIG } from "../../../trial/core/TrialTypes";
 
 /**
  * Strategy for Trial and Trial Canceled users.

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

@@ -15,7 +15,11 @@ export class SubscriptionSyncService {
   async handlePurchase(userId: string, productId: string, customerInfo: CustomerInfo, source?: PurchaseSource) {
     try {
       const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
-      await getCreditsRepository().initializeCredits(userId, `purchase_${productId}_${Date.now()}`, productId, source, revenueCatData);
+      const purchaseId = revenueCatData.originalTransactionId 
+        ? `purchase_${revenueCatData.originalTransactionId}`
+        : `purchase_${productId}_${Date.now()}`;
+
+      await getCreditsRepository().initializeCredits(userId, purchaseId, productId, source, revenueCatData);
       
       // Notify listeners via Event Bus
       subscriptionEventBus.emit(SUBSCRIPTION_EVENTS.CREDITS_UPDATED, userId);
@@ -29,7 +33,11 @@ export class SubscriptionSyncService {
     try {
       const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
       revenueCatData.expirationDate = newExpirationDate || revenueCatData.expirationDate;
-      await getCreditsRepository().initializeCredits(userId, `renewal_${productId}_${Date.now()}`, productId, "renewal", revenueCatData);
+      const purchaseId = revenueCatData.originalTransactionId 
+        ? `renewal_${revenueCatData.originalTransactionId}_${newExpirationDate}`
+        : `renewal_${productId}_${Date.now()}`;
+
+      await getCreditsRepository().initializeCredits(userId, purchaseId, productId, "renewal", revenueCatData);
       
       subscriptionEventBus.emit(SUBSCRIPTION_EVENTS.CREDITS_UPDATED, userId);
       subscriptionEventBus.emit(SUBSCRIPTION_EVENTS.RENEWAL_DETECTED, { userId, productId });

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

@@ -1,6 +1,6 @@
 import type { CustomerInfo } from "react-native-purchases";
-import type { RevenueCatData } from "../../domain/types/RevenueCatData";
-import { type PeriodType } from "../../domain/entities/SubscriptionConstants";
+import type { RevenueCatData } from "../core/RevenueCatData";
+import { type PeriodType } from "../core/SubscriptionStatus";
 
 /** Extract RevenueCat data from CustomerInfo (Single Source of Truth) */
 export const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId: string): RevenueCatData => {
@@ -10,7 +10,9 @@ export const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId:
   return {
     expirationDate: entitlement?.expirationDate ?? customerInfo.latestExpirationDate ?? null,
     willRenew: entitlement?.willRenew ?? false,
-    originalTransactionId: entitlement?.originalPurchaseDate ?? undefined,
+    // Use latestPurchaseDate if originalPurchaseDate is missing, or a combine id
+    originalTransactionId: entitlement?.originalPurchaseDate || customerInfo.firstSeen, 
     periodType: entitlement?.periodType as PeriodType | undefined,
+    isPremium: !!customerInfo.entitlements.active[entitlementId],
   };
 };

package/src/utils/packageTypeDetector.ts

@@ -3,7 +3,7 @@
  * Detects subscription package type from RevenueCat package identifier
  */
 
-import { PACKAGE_TYPE, type PackageType } from "../domain/entities/SubscriptionConstants";
+import { PACKAGE_TYPE, type PackageType } from "../domains/subscription/core/SubscriptionConstants";
 
 export type SubscriptionPackageType = PackageType;
 
@@ -15,7 +15,7 @@ export type SubscriptionPackageType = PackageType;
  * Check if identifier is a credit package (consumable purchase)
  * Credit packages use a different system and don't need type detection
  */
-function isCreditPackage(identifier: string): boolean {
+export function isCreditPackage(identifier: string): boolean {
   // Matches "credit" as a word or part of a common naming pattern
   return /\bcredit\b|_credit_|-credit-/i.test(identifier) || identifier.toLowerCase().includes("credit");
 }