react-native-push-signal 0.1.2 → 0.1.3

package/README.md

@@ -74,7 +74,7 @@ Keep Apple `.p8` keys and the Firebase service account on the server. The app ne
 2. Enable **Background Modes → Remote notifications**.
 3. Use a physical device. The simulator cannot register with APNs.
 
-The library hooks `UNUserNotificationCenter` and APNs token callbacks, so the host `AppDelegate` does not need extra code.
+The library hooks `UNUserNotificationCenter` at launch (before JS starts) and APNs token callbacks, so the host `AppDelegate` does not need extra code. Foreground pushes only reach JS if this delegate is installed before launch finishes.
 
 ## Android setup
 

package/README.ru.md

@@ -74,7 +74,7 @@ const stopPress = onNotificationPress((message) => {
 2. Включите **Background Modes → Remote notifications**.
 3. Проверяйте на физическом устройстве. Симулятор не умеет регистрироваться в APNs.
 
-Библиотека сама подписывается на `UNUserNotificationCenter` и колбеки APNs-токена. В `AppDelegate` хоста ничего дописывать не нужно.
+Библиотека сама ставит делегат `UNUserNotificationCenter` на запуске (до JS) и подписывается на колбеки APNs-токена. В `AppDelegate` хоста ничего дописывать не нужно. Без делегата до конца запуска iOS не вызывает `willPresent`, и пуш в foreground не доходит до JS.
 
 ## Настройка Android
 

package/android/build.gradle

@@ -43,6 +43,7 @@ android {
 
   defaultConfig {
     minSdkVersion getExtOrDefault("minSdkVersion")
+    consumerProguardFiles "consumer-rules.pro"
 
     externalNativeBuild {
       cmake {

package/android/consumer-rules.pro

@@ -0,0 +1,4 @@
+-keep class com.margelo.nitro.pushsignal.PushSignalMessagingService { *; }
+-keep class com.margelo.nitro.pushsignal.PushSignalInitProvider { *; }
+-keep class com.margelo.nitro.pushsignal.PushSignalCenter { *; }
+-keep class com.google.firebase.messaging.** { *; }

package/android/src/main/java/com/margelo/nitro/pushsignal/PushSignalCenter.kt

@@ -37,7 +37,9 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
   @Volatile private var onMessage: ((PushMessage) -> Promise<Promise<Boolean>>)? = null
   @Volatile private var onNotificationPress: ((PushMessage) -> Unit)? = null
   @Volatile private var pendingPress: PushMessage? = null
+  private val pendingMessages = CopyOnWriteArrayList<PushMessage>()
   private val registeredActivities = Collections.newSetFromMap(WeakHashMap<Activity, Boolean>())
+  @Volatile private var startedActivityCount = 0
   @Volatile private var pendingFirebaseConfig: AndroidFirebaseConfig? = null
   private val initializeWaiters = CopyOnWriteArrayList<(Exception?) -> Unit>()
 
@@ -78,6 +80,22 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
 
   fun setOnMessage(callback: (PushMessage) -> Promise<Promise<Boolean>>) {
     onMessage = callback
+    val queued = pendingMessages.toList()
+    pendingMessages.clear()
+    queued.forEach { message ->
+      runOnMain {
+        val inForeground = startedActivityCount > 0 || currentActivity != null
+        resolveShouldShowBanner(message) { shouldShow ->
+          if (
+            shouldShow &&
+            inForeground &&
+            (!message.title.isNullOrEmpty() || !message.body.isNullOrEmpty())
+          ) {
+            postForegroundNotification(message)
+          }
+        }
+      }
+    }
   }
 
   fun setOnNotificationPress(callback: (PushMessage) -> Unit) {
@@ -127,18 +145,34 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
 
   fun emitMessage(remoteMessage: RemoteMessage) {
     val message = remoteMessage.toPushMessage()
-    val inForeground = currentActivity != null
-    resolveShouldShowBanner(message) { shouldShow ->
-      if (
-        shouldShow &&
-        inForeground &&
-        (!message.title.isNullOrEmpty() || !message.body.isNullOrEmpty())
-      ) {
-        postForegroundNotification(message)
+    runOnMain {
+      val callback = onMessage
+      if (callback == null) {
+        pendingMessages.add(message)
+        return@runOnMain
+      }
+
+      val inForeground = startedActivityCount > 0 || currentActivity != null
+      resolveShouldShowBanner(message) { shouldShow ->
+        if (
+          shouldShow &&
+          inForeground &&
+          (!message.title.isNullOrEmpty() || !message.body.isNullOrEmpty())
+        ) {
+          postForegroundNotification(message)
+        }
       }
     }
   }
 
+  private fun runOnMain(block: () -> Unit) {
+    if (Looper.myLooper() == Looper.getMainLooper()) {
+      block()
+    } else {
+      mainHandler.post(block)
+    }
+  }
+
   private fun resolveShouldShowBanner(
     message: PushMessage,
     onDone: (Boolean) -> Unit
@@ -152,7 +186,7 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     val delivered = AtomicBoolean(false)
     val timeout = Runnable {
       if (delivered.compareAndSet(false, true)) {
-        onDone(false)
+        onDone(true)
       }
     }
     mainHandler.postDelayed(timeout, FOREGROUND_TIMEOUT_MS)
@@ -169,11 +203,11 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
         .then { inner ->
           inner
             .then { shouldShow -> finish(shouldShow) }
-            .catch { finish(false) }
+            .catch { finish(true) }
         }
-        .catch { finish(false) }
+        .catch { finish(true) }
     } catch (_: Throwable) {
-      finish(false)
+      finish(true)
     }
   }
 
@@ -244,7 +278,10 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     handleIntent(activity.intent)
   }
 
-  override fun onActivityStarted(activity: Activity) = Unit
+  override fun onActivityStarted(activity: Activity) {
+    currentActivity = activity
+    startedActivityCount += 1
+  }
 
   override fun onActivityResumed(activity: Activity) {
     currentActivity = activity
@@ -257,7 +294,12 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     }
   }
 
-  override fun onActivityStopped(activity: Activity) = Unit
+  override fun onActivityStopped(activity: Activity) {
+    startedActivityCount = (startedActivityCount - 1).coerceAtLeast(0)
+    if (currentActivity === activity) {
+      currentActivity = null
+    }
+  }
 
   override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
 
@@ -289,6 +331,7 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
 
   private fun applyFirebaseConfig(context: Context, config: AndroidFirebaseConfig): Exception? {
     if (FirebaseApp.getApps(context).isNotEmpty()) {
+      FirebaseMessaging.getInstance().isAutoInitEnabled = true
       return null
     }
 
@@ -305,6 +348,7 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
           .setGcmSenderId(config.project_number!!.trim())
           .build()
       FirebaseApp.initializeApp(context, options)
+      FirebaseMessaging.getInstance().isAutoInitEnabled = true
       null
     } catch (error: Exception) {
       error

package/android/src/main/java/com/margelo/nitro/pushsignal/PushSignalMessagingService.kt

@@ -9,7 +9,12 @@ class PushSignalMessagingService : FirebaseMessagingService() {
     PushSignalCenter.attach(applicationContext)
   }
 
+  override fun onNewToken(token: String) {
+    PushSignalCenter.attach(applicationContext)
+  }
+
   override fun onMessageReceived(message: RemoteMessage) {
+    PushSignalCenter.attach(applicationContext)
     PushSignalCenter.emitMessage(message)
   }
 }

package/ios/PushSignalCenter.swift

@@ -13,16 +13,31 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     shared.install()
   }
 
+  /// Called from ObjC `+load` / launch notifications so the UNUserNotificationCenter
+  /// delegate is set before the app finishes launching. If this happens after JS loads,
+  /// iOS never calls `willPresent` and foreground pushes never reach JS.
+  @objc static func installEarly() {
+    shared.install()
+  }
+
   private let lock = NSLock()
   private var didInstall = false
+  private var didSwizzleNotificationCenter = false
   private var deviceToken: String?
   private var registrationError: Error?
   private var tokenWaiters: [(Result<String, Error>) -> Void] = []
   private var pendingPress: PushMessage?
+  private var pendingMessages: [PushMessage] = []
   private var pendingLaunchOptions: [AnyHashable: Any]?
   private var didCaptureLaunchNotification = false
+  private var recentMessageIds: [String: Date] = [:]
+  private weak var forwardingDelegate: UNUserNotificationCenterDelegate?
 
-  var onMessage: ((PushMessage) -> Promise<Promise<Bool>>)?
+  var onMessage: ((PushMessage) -> Promise<Promise<Bool>>)? {
+    didSet {
+      flushPendingMessages()
+    }
+  }
   var onNotificationPress: ((PushMessage) -> Void)? {
     didSet {
       flushPendingPress()
@@ -30,13 +45,21 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
   }
 
   func install() {
-    DispatchQueue.main.async {
-      self.installOnMain()
+    if Thread.isMainThread {
+      installOnMain()
+    } else {
+      DispatchQueue.main.async {
+        self.installOnMain()
+      }
     }
   }
 
   private func installOnMain() {
+    swizzleNotificationCenterDelegateIfNeeded()
+
     guard !didInstall else {
+      UNUserNotificationCenter.current().delegate = self
+      swizzleAppDelegate()
       captureLaunchNotificationIfNeeded()
       return
     }
@@ -47,6 +70,12 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     captureLaunchNotificationIfNeeded()
   }
 
+  func rememberForwardingDelegate(_ delegate: UNUserNotificationCenterDelegate?) {
+    if let delegate, delegate !== self {
+      forwardingDelegate = delegate
+    }
+  }
+
   func fetchCredentials() async throws -> PushCredentials {
     await MainActor.run {
       self.installOnMain()
@@ -70,25 +99,39 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     finishRegistration(result: .failure(error))
   }
 
-  func userNotificationCenter(
+  @objc func userNotificationCenter(
     _ center: UNUserNotificationCenter,
     willPresent notification: UNNotification,
     withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
   ) {
     let message = Self.message(from: notification)
     Task {
-      let shouldShow = await self.shouldShowForegroundBanner(for: message)
-      completionHandler(shouldShow ? Self.foregroundPresentationOptions : [])
+      let shouldShow = await self.deliverMessage(message)
+      let ours: UNNotificationPresentationOptions = shouldShow ? Self.foregroundPresentationOptions : []
+      await MainActor.run {
+        self.forwardWillPresent(
+          center,
+          notification: notification,
+          ourOptions: ours,
+          completionHandler: completionHandler
+        )
+      }
     }
   }
 
-  func userNotificationCenter(
+  @objc func userNotificationCenter(
     _ center: UNUserNotificationCenter,
     didReceive response: UNNotificationResponse,
     withCompletionHandler completionHandler: @escaping () -> Void
   ) {
     emitPress(Self.message(from: response.notification))
-    completionHandler()
+    if forwardingDelegate?.responds(
+      to: #selector(UNUserNotificationCenterDelegate.userNotificationCenter(_:didReceive:withCompletionHandler:))
+    ) == true {
+      forwardingDelegate?.userNotificationCenter?(center, didReceive: response, withCompletionHandler: completionHandler)
+    } else {
+      completionHandler()
+    }
   }
 
   private func waitForToken() async throws -> String {
@@ -156,29 +199,118 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     waiters.forEach { $0(result) }
   }
 
-  private func shouldShowForegroundBanner(for message: PushMessage) async -> Bool {
-    guard let callback = onMessage else {
+  private func synchronized<T>(_ body: () -> T) -> T {
+    lock.lock()
+    defer { lock.unlock() }
+    return body()
+  }
+
+  private func deliverMessage(_ message: PushMessage) async -> Bool {
+    guard shouldEmit(message) else {
       return false
     }
 
-    return await withTaskGroup(of: Bool.self) { group in
-      group.addTask {
-        do {
-          let inner = try await callback(message).await()
-          return try await inner.await()
-        } catch {
-          return false
+    let callback = synchronized { onMessage }
+
+    guard let callback else {
+      synchronized { pendingMessages.append(message) }
+      // Still show the system banner so a visible push is not swallowed
+      // before JS has subscribed.
+      return true
+    }
+
+    return await invokeOnMessage(callback, message: message)
+  }
+
+  private func invokeOnMessage(
+    _ callback: @escaping (PushMessage) -> Promise<Promise<Bool>>,
+    message: PushMessage
+  ) async -> Bool {
+    await withCheckedContinuation { continuation in
+      let resumeLock = NSLock()
+      var resumed = false
+      let finish: (Bool) -> Void = { value in
+        resumeLock.lock()
+        defer { resumeLock.unlock() }
+        guard !resumed else {
+          return
         }
+        resumed = true
+        continuation.resume(returning: value)
+      }
+
+      DispatchQueue.main.async {
+        Task {
+          do {
+            let inner = try await callback(message).await()
+            let shouldShow = try await inner.await()
+            finish(shouldShow)
+          } catch {
+            finish(true)
+          }
+        }
+      }
+
+      DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
+        finish(true)
+      }
+    }
+  }
+
+  private func flushPendingMessages() {
+    DispatchQueue.main.async {
+      let callback = self.synchronized { self.onMessage }
+      let queued = self.synchronized { () -> [PushMessage] in
+        let messages = self.pendingMessages
+        self.pendingMessages.removeAll()
+        return messages
       }
-      group.addTask {
-        try? await Task.sleep(nanoseconds: 2_000_000_000)
+      guard let callback, !queued.isEmpty else {
+        return
+      }
+
+      for message in queued {
+        Task {
+          _ = await self.invokeOnMessage(callback, message: message)
+        }
+      }
+    }
+  }
+
+  private func shouldEmit(_ message: PushMessage) -> Bool {
+    let key = message.id ?? "\(message.title ?? "")|\(message.body ?? "")"
+    return synchronized {
+      let now = Date()
+      recentMessageIds = recentMessageIds.filter { now.timeIntervalSince($0.value) < 5 }
+      if let last = recentMessageIds[key], now.timeIntervalSince(last) < 2 {
         return false
       }
+      recentMessageIds[key] = now
+      return true
+    }
+  }
 
-      let first = await group.next() ?? false
-      group.cancelAll()
-      return first
+  private func forwardWillPresent(
+    _ center: UNUserNotificationCenter,
+    notification: UNNotification,
+    ourOptions: UNNotificationPresentationOptions,
+    completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
+  ) {
+    let selector = #selector(
+      UNUserNotificationCenterDelegate.userNotificationCenter(_:willPresent:withCompletionHandler:)
+    )
+    guard let forwardingDelegate, forwardingDelegate.responds(to: selector) else {
+      completionHandler(ourOptions)
+      return
     }
+
+    forwardingDelegate.userNotificationCenter?(
+      center,
+      willPresent: notification,
+      withCompletionHandler: { forwarded in
+        completionHandler(ourOptions.union(forwarded))
+      }
+    )
   }
 
   private static var foregroundPresentationOptions: UNNotificationPresentationOptions {
@@ -363,6 +495,25 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     )
   }
 
+  private func swizzleNotificationCenterDelegateIfNeeded() {
+    guard !didSwizzleNotificationCenter else {
+      return
+    }
+    didSwizzleNotificationCenter = true
+
+    let target: AnyClass = UNUserNotificationCenter.self
+    let original = #selector(setter: UNUserNotificationCenter.delegate)
+    let replacement = #selector(UNUserNotificationCenter.pushSignal_setDelegate(_:))
+
+    guard let originalMethod = class_getInstanceMethod(target, original),
+          let replacementMethod = class_getInstanceMethod(target, replacement)
+    else {
+      return
+    }
+
+    method_exchangeImplementations(originalMethod, replacementMethod)
+  }
+
   private func swizzle(target: AnyClass, original: Selector, replacement: Selector, source: AnyClass) {
     guard let replacementMethod = class_getInstanceMethod(source, replacement) else {
       return
@@ -423,3 +574,15 @@ private final class PushSignalAppDelegateHook: NSObject {
     unsafeBitCast(method_getImplementation(method), to: Fn.self)(self, selector, application, error as NSError)
   }
 }
+
+extension UNUserNotificationCenter {
+  @objc func pushSignal_setDelegate(_ delegate: UNUserNotificationCenterDelegate?) {
+    if let delegate, delegate is PushSignalCenter {
+      pushSignal_setDelegate(delegate)
+      return
+    }
+
+    PushSignalCenter.shared.rememberForwardingDelegate(delegate)
+    pushSignal_setDelegate(PushSignalCenter.shared)
+  }
+}

package/ios/PushSignalLaunchStore.m

@@ -10,12 +10,27 @@ NSDictionary *PushSignalCopyLaunchOptions(void) {
 @implementation PushSignalLaunchStore
 
 + (void)load {
+  [[NSNotificationCenter defaultCenter]
+      addObserverForName:UIApplicationWillFinishLaunchingNotification
+                  object:nil
+                   queue:nil
+              usingBlock:^(NSNotification *notification) {
+                Class center = NSClassFromString(@"PushSignalCenter");
+                if ([center respondsToSelector:@selector(installEarly)]) {
+                  [center installEarly];
+                }
+              }];
+
   [[NSNotificationCenter defaultCenter]
       addObserverForName:UIApplicationDidFinishLaunchingNotification
                   object:nil
                    queue:nil
               usingBlock:^(NSNotification *notification) {
                 sLaunchOptions = [notification.userInfo copy];
+                Class center = NSClassFromString(@"PushSignalCenter");
+                if ([center respondsToSelector:@selector(bootstrapWithLaunchOptions:)]) {
+                  [center bootstrapWithLaunchOptions:sLaunchOptions];
+                }
               }];
 }
 

package/lib/module/pushSignal.native.js

@@ -11,7 +11,8 @@ function bindNativeCallbacks() {
   }
   nativeCallbacksBound = true;
   PushSignalHybridObject.setOnMessage(async message => {
-    const results = await Promise.all([...messageListeners].map(async listener => {
+    const listeners = [...messageListeners];
+    const results = await Promise.all(listeners.map(async listener => {
       try {
         return await listener(message);
       } catch {
@@ -44,4 +45,5 @@ export function onNotificationPress(listener) {
     pressListeners.delete(listener);
   };
 }
+bindNativeCallbacks();
 //# sourceMappingURL=pushSignal.native.js.map

package/lib/module/pushSignal.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["NitroModules","PushSignalHybridObject","createHybridObject","messageListeners","Set","pressListeners","nativeCallbacksBound","bindNativeCallbacks","setOnMessage","message","results","Promise","all","map","listener","some","result","setOnNotificationPress","forEach","initialize","config","getCredentials","onMessage","add","delete","onNotificationPress"],"sourceRoot":"../../src","sources":["pushSignal.native.tsx"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AASzD,MAAMC,sBAAsB,GAC1BD,YAAY,CAACE,kBAAkB,CAAa,YAAY,CAAC;AAE3D,MAAMC,gBAAgB,GAAG,IAAIC,GAAG,CAAoB,CAAC;AACrD,MAAMC,cAAc,GAAG,IAAID,GAAG,CAAiC,CAAC;AAChE,IAAIE,oBAAoB,GAAG,KAAK;AAEhC,SAASC,mBAAmBA,CAAA,EAAG;EAC7B,IAAID,oBAAoB,EAAE;IACxB;EACF;EAEAA,oBAAoB,GAAG,IAAI;EAE3BL,sBAAsB,CAACO,YAAY,CAAC,MAAOC,OAAO,IAAK;IACrD,MAAMC,OAAO,GAAG,MAAMC,OAAO,CAACC,GAAG,CAC/B,CAAC,GAAGT,gBAAgB,CAAC,CAACU,GAAG,CAAC,MAAOC,QAAQ,IAAK;MAC5C,IAAI;QACF,OAAO,MAAMA,QAAQ,CAACL,OAAO,CAAC;MAChC,CAAC,CAAC,MAAM;QACN,OAAO,KAAK;MACd;IACF,CAAC,CACH,CAAC;IAED,OAAOC,OAAO,CAACK,IAAI,CAAEC,MAAM,IAAKA,MAAM,KAAK,IAAI,CAAC;EAClD,CAAC,CAAC;EAEFf,sBAAsB,CAACgB,sBAAsB,CAAER,OAAO,IAAK;IACzDJ,cAAc,CAACa,OAAO,CAAEJ,QAAQ,IAAKA,QAAQ,CAACL,OAAO,CAAC,CAAC;EACzD,CAAC,CAAC;AACJ;AAEA,OAAO,SAASU,UAAUA,CAACC,MAA6B,GAAG,CAAC,CAAC,EAAiB;EAC5E,OAAOnB,sBAAsB,CAACkB,UAAU,CAACC,MAAM,CAAC;AAClD;AAEA,OAAO,SAASC,cAAcA,CAAA,EAA6B;EACzD,OAAOpB,sBAAsB,CAACoB,cAAc,CAAC,CAAC;AAChD;AAEA,OAAO,SAASC,SAASA,CAACR,QAA2B,EAAc;EACjEP,mBAAmB,CAAC,CAAC;EACrBJ,gBAAgB,CAACoB,GAAG,CAACT,QAAQ,CAAC;EAC9B,OAAO,MAAM;IACXX,gBAAgB,CAACqB,MAAM,CAACV,QAAQ,CAAC;EACnC,CAAC;AACH;AAEA,OAAO,SAASW,mBAAmBA,CACjCX,QAAwC,EAC5B;EACZP,mBAAmB,CAAC,CAAC;EACrBF,cAAc,CAACkB,GAAG,CAACT,QAAQ,CAAC;EAC5B,OAAO,MAAM;IACXT,cAAc,CAACmB,MAAM,CAACV,QAAQ,CAAC;EACjC,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["NitroModules","PushSignalHybridObject","createHybridObject","messageListeners","Set","pressListeners","nativeCallbacksBound","bindNativeCallbacks","setOnMessage","message","listeners","results","Promise","all","map","listener","some","result","setOnNotificationPress","forEach","initialize","config","getCredentials","onMessage","add","delete","onNotificationPress"],"sourceRoot":"../../src","sources":["pushSignal.native.tsx"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AASzD,MAAMC,sBAAsB,GAC1BD,YAAY,CAACE,kBAAkB,CAAa,YAAY,CAAC;AAE3D,MAAMC,gBAAgB,GAAG,IAAIC,GAAG,CAAoB,CAAC;AACrD,MAAMC,cAAc,GAAG,IAAID,GAAG,CAAiC,CAAC;AAChE,IAAIE,oBAAoB,GAAG,KAAK;AAEhC,SAASC,mBAAmBA,CAAA,EAAG;EAC7B,IAAID,oBAAoB,EAAE;IACxB;EACF;EAEAA,oBAAoB,GAAG,IAAI;EAE3BL,sBAAsB,CAACO,YAAY,CAAC,MAAOC,OAAO,IAAK;IACrD,MAAMC,SAAS,GAAG,CAAC,GAAGP,gBAAgB,CAAC;IACvC,MAAMQ,OAAO,GAAG,MAAMC,OAAO,CAACC,GAAG,CAC/BH,SAAS,CAACI,GAAG,CAAC,MAAOC,QAAQ,IAAK;MAChC,IAAI;QACF,OAAO,MAAMA,QAAQ,CAACN,OAAO,CAAC;MAChC,CAAC,CAAC,MAAM;QACN,OAAO,KAAK;MACd;IACF,CAAC,CACH,CAAC;IAED,OAAOE,OAAO,CAACK,IAAI,CAAEC,MAAM,IAAKA,MAAM,KAAK,IAAI,CAAC;EAClD,CAAC,CAAC;EAEFhB,sBAAsB,CAACiB,sBAAsB,CAAET,OAAO,IAAK;IACzDJ,cAAc,CAACc,OAAO,CAAEJ,QAAQ,IAAKA,QAAQ,CAACN,OAAO,CAAC,CAAC;EACzD,CAAC,CAAC;AACJ;AAEA,OAAO,SAASW,UAAUA,CAACC,MAA6B,GAAG,CAAC,CAAC,EAAiB;EAC5E,OAAOpB,sBAAsB,CAACmB,UAAU,CAACC,MAAM,CAAC;AAClD;AAEA,OAAO,SAASC,cAAcA,CAAA,EAA6B;EACzD,OAAOrB,sBAAsB,CAACqB,cAAc,CAAC,CAAC;AAChD;AAEA,OAAO,SAASC,SAASA,CAACR,QAA2B,EAAc;EACjER,mBAAmB,CAAC,CAAC;EACrBJ,gBAAgB,CAACqB,GAAG,CAACT,QAAQ,CAAC;EAC9B,OAAO,MAAM;IACXZ,gBAAgB,CAACsB,MAAM,CAACV,QAAQ,CAAC;EACnC,CAAC;AACH;AAEA,OAAO,SAASW,mBAAmBA,CACjCX,QAAwC,EAC5B;EACZR,mBAAmB,CAAC,CAAC;EACrBF,cAAc,CAACmB,GAAG,CAACT,QAAQ,CAAC;EAC5B,OAAO,MAAM;IACXV,cAAc,CAACoB,MAAM,CAACV,QAAQ,CAAC;EACjC,CAAC;AACH;AAEAR,mBAAmB,CAAC,CAAC","ignoreList":[]}

package/lib/typescript/src/pushSignal.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pushSignal.native.d.ts","sourceRoot":"","sources":["../../../src/pushSignal.native.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,WAAW,EAEZ,MAAM,uBAAoB,CAAC;AAmC5B,wBAAgB,UAAU,CAAC,MAAM,GAAE,qBAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5E;AAED,wBAAgB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAEzD;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,IAAI,CAMjE;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GACvC,MAAM,IAAI,CAMZ"}
+{"version":3,"file":"pushSignal.native.d.ts","sourceRoot":"","sources":["../../../src/pushSignal.native.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,WAAW,EAEZ,MAAM,uBAAoB,CAAC;AAoC5B,wBAAgB,UAAU,CAAC,MAAM,GAAE,qBAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5E;AAED,wBAAgB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAEzD;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,IAAI,CAMjE;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GACvC,MAAM,IAAI,CAMZ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-push-signal",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Push",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/pushSignal.native.tsx

@@ -22,8 +22,9 @@ function bindNativeCallbacks() {
   nativeCallbacksBound = true;
 
   PushSignalHybridObject.setOnMessage(async (message) => {
+    const listeners = [...messageListeners];
     const results = await Promise.all(
-      [...messageListeners].map(async (listener) => {
+      listeners.map(async (listener) => {
         try {
           return await listener(message);
         } catch {
@@ -65,3 +66,5 @@ export function onNotificationPress(
     pressListeners.delete(listener);
   };
 }
+
+bindNativeCallbacks();