expo-helium 0.8.5 → 3.0.5

package/src/index.ts

@@ -2,7 +2,7 @@ import {
   DelegateActionEvent,
   HeliumConfig,
   HeliumPaywallEvent,
-  NativeHeliumConfig, PaywallInfo,
+  NativeHeliumConfig, PaywallEventHandlers, PaywallInfo, PresentUpsellParams,
 } from "./HeliumPaywallSdk.types";
 import HeliumPaywallSdkModule from "./HeliumPaywallSdkModule";
 import { EventSubscription } from 'expo-modules-core';
@@ -20,6 +20,10 @@ function addDelegateActionEventListener(listener: (event: DelegateActionEvent) =
   return HeliumPaywallSdkModule.addListener('onDelegateActionEvent', listener);
 }
 
+function addPaywallEventHandlersListener(listener: (event: HeliumPaywallEvent) => void): EventSubscription {
+  return HeliumPaywallSdkModule.addListener('paywallEventHandlers', listener);
+}
+
 let isInitialized = false;
 export const initialize = (config: HeliumConfig) => {
   if (isInitialized) {
@@ -29,36 +33,44 @@ export const initialize = (config: HeliumConfig) => {
 
   HeliumPaywallSdkModule.removeAllListeners('onHeliumPaywallEvent');
   HeliumPaywallSdkModule.removeAllListeners('onDelegateActionEvent');
+  HeliumPaywallSdkModule.removeAllListeners('paywallEventHandlers');
 
   // Set up listener for paywall events
   addHeliumPaywallEventListener((event) => {
+    handlePaywallEvent(event);
     config.onHeliumPaywallEvent(event);
   });
 
   // Set up delegate action listener for purchase and restore operations
-  addDelegateActionEventListener(async (event) => {
-    try {
-      if (event.type === 'purchase') {
-        if (event.productId) {
-          const result = await config.purchaseConfig.makePurchase(event.productId);
-          HeliumPaywallSdkModule.handlePurchaseResult(result.status, result.error);
-        } else {
-          HeliumPaywallSdkModule.handlePurchaseResult('failed', 'No product ID for purchase event.');
+  const purchaseConfig = config.purchaseConfig;
+  if (purchaseConfig) {
+    addDelegateActionEventListener(async (event) => {
+      try {
+        if (event.type === 'purchase') {
+          if (event.productId) {
+            const result = await purchaseConfig.makePurchase(event.productId);
+            HeliumPaywallSdkModule.handlePurchaseResult(result.status, result.error);
+          } else {
+            HeliumPaywallSdkModule.handlePurchaseResult('failed', 'No product ID for purchase event.');
+          }
+        } else if (event.type === 'restore') {
+          const success = await purchaseConfig.restorePurchases();
+          HeliumPaywallSdkModule.handleRestoreResult(success);
+        }
+      } catch (error) {
+        // Send failure result based on action type
+        if (event.type === 'purchase') {
+          console.log('[Helium] Unexpected error: ', error);
+          HeliumPaywallSdkModule.handlePurchaseResult('failed');
+        } else if (event.type === 'restore') {
+          HeliumPaywallSdkModule.handleRestoreResult(false);
         }
       }
-      else if (event.type === 'restore') {
-        const success = await config.purchaseConfig.restorePurchases();
-        HeliumPaywallSdkModule.handleRestoreResult(success);
-      }
-    } catch (error) {
-      // Send failure result based on action type
-      if (event.type === 'purchase') {
-        console.log('[Helium] Unexpected error: ', error);
-        HeliumPaywallSdkModule.handlePurchaseResult('failed');
-      } else if (event.type === 'restore') {
-        HeliumPaywallSdkModule.handleRestoreResult(false);
-      }
-    }
+    });
+  }
+
+  addPaywallEventHandlersListener((event) => {
+    callPaywallEventHandlers(event);
   });
 
   nativeInitializeAsync(config).catch(error => {
@@ -95,24 +107,27 @@ const nativeInitializeAsync = async (config: HeliumConfig) => {
     apiKey: config.apiKey,
     customUserId: config.customUserId,
     customAPIEndpoint: config.customAPIEndpoint,
-    customUserTraits: config.customUserTraits,
+    customUserTraits: convertBooleansToMarkers(config.customUserTraits),
     revenueCatAppUserId: config.revenueCatAppUserId,
     fallbackBundleUrlString: fallbackBundleUrlString,
     fallbackBundleString: fallbackBundleString,
+    paywallLoadingConfig: convertBooleansToMarkers(config.paywallLoadingConfig),
+    useDefaultDelegate: !config.purchaseConfig,
   };
 
   // Initialize the native module
   HeliumPaywallSdkModule.initialize(nativeConfig);
 };
 
+let paywallEventHandlers: PaywallEventHandlers | undefined;
+let presentOnFallback: (() => void) | undefined;
 export const presentUpsell = ({
                                 triggerName,
-                                onFallback
-                              }: {
-  triggerName: string;
-  onFallback?: () => void;
-}) => {
-  const { canPresent, reason } = HeliumPaywallSdkModule.canPresentUpsell(triggerName);
+                                onFallback,
+                                eventHandlers,
+                                customPaywallTraits,
+                              }: PresentUpsellParams) => {
+  const {canPresent, reason} = HeliumPaywallSdkModule.canPresentUpsell(triggerName);
 
   if (!canPresent) {
     console.log(
@@ -124,17 +139,83 @@ export const presentUpsell = ({
   }
 
   try {
-    HeliumPaywallSdkModule.presentUpsell(triggerName);
+    paywallEventHandlers = eventHandlers;
+    presentOnFallback = onFallback;
+    HeliumPaywallSdkModule.presentUpsell(triggerName, convertBooleansToMarkers(customPaywallTraits));
   } catch (error) {
     console.log('Helium present error', error);
+    paywallEventHandlers = undefined;
+    presentOnFallback = undefined;
     onFallback?.();
     HeliumPaywallSdkModule.fallbackOpenOrCloseEvent(triggerName, true, 'presented');
   }
 };
 
+function callPaywallEventHandlers(event: HeliumPaywallEvent) {
+  if (paywallEventHandlers) {
+    switch (event.type) {
+      case 'paywallOpen':
+        paywallEventHandlers?.onOpen?.({
+          type: 'paywallOpen',
+          triggerName: event.triggerName ?? 'unknown',
+          paywallName: event.paywallName ?? 'unknown',
+          isSecondTry: event.isSecondTry ?? false,
+          viewType: 'presented',
+        });
+        break;
+      case 'paywallClose':
+        paywallEventHandlers?.onClose?.({
+          type: 'paywallClose',
+          triggerName: event.triggerName ?? 'unknown',
+          paywallName: event.paywallName ?? 'unknown',
+          isSecondTry: event.isSecondTry ?? false,
+        });
+        break;
+      case 'paywallDismissed':
+        paywallEventHandlers?.onDismissed?.({
+          type: 'paywallDismissed',
+          triggerName: event.triggerName ?? 'unknown',
+          paywallName: event.paywallName ?? 'unknown',
+          isSecondTry: event.isSecondTry ?? false,
+        });
+        break;
+      case 'purchaseSucceeded':
+        paywallEventHandlers?.onPurchaseSucceeded?.({
+          type: 'purchaseSucceeded',
+          productId: event.productId ?? 'unknown',
+          triggerName: event.triggerName ?? 'unknown',
+          paywallName: event.paywallName ?? 'unknown',
+          isSecondTry: event.isSecondTry ?? false,
+        });
+        break;
+    }
+  }
+}
+
+function handlePaywallEvent(event: HeliumPaywallEvent) {
+  switch (event.type) {
+    case 'paywallClose':
+      if (!event.isSecondTry) {
+        paywallEventHandlers = undefined;
+      }
+      presentOnFallback = undefined;
+      break;
+    case 'paywallSkipped':
+      paywallEventHandlers = undefined;
+      presentOnFallback = undefined;
+      break;
+    case 'paywallOpenFailed':
+      paywallEventHandlers = undefined;
+      presentOnFallback?.();
+      presentOnFallback = undefined;
+      break;
+  }
+}
+
 export const hideUpsell = HeliumPaywallSdkModule.hideUpsell;
 export const hideAllUpsells = HeliumPaywallSdkModule.hideAllUpsells;
 export const getDownloadStatus = HeliumPaywallSdkModule.getDownloadStatus;
+export const setRevenueCatAppUserId = HeliumPaywallSdkModule.setRevenueCatAppUserId;
 
 export const getPaywallInfo = (trigger: string): PaywallInfo | undefined => {
   const result = HeliumPaywallSdkModule.getPaywallInfo(trigger);
@@ -161,9 +242,37 @@ export const handleDeepLink = (url: string | null) => {
   return false;
 };
 
-export {createCustomPurchaseConfig, HELIUM_CTA_NAMES} from './HeliumPaywallSdk.types';
+/**
+ * Recursively converts boolean values to special marker strings to preserve
+ * type information when passing through native bridge.
+ *
+ * Native bridge converts booleans to NSNumber (0/1), making them
+ * indistinguishable from actual numeric values. This helper converts:
+ * - true -> "__helium_rn_bool_true__"
+ * - false -> "__helium_rn_bool_false__"
+ * - All other values remain unchanged
+ */
+function convertBooleansToMarkers(input: Record<string, any> | undefined): Record<string, any> | undefined {
+  if (!input) return undefined;
 
-export type {
-  HeliumTransactionStatus,
-  HeliumConfig,
-} from './HeliumPaywallSdk.types';
+  const result: Record<string, any> = {};
+  for (const [key, value] of Object.entries(input)) {
+    result[key] = convertValueBooleansToMarkers(value);
+  }
+  return result;
+}
+/**
+ * Helper to recursively convert booleans in any value type
+ */
+function convertValueBooleansToMarkers(value: any): any {
+  if (typeof value === 'boolean') {
+    return value ? "__helium_rn_bool_true__" : "__helium_rn_bool_false__";
+  } else if (value && typeof value === 'object' && !Array.isArray(value)) {
+    return convertBooleansToMarkers(value);
+  } else if (value && Array.isArray(value)) {
+    return value.map(convertValueBooleansToMarkers);
+  }
+  return value;
+}
+
+export {createCustomPurchaseConfig, HELIUM_CTA_NAMES} from './HeliumPaywallSdk.types';

package/src/revenuecat/revenuecat.ts

@@ -1,6 +1,7 @@
 import Purchases, {PURCHASES_ERROR_CODE, PurchasesStoreProduct} from 'react-native-purchases';
 import type { PurchasesError, PurchasesPackage, CustomerInfoUpdateListener, CustomerInfo, PurchasesEntitlementInfo } from 'react-native-purchases';
 import {HeliumPurchaseConfig, HeliumPurchaseResult} from "../HeliumPaywallSdk.types";
+import {setRevenueCatAppUserId} from "../index";
 
 // Rename the factory function
 export function createRevenueCatPurchaseConfig(config?: {
@@ -8,7 +9,6 @@ export function createRevenueCatPurchaseConfig(config?: {
 }): HeliumPurchaseConfig {
     const rcHandler = new RevenueCatHeliumHandler(config?.apiKey);
     return {
-      apiKey: config?.apiKey,
       makePurchase: rcHandler.makePurchase.bind(rcHandler),
       restorePurchases: rcHandler.restorePurchases.bind(rcHandler),
     };
@@ -24,9 +24,8 @@ export class RevenueCatHeliumHandler {
     constructor(apiKey?: string) {
         if (apiKey) {
             Purchases.configure({ apiKey });
-        } else {
         }
-        this.initializePackageMapping();
+        void this.initializePackageMapping();
     }
 
     private async initializePackageMapping(): Promise<void> {
@@ -35,6 +34,9 @@ export class RevenueCatHeliumHandler {
         }
         this.initializationPromise = (async () => {
             try {
+                // Keep this value as up-to-date as possible
+                setRevenueCatAppUserId(await Purchases.getAppUserID());
+
                 const offerings = await Purchases.getOfferings();
                 const allOfferings = offerings.all;
                 for (const offering of Object.values(allOfferings)) {
@@ -64,6 +66,8 @@ export class RevenueCatHeliumHandler {
 
     async makePurchase(productId: string): Promise<HeliumPurchaseResult> {
         await this.ensureMappingInitialized();
+        // Keep this value as up-to-date as possible
+        setRevenueCatAppUserId(await Purchases.getAppUserID());
 
         const pkg: PurchasesPackage | undefined = this.productIdToPackageMapping[productId];
         let rcProduct: PurchasesStoreProduct | undefined;