react-native-push-signal 0.1.1 → 0.1.2

package/README.md

@@ -44,6 +44,10 @@ const credentials = await getCredentials();
 
 const stopMessages = onMessage((message) => {
   console.log('incoming', message);
+  if (message.data.silent === '1') {
+    return;
+  }
+  return true;
 });
 
 const stopPress = onNotificationPress((message) => {
@@ -112,13 +116,20 @@ If the host app already declares its own `FirebaseMessagingService`, only one se
 
 ## Incoming messages vs taps
 
-- `onMessage` — the push arrived while the app is in the foreground (and Android data messages while the process is alive). The library does not draw a banner.
+| App state | iOS | Android (notification payload) | Android (data-only) |
+| --- | --- | --- | --- |
+| Foreground | `onMessage`. Banner if a listener returns `true` | `onMessage`. Banner if a listener returns `true` | `onMessage`. Tray only if a listener returns `true` and the payload has title or body |
+| Background / killed | System banner. Tap → `onNotificationPress` | System banner. Tap → `onNotificationPress` | No banner. `onMessage` if the process is alive |
+
+- `onMessage` — the push arrived while the app is in the foreground (and Android data messages while the process is alive). Return `true` to show the system banner as usual. No return, `false`, or a throw means no banner. If several listeners are registered, the banner shows when any of them returns `true`.
 - `onNotificationPress` — the user opened the notification, including a cold start.
 - On iOS, a visible push received in the background or when the app is killed is delivered on tap, not through `onMessage`. That is an OS limit.
 
+If `onMessage` throws or takes longer than about 2 seconds, the library does not show a banner.
+
 ## Web
 
-`initialize()` resolves. `getCredentials()` throws. Listeners are no-ops.
+`initialize()` resolves. `getCredentials()` throws. Listeners (`onMessage`, `onNotificationPress`) are no-ops.
 
 ## Contributing
 

package/README.ru.md

@@ -44,6 +44,10 @@ const credentials = await getCredentials();
 
 const stopMessages = onMessage((message) => {
   console.log('incoming', message);
+  if (message.data.silent === '1') {
+    return;
+  }
+  return true;
 });
 
 const stopPress = onNotificationPress((message) => {
@@ -112,13 +116,20 @@ apply plugin: "com.google.gms.google-services"
 
 ## Входящее сообщение и тап
 
-- `onMessage` — пуш пришёл, пока приложение на переднем плане (и Android data-message, пока процесс жив). Баннер библиотека не рисует.
+| Состояние | iOS | Android (notification payload) | Android (data-only) |
+| --- | --- | --- | --- |
+| Foreground | `onMessage`. Баннер, если слушатель вернул `true` | `onMessage`. Баннер, если слушатель вернул `true` | `onMessage`. Tray только если слушатель вернул `true` и в payload есть title или body |
+| Background / killed | Системный баннер. Тап → `onNotificationPress` | Системный баннер. Тап → `onNotificationPress` | Баннера нет. `onMessage`, если процесс жив |
+
+- `onMessage` — пуш пришёл, пока приложение на переднем плане (и Android data-message, пока процесс жив). Верните `true`, чтобы показать системный баннер как обычно. Без return, `false` или ошибка — баннера нет. Если слушателей несколько, баннер показывается, когда любой вернул `true`.
 - `onNotificationPress` — пользователь открыл уведомление, в том числе при холодном старте.
 - На iOS видимый пуш в фоне или при убитом приложении приходит только в тап, не в `onMessage`. Это ограничение ОС.
 
+Если `onMessage` бросил ошибку или не ответил примерно за 2 секунды, баннер не показывается.
+
 ## Web
 
-`initialize()` резолвится. `getCredentials()` бросает ошибку. Слушатели ничего не делают.
+`initialize()` резолвится. `getCredentials()` бросает ошибку. Слушатели (`onMessage`, `onNotificationPress`) ничего не делают.
 
 ## Contributing
 

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

@@ -28,7 +28,7 @@ class PushSignal : HybridPushSignalSpec() {
     }
   }
 
-  override fun setOnMessage(callback: (message: PushMessage) -> Unit) {
+  override fun setOnMessage(callback: (message: PushMessage) -> Promise<Promise<Boolean>>) {
     PushSignalCenter.setOnMessage(callback)
   }
 

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

@@ -2,26 +2,39 @@ package com.margelo.nitro.pushsignal
 
 import android.app.Activity
 import android.app.Application
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import androidx.activity.ComponentActivity
+import androidx.core.app.NotificationCompat
 import com.google.firebase.FirebaseApp
 import com.google.firebase.FirebaseOptions
 import com.google.firebase.messaging.FirebaseMessaging
 import com.google.android.gms.tasks.Tasks
 import com.google.firebase.messaging.RemoteMessage
+import com.margelo.nitro.core.Promise
 import java.util.Collections
+import java.util.UUID
 import java.util.WeakHashMap
 import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
 
 internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
   private const val EXTRA_HANDLED = "pushsignal.handled"
+  private const val CHANNEL_ID = "push_signal_default"
+  private const val FOREGROUND_TIMEOUT_MS = 2_000L
 
   private val lock = Any()
+  private val mainHandler = Handler(Looper.getMainLooper())
   @Volatile private var application: Application? = null
   @Volatile private var currentActivity: Activity? = null
-  @Volatile private var onMessage: ((PushMessage) -> Unit)? = null
+  @Volatile private var onMessage: ((PushMessage) -> Promise<Promise<Boolean>>)? = null
   @Volatile private var onNotificationPress: ((PushMessage) -> Unit)? = null
   @Volatile private var pendingPress: PushMessage? = null
   private val registeredActivities = Collections.newSetFromMap(WeakHashMap<Activity, Boolean>())
@@ -63,7 +76,7 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     onDone(applyFirebaseConfig(context, config))
   }
 
-  fun setOnMessage(callback: (PushMessage) -> Unit) {
+  fun setOnMessage(callback: (PushMessage) -> Promise<Promise<Boolean>>) {
     onMessage = callback
   }
 
@@ -112,12 +125,117 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     return token
   }
 
-  fun emitMessage(message: PushMessage) {
-    onMessage?.invoke(message)
+  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)
+      }
+    }
   }
 
-  fun emitMessage(remoteMessage: RemoteMessage) {
-    emitMessage(remoteMessage.toPushMessage())
+  private fun resolveShouldShowBanner(
+    message: PushMessage,
+    onDone: (Boolean) -> Unit
+  ) {
+    val callback = onMessage
+    if (callback == null) {
+      onDone(false)
+      return
+    }
+
+    val delivered = AtomicBoolean(false)
+    val timeout = Runnable {
+      if (delivered.compareAndSet(false, true)) {
+        onDone(false)
+      }
+    }
+    mainHandler.postDelayed(timeout, FOREGROUND_TIMEOUT_MS)
+
+    val finish = { shouldShow: Boolean ->
+      if (delivered.compareAndSet(false, true)) {
+        mainHandler.removeCallbacks(timeout)
+        onDone(shouldShow)
+      }
+    }
+
+    try {
+      callback(message)
+        .then { inner ->
+          inner
+            .then { shouldShow -> finish(shouldShow) }
+            .catch { finish(false) }
+        }
+        .catch { finish(false) }
+    } catch (_: Throwable) {
+      finish(false)
+    }
+  }
+
+  private fun postForegroundNotification(message: PushMessage) {
+    val context = application ?: return
+    val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
+      ?: return
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      val existing = manager.getNotificationChannel(CHANNEL_ID)
+      if (existing == null) {
+        manager.createNotificationChannel(
+          NotificationChannel(
+            CHANNEL_ID,
+            "Notifications",
+            NotificationManager.IMPORTANCE_HIGH
+          )
+        )
+      }
+    }
+
+    val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
+      ?: return
+    launchIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+    launchIntent.putExtra("google.message_id", message.id ?: UUID.randomUUID().toString())
+    message.title?.let { launchIntent.putExtra("gcm.notification.title", it) }
+    message.body?.let { launchIntent.putExtra("gcm.notification.body", it) }
+    message.data.forEach { (key, value) ->
+      launchIntent.putExtra(key, value)
+    }
+
+    val requestCode = (message.id ?: message.title ?: "push").hashCode()
+    val pendingIntent = PendingIntent.getActivity(
+      context,
+      requestCode,
+      launchIntent,
+      PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+    )
+
+    val builder = NotificationCompat.Builder(context, CHANNEL_ID)
+      .setSmallIcon(smallIcon(context))
+      .setContentTitle(message.title.orEmpty())
+      .setContentText(message.body.orEmpty())
+      .setContentIntent(pendingIntent)
+      .setAutoCancel(true)
+      .setPriority(NotificationCompat.PRIORITY_HIGH)
+      .setDefaults(NotificationCompat.DEFAULT_SOUND)
+      .setNumber(1)
+
+    manager.notify(requestCode, builder.build())
+  }
+
+  private fun smallIcon(context: Context): Int {
+    val named = context.resources.getIdentifier("ic_notification", "drawable", context.packageName)
+    if (named != 0) {
+      return named
+    }
+    val appIcon = context.applicationInfo.icon
+    if (appIcon != 0) {
+      return appIcon
+    }
+    return android.R.drawable.stat_notify_more
   }
 
   override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {

package/ios/PushSignal.swift

@@ -19,7 +19,7 @@ class PushSignal: HybridPushSignalSpec {
     }
   }
 
-  func setOnMessage(callback: @escaping (PushMessage) -> Void) throws {
+  func setOnMessage(callback: @escaping (PushMessage) -> Promise<Promise<Bool>>) throws {
     PushSignalCenter.shared.onMessage = callback
   }
 

package/ios/PushSignalCenter.swift

@@ -1,4 +1,5 @@
 import Foundation
+import NitroModules
 import ObjectiveC
 import UIKit
 import UserNotifications
@@ -21,7 +22,7 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
   private var pendingLaunchOptions: [AnyHashable: Any]?
   private var didCaptureLaunchNotification = false
 
-  var onMessage: ((PushMessage) -> Void)?
+  var onMessage: ((PushMessage) -> Promise<Promise<Bool>>)?
   var onNotificationPress: ((PushMessage) -> Void)? {
     didSet {
       flushPendingPress()
@@ -74,8 +75,11 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     willPresent notification: UNNotification,
     withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
   ) {
-    emitMessage(Self.message(from: notification))
-    completionHandler([])
+    let message = Self.message(from: notification)
+    Task {
+      let shouldShow = await self.shouldShowForegroundBanner(for: message)
+      completionHandler(shouldShow ? Self.foregroundPresentationOptions : [])
+    }
   }
 
   func userNotificationCenter(
@@ -152,10 +156,36 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     waiters.forEach { $0(result) }
   }
 
-  private func emitMessage(_ message: PushMessage) {
-    DispatchQueue.main.async {
-      self.onMessage?(message)
+  private func shouldShowForegroundBanner(for message: PushMessage) async -> Bool {
+    guard let callback = onMessage 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
+        }
+      }
+      group.addTask {
+        try? await Task.sleep(nanoseconds: 2_000_000_000)
+        return false
+      }
+
+      let first = await group.next() ?? false
+      group.cancelAll()
+      return first
+    }
+  }
+
+  private static var foregroundPresentationOptions: UNNotificationPresentationOptions {
+    if #available(iOS 14.0, *) {
+      return [.banner, .list, .sound, .badge]
     }
+    return [.alert, .sound, .badge]
   }
 
   private func emitPress(_ message: PushMessage) {

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["getCredentials","initialize","onMessage","onNotificationPress"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAOA,SACEA,cAAc,EACdC,UAAU,EACVC,SAAS,EACTC,mBAAmB,QACd,cAAc","ignoreList":[]}
+{"version":3,"names":["getCredentials","initialize","onMessage","onNotificationPress"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAQA,SACEA,cAAc,EACdC,UAAU,EACVC,SAAS,EACTC,mBAAmB,QACd,cAAc","ignoreList":[]}

package/lib/module/pushSignal.js.map

@@ -1 +1 @@
-{"version":3,"names":["initialize","_config","getCredentials","Error","onMessage","_listener","onNotificationPress"],"sourceRoot":"../../src","sources":["pushSignal.tsx"],"mappings":";;AAMA,OAAO,eAAeA,UAAUA,CAC9BC,OAA8B,GAAG,CAAC,CAAC,EACpB,CAAC;AAElB,OAAO,eAAeC,cAAcA,CAAA,EAA6B;EAC/D,MAAM,IAAIC,KAAK,CAAC,2CAA2C,CAAC;AAC9D;AAEA,OAAO,SAASC,SAASA,CACvBC,SAAyC,EAC7B;EACZ,OAAO,MAAM,CAAC,CAAC;AACjB;AAEA,OAAO,SAASC,mBAAmBA,CACjCD,SAAyC,EAC7B;EACZ,OAAO,MAAM,CAAC,CAAC;AACjB","ignoreList":[]}
+{"version":3,"names":["initialize","_config","getCredentials","Error","onMessage","_listener","onNotificationPress"],"sourceRoot":"../../src","sources":["pushSignal.tsx"],"mappings":";;AAOA,OAAO,eAAeA,UAAUA,CAC9BC,OAA8B,GAAG,CAAC,CAAC,EACpB,CAAC;AAElB,OAAO,eAAeC,cAAcA,CAAA,EAA6B;EAC/D,MAAM,IAAIC,KAAK,CAAC,2CAA2C,CAAC;AAC9D;AAEA,OAAO,SAASC,SAASA,CAACC,SAA4B,EAAc;EAClE,OAAO,MAAM,CAAC,CAAC;AACjB;AAEA,OAAO,SAASC,mBAAmBA,CACjCD,SAAyC,EAC7B;EACZ,OAAO,MAAM,CAAC,CAAC;AACjB","ignoreList":[]}

package/lib/module/pushSignal.native.js

@@ -10,8 +10,15 @@ function bindNativeCallbacks() {
     return;
   }
   nativeCallbacksBound = true;
-  PushSignalHybridObject.setOnMessage(message => {
-    messageListeners.forEach(listener => listener(message));
+  PushSignalHybridObject.setOnMessage(async message => {
+    const results = await Promise.all([...messageListeners].map(async listener => {
+      try {
+        return await listener(message);
+      } catch {
+        return false;
+      }
+    }));
+    return results.some(result => result === true);
   });
   PushSignalHybridObject.setOnNotificationPress(message => {
     pressListeners.forEach(listener => listener(message));

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

@@ -1 +1 @@
-{"version":3,"names":["NitroModules","PushSignalHybridObject","createHybridObject","messageListeners","Set","pressListeners","nativeCallbacksBound","bindNativeCallbacks","setOnMessage","message","forEach","listener","setOnNotificationPress","initialize","config","getCredentials","onMessage","add","delete","onNotificationPress"],"sourceRoot":"../../src","sources":["pushSignal.native.tsx"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AAQzD,MAAMC,sBAAsB,GAC1BD,YAAY,CAACE,kBAAkB,CAAa,YAAY,CAAC;AAE3D,MAAMC,gBAAgB,GAAG,IAAIC,GAAG,CAAiC,CAAC;AAClE,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,CAAEC,OAAO,IAAK;IAC/CN,gBAAgB,CAACO,OAAO,CAAEC,QAAQ,IAAKA,QAAQ,CAACF,OAAO,CAAC,CAAC;EAC3D,CAAC,CAAC;EAEFR,sBAAsB,CAACW,sBAAsB,CAAEH,OAAO,IAAK;IACzDJ,cAAc,CAACK,OAAO,CAAEC,QAAQ,IAAKA,QAAQ,CAACF,OAAO,CAAC,CAAC;EACzD,CAAC,CAAC;AACJ;AAEA,OAAO,SAASI,UAAUA,CAACC,MAA6B,GAAG,CAAC,CAAC,EAAiB;EAC5E,OAAOb,sBAAsB,CAACY,UAAU,CAACC,MAAM,CAAC;AAClD;AAEA,OAAO,SAASC,cAAcA,CAAA,EAA6B;EACzD,OAAOd,sBAAsB,CAACc,cAAc,CAAC,CAAC;AAChD;AAEA,OAAO,SAASC,SAASA,CACvBL,QAAwC,EAC5B;EACZJ,mBAAmB,CAAC,CAAC;EACrBJ,gBAAgB,CAACc,GAAG,CAACN,QAAQ,CAAC;EAC9B,OAAO,MAAM;IACXR,gBAAgB,CAACe,MAAM,CAACP,QAAQ,CAAC;EACnC,CAAC;AACH;AAEA,OAAO,SAASQ,mBAAmBA,CACjCR,QAAwC,EAC5B;EACZJ,mBAAmB,CAAC,CAAC;EACrBF,cAAc,CAACY,GAAG,CAACN,QAAQ,CAAC;EAC5B,OAAO,MAAM;IACXN,cAAc,CAACa,MAAM,CAACP,QAAQ,CAAC;EACjC,CAAC;AACH","ignoreList":[]}
+{"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":[]}

package/lib/typescript/src/PushSignal.nitro.d.ts

@@ -13,6 +13,7 @@ export interface PushMessage {
     body?: string;
     data: Record<string, string>;
 }
+export type OnMessageListener = (message: PushMessage) => boolean | void | Promise<boolean | void>;
 export interface AndroidFirebaseConfig {
     project_id?: string;
     mobilesdk_app_id?: string;
@@ -25,7 +26,7 @@ export interface PushSignal extends HybridObject<{
 }> {
     initialize(config: AndroidFirebaseConfig): Promise<void>;
     getCredentials(): Promise<PushCredentials>;
-    setOnMessage(callback: (message: PushMessage) => void): void;
+    setOnMessage(callback: (message: PushMessage) => Promise<boolean>): void;
     setOnNotificationPress(callback: (message: PushMessage) => void): void;
 }
 //# sourceMappingURL=PushSignal.nitro.d.ts.map

package/lib/typescript/src/PushSignal.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PushSignal.nitro.d.ts","sourceRoot":"","sources":["../../../src/PushSignal.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,8FAA8F;AAC9F,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,YAAY,CAAC;AAChD,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,YAAY,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,UAAW,SAAQ,YAAY,CAAC;IAC/C,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,QAAQ,CAAC;CACnB,CAAC;IACA,UAAU,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;IAC3C,YAAY,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI,CAAC;IAC7D,sBAAsB,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI,CAAC;CACxE"}
+{"version":3,"file":"PushSignal.nitro.d.ts","sourceRoot":"","sources":["../../../src/PushSignal.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,8FAA8F;AAC9F,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,YAAY,CAAC;AAChD,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,YAAY,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,MAAM,iBAAiB,GAAG,CAC9B,OAAO,EAAE,WAAW,KACjB,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;AAE9C,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,UAAW,SAAQ,YAAY,CAAC;IAC/C,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,QAAQ,CAAC;CACnB,CAAC;IACA,UAAU,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;IAC3C,YAAY,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;IACzE,sBAAsB,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI,CAAC;CACxE"}

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

@@ -1,3 +1,3 @@
-export type { AndroidFirebaseConfig, PushCredentials, PushEnvironment, PushMessage, PushPlatform, } from './PushSignal.nitro.js';
+export type { AndroidFirebaseConfig, OnMessageListener, PushCredentials, PushEnvironment, PushMessage, PushPlatform, } from './PushSignal.nitro.js';
 export { getCredentials, initialize, onMessage, onNotificationPress, } from './pushSignal';
 //# 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":"AAAA,YAAY,EACV,qBAAqB,EACrB,eAAe,EACf,eAAe,EACf,WAAW,EACX,YAAY,GACb,MAAM,uBAAoB,CAAC;AAC5B,OAAO,EACL,cAAc,EACd,UAAU,EACV,SAAS,EACT,mBAAmB,GACpB,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,YAAY,EACV,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,WAAW,EACX,YAAY,GACb,MAAM,uBAAoB,CAAC;AAC5B,OAAO,EACL,cAAc,EACd,UAAU,EACV,SAAS,EACT,mBAAmB,GACpB,MAAM,cAAc,CAAC"}

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

@@ -1,6 +1,6 @@
-import type { AndroidFirebaseConfig, PushCredentials, PushMessage } from './PushSignal.nitro.js';
+import type { AndroidFirebaseConfig, OnMessageListener, PushCredentials, PushMessage } from './PushSignal.nitro.js';
 export declare function initialize(_config?: AndroidFirebaseConfig): Promise<void>;
 export declare function getCredentials(): Promise<PushCredentials>;
-export declare function onMessage(_listener: (message: PushMessage) => void): () => void;
+export declare function onMessage(_listener: OnMessageListener): () => void;
 export declare function onNotificationPress(_listener: (message: PushMessage) => void): () => void;
 //# sourceMappingURL=pushSignal.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pushSignal.d.ts","sourceRoot":"","sources":["../../../src/pushSignal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,eAAe,EACf,WAAW,EACZ,MAAM,uBAAoB,CAAC;AAE5B,wBAAsB,UAAU,CAC9B,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,IAAI,CAAC,CAAG;AAEnB,wBAAsB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAE/D;AAED,wBAAgB,SAAS,CACvB,SAAS,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GACxC,MAAM,IAAI,CAEZ;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GACxC,MAAM,IAAI,CAEZ"}
+{"version":3,"file":"pushSignal.d.ts","sourceRoot":"","sources":["../../../src/pushSignal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,WAAW,EACZ,MAAM,uBAAoB,CAAC;AAE5B,wBAAsB,UAAU,CAC9B,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,IAAI,CAAC,CAAG;AAEnB,wBAAsB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAE/D;AAED,wBAAgB,SAAS,CAAC,SAAS,EAAE,iBAAiB,GAAG,MAAM,IAAI,CAElE;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GACxC,MAAM,IAAI,CAEZ"}

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

@@ -1,6 +1,6 @@
-import type { AndroidFirebaseConfig, PushCredentials, PushMessage } from './PushSignal.nitro.js';
+import type { AndroidFirebaseConfig, OnMessageListener, PushCredentials, PushMessage } from './PushSignal.nitro.js';
 export declare function initialize(config?: AndroidFirebaseConfig): Promise<void>;
 export declare function getCredentials(): Promise<PushCredentials>;
-export declare function onMessage(listener: (message: PushMessage) => void): () => void;
+export declare function onMessage(listener: OnMessageListener): () => void;
 export declare function onNotificationPress(listener: (message: PushMessage) => void): () => void;
 //# sourceMappingURL=pushSignal.native.d.ts.map

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,eAAe,EACf,WAAW,EAEZ,MAAM,uBAAoB,CAAC;AAyB5B,wBAAgB,UAAU,CAAC,MAAM,GAAE,qBAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5E;AAED,wBAAgB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAEzD;AAED,wBAAgB,SAAS,CACvB,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,GACvC,MAAM,IAAI,CAMZ;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;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"}

package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage.hpp

@@ -0,0 +1,128 @@
+///
+/// JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <functional>
+
+#include <NitroModules/Promise.hpp>
+#include "PushMessage.hpp"
+#include <functional>
+#include <NitroModules/JNICallable.hpp>
+#include <NitroModules/JPromise.hpp>
+#include "JPushMessage.hpp"
+#include <string>
+#include <optional>
+#include <unordered_map>
+
+namespace margelo::nitro::pushsignal {
+
+  using namespace facebook;
+
+  /**
+   * Represents the Java/Kotlin callback `(message: PushMessage) -> Promise<Promise<Boolean>>`.
+   * This can be passed around between C++ and Java/Kotlin.
+   */
+  struct JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage: public jni::JavaClass<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage> {
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/pushsignal/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage;";
+
+  public:
+    /**
+     * Invokes the function this `JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage` instance holds through JNI.
+     */
+    std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>> invoke(const PushMessage& message) const {
+      static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JPushMessage> /* message */)>("invoke");
+      auto __result = method(self(), JPushMessage::fromCpp(message));
+      return [&]() {
+        auto __promise = Promise<std::shared_ptr<Promise<bool>>>::create();
+        __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
+          auto __result = jni::static_ref_cast<JPromise::javaobject>(__boxedResult);
+          __promise->resolve([&]() {
+            auto __promise = Promise<bool>::create();
+            __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
+              auto __result = jni::static_ref_cast<jni::JBoolean>(__boxedResult);
+              __promise->resolve(static_cast<bool>(__result->value()));
+            });
+            __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
+              jni::JniException __jniError(__throwable);
+              __promise->reject(std::make_exception_ptr(__jniError));
+            });
+            return __promise;
+          }());
+        });
+        __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
+          jni::JniException __jniError(__throwable);
+          __promise->reject(std::make_exception_ptr(__jniError));
+        });
+        return __promise;
+      }();
+    }
+  };
+
+  /**
+   * An implementation of Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage that is backed by a C++ implementation (using `std::function<...>`)
+   */
+  class JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx final: public jni::HybridClass<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx, JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage> {
+  public:
+    static jni::local_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& func) {
+      return JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx::newObjectCxxArgs(func);
+    }
+
+  public:
+    /**
+     * Invokes the C++ `std::function<...>` this `JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx` instance holds.
+     */
+    jni::local_ref<JPromise::javaobject> invoke_cxx(jni::alias_ref<JPushMessage> message) {
+      std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>> __result = _func(message->toCpp());
+      return [&]() {
+        jni::local_ref<JPromise::javaobject> __localPromise = JPromise::create();
+        jni::global_ref<JPromise::javaobject> __promise = jni::make_global(__localPromise);
+        __result->addOnResolvedListener([=](const std::shared_ptr<Promise<bool>>& __result) {
+          __promise->cthis()->resolve([&]() {
+            jni::local_ref<JPromise::javaobject> __localPromise = JPromise::create();
+            jni::global_ref<JPromise::javaobject> __promise = jni::make_global(__localPromise);
+            __result->addOnResolvedListener([=](const bool& __result) {
+              __promise->cthis()->resolve(jni::JBoolean::valueOf(__result));
+            });
+            __result->addOnRejectedListener([=](const std::exception_ptr& __error) {
+              auto __jniError = jni::getJavaExceptionForCppException(__error);
+              __promise->cthis()->reject(__jniError);
+            });
+            return __localPromise;
+          }());
+        });
+        __result->addOnRejectedListener([=](const std::exception_ptr& __error) {
+          auto __jniError = jni::getJavaExceptionForCppException(__error);
+          __promise->cthis()->reject(__jniError);
+        });
+        return __localPromise;
+      }();
+    }
+
+  public:
+    [[nodiscard]]
+    inline const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& getFunction() const {
+      return _func;
+    }
+
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/pushsignal/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx;";
+    static void registerNatives() {
+      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx::invoke_cxx)});
+    }
+
+  private:
+    explicit JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& func): _func(func) { }
+
+  private:
+    friend HybridBase;
+    std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)> _func;
+  };
+
+} // namespace margelo::nitro::pushsignal

package/nitrogen/generated/android/c++/JHybridPushSignalSpec.cpp

@@ -33,10 +33,11 @@ namespace margelo::nitro::pushsignal { struct PushMessage; }
 #include "JAndroidFirebaseConfig.hpp"
 #include "PushMessage.hpp"
 #include <functional>
-#include "JFunc_void_PushMessage.hpp"
+#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage.hpp"
 #include <NitroModules/JNICallable.hpp>
 #include "JPushMessage.hpp"
 #include <unordered_map>
+#include "JFunc_void_PushMessage.hpp"
 
 namespace margelo::nitro::pushsignal {
 
@@ -102,9 +103,9 @@ namespace margelo::nitro::pushsignal {
       return __promise;
     }();
   }
-  void JHybridPushSignalSpec::setOnMessage(const std::function<void(const PushMessage& /* message */)>& callback) {
-    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_PushMessage::javaobject> /* callback */)>("setOnMessage_cxx");
-    method(_javaPart, JFunc_void_PushMessage_cxx::fromCpp(callback));
+  void JHybridPushSignalSpec::setOnMessage(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& callback) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage::javaobject> /* callback */)>("setOnMessage_cxx");
+    method(_javaPart, JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx::fromCpp(callback));
   }
   void JHybridPushSignalSpec::setOnNotificationPress(const std::function<void(const PushMessage& /* message */)>& callback) {
     static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_PushMessage::javaobject> /* callback */)>("setOnNotificationPress_cxx");

package/nitrogen/generated/android/c++/JHybridPushSignalSpec.hpp

@@ -56,7 +56,7 @@ namespace margelo::nitro::pushsignal {
     // Methods
     std::shared_ptr<Promise<void>> initialize(const AndroidFirebaseConfig& config) override;
     std::shared_ptr<Promise<PushCredentials>> getCredentials() override;
-    void setOnMessage(const std::function<void(const PushMessage& /* message */)>& callback) override;
+    void setOnMessage(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& callback) override;
     void setOnNotificationPress(const std::function<void(const PushMessage& /* message */)>& callback) override;
 
   private:

package/nitrogen/generated/android/kotlin/com/margelo/nitro/pushsignal/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage.kt

@@ -0,0 +1,78 @@
+///
+/// Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage.kt
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+package com.margelo.nitro.pushsignal
+
+import androidx.annotation.Keep
+import com.facebook.jni.HybridData
+import com.facebook.proguard.annotations.DoNotStrip
+import com.margelo.nitro.core.Promise
+
+/**
+ * Represents the JavaScript callback `(message: struct) => std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>`.
+ * This can be either implemented in C++ (in which case it might be a callback coming from JS),
+ * or in Kotlin/Java (in which case it is a native callback).
+ */
+@DoNotStrip
+@Keep
+@Suppress("ClassName", "RedundantUnitReturnType")
+fun interface Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage: (PushMessage) -> Promise<Promise<Boolean>> {
+  /**
+   * Call the given JS callback.
+   * @throws Throwable if the JS function itself throws an error, or if the JS function/runtime has already been deleted.
+   */
+  @DoNotStrip
+  @Keep
+  override fun invoke(message: PushMessage): Promise<Promise<Boolean>>
+}
+
+/**
+ * Represents the JavaScript callback `(message: struct) => std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>`.
+ * This is implemented in C++, via a `std::function<...>`.
+ * The callback might be coming from JS.
+ */
+@DoNotStrip
+@Keep
+@Suppress(
+  "KotlinJniMissingFunction", "unused",
+  "RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
+  "ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
+)
+class Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage {
+  @DoNotStrip
+  @Keep
+  private val mHybridData: HybridData
+
+  @DoNotStrip
+  @Keep
+  private constructor(hybridData: HybridData) {
+    mHybridData = hybridData
+  }
+
+  @DoNotStrip
+  @Keep
+  override fun invoke(message: PushMessage): Promise<Promise<Boolean>>
+    = invoke_cxx(message)
+
+  private external fun invoke_cxx(message: PushMessage): Promise<Promise<Boolean>>
+}
+
+/**
+ * Represents the JavaScript callback `(message: struct) => std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>`.
+ * This is implemented in Java/Kotlin, via a `(PushMessage) -> Promise<Promise<Boolean>>`.
+ * The callback is always coming from native.
+ */
+@DoNotStrip
+@Keep
+@Suppress("ClassName", "RedundantUnitReturnType", "unused")
+class Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_java(private val function: (PushMessage) -> Promise<Promise<Boolean>>): Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage {
+  @DoNotStrip
+  @Keep
+  override fun invoke(message: PushMessage): Promise<Promise<Boolean>> {
+    return this.function(message)
+  }
+}

package/nitrogen/generated/android/kotlin/com/margelo/nitro/pushsignal/HybridPushSignalSpec.kt

@@ -38,11 +38,11 @@ abstract class HybridPushSignalSpec: HybridObject() {
   @Keep
   abstract fun getCredentials(): Promise<PushCredentials>
   
-  abstract fun setOnMessage(callback: (message: PushMessage) -> Unit): Unit
+  abstract fun setOnMessage(callback: (message: PushMessage) -> Promise<Promise<Boolean>>): Unit
   
   @DoNotStrip
   @Keep
-  private fun setOnMessage_cxx(callback: Func_void_PushMessage): Unit {
+  private fun setOnMessage_cxx(callback: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage): Unit {
     val __result = setOnMessage(callback)
     return __result
   }

package/nitrogen/generated/android/pushsignalOnLoad.cpp

@@ -16,6 +16,7 @@
 #include <NitroModules/HybridObjectRegistry.hpp>
 
 #include "JHybridPushSignalSpec.hpp"
+#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage.hpp"
 #include "JFunc_void_PushMessage.hpp"
 #include <NitroModules/DefaultConstructableObject.hpp>
 
@@ -42,6 +43,7 @@ void registerAllNatives() {
 
   // Register native JNI methods
   margelo::nitro::pushsignal::JHybridPushSignalSpec::CxxPart::registerNatives();
+  margelo::nitro::pushsignal::JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_cxx::registerNatives();
   margelo::nitro::pushsignal::JFunc_void_PushMessage_cxx::registerNatives();
 
   // Register Nitro Hybrid Objects

package/nitrogen/generated/ios/PushSignal-Swift-Cxx-Bridge.cpp

@@ -38,6 +38,31 @@ namespace margelo::nitro::pushsignal::bridge::swift {
     };
   }
   
+  // pragma MARK: std::function<void(bool /* result */)>
+  Func_void_bool create_Func_void_bool(void* NON_NULL swiftClosureWrapper) noexcept {
+    auto swiftClosure = PushSignal::Func_void_bool::fromUnsafe(swiftClosureWrapper);
+    return [swiftClosure = std::move(swiftClosure)](bool result) mutable -> void {
+      swiftClosure.call(result);
+    };
+  }
+  
+  // pragma MARK: std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>
+  Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage create_Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage(void* NON_NULL swiftClosureWrapper) noexcept {
+    auto swiftClosure = PushSignal::Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage::fromUnsafe(swiftClosureWrapper);
+    return [swiftClosure = std::move(swiftClosure)](const PushMessage& message) mutable -> std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>> {
+      auto __result = swiftClosure.call(message);
+      return __result;
+    };
+  }
+  
+  // pragma MARK: std::function<void(const std::shared_ptr<Promise<bool>>& /* result */)>
+  Func_void_std__shared_ptr_Promise_bool__ create_Func_void_std__shared_ptr_Promise_bool__(void* NON_NULL swiftClosureWrapper) noexcept {
+    auto swiftClosure = PushSignal::Func_void_std__shared_ptr_Promise_bool__::fromUnsafe(swiftClosureWrapper);
+    return [swiftClosure = std::move(swiftClosure)](const std::shared_ptr<Promise<bool>>& result) mutable -> void {
+      swiftClosure.call(result);
+    };
+  }
+  
   // pragma MARK: std::function<void(const PushMessage& /* message */)>
   Func_void_PushMessage create_Func_void_PushMessage(void* NON_NULL swiftClosureWrapper) noexcept {
     auto swiftClosure = PushSignal::Func_void_PushMessage::fromUnsafe(swiftClosureWrapper);

package/nitrogen/generated/ios/PushSignal-Swift-Cxx-Bridge.hpp

@@ -165,6 +165,40 @@ namespace margelo::nitro::pushsignal::bridge::swift {
     return Func_void_PushCredentials_Wrapper(std::move(value));
   }
   
+  // pragma MARK: std::shared_ptr<Promise<bool>>
+  /**
+   * Specialized version of `std::shared_ptr<Promise<bool>>`.
+   */
+  using std__shared_ptr_Promise_bool__ = std::shared_ptr<Promise<bool>>;
+  inline std::shared_ptr<Promise<bool>> create_std__shared_ptr_Promise_bool__() noexcept {
+    return Promise<bool>::create();
+  }
+  inline PromiseHolder<bool> wrap_std__shared_ptr_Promise_bool__(std::shared_ptr<Promise<bool>> promise) noexcept {
+    return PromiseHolder<bool>(std::move(promise));
+  }
+  
+  // pragma MARK: std::function<void(bool /* result */)>
+  /**
+   * Specialized version of `std::function<void(bool)>`.
+   */
+  using Func_void_bool = std::function<void(bool /* result */)>;
+  /**
+   * Wrapper class for a `std::function<void(bool / * result * /)>`, this can be used from Swift.
+   */
+  class Func_void_bool_Wrapper final {
+  public:
+    explicit Func_void_bool_Wrapper(std::function<void(bool /* result */)>&& func): _function(std::make_unique<std::function<void(bool /* result */)>>(std::move(func))) {}
+    inline void call(bool result) const noexcept {
+      _function->operator()(result);
+    }
+  private:
+    std::unique_ptr<std::function<void(bool /* result */)>> _function;
+  } SWIFT_NONCOPYABLE;
+  Func_void_bool create_Func_void_bool(void* NON_NULL swiftClosureWrapper) noexcept;
+  inline Func_void_bool_Wrapper wrap_Func_void_bool(Func_void_bool value) noexcept {
+    return Func_void_bool_Wrapper(std::move(value));
+  }
+  
   // pragma MARK: std::unordered_map<std::string, std::string>
   /**
    * Specialized version of `std::unordered_map<std::string, std::string>`.
@@ -190,6 +224,63 @@ namespace margelo::nitro::pushsignal::bridge::swift {
     map.emplace(key, value);
   }
   
+  // pragma MARK: std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>
+  /**
+   * Specialized version of `std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage&)>`.
+   */
+  using Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage = std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>;
+  /**
+   * Wrapper class for a `std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& / * message * /)>`, this can be used from Swift.
+   */
+  class Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_Wrapper final {
+  public:
+    explicit Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_Wrapper(std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>&& func): _function(std::make_unique<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>>(std::move(func))) {}
+    inline std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>> call(PushMessage message) const noexcept {
+      auto __result = _function->operator()(message);
+      return __result;
+    }
+  private:
+    std::unique_ptr<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>> _function;
+  } SWIFT_NONCOPYABLE;
+  Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage create_Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage(void* NON_NULL swiftClosureWrapper) noexcept;
+  inline Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_Wrapper wrap_Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage(Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage value) noexcept {
+    return Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage_Wrapper(std::move(value));
+  }
+  
+  // pragma MARK: std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>
+  /**
+   * Specialized version of `std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>`.
+   */
+  using std__shared_ptr_Promise_std__shared_ptr_Promise_bool____ = std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>;
+  inline std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>> create_std__shared_ptr_Promise_std__shared_ptr_Promise_bool____() noexcept {
+    return Promise<std::shared_ptr<Promise<bool>>>::create();
+  }
+  inline PromiseHolder<std::shared_ptr<Promise<bool>>> wrap_std__shared_ptr_Promise_std__shared_ptr_Promise_bool____(std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>> promise) noexcept {
+    return PromiseHolder<std::shared_ptr<Promise<bool>>>(std::move(promise));
+  }
+  
+  // pragma MARK: std::function<void(const std::shared_ptr<Promise<bool>>& /* result */)>
+  /**
+   * Specialized version of `std::function<void(const std::shared_ptr<Promise<bool>>&)>`.
+   */
+  using Func_void_std__shared_ptr_Promise_bool__ = std::function<void(const std::shared_ptr<Promise<bool>>& /* result */)>;
+  /**
+   * Wrapper class for a `std::function<void(const std::shared_ptr<Promise<bool>>& / * result * /)>`, this can be used from Swift.
+   */
+  class Func_void_std__shared_ptr_Promise_bool___Wrapper final {
+  public:
+    explicit Func_void_std__shared_ptr_Promise_bool___Wrapper(std::function<void(const std::shared_ptr<Promise<bool>>& /* result */)>&& func): _function(std::make_unique<std::function<void(const std::shared_ptr<Promise<bool>>& /* result */)>>(std::move(func))) {}
+    inline void call(std::shared_ptr<Promise<bool>> result) const noexcept {
+      _function->operator()(result);
+    }
+  private:
+    std::unique_ptr<std::function<void(const std::shared_ptr<Promise<bool>>& /* result */)>> _function;
+  } SWIFT_NONCOPYABLE;
+  Func_void_std__shared_ptr_Promise_bool__ create_Func_void_std__shared_ptr_Promise_bool__(void* NON_NULL swiftClosureWrapper) noexcept;
+  inline Func_void_std__shared_ptr_Promise_bool___Wrapper wrap_Func_void_std__shared_ptr_Promise_bool__(Func_void_std__shared_ptr_Promise_bool__ value) noexcept {
+    return Func_void_std__shared_ptr_Promise_bool___Wrapper(std::move(value));
+  }
+  
   // pragma MARK: std::function<void(const PushMessage& /* message */)>
   /**
    * Specialized version of `std::function<void(const PushMessage&)>`.

package/nitrogen/generated/ios/c++/HybridPushSignalSpecSwift.hpp

@@ -100,7 +100,7 @@ namespace margelo::nitro::pushsignal {
       auto __value = std::move(__result.value());
       return __value;
     }
-    inline void setOnMessage(const std::function<void(const PushMessage& /* message */)>& callback) override {
+    inline void setOnMessage(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& callback) override {
       auto __result = _swiftPart.setOnMessage(callback);
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());

package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage.swift

@@ -0,0 +1,61 @@
+///
+/// Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+import NitroModules
+
+/**
+ * Wraps a Swift `(_ message: PushMessage) -> Promise<Promise<Bool>>` as a class.
+ * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.
+ */
+public final class Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage {
+  public typealias bridge = margelo.nitro.pushsignal.bridge.swift
+
+  private let closure: (_ message: PushMessage) -> Promise<Promise<Bool>>
+
+  public init(_ closure: @escaping (_ message: PushMessage) -> Promise<Promise<Bool>>) {
+    self.closure = closure
+  }
+
+  @inline(__always)
+  public func call(message: PushMessage) -> bridge.std__shared_ptr_Promise_std__shared_ptr_Promise_bool____ {
+    let __result: Promise<Promise<Bool>> = self.closure(message)
+    return { () -> bridge.std__shared_ptr_Promise_std__shared_ptr_Promise_bool____ in
+      let __promise = bridge.create_std__shared_ptr_Promise_std__shared_ptr_Promise_bool____()
+      let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_std__shared_ptr_Promise_bool____(__promise)
+      __result
+        .then({ __result in __promiseHolder.resolve({ () -> bridge.std__shared_ptr_Promise_bool__ in
+            let __promise = bridge.create_std__shared_ptr_Promise_bool__()
+            let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_bool__(__promise)
+            __result
+              .then({ __result in __promiseHolder.resolve(__result) })
+              .catch({ __error in __promiseHolder.reject(__error.toCpp()) })
+            return __promise
+          }()) })
+        .catch({ __error in __promiseHolder.reject(__error.toCpp()) })
+      return __promise
+    }()
+  }
+
+  /**
+   * Casts this instance to a retained unsafe raw pointer.
+   * This acquires one additional strong reference on the object!
+   */
+  @inline(__always)
+  public func toUnsafe() -> UnsafeMutableRawPointer {
+    return Unmanaged.passRetained(self).toOpaque()
+  }
+
+  /**
+   * Casts an unsafe pointer to a `Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage`.
+   * The pointer has to be a retained opaque `Unmanaged<Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage>`.
+   * This removes one strong reference from the object!
+   */
+  @inline(__always)
+  public static func fromUnsafe(_ pointer: UnsafeMutableRawPointer) -> Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage {
+    return Unmanaged<Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage>.fromOpaque(pointer).takeRetainedValue()
+  }
+}

package/nitrogen/generated/ios/swift/Func_void_bool.swift

@@ -0,0 +1,46 @@
+///
+/// Func_void_bool.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+import NitroModules
+
+/**
+ * Wraps a Swift `(_ value: Bool) -> Void` as a class.
+ * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.
+ */
+public final class Func_void_bool {
+  public typealias bridge = margelo.nitro.pushsignal.bridge.swift
+
+  private let closure: (_ value: Bool) -> Void
+
+  public init(_ closure: @escaping (_ value: Bool) -> Void) {
+    self.closure = closure
+  }
+
+  @inline(__always)
+  public func call(value: Bool) -> Void {
+    self.closure(value)
+  }
+
+  /**
+   * Casts this instance to a retained unsafe raw pointer.
+   * This acquires one additional strong reference on the object!
+   */
+  @inline(__always)
+  public func toUnsafe() -> UnsafeMutableRawPointer {
+    return Unmanaged.passRetained(self).toOpaque()
+  }
+
+  /**
+   * Casts an unsafe pointer to a `Func_void_bool`.
+   * The pointer has to be a retained opaque `Unmanaged<Func_void_bool>`.
+   * This removes one strong reference from the object!
+   */
+  @inline(__always)
+  public static func fromUnsafe(_ pointer: UnsafeMutableRawPointer) -> Func_void_bool {
+    return Unmanaged<Func_void_bool>.fromOpaque(pointer).takeRetainedValue()
+  }
+}

package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_bool__.swift

@@ -0,0 +1,66 @@
+///
+/// Func_void_std__shared_ptr_Promise_bool__.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+import NitroModules
+
+/**
+ * Wraps a Swift `(_ value: Promise<Bool>) -> Void` as a class.
+ * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.
+ */
+public final class Func_void_std__shared_ptr_Promise_bool__ {
+  public typealias bridge = margelo.nitro.pushsignal.bridge.swift
+
+  private let closure: (_ value: Promise<Bool>) -> Void
+
+  public init(_ closure: @escaping (_ value: Promise<Bool>) -> Void) {
+    self.closure = closure
+  }
+
+  @inline(__always)
+  public func call(value: bridge.std__shared_ptr_Promise_bool__) -> Void {
+    self.closure({ () -> Promise<Bool> in
+      let __promise = Promise<Bool>()
+      let __resolver = { (__result: Bool) in
+        __promise.resolve(withResult: __result)
+      }
+      let __rejecter = { (__error: Error) in
+        __promise.reject(withError: __error)
+      }
+      let __resolverCpp = { () -> bridge.Func_void_bool in
+        let __closureWrapper = Func_void_bool(__resolver)
+        return bridge.create_Func_void_bool(__closureWrapper.toUnsafe())
+      }()
+      let __rejecterCpp = { () -> bridge.Func_void_std__exception_ptr in
+        let __closureWrapper = Func_void_std__exception_ptr(__rejecter)
+        return bridge.create_Func_void_std__exception_ptr(__closureWrapper.toUnsafe())
+      }()
+      let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_bool__(value)
+      __promiseHolder.addOnResolvedListenerCopy(__resolverCpp)
+      __promiseHolder.addOnRejectedListener(__rejecterCpp)
+      return __promise
+    }())
+  }
+
+  /**
+   * Casts this instance to a retained unsafe raw pointer.
+   * This acquires one additional strong reference on the object!
+   */
+  @inline(__always)
+  public func toUnsafe() -> UnsafeMutableRawPointer {
+    return Unmanaged.passRetained(self).toOpaque()
+  }
+
+  /**
+   * Casts an unsafe pointer to a `Func_void_std__shared_ptr_Promise_bool__`.
+   * The pointer has to be a retained opaque `Unmanaged<Func_void_std__shared_ptr_Promise_bool__>`.
+   * This removes one strong reference from the object!
+   */
+  @inline(__always)
+  public static func fromUnsafe(_ pointer: UnsafeMutableRawPointer) -> Func_void_std__shared_ptr_Promise_bool__ {
+    return Unmanaged<Func_void_std__shared_ptr_Promise_bool__>.fromOpaque(pointer).takeRetainedValue()
+  }
+}

package/nitrogen/generated/ios/swift/HybridPushSignalSpec.swift

@@ -15,7 +15,7 @@ public protocol HybridPushSignalSpec_protocol: HybridObject {
   // Methods
   func initialize(config: AndroidFirebaseConfig) throws -> Promise<Void>
   func getCredentials() throws -> Promise<PushCredentials>
-  func setOnMessage(callback: @escaping (_ message: PushMessage) -> Void) throws -> Void
+  func setOnMessage(callback: @escaping (_ message: PushMessage) -> Promise<Promise<Bool>>) throws -> Void
   func setOnNotificationPress(callback: @escaping (_ message: PushMessage) -> Void) throws -> Void
 }
 

package/nitrogen/generated/ios/swift/HybridPushSignalSpec_cxx.swift

@@ -163,12 +163,33 @@ open class HybridPushSignalSpec_cxx {
   }
   
   @inline(__always)
-  public final func setOnMessage(callback: bridge.Func_void_PushMessage) -> bridge.Result_void_ {
+  public final func setOnMessage(callback: bridge.Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage) -> bridge.Result_void_ {
     do {
-      try self.__implementation.setOnMessage(callback: { () -> (PushMessage) -> Void in
-        let __wrappedFunction = bridge.wrap_Func_void_PushMessage(callback)
-        return { (__message: PushMessage) -> Void in
-          __wrappedFunction.call(__message)
+      try self.__implementation.setOnMessage(callback: { () -> (PushMessage) -> Promise<Promise<Bool>> in
+        let __wrappedFunction = bridge.wrap_Func_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage(callback)
+        return { (__message: PushMessage) -> Promise<Promise<Bool>> in
+          let __result = __wrappedFunction.call(__message)
+          return { () -> Promise<Promise<Bool>> in
+            let __promise = Promise<Promise<Bool>>()
+            let __resolver = { (__result: Promise<Bool>) in
+              __promise.resolve(withResult: __result)
+            }
+            let __rejecter = { (__error: Error) in
+              __promise.reject(withError: __error)
+            }
+            let __resolverCpp = { () -> bridge.Func_void_std__shared_ptr_Promise_bool__ in
+              let __closureWrapper = Func_void_std__shared_ptr_Promise_bool__(__resolver)
+              return bridge.create_Func_void_std__shared_ptr_Promise_bool__(__closureWrapper.toUnsafe())
+            }()
+            let __rejecterCpp = { () -> bridge.Func_void_std__exception_ptr in
+              let __closureWrapper = Func_void_std__exception_ptr(__rejecter)
+              return bridge.create_Func_void_std__exception_ptr(__closureWrapper.toUnsafe())
+            }()
+            let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_std__shared_ptr_Promise_bool____(__result)
+            __promiseHolder.addOnResolvedListener(__resolverCpp)
+            __promiseHolder.addOnRejectedListener(__rejecterCpp)
+            return __promise
+          }()
         }
       }())
       return bridge.create_Result_void_()

package/nitrogen/generated/shared/c++/HybridPushSignalSpec.hpp

@@ -59,7 +59,7 @@ namespace margelo::nitro::pushsignal {
       // Methods
       virtual std::shared_ptr<Promise<void>> initialize(const AndroidFirebaseConfig& config) = 0;
       virtual std::shared_ptr<Promise<PushCredentials>> getCredentials() = 0;
-      virtual void setOnMessage(const std::function<void(const PushMessage& /* message */)>& callback) = 0;
+      virtual void setOnMessage(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& callback) = 0;
       virtual void setOnNotificationPress(const std::function<void(const PushMessage& /* message */)>& callback) = 0;
 
     protected:

package/package.json

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

package/src/PushSignal.nitro.ts

@@ -17,6 +17,10 @@ export interface PushMessage {
   data: Record<string, string>;
 }
 
+export type OnMessageListener = (
+  message: PushMessage
+) => boolean | void | Promise<boolean | void>;
+
 export interface AndroidFirebaseConfig {
   project_id?: string;
   mobilesdk_app_id?: string;
@@ -30,6 +34,6 @@ export interface PushSignal extends HybridObject<{
 }> {
   initialize(config: AndroidFirebaseConfig): Promise<void>;
   getCredentials(): Promise<PushCredentials>;
-  setOnMessage(callback: (message: PushMessage) => void): void;
+  setOnMessage(callback: (message: PushMessage) => Promise<boolean>): void;
   setOnNotificationPress(callback: (message: PushMessage) => void): void;
 }

package/src/index.tsx

@@ -1,5 +1,6 @@
 export type {
   AndroidFirebaseConfig,
+  OnMessageListener,
   PushCredentials,
   PushEnvironment,
   PushMessage,

package/src/pushSignal.native.tsx

@@ -1,6 +1,7 @@
 import { NitroModules } from 'react-native-nitro-modules';
 import type {
   AndroidFirebaseConfig,
+  OnMessageListener,
   PushCredentials,
   PushMessage,
   PushSignal,
@@ -9,7 +10,7 @@ import type {
 const PushSignalHybridObject =
   NitroModules.createHybridObject<PushSignal>('PushSignal');
 
-const messageListeners = new Set<(message: PushMessage) => void>();
+const messageListeners = new Set<OnMessageListener>();
 const pressListeners = new Set<(message: PushMessage) => void>();
 let nativeCallbacksBound = false;
 
@@ -20,8 +21,18 @@ function bindNativeCallbacks() {
 
   nativeCallbacksBound = true;
 
-  PushSignalHybridObject.setOnMessage((message) => {
-    messageListeners.forEach((listener) => listener(message));
+  PushSignalHybridObject.setOnMessage(async (message) => {
+    const results = await Promise.all(
+      [...messageListeners].map(async (listener) => {
+        try {
+          return await listener(message);
+        } catch {
+          return false;
+        }
+      })
+    );
+
+    return results.some((result) => result === true);
   });
 
   PushSignalHybridObject.setOnNotificationPress((message) => {
@@ -37,9 +48,7 @@ export function getCredentials(): Promise<PushCredentials> {
   return PushSignalHybridObject.getCredentials();
 }
 
-export function onMessage(
-  listener: (message: PushMessage) => void
-): () => void {
+export function onMessage(listener: OnMessageListener): () => void {
   bindNativeCallbacks();
   messageListeners.add(listener);
   return () => {

package/src/pushSignal.tsx

@@ -1,5 +1,6 @@
 import type {
   AndroidFirebaseConfig,
+  OnMessageListener,
   PushCredentials,
   PushMessage,
 } from './PushSignal.nitro';
@@ -12,9 +13,7 @@ export async function getCredentials(): Promise<PushCredentials> {
   throw new Error('Push credentials are not supported on web');
 }
 
-export function onMessage(
-  _listener: (message: PushMessage) => void
-): () => void {
+export function onMessage(_listener: OnMessageListener): () => void {
   return () => {};
 }