@loyalytics/swan-react-native-sdk 2.5.1-beta.5 → 2.5.1-beta.8

package/lib/module/index.js

@@ -116,7 +116,7 @@ function parseKeyValuePairs(data) {
  * Notifee handlers fire for the same notification.
  */
 const processedClickIds = new Set();
-const CLICK_ID_TTL_MS = 10_000; // Clear after 10 seconds
+const CLICK_ID_TTL_MS = 30_000; // Clear after 30 seconds
 
 function markClickProcessed(id) {
   if (processedClickIds.has(id)) {
@@ -127,9 +127,17 @@ function markClickProcessed(id) {
   return true; // First time processing
 }
 
+/**
+ * Track messageIds that already received a direct click ACK from the background
+ * handler when the SDK was not ready. Prevents setupNotifeeEventListeners from
+ * sending a duplicate click ACK for the same notification.
+ */
+const directAckSentIds = new Set();
+
 /** @internal Test-only: reset click deduplication state */
 export function _resetClickDedup() {
   processedClickIds.clear();
+  directAckSentIds.clear();
 }
 
 /**
@@ -615,22 +623,32 @@ export default class SwanSDK {
     }
     this.listeners[event].push(callback);
 
-    // On first NOTIFICATION_OPENED listener, check for pending cold-start notifications.
-    // The native side holds click data until consumed — we just need to ask when ready.
-    if (event === SwanSDK.EVENTS.NOTIFICATION_OPENED && !this.coldStartCheckDone) {
-      this.coldStartCheckDone = true;
+    // On every NOTIFICATION_OPENED listener registration, check for buffered notifications.
+    // Runs on cold start (process dead → getInitialNotification buffered), warm restart
+    // (process alive but Activity destroyed by swipe-from-recents on Android), and
+    // Metro hot-reload (component unmount/remount cycles).
+    if (event === SwanSDK.EVENTS.NOTIFICATION_OPENED) {
       // Defer to next microtask so the listener is fully registered before events emit
       Promise.resolve().then(() => {
-        // Deliver buffered standard/image push notification (one-shot APIs like
-        // getInitialNotification() can't be re-read — data was buffered in emitNotificationOpened).
-        // Skip carousel notifications — checkPendingCarouselClick() handles those with per-item routes.
-        const payload = this.pendingNotificationPayload;
-        this.pendingNotificationPayload = null;
-        if (payload && payload.notificationType !== 'carousel') {
-          this.emitNotificationOpened(payload);
+        // Deliver buffered standard/image push notification.
+        // Skip carousel — checkPendingCarouselClick() handles those with per-item routes.
+        if (this.pendingNotificationPayload) {
+          const payload = this.pendingNotificationPayload;
+          this.pendingNotificationPayload = null;
+          if (payload.notificationType !== 'carousel') {
+            this.emit(SwanSDK.EVENTS.NOTIFICATION_OPENED, payload);
+            this.emitDeepLinkOpened({
+              ...payload,
+              source: 'push'
+            });
+          }
         }
-        // Check for pending carousel click (native side holds data until consumed)
+        // Check for pending carousel click (native side holds data until consumed).
+        // Unconditional: handles both cold start and warm restart carousel taps.
         this.checkPendingCarouselClick();
+        if (!this.coldStartCheckDone) {
+          this.coldStartCheckDone = true;
+        }
       });
     }
 
@@ -660,9 +678,11 @@ export default class SwanSDK {
    */
   emitNotificationOpened(payload) {
     const listeners = this.listeners[SwanSDK.EVENTS.NOTIFICATION_OPENED];
-    if ((!listeners || listeners.length === 0) && !this.coldStartCheckDone) {
-      // Cold start: buffer for delivery when first listener registers.
-      // One-shot APIs like getInitialNotification() won't have this data later.
+    if (!listeners || listeners.length === 0) {
+      // No listeners yet — buffer for delivery when first listener registers.
+      // Handles: true cold start (process dead), Activity recreation (process alive
+      // but Activity destroyed by swipe-from-recents on Android), and Metro
+      // hot-reload (component unmount/remount cycles).
       Logger.log('[SwanSDK] Buffering notification payload for deferred delivery');
       this.pendingNotificationPayload = payload;
       return;
@@ -2882,31 +2902,48 @@ export default class SwanSDK {
       // similar to how Firebase requires onMessage() at module level.
 
       // Check if app was opened by tapping a Notifee-displayed notification (data-only architecture)
-      // Notifee's getInitialNotification() returns { notification, pressAction }.
-      // The FCM data we stored via displayNotification({ data: {...} }) lives at
-      // notification.data — NOT at the top-level .data (which doesn't exist).
       const initialNotification = await notifee.getInitialNotification();
+      Logger.log('[SwanSDK] getInitialNotification result:', JSON.stringify(initialNotification, null, 2));
       if (initialNotification && !this.initialNotificationHandled) {
-        const messageId = initialNotification?.notification?.id;
-        const notificationData = initialNotification.notification?.data || {};
-        if (messageId && markClickProcessed(messageId)) {
-          Logger.log('[SwanSDK] App opened from Notifee notification tap:', messageId);
-          this.initialNotificationHandled = true;
-          await this.sendNotificationAck(messageId, 'clicked');
+        // Notifee returned an initial notification — mark as handled
+        // unconditionally to prevent Firebase fallback from double-emitting.
+        this.initialNotificationHandled = true;
+        if (!this.isPushEnabled()) {
+          Logger.log('[SwanSDK] Push notifications disabled, ignoring initial notification');
+        } else {
+          const notificationData = initialNotification.notification?.data || {};
+          const messageId = notificationData.messageId;
+
+          // Carousel notifications: skip standard path entirely.
+          // checkPendingCarouselClick() (triggered by addListener) handles
+          // per-item routes from native storage / App Group.
+          if (notificationData.notificationType === 'carousel') {
+            Logger.log('[SwanSDK] Carousel initial notification, deferring to checkPendingCarouselClick');
+          } else if (messageId && !markClickProcessed(messageId)) {
+            Logger.log('[SwanSDK] Click already processed for messageId:', messageId);
+          } else {
+            Logger.log('[SwanSDK] App opened from Notifee notification tap:', messageId);
+
+            // Extract deep link information
+            const resolvedRoute = notificationData.route || notificationData.defaultRoute;
+            const deepLinkPayload = {
+              ...notificationData,
+              route: resolvedRoute,
+              keyValuePairs: parseKeyValuePairs(notificationData),
+              title: initialNotification.notification?.title || notificationData.title,
+              body: initialNotification.notification?.body || notificationData.body
+            };
+
+            // Emit deep link FIRST to ensure delivery even if ACK fails
+            Logger.log('[SwanSDK] Cold-start deepLinkPayload:', JSON.stringify(deepLinkPayload, null, 2));
+            this.emitNotificationOpened(deepLinkPayload);
+
+            // Send click ACK after emit (skip if background handler already sent one)
+            if (messageId && !directAckSentIds.has(messageId)) {
+              await this.sendNotificationAck(messageId, 'clicked');
+            }
+          }
         }
-        // Extract deep link information
-        // For carousel notifications, the default route is in 'defaultRoute' field
-        const resolvedRoute = notificationData.route || notificationData.defaultRoute;
-        const deepLinkPayload = {
-          ...notificationData,
-          route: resolvedRoute,
-          keyValuePairs: parseKeyValuePairs(notificationData),
-          title: initialNotification.notification?.title || notificationData.title,
-          body: initialNotification.notification?.body || notificationData.body
-        };
-
-        // Emit notificationOpened event for host app to handle deep linking
-        this.emitNotificationOpened(deepLinkPayload);
       }
 
       // Also check Firebase's getInitialNotification for iOS auto-displayed notifications
@@ -2930,7 +2967,21 @@ export default class SwanSDK {
       const messaging = require('@react-native-firebase/messaging').default;
       const initialNotification = await messaging().getInitialNotification();
       if (initialNotification && !this.initialNotificationHandled) {
-        const messageId = initialNotification.messageId;
+        this.initialNotificationHandled = true;
+        if (!this.isPushEnabled()) {
+          Logger.log('[SwanSDK] Push notifications disabled, ignoring Firebase initial notification');
+          return;
+        }
+        const notificationData = initialNotification.data || {};
+        // Use custom messageId from data (consistent with Notifee handlers),
+        // fall back to Firebase's system messageId
+        const messageId = notificationData.messageId || initialNotification.messageId;
+
+        // Carousel notifications: defer to checkPendingCarouselClick for per-item routes
+        if (notificationData.notificationType === 'carousel') {
+          Logger.log('[SwanSDK] Carousel Firebase initial notification, deferring to checkPendingCarouselClick');
+          return;
+        }
 
         // Deduplication: prevent double click handling
         if (messageId && !markClickProcessed(messageId)) {
@@ -2939,12 +2990,7 @@ export default class SwanSDK {
         }
         Logger.log('[SwanSDK] App opened from Firebase notification (killed state):', messageId);
 
-        // Mark as handled to prevent duplicate ACKs
-        this.initialNotificationHandled = true;
-        const notificationData = initialNotification.data || {};
-
         // Extract deep link information
-        // For carousel notifications, the default route is in 'defaultRoute' field
         const resolvedRoute = notificationData.route || notificationData.defaultRoute;
         const deepLinkPayload = {
           ...notificationData,
@@ -2954,13 +3000,11 @@ export default class SwanSDK {
           body: initialNotification.notification?.body || notificationData.body
         };
 
-        // Emit notificationOpened event for host app to handle deep linking
+        // Emit deep link FIRST, then ACK
         this.emitNotificationOpened(deepLinkPayload);
-
-        // Send click ACK
-        if (messageId) {
+        if (messageId && !directAckSentIds.has(messageId)) {
           await this.sendNotificationAck(messageId, 'clicked');
-          Logger.log('[SwanSDK] ✅ Firebase initial notification click ACK sent');
+          Logger.log('[SwanSDK] Firebase initial notification click ACK sent');
         }
       }
     } catch (error) {
@@ -3811,7 +3855,7 @@ export function createNotificationOpenedHandler() {
         Logger.warn('[SwanSDK] No messageId in notification data, skipping click ACK');
       }
     } catch (error) {
-      Logger.error('[SwanSDK] Error handling Notifee foreground event:', error);
+      Logger.error('[SwanSDK] Error handling notification opened event:', error);
     }
   };
 }
@@ -3949,41 +3993,8 @@ export function createNotifeeBackgroundHandler() {
       // Get messageId and notification data
       const messageId = detail?.notification?.data?.messageId;
       const notificationData = detail?.notification?.data || {};
-
-      // Deduplication: prevent double click handling
-      if (messageId && !markClickProcessed(messageId)) {
-        Logger.log('[SwanSDK] Click already processed for messageId:', messageId);
-        return;
-      }
-
-      // Extract deep link information
-      // Note: route field can contain either a path (/products/123) or full URL (myapp://products/123)
-      // For carousel notifications, the default route is in 'defaultRoute' field
-      let route = notificationData.route || notificationData.defaultRoute;
-
-      // For carousel notifications on iOS, the Content Extension saves per-item
-      // click data (including item-specific route) to the App Group.
-      if (Platform.OS === 'ios' && notificationData.notificationType === 'carousel') {
-        try {
-          const clickData = await SharedCredentialsManager.readTemplateClickData();
-          if (clickData?.route) {
-            Logger.log('[SwanSDK] Background: carousel item route from Content Extension:', clickData.route);
-            route = clickData.route;
-          }
-        } catch (err) {
-          Logger.warn('[SwanSDK] Failed to read Content Extension click data:', err);
-        }
-      }
-      const deepLinkPayload = {
-        ...notificationData,
-        route,
-        keyValuePairs: parseKeyValuePairs(notificationData),
-        title: detail?.notification?.title,
-        body: detail?.notification?.body
-      };
       Logger.log('[SwanSDK] Background notification clicked:', {
         messageId,
-        route: deepLinkPayload.route,
         type: notificationData.notificationType
       });
 
@@ -3991,10 +4002,39 @@ export function createNotifeeBackgroundHandler() {
       const sdkInstance = SwanSDK.getCurrentInstance();
       const isSDKReady = sdkInstance && sdkInstance.isReady();
       if (isSDKReady) {
+        // Deduplication: only when SDK can deliver the deep link
+        if (messageId && !markClickProcessed(messageId)) {
+          Logger.log('[SwanSDK] Click already processed for messageId:', messageId);
+          return;
+        }
         if (!sdkInstance.isPushEnabled()) {
           return;
         }
 
+        // Extract deep link information
+        let route = notificationData.route || notificationData.defaultRoute;
+
+        // For carousel notifications on iOS, the Content Extension saves per-item
+        // click data (including item-specific route) to the App Group.
+        if (Platform.OS === 'ios' && notificationData.notificationType === 'carousel') {
+          try {
+            const clickData = await SharedCredentialsManager.readTemplateClickData();
+            if (clickData?.route) {
+              Logger.log('[SwanSDK] Background: carousel item route from Content Extension:', clickData.route);
+              route = clickData.route;
+            }
+          } catch (err) {
+            Logger.warn('[SwanSDK] Failed to read Content Extension click data:', err);
+          }
+        }
+        const deepLinkPayload = {
+          ...notificationData,
+          route,
+          keyValuePairs: parseKeyValuePairs(notificationData),
+          title: detail?.notification?.title,
+          body: detail?.notification?.body
+        };
+
         // Emit notificationOpened event for host app to handle
         sdkInstance.emitNotificationOpened(deepLinkPayload);
         Logger.log('[SwanSDK] Background: emitted notificationOpened with route:', deepLinkPayload.route);
@@ -4007,9 +4047,12 @@ export function createNotifeeBackgroundHandler() {
         return;
       }
 
-      // SDK not ready (app was killed) - send ACK directly via fetch
+      // SDK not ready (app was killed) — send ACK directly via fetch.
+      // Do NOT markClickProcessed here: setupNotifeeEventListeners will
+      // handle dedup and deep link routing when the SDK initializes.
       Logger.log('[SwanSDK] SDK not ready, sending click ACK via direct fetch');
       if (messageId) {
+        directAckSentIds.add(messageId);
         await sendDirectNotificationAck(messageId, 'clicked');
       }
     } catch (error) {