appambit-push-notifications 0.3.1 → 1.0.1

package/ios/AppambitPushNotifications.mm

@@ -1,12 +1,67 @@
 #import "AppambitPushNotifications.h"
 #import <AppAmbitSdkPushNotifications-Swift.h>
 
+// Defined in AppAmbitNotificationSwizzler.m — call when JS background handler resolves
+extern "C" void AppAmbitNotifyJSBackgroundHandlerCompleted(void);
+
+static NSString * const kPushEnabledStateKey = @"appambit_push_enabled_state";
+static NSString * const kPushHasStateKey     = @"appambit_push_has_enabled_state";
+// Pending consumer-sync intent: the last value the user toggled that has not yet
+// been confirmed as delivered to the backend. Replayed when connectivity returns.
+static NSString * const kPushPendingKey      = @"appambit_push_pending_sync";
+static NSString * const kPushPendingValueKey = @"appambit_push_pending_value";
+
 @implementation AppambitPushNotifications {
   BOOL _hasListeners;
+  BOOL _sdkListenerInstalled;
+  NSMutableArray<NSDictionary *> *_pendingBackgroundEvents;
+  NSMutableArray<NSDictionary *> *_pendingOpenedEvents;
+  NSMutableArray<NSDictionary *> *_pendingForegroundEvents;
 }
 
 RCT_EXPORT_MODULE(AppambitPushNotifications)
 
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    _pendingBackgroundEvents = [NSMutableArray new];
+    _pendingOpenedEvents     = [NSMutableArray new];
+    _pendingForegroundEvents = [NSMutableArray new];
+    NSArray<NSDictionary *> *earlyBackground = [AppAmbitPushWrapper getAndClearPendingBackgroundPayloads];
+    if (earlyBackground.count > 0) {
+      [_pendingBackgroundEvents addObjectsFromArray:earlyBackground];
+    }
+
+    NSArray<NSDictionary *> *earlyOpened = [AppAmbitPushWrapper getAndClearPendingOpenedPayloads];
+    if (earlyOpened.count > 0) {
+      [_pendingOpenedEvents addObjectsFromArray:earlyOpened];
+    }
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleBackgroundNotification:)
+                                                 name:@"AppAmbit_onBackgroundNotification"
+                                               object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleOpenedNotification:)
+                                                 name:@"AppAmbit_onOpenedNotification"
+                                               object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleAppBecameActive:)
+                                                 name:UIApplicationDidBecomeActiveNotification
+                                               object:nil];
+
+    // Replay any deferred consumer sync as soon as the network comes back.
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleNetworkAvailable:)
+                                                 name:@"AppAmbit_networkAvailable"
+                                               object:nil];
+    [AppAmbitPushWrapper startNetworkMonitor];
+  }
+  return self;
+}
+
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
@@ -16,20 +71,131 @@ RCT_EXPORT_MODULE(AppambitPushNotifications)
 // MARK: - Event Emitter
 
 - (NSArray<NSString *> *)supportedEvents {
-  return @[@"onNotificationReceived"];
+  return @[
+    @"AppAmbit_onForegroundNotification",
+    @"AppAmbit_onBackgroundNotification",
+    @"AppAmbit_onOpenedNotification"
+  ];
 }
 
 - (void)startObserving {
   _hasListeners = YES;
 }
 
+// Called lazily the first time JS subscribes to any event — mirrors Flutter's
+// installNotificationListenerIfNeeded. At this point _hasListeners is already
+// YES (set by startObserving via [super addListener:]) so SDK cold-start replay
+// can be sent immediately, exactly like Flutter's DispatchQueue.main.async trick.
+- (void)installSDKListenerIfNeeded {
+  if (_sdkListenerInstalled) return;
+  _sdkListenerInstalled = YES;
+
+  __weak AppambitPushNotifications *weakSelf = self;
+  [AppAmbitPushWrapper setNotificationListener:^(NSDictionary * _Nonnull payload, NSInteger state) {
+    AppambitPushNotifications *strongSelf = weakSelf;
+    if (!strongSelf) return;
+
+    if (state == 0) {
+      // Foreground
+      if (strongSelf->_hasListeners) {
+        [strongSelf sendEventWithName:@"AppAmbit_onForegroundNotification" body:payload];
+      } else {
+        [strongSelf->_pendingForegroundEvents addObject:payload];
+      }
+    } else {
+      // Opened/tapped — queue if app is still transitioning; applicationDidBecomeActive: flushes.
+      // Do NOT call isDuplicateOpenedPayload: here — it marks the payload as seen even when
+      // _hasListeners is NO, which would cause the subsequent flush in addListener: to skip it.
+      BOOL appIsActive = [UIApplication sharedApplication].applicationState == UIApplicationStateActive;
+      if (strongSelf->_hasListeners && appIsActive) {
+        if (![strongSelf isDuplicateOpenedPayload:payload]) {
+          [strongSelf sendEventWithName:@"AppAmbit_onOpenedNotification" body:payload];
+        }
+      } else {
+        [strongSelf->_pendingOpenedEvents addObject:payload];
+      }
+    }
+  }];
+}
+
+- (void)handleBackgroundNotification:(NSNotification *)notification {
+  if (!notification.userInfo) return;
+  if (_hasListeners) {
+    [self sendEventWithName:@"AppAmbit_onBackgroundNotification" body:notification.userInfo];
+  } else {
+    [_pendingBackgroundEvents addObject:notification.userInfo];
+  }
+}
+
+- (void)handleAppBecameActive:(NSNotification *)notification {
+  // The SDK has had time to finish its async init (and register the device token)
+  // by the time the app becomes active, so this is a safe place to replay a
+  // deferred consumer sync (covers "toggle offline → reopen online").
+  [self flushPendingConsumerSync];
+
+  if (!_hasListeners || _pendingOpenedEvents.count == 0) return;
+  NSArray<NSDictionary *> *toSend = [_pendingOpenedEvents copy];
+  [_pendingOpenedEvents removeAllObjects];
+  for (NSDictionary *payload in toSend) {
+    if (![self isDuplicateOpenedPayload:payload]) {
+      [self sendEventWithName:@"AppAmbit_onOpenedNotification" body:payload];
+    }
+  }
+}
+
+- (void)handleNetworkAvailable:(NSNotification *)notification {
+  [self flushPendingConsumerSync];
+}
+
+- (void)handleOpenedNotification:(NSNotification *)notification {
+  if (!notification.userInfo) return;
+  // Only call isDuplicateOpenedPayload: when actually sending to JS.
+  // Calling it when _hasListeners is NO would mark the payload as seen before it's
+  // delivered, causing the addListener: flush to skip it (the payload never reaches JS).
+  if (_hasListeners) {
+    if (![self isDuplicateOpenedPayload:notification.userInfo]) {
+      [self sendEventWithName:@"AppAmbit_onOpenedNotification" body:notification.userInfo];
+    }
+  } else {
+    [_pendingOpenedEvents addObject:notification.userInfo];
+  }
+}
+
+- (BOOL)isDuplicateOpenedPayload:(NSDictionary *)payload {
+  static NSMutableArray<NSDictionary *> *sentPayloads = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    sentPayloads = [NSMutableArray new];
+  });
+
+  for (NSDictionary *sent in sentPayloads) {
+    if ([sent isEqualToDictionary:payload]) {
+      return YES;
+    }
+  }
+
+  [sentPayloads addObject:payload];
+  if (sentPayloads.count > 10) {
+    [sentPayloads removeObjectAtIndex:0];
+  }
+  return NO;
+}
+
 - (void)stopObserving {
   _hasListeners = NO;
 }
 
+- (void)dealloc {
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 // MARK: - TurboModule Methods
 
 - (void)start {
+  // Initialize the SDK. Do NOT call flushPendingSyncIfNeeded here — PushNotifications.start()
+  // registers the device token asynchronously, so getCurrentToken() returns nil immediately
+  // after start(), causing updateConsumer to fail. handleAppBecameActive: fires after the SDK
+  // has had time to complete its async init and is the correct place to flush pending sync.
   [AppAmbitPushWrapper start];
 }
 
@@ -40,31 +206,119 @@ RCT_EXPORT_MODULE(AppambitPushNotifications)
 - (void)requestNotificationPermissionWithResult:(RCTPromiseResolveBlock)resolve
                                          reject:(RCTPromiseRejectBlock)reject {
   [AppAmbitPushWrapper requestNotificationPermissionWithListener:^(BOOL granted) {
+    if (granted) {
+      // Cache immediately so hasNotificationPermission() returns true on next
+      // restart even if the system permission resets (e.g. simulator reinstall).
+      [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"appambit_push_has_permission"];
+      [[NSUserDefaults standardUserDefaults] synchronize];
+    }
     resolve(@(granted));
   }];
 }
 
 - (void)setNotificationsEnabled:(BOOL)enabled {
-  [AppAmbitPushWrapper setNotificationsEnabled:enabled];
+  NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+  // 1. Persist the user's intended state for UI consistency across restarts.
+  [ud setBool:enabled forKey:kPushEnabledStateKey];
+  [ud setBool:YES forKey:kPushHasStateKey];
+  // 2. Record a pending consumer-sync intent. It is cleared only once the
+  //    backend update actually succeeds (see flushPendingConsumerSync).
+  [ud setBool:enabled forKey:kPushPendingValueKey];
+  [ud setBool:YES forKey:kPushPendingKey];
+  [ud synchronize];
+  // 3. Update the SDK's local enabled flag (no network) so cold-start token
+  //    sync knows the user's intent.
+  [AppAmbitPushWrapper setNotificationsEnabledLocal:enabled];
+  // 4. Try to push it to the backend now. When offline this is a no-op: calling
+  //    updateConsumer offline poisons the SDK's dedup cache (it writes the new
+  //    state to its DB before the failed network send, so identical retries are
+  //    skipped as "already synced"). The pending intent is replayed when the
+  //    network returns or the app becomes active.
+  [self flushPendingConsumerSync];
 }
 
 - (void)isNotificationsEnabled:(RCTPromiseResolveBlock)resolve
                         reject:(RCTPromiseRejectBlock)reject {
-  resolve(@([AppAmbitPushWrapper isNotificationsEnabled]));
+  NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+  if ([ud boolForKey:kPushHasStateKey]) {
+    // Return our own persisted state — this is always the last value the user
+    // explicitly set, survives cold restarts and SDK state inconsistencies.
+    resolve(@([ud boolForKey:kPushEnabledStateKey]));
+  } else {
+    // First-ever launch: no stored state yet, ask the SDK.
+    resolve(@([AppAmbitPushWrapper isNotificationsEnabled]));
+  }
 }
 
-- (void)setNotificationCustomizer {
-  __weak AppambitPushNotifications *weakSelf = self;
-  [AppAmbitPushWrapper setNotificationCustomizer:^(NSDictionary * _Nonnull payload) {
-    AppambitPushNotifications *strongSelf = weakSelf;
-    if (strongSelf && strongSelf->_hasListeners) {
-      [strongSelf sendEventWithName:@"onNotificationReceived" body:payload];
+- (void)hasNotificationPermission:(RCTPromiseResolveBlock)resolve
+                            reject:(RCTPromiseRejectBlock)reject {
+  [AppAmbitPushWrapper hasNotificationPermissionWithCompletion:^(BOOL granted) {
+    resolve(@(granted));
+  }];
+}
+
+// Called by JS when the background notification async handler Promise resolves.
+// Signals the iOS system that background processing is complete so iOS can reclaim
+// time and allow future background wake-ups.
+- (void)backgroundHandlerCompleted {
+  AppAmbitNotifyJSBackgroundHandlerCompleted();
+}
+
+// MARK: - Offline-resilient consumer sync
+
+// Replays the pending consumer-sync intent to the backend when online. The SDK
+// has no offline retry queue and dedups consumer updates against its local DB,
+// so we must only call updateConsumer with real connectivity. The pending flag
+// is cleared only on a confirmed successful backend update.
+- (void)flushPendingConsumerSync {
+  NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+  if (![ud boolForKey:kPushPendingKey]) return;
+  if (![AppAmbitPushWrapper isNetworkAvailable]) return;
+
+  BOOL desired = [ud boolForKey:kPushPendingValueKey];
+  [AppAmbitPushWrapper setNotificationsEnabled:desired completion:^(BOOL success) {
+    if (!success) return;
+    NSUserDefaults *u = [NSUserDefaults standardUserDefaults];
+    // Only clear if the pending value still matches what we just synced — a
+    // newer toggle during the network call must keep its own pending intent.
+    if ([u boolForKey:kPushPendingKey] && [u boolForKey:kPushPendingValueKey] == desired) {
+      [u removeObjectForKey:kPushPendingKey];
+      [u removeObjectForKey:kPushPendingValueKey];
+      [u synchronize];
     }
   }];
 }
 
 - (void)addListener:(NSString *)eventName {
-  [super addListener:eventName];
+  [super addListener:eventName]; // sets _hasListeners = YES via startObserving
+
+  // Install SDK listener once JS is ready — same as Flutter's installNotificationListenerIfNeeded.
+  // _hasListeners is now YES so SDK cold-start replay fires sendEventWithName: directly.
+  [self installSDKListenerIfNeeded];
+
+  if ([eventName isEqualToString:@"AppAmbit_onBackgroundNotification"]) {
+    for (NSDictionary *payload in _pendingBackgroundEvents) {
+      [self sendEventWithName:@"AppAmbit_onBackgroundNotification" body:payload];
+    }
+    [_pendingBackgroundEvents removeAllObjects];
+  } else if ([eventName isEqualToString:@"AppAmbit_onForegroundNotification"]) {
+    for (NSDictionary *payload in _pendingForegroundEvents) {
+      [self sendEventWithName:@"AppAmbit_onForegroundNotification" body:payload];
+    }
+    [_pendingForegroundEvents removeAllObjects];
+  } else if ([eventName isEqualToString:@"AppAmbit_onOpenedNotification"]) {
+    NSArray<NSDictionary *> *earlyOpened = [AppAmbitPushWrapper getAndClearPendingOpenedPayloads];
+    if (earlyOpened.count > 0) {
+      [_pendingOpenedEvents addObjectsFromArray:earlyOpened];
+    }
+
+    for (NSDictionary *payload in _pendingOpenedEvents) {
+      if (![self isDuplicateOpenedPayload:payload]) {
+        [self sendEventWithName:@"AppAmbit_onOpenedNotification" body:payload];
+      }
+    }
+    [_pendingOpenedEvents removeAllObjects];
+  }
 }
 
 - (void)removeListeners:(double)count {

package/lib/module/NativeAppambitPushNotifications.js.map

@@ -1 +1 @@
-{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeAppambitPushNotifications.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAA0B,cAAc;AAcpE,eAAeA,mBAAmB,CAACC,YAAY,CAAO,2BAA2B,CAAC","ignoreList":[]}
+{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeAppambitPushNotifications.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAA0B,cAAc;AAoBpE,eAAeA,mBAAmB,CAACC,YAAY,CAAO,2BAA2B,CAAC","ignoreList":[]}

package/lib/module/index.js

@@ -1,8 +1,15 @@
 "use strict";
 
-import { NativeEventEmitter } from 'react-native';
+import { NativeEventEmitter, Platform } from 'react-native';
 import AppambitPushNotifications from "./NativeAppambitPushNotifications.js";
+export const BACKGROUND_NOTIFICATION_TASK = 'AppAmbitBackgroundNotification';
+const EVENT_FOREGROUND = 'AppAmbit_onForegroundNotification';
+const EVENT_BACKGROUND = 'AppAmbit_onBackgroundNotification';
+const EVENT_OPENED = 'AppAmbit_onOpenedNotification';
 const eventEmitter = new NativeEventEmitter(AppambitPushNotifications);
+let foregroundSub = null;
+let backgroundSub = null;
+let openedSub = null;
 export const start = () => {
   AppambitPushNotifications.start();
 };
@@ -10,19 +17,48 @@ export const requestNotificationPermission = () => {
   AppambitPushNotifications.requestNotificationPermission();
 };
 export const requestNotificationPermissionWithResult = async () => {
-  return await AppambitPushNotifications.requestNotificationPermissionWithResult();
+  return AppambitPushNotifications.requestNotificationPermissionWithResult();
 };
 export const setNotificationsEnabled = enabled => {
   AppambitPushNotifications.setNotificationsEnabled(enabled);
 };
 export const isNotificationsEnabled = async () => {
-  return await AppambitPushNotifications.isNotificationsEnabled();
-};
-export const setNotificationCustomizer = callback => {
-  AppambitPushNotifications.setNotificationCustomizer();
-  eventEmitter.removeAllListeners('onNotificationReceived');
-  eventEmitter.addListener('onNotificationReceived', payload => {
-    callback(payload);
-  });
+  return AppambitPushNotifications.isNotificationsEnabled();
+};
+export const hasNotificationPermission = async () => {
+  return AppambitPushNotifications.hasNotificationPermission();
+};
+export const setForegroundListener = callback => {
+  foregroundSub?.remove();
+  foregroundSub = eventEmitter.addListener(EVENT_FOREGROUND, callback);
+  return () => {
+    foregroundSub?.remove();
+    foregroundSub = null;
+  };
+};
+export const setOpenedListener = callback => {
+  openedSub?.remove();
+  openedSub = eventEmitter.addListener(EVENT_OPENED, callback);
+  return () => {
+    openedSub?.remove();
+    openedSub = null;
+  };
+};
+export const Android = {
+  setBackgroundListener: callback => {
+    if (Platform.OS !== 'android') {
+      return () => {};
+    }
+    backgroundSub?.remove();
+    backgroundSub = eventEmitter.addListener(EVENT_BACKGROUND, payload => {
+      void callback(payload).finally(() => {
+        AppambitPushNotifications.backgroundHandlerCompleted();
+      });
+    });
+    return () => {
+      backgroundSub?.remove();
+      backgroundSub = null;
+    };
+  }
 };
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeEventEmitter","AppambitPushNotifications","eventEmitter","start","requestNotificationPermission","requestNotificationPermissionWithResult","setNotificationsEnabled","enabled","isNotificationsEnabled","setNotificationCustomizer","callback","removeAllListeners","addListener","payload"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,cAAc;AACjD,OAAOC,yBAAyB,MAAM,sCAAmC;AAEzE,MAAMC,YAAY,GAAG,IAAIF,kBAAkB,CAACC,yBAAyB,CAAC;AAUtE,OAAO,MAAME,KAAK,GAAGA,CAAA,KAAY;EAC/BF,yBAAyB,CAACE,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,OAAO,MAAMC,6BAA6B,GAAGA,CAAA,KAAY;EACvDH,yBAAyB,CAACG,6BAA6B,CAAC,CAAC;AAC3D,CAAC;AAED,OAAO,MAAMC,uCAAuC,GAAG,MAAAA,CAAA,KAA8B;EACnF,OAAO,MAAMJ,yBAAyB,CAACI,uCAAuC,CAAC,CAAC;AAClF,CAAC;AAED,OAAO,MAAMC,uBAAuB,GAAIC,OAAgB,IAAW;EACjEN,yBAAyB,CAACK,uBAAuB,CAACC,OAAO,CAAC;AAC5D,CAAC;AAED,OAAO,MAAMC,sBAAsB,GAAG,MAAAA,CAAA,KAA8B;EAClE,OAAO,MAAMP,yBAAyB,CAACO,sBAAsB,CAAC,CAAC;AACjE,CAAC;AAED,OAAO,MAAMC,yBAAyB,GACpCC,QAAgD,IACvC;EACTT,yBAAyB,CAACQ,yBAAyB,CAAC,CAAC;EACrDP,YAAY,CAACS,kBAAkB,CAAC,wBAAwB,CAAC;EACzDT,YAAY,CAACU,WAAW,CAAC,wBAAwB,EAAGC,OAAO,IAAK;IAC9DH,QAAQ,CAACG,OAAc,CAAC;EAC1B,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["NativeEventEmitter","Platform","AppambitPushNotifications","BACKGROUND_NOTIFICATION_TASK","EVENT_FOREGROUND","EVENT_BACKGROUND","EVENT_OPENED","eventEmitter","foregroundSub","backgroundSub","openedSub","start","requestNotificationPermission","requestNotificationPermissionWithResult","setNotificationsEnabled","enabled","isNotificationsEnabled","hasNotificationPermission","setForegroundListener","callback","remove","addListener","setOpenedListener","Android","setBackgroundListener","OS","payload","finally","backgroundHandlerCompleted"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,kBAAkB,EAAEC,QAAQ,QAAQ,cAAc;AAC3D,OAAOC,yBAAyB,MAAM,sCAAmC;AAiCzE,OAAO,MAAMC,4BAA4B,GAAG,gCAAgC;AAE5E,MAAMC,gBAAgB,GAAG,mCAAmC;AAC5D,MAAMC,gBAAgB,GAAG,mCAAmC;AAC5D,MAAMC,YAAY,GAAO,+BAA+B;AAExD,MAAMC,YAAY,GAAG,IAAIP,kBAAkB,CAACE,yBAAyB,CAAC;AAEtE,IAAIM,aAAiE,GAAG,IAAI;AAC5E,IAAIC,aAAiE,GAAG,IAAI;AAC5E,IAAIC,SAAiE,GAAG,IAAI;AAE5E,OAAO,MAAMC,KAAK,GAAGA,CAAA,KAAY;EAC/BT,yBAAyB,CAACS,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,OAAO,MAAMC,6BAA6B,GAAGA,CAAA,KAAY;EACvDV,yBAAyB,CAACU,6BAA6B,CAAC,CAAC;AAC3D,CAAC;AAED,OAAO,MAAMC,uCAAuC,GAClD,MAAAA,CAAA,KAA8B;EAC5B,OAAOX,yBAAyB,CAACW,uCAAuC,CAAC,CAAC;AAC5E,CAAC;AAEH,OAAO,MAAMC,uBAAuB,GAAIC,OAAgB,IAAW;EACjEb,yBAAyB,CAACY,uBAAuB,CAACC,OAAO,CAAC;AAC5D,CAAC;AAED,OAAO,MAAMC,sBAAsB,GAAG,MAAAA,CAAA,KAA8B;EAClE,OAAOd,yBAAyB,CAACc,sBAAsB,CAAC,CAAC;AAC3D,CAAC;AAED,OAAO,MAAMC,yBAAyB,GAAG,MAAAA,CAAA,KAA8B;EACrE,OAAOf,yBAAyB,CAACe,yBAAyB,CAAC,CAAC;AAC9D,CAAC;AAED,OAAO,MAAMC,qBAAqB,GAChCC,QAA8B,IACb;EACjBX,aAAa,EAAEY,MAAM,CAAC,CAAC;EACvBZ,aAAa,GAAGD,YAAY,CAACc,WAAW,CAACjB,gBAAgB,EAAEe,QAAe,CAAC;EAC3E,OAAO,MAAM;IACXX,aAAa,EAAEY,MAAM,CAAC,CAAC;IACvBZ,aAAa,GAAG,IAAI;EACtB,CAAC;AACH,CAAC;AAED,OAAO,MAAMc,iBAAiB,GAC5BH,QAA8B,IACb;EACjBT,SAAS,EAAEU,MAAM,CAAC,CAAC;EACnBV,SAAS,GAAGH,YAAY,CAACc,WAAW,CAACf,YAAY,EAAEa,QAAe,CAAC;EACnE,OAAO,MAAM;IACXT,SAAS,EAAEU,MAAM,CAAC,CAAC;IACnBV,SAAS,GAAG,IAAI;EAClB,CAAC;AACH,CAAC;AAED,OAAO,MAAMa,OAAO,GAAG;EACrBC,qBAAqB,EACnBL,QAAwC,IACvB;IACjB,IAAIlB,QAAQ,CAACwB,EAAE,KAAK,SAAS,EAAE;MAC7B,OAAO,MAAM,CAAC,CAAC;IACjB;IACAhB,aAAa,EAAEW,MAAM,CAAC,CAAC;IACvBX,aAAa,GAAGF,YAAY,CAACc,WAAW,CACtChB,gBAAgB,EACdqB,OAA4B,IAAK;MACjC,KAAKP,QAAQ,CAACO,OAAO,CAAC,CAACC,OAAO,CAAC,MAAM;QACnCzB,yBAAyB,CAAC0B,0BAA0B,CAAC,CAAC;MACxD,CAAC,CAAC;IACJ,CACF,CAAC;IACD,OAAO,MAAM;MACXnB,aAAa,EAAEW,MAAM,CAAC,CAAC;MACvBX,aAAa,GAAG,IAAI;IACtB,CAAC;EACH;AACF,CAAC","ignoreList":[]}

package/lib/typescript/src/NativeAppambitPushNotifications.d.ts

@@ -5,7 +5,8 @@ export interface Spec extends TurboModule {
     requestNotificationPermissionWithResult(): Promise<boolean>;
     setNotificationsEnabled(enabled: boolean): void;
     isNotificationsEnabled(): Promise<boolean>;
-    setNotificationCustomizer(): void;
+    hasNotificationPermission(): Promise<boolean>;
+    backgroundHandlerCompleted(): void;
     addListener(eventName: string): void;
     removeListeners(count: number): void;
 }

package/lib/typescript/src/NativeAppambitPushNotifications.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeAppambitPushNotifications.d.ts","sourceRoot":"","sources":["../../../src/NativeAppambitPushNotifications.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,KAAK,IAAI,IAAI,CAAC;IACd,6BAA6B,IAAI,IAAI,CAAC;IACtC,uCAAuC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAChD,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3C,yBAAyB,IAAI,IAAI,CAAC;IAClC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;;AAED,wBAAmF"}
+{"version":3,"file":"NativeAppambitPushNotifications.d.ts","sourceRoot":"","sources":["../../../src/NativeAppambitPushNotifications.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,KAAK,IAAI,IAAI,CAAC;IAEd,6BAA6B,IAAI,IAAI,CAAC;IACtC,uCAAuC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAChD,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,yBAAyB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAK9C,0BAA0B,IAAI,IAAI,CAAC;IAEnC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;;AAED,wBAAmF"}

package/lib/typescript/src/index.d.ts

@@ -1,14 +1,40 @@
+export interface AndroidNotificationData {
+    color: string | null;
+    smallIconName: string | null;
+    ticker: string | null;
+    sticky: boolean | null;
+    visibility: string | null;
+    channelId: string | null;
+    tag: string | null;
+    sound: string | null;
+    clickAction: string | null;
+}
+export interface IosNotificationData {
+    badge: number | null;
+    sound: string | null;
+    category: string | null;
+    threadId: string | null;
+}
 export interface NotificationPayload {
-    notification: {
-        title: string;
-        body: string;
-    };
-    data?: Record<string, string>;
+    title: string | null;
+    body: string | null;
+    imageUrl: string | null;
+    data: Record<string, any>;
+    android: AndroidNotificationData | null;
+    ios: IosNotificationData | null;
 }
+export type NotificationListener = (notification: NotificationPayload) => void;
+export type BackgroundNotificationListener = (notification: NotificationPayload) => Promise<void>;
+export declare const BACKGROUND_NOTIFICATION_TASK = "AppAmbitBackgroundNotification";
 export declare const start: () => void;
 export declare const requestNotificationPermission: () => void;
 export declare const requestNotificationPermissionWithResult: () => Promise<boolean>;
 export declare const setNotificationsEnabled: (enabled: boolean) => void;
 export declare const isNotificationsEnabled: () => Promise<boolean>;
-export declare const setNotificationCustomizer: (callback: (payload: NotificationPayload) => void) => void;
+export declare const hasNotificationPermission: () => Promise<boolean>;
+export declare const setForegroundListener: (callback: NotificationListener) => (() => void);
+export declare const setOpenedListener: (callback: NotificationListener) => (() => void);
+export declare const Android: {
+    setBackgroundListener: (callback: BackgroundNotificationListener) => (() => void);
+};
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAKA,MAAM,WAAW,mBAAmB;IAClC,YAAY,EAAE;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;KACd,CAAA;IACD,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,eAAO,MAAM,KAAK,QAAO,IAExB,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAO,IAEhD,CAAC;AAEF,eAAO,MAAM,uCAAuC,QAAa,OAAO,CAAC,OAAO,CAE/E,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,SAAS,OAAO,KAAG,IAE1D,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAAa,OAAO,CAAC,OAAO,CAE9D,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,UAAU,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,KAC/C,IAMF,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAGA,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,uBAAuB,GAAG,IAAI,CAAC;IACxC,GAAG,EAAE,mBAAmB,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,YAAY,EAAE,mBAAmB,KAAK,IAAI,CAAC;AAC/E,MAAM,MAAM,8BAA8B,GAAG,CAAC,YAAY,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElG,eAAO,MAAM,4BAA4B,mCAAmC,CAAC;AAY7E,eAAO,MAAM,KAAK,QAAO,IAExB,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAO,IAEhD,CAAC;AAEF,eAAO,MAAM,uCAAuC,QACxC,OAAO,CAAC,OAAO,CAExB,CAAC;AAEJ,eAAO,MAAM,uBAAuB,GAAI,SAAS,OAAO,KAAG,IAE1D,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAAa,OAAO,CAAC,OAAO,CAE9D,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,OAAO,CAEjE,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,KAC7B,CAAC,MAAM,IAAI,CAOb,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,UAAU,oBAAoB,KAC7B,CAAC,MAAM,IAAI,CAOb,CAAC;AAEF,eAAO,MAAM,OAAO;sCAEN,8BAA8B,KACvC,CAAC,MAAM,IAAI,CAAC;CAkBhB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appambit-push-notifications",
-  "version": "0.3.1",
+  "version": "1.0.1",
   "description": "Push Notifications SDK for Android to send push notifications via AppAmbit platform.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/NativeAppambitPushNotifications.ts

@@ -2,12 +2,18 @@ import { TurboModuleRegistry, type TurboModule } from 'react-native';
 
 export interface Spec extends TurboModule {
   start(): void;
+
   requestNotificationPermission(): void;
   requestNotificationPermissionWithResult(): Promise<boolean>;
   setNotificationsEnabled(enabled: boolean): void;
   isNotificationsEnabled(): Promise<boolean>;
+  hasNotificationPermission(): Promise<boolean>;
+
+  // iOS: call when the background notification async handler Promise resolves.
+  // Signals iOS that background processing is complete so the system can reclaim
+  // time and continue scheduling background wake-ups.
+  backgroundHandlerCompleted(): void;
 
-  setNotificationCustomizer(): void;
   addListener(eventName: string): void;
   removeListeners(count: number): void;
 }

package/src/index.tsx

@@ -1,16 +1,49 @@
-import { NativeEventEmitter } from 'react-native';
+import { NativeEventEmitter, Platform } from 'react-native';
 import AppambitPushNotifications from './NativeAppambitPushNotifications';
 
-const eventEmitter = new NativeEventEmitter(AppambitPushNotifications);
+export interface AndroidNotificationData {
+  color: string | null;
+  smallIconName: string | null;
+  ticker: string | null;
+  sticky: boolean | null;
+  visibility: string | null;
+  channelId: string | null;
+  tag: string | null;
+  sound: string | null;
+  clickAction: string | null;
+}
+
+export interface IosNotificationData {
+  badge: number | null;
+  sound: string | null;
+  category: string | null;
+  threadId: string | null;
+}
 
 export interface NotificationPayload {
-  notification: {
-    title: string;
-    body: string;
-  }
-  data?: Record<string, string>;
+  title: string | null;
+  body: string | null;
+  imageUrl: string | null;
+  data: Record<string, any>;
+  android: AndroidNotificationData | null;
+  ios: IosNotificationData | null;
 }
 
+export type NotificationListener = (notification: NotificationPayload) => void;
+export type BackgroundNotificationListener = (notification: NotificationPayload) => Promise<void>;
+
+export const BACKGROUND_NOTIFICATION_TASK = 'AppAmbitBackgroundNotification';
+
+const EVENT_FOREGROUND = 'AppAmbit_onForegroundNotification';
+const EVENT_BACKGROUND = 'AppAmbit_onBackgroundNotification';
+const EVENT_OPENED     = 'AppAmbit_onOpenedNotification';
+
+const eventEmitter = new NativeEventEmitter(AppambitPushNotifications);
+
+let foregroundSub: ReturnType<typeof eventEmitter.addListener> | null = null;
+let backgroundSub: ReturnType<typeof eventEmitter.addListener> | null = null;
+let openedSub:     ReturnType<typeof eventEmitter.addListener> | null = null;
+
 export const start = (): void => {
   AppambitPushNotifications.start();
 };
@@ -19,24 +52,64 @@ export const requestNotificationPermission = (): void => {
   AppambitPushNotifications.requestNotificationPermission();
 };
 
-export const requestNotificationPermissionWithResult = async (): Promise<boolean> => {
-  return await AppambitPushNotifications.requestNotificationPermissionWithResult();
-};
+export const requestNotificationPermissionWithResult =
+  async (): Promise<boolean> => {
+    return AppambitPushNotifications.requestNotificationPermissionWithResult();
+  };
 
 export const setNotificationsEnabled = (enabled: boolean): void => {
   AppambitPushNotifications.setNotificationsEnabled(enabled);
 };
 
 export const isNotificationsEnabled = async (): Promise<boolean> => {
-  return await AppambitPushNotifications.isNotificationsEnabled();
+  return AppambitPushNotifications.isNotificationsEnabled();
 };
 
-export const setNotificationCustomizer = (
-  callback: (payload: NotificationPayload) => void
-): void => {
-  AppambitPushNotifications.setNotificationCustomizer();
-  eventEmitter.removeAllListeners('onNotificationReceived');
-  eventEmitter.addListener('onNotificationReceived', (payload) => {
-    callback(payload as any);
-  });
-}; 
+export const hasNotificationPermission = async (): Promise<boolean> => {
+  return AppambitPushNotifications.hasNotificationPermission();
+};
+
+export const setForegroundListener = (
+  callback: NotificationListener
+): (() => void) => {
+  foregroundSub?.remove();
+  foregroundSub = eventEmitter.addListener(EVENT_FOREGROUND, callback as any);
+  return () => {
+    foregroundSub?.remove();
+    foregroundSub = null;
+  };
+};
+
+export const setOpenedListener = (
+  callback: NotificationListener
+): (() => void) => {
+  openedSub?.remove();
+  openedSub = eventEmitter.addListener(EVENT_OPENED, callback as any);
+  return () => {
+    openedSub?.remove();
+    openedSub = null;
+  };
+};
+
+export const Android = {
+  setBackgroundListener: (
+    callback: BackgroundNotificationListener
+  ): (() => void) => {
+    if (Platform.OS !== 'android') {
+      return () => {};
+    }
+    backgroundSub?.remove();
+    backgroundSub = eventEmitter.addListener(
+      EVENT_BACKGROUND,
+      ((payload: NotificationPayload) => {
+        void callback(payload).finally(() => {
+          AppambitPushNotifications.backgroundHandlerCompleted();
+        });
+      }) as any
+    );
+    return () => {
+      backgroundSub?.remove();
+      backgroundSub = null;
+    };
+  }
+};