@loyalytics/swan-react-native-sdk 2.3.0 → 2.3.1-beta.0

package/lib/commonjs/index.js

@@ -43,6 +43,7 @@ var _DeviceRegistrationService = require("./services/DeviceRegistrationService.j
 var _PushTokenService = require("./services/PushTokenService.js");
 var _NullPushProvider = require("./providers/NullPushProvider.js");
 var _SharedCredentialsManager = require("./utils/SharedCredentialsManager.js");
+var _NotificationSoundHelper = require("./utils/NotificationSoundHelper.js");
 var _ApiUrls = _interopRequireDefault(require("./constants/ApiUrls.js"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -2127,6 +2128,11 @@ class SwanSDK {
       // Get priority from payload (for Android 7.1 and below)
       const priority = this.getPriorityFromPayload(remoteMessage);
 
+      // Resolve sound from data.sound payload field
+      const soundConfig = (0, _NotificationSoundHelper.resolveSoundFromPayload)(remoteMessage?.data?.sound);
+      const androidSound = (0, _NotificationSoundHelper.buildAndroidSound)(soundConfig);
+      const iosSound = (0, _NotificationSoundHelper.buildIosSound)(soundConfig);
+
       // Build notification config
       const notificationConfig = {
         id: remoteMessage?.messageId || String(Date.now()),
@@ -2157,7 +2163,7 @@ class SwanSDK {
           foregroundPresentationOptions: {
             alert: true,
             badge: true,
-            sound: true
+            sound: soundConfig.enabled
           },
           // Pass through category for Content Extension (e.g., carousel)
           ...(remoteMessage?.category && {
@@ -2166,6 +2172,14 @@ class SwanSDK {
         }
       };
 
+      // Add sound if resolved
+      if (androidSound !== undefined) {
+        notificationConfig.android.sound = androidSound;
+      }
+      if (iosSound !== undefined) {
+        notificationConfig.ios.sound = iosSound;
+      }
+
       // Add image if present
       if (imageUrl) {
         // Dynamically import AndroidStyle to avoid import errors
@@ -2184,8 +2198,7 @@ class SwanSDK {
       // Display notification
       _Logger.default.log('[SwanSDK] Displaying notification on channel:', channelId, priority !== undefined ? `with priority: ${priority}` : '(using channel importance)');
       _Logger.default.log('[SwanSDK] Notification config:', JSON.stringify(notificationConfig));
-      const notificationId = await notifee.displayNotification(notificationConfig);
-      _Logger.default.log('[SwanSDK] Notification displayed successfully with ID:', notificationId);
+      await routeNotificationForDisplay(remoteMessage, notificationConfig, notifee);
     } catch (error) {
       _Logger.default.error('[SwanSDK] Error displaying foreground notification:', error);
       // Emit event so app can handle display on error
@@ -2939,18 +2952,18 @@ class SwanSDK {
    * @param description - User visible description
    * @param channelId - Custom Channel ID (defaults to App ID)
    */
-  async createNotificationChannel(channelName = 'General Notifications', importance = 4, description, channelId) {
+  async createNotificationChannel(channelName = 'General Notifications', importance = 4, description, channelId, sound) {
     // Use provided channelId or fallback to appId
     const id = channelId || this.appId;
 
     // Use new PushTokenService if available
     if (this.pushService) {
-      return await this.pushService.createNotificationChannel(id, channelName, importance, description);
+      return await this.pushService.createNotificationChannel(id, channelName, importance, description, sound);
     }
 
     // Fallback to firebaseManager for backward compatibility
     if (this.firebaseManager) {
-      return await this.firebaseManager.createNotificationChannel(id, channelName, importance, description);
+      return await this.firebaseManager.createNotificationChannel(id, channelName, importance, description, sound);
     }
     _Logger.default.warn('[SwanSDK] Push notifications not initialized');
     return null;
@@ -3271,6 +3284,44 @@ class SwanSDK {
   }
 }
 
+/**
+ * Routes notification display to either the native carousel module (Android)
+ * or Notifee's standard display. Shared between foreground and background handlers.
+ */
+exports.SwanEcomSDK = exports.default = SwanSDK;
+async function routeNotificationForDisplay(remoteMessage, notificationConfig, notifee) {
+  const isAndroidCarousel = _reactNative.Platform.OS === 'android' && remoteMessage?.data?.notificationType === 'carousel';
+  if (isAndroidCarousel) {
+    _Logger.default.log('[SwanSDK] Routing to native carousel template');
+    const {
+      SwanNotificationModule
+    } = _reactNative.NativeModules;
+    if (SwanNotificationModule) {
+      await SwanNotificationModule.displayTemplateNotification({
+        notificationType: remoteMessage.data.notificationType,
+        messageId: notificationConfig.id,
+        title: notificationConfig.title,
+        body: notificationConfig.body,
+        channelId: notificationConfig.android.channelId,
+        carouselMode: remoteMessage.data.carouselMode || 'manual',
+        carouselVariant: remoteMessage.data.carouselVariant || 'standard',
+        carouselItems: remoteMessage.data.carouselItems || '[]',
+        defaultRoute: remoteMessage.data.defaultRoute || '',
+        ...(remoteMessage.data.carouselInterval && {
+          carouselInterval: parseInt(remoteMessage.data.carouselInterval, 10)
+        })
+      });
+      _Logger.default.log('[SwanSDK] Native carousel displayed successfully');
+    } else {
+      _Logger.default.warn('[SwanSDK] SwanNotificationModule not available, falling back to Notifee');
+      await notifee.displayNotification(notificationConfig);
+    }
+  } else {
+    const notificationId = await notifee.displayNotification(notificationConfig);
+    _Logger.default.log('[SwanSDK] Notification displayed successfully with ID:', notificationId);
+  }
+}
+
 /**
  * Foreground Message Handler for index.js
  *
@@ -3289,7 +3340,6 @@ class SwanSDK {
  * messaging().onMessage(createForegroundMessageHandler());
  * ```
  */
-exports.SwanEcomSDK = exports.default = SwanSDK;
 function createForegroundMessageHandler() {
   return async remoteMessage => {
     _Logger.default.log('[SwanSDK] Foreground notification received:', remoteMessage?.messageId);
@@ -3351,12 +3401,9 @@ function createBackgroundMessageHandler() {
     // Handle silent push (no UI display)
     if (isSilent) {
       console.log('[SwanSDK] Silent push received in background, skipping notification display');
-      console.log('[SwanSDK] ✅ Silent push handled');
+      _Logger.default.log('[SwanSDK] ✅ Silent push handled');
       return;
     }
-    if (sdkInstance && sdkInstance.isReady()) {
-      await sdkInstance.sendNotificationAck(messageId, 'delivered');
-    }
     try {
       // Import notifee dynamically to avoid issues if not installed
       let notifee;
@@ -3371,10 +3418,10 @@ function createBackgroundMessageHandler() {
       // Android may kill headless JS task during network requests
       // So we must show notification before any network calls
       const messageId = remoteMessage?.messageId;
-      console.log('[SwanSDK] Background handler - messageId:', messageId);
+      _Logger.default.log('[SwanSDK] Background handler - messageId:', messageId);
 
       // Extract notification data from data payload (data-only messages)
-      console.log('[SwanSDK] Extracting notification data from payload...');
+      _Logger.default.log('[SwanSDK] Extracting notification data from payload...');
       const title = remoteMessage.data?.title || 'Notification';
       const body = remoteMessage.data?.body || 'New message';
       const imageUrl = remoteMessage.data?.image || remoteMessage.data?.fcm_options?.image || '';
@@ -3398,6 +3445,11 @@ function createBackgroundMessageHandler() {
       };
       const priority = getPriority();
 
+      // Resolve sound from data.sound payload field
+      const soundConfig = (0, _NotificationSoundHelper.resolveSoundFromPayload)(remoteMessage?.data?.sound);
+      const androidSound = (0, _NotificationSoundHelper.buildAndroidSound)(soundConfig);
+      const iosSound = (0, _NotificationSoundHelper.buildIosSound)(soundConfig);
+
       // Use messageId as notification ID for click tracking
       const notificationId = messageId || `swan_bg_${Date.now()}`;
       const notificationConfig = {
@@ -3420,9 +3472,18 @@ function createBackgroundMessageHandler() {
           pressAction: {
             id: 'default'
           }
-        }
+        },
+        ios: {}
       };
 
+      // Add sound if resolved
+      if (androidSound !== undefined) {
+        notificationConfig.android.sound = androidSound;
+      }
+      if (iosSound !== undefined) {
+        notificationConfig.ios.sound = iosSound;
+      }
+
       // Add iOS category for Content Extension (e.g., carousel)
       if (remoteMessage?.category) {
         notificationConfig.ios = {
@@ -3448,30 +3509,26 @@ function createBackgroundMessageHandler() {
           }]
         };
       }
-
-      // STEP 1: Display notification FIRST (fast local operation)
-      console.log('[SwanSDK] STEP 1: Displaying notification...');
-      await notifee.displayNotification(notificationConfig);
-      console.log('[SwanSDK] ✅ Notification displayed successfully');
+      await routeNotificationForDisplay(remoteMessage, notificationConfig, notifee);
 
       // STEP 2: Send delivery ACK (network operation - may be killed by OS)
-      console.log('[SwanSDK] STEP 2: Sending delivery ACK...');
+      _Logger.default.log('[SwanSDK] STEP 2: Sending delivery ACK...');
       const isSDKReady = sdkInstance && sdkInstance.isReady();
       if (isSDKReady) {
-        console.log('[SwanSDK] Using SDK instance for delivery ACK');
+        _Logger.default.log('[SwanSDK] Using SDK instance for delivery ACK');
         await sdkInstance.sendNotificationAck(messageId, 'delivered');
       } else if (messageId) {
         // SDK not fully initialized (app was killed) - send delivery ACK directly via fetch
         console.log('[SwanSDK] SDK not ready, sending delivery ACK via direct fetch');
         // Fire and forget - don't await since OS may kill us
         sendDirectNotificationAck(messageId, 'delivered').catch(err => {
-          console.log('[SwanSDK] Direct delivery ACK failed:', err);
+          _Logger.default.log('[SwanSDK] Direct delivery ACK failed:', err);
         });
       }
-      console.log('[SwanSDK] ✅ Background handler completed');
+      _Logger.default.log('[SwanSDK] ✅ Background handler completed');
     } catch (error) {
-      console.log('[SwanSDK] ❌ Error handling background message:', error?.message || error);
-      console.log('[SwanSDK] Error stack:', error?.stack);
+      _Logger.default.error('[SwanSDK] Error handling background message:', error?.message || error);
+      _Logger.default.error('[SwanSDK] Error stack:', error?.stack);
     }
   };
 }
@@ -3752,13 +3809,13 @@ async function sendDirectNotificationAck(messageId, event) {
     const Base64Module = require('react-native-base64').default;
 
     // Read credentials from AsyncStorage
-    console.log('[SwanSDK] Reading credentials from AsyncStorage...');
+    _Logger.default.log('[SwanSDK] Reading credentials from AsyncStorage...');
     const encoded = await AsyncStorageModule.getItem('swanCredentials');
     if (!encoded) {
       console.log(`[SwanSDK] No credentials found, cannot send ${event} ACK`);
       return;
     }
-    console.log('[SwanSDK] Credentials found, decoding...');
+    _Logger.default.log('[SwanSDK] Credentials found, decoding...');
     const credentials = JSON.parse(Base64Module.decode(encoded));
     const {
       appId,
@@ -3783,13 +3840,13 @@ async function sendDirectNotificationAck(messageId, event) {
     };
     const urlType = isProduction === 'PROD' ? 'PROD' : 'STAGE';
     console.log(`[SwanSDK] Sending ${event} ACK to: ${_ApiUrls.default.WEBHOOK_MOBILE_PUSH_URL[urlType]}`);
-    console.log('[SwanSDK] Payload:', JSON.stringify(payload));
+    _Logger.default.log('[SwanSDK] Payload:', JSON.stringify(payload));
     const controller = new AbortController();
     const timeoutId = setTimeout(() => {
-      console.log('[SwanSDK] ACK request timeout triggered (10s)');
+      _Logger.default.log('[SwanSDK] ACK request timeout triggered (10s)');
       controller.abort();
     }, 10000);
-    console.log('[SwanSDK] Starting fetch...');
+    _Logger.default.log('[SwanSDK] Starting fetch...');
     const response = await fetch(_ApiUrls.default.WEBHOOK_MOBILE_PUSH_URL[urlType], {
       method: 'POST',
       headers: {
@@ -3799,7 +3856,7 @@ async function sendDirectNotificationAck(messageId, event) {
       body: JSON.stringify(payload),
       signal: controller.signal
     });
-    console.log('[SwanSDK] Fetch completed, status:', response.status);
+    _Logger.default.log('[SwanSDK] Fetch completed, status:', response.status);
     clearTimeout(timeoutId);
     if (response.ok) {
       console.log(`[SwanSDK] ✅ ${event} ACK sent successfully via direct fetch`);
@@ -3808,7 +3865,7 @@ async function sendDirectNotificationAck(messageId, event) {
       console.log(`[SwanSDK] ${event} ACK failed - HTTP ${response.status}: ${responseText}`);
     }
   } catch (error) {
-    console.log('[SwanSDK] Caught error in sendDirectNotificationAck');
+    _Logger.default.log('[SwanSDK] Caught error in sendDirectNotificationAck');
     if (error?.name === 'AbortError') {
       console.log(`[SwanSDK] ${event} ACK timed out (AbortError)`);
     } else {