react-native-push-signal 0.1.4 → 0.1.6

package/README.md

@@ -44,10 +44,6 @@ const credentials = await getCredentials();
 
 const stopMessages = onMessage((message) => {
   console.log('incoming', message);
-  if (message.data.silent === '1') {
-    return;
-  }
-  return true;
 });
 
 const stopPress = onNotificationPress((message) => {
@@ -118,15 +114,13 @@ If the host app already declares its own `FirebaseMessagingService`, only one se
 
 | 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 |
+| Foreground | `onMessage` + system banner | `onMessage` + tray (if title/body) | `onMessage` + tray (if title/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`.
+- `onMessage` — the push arrived while the app is in the foreground (and Android data messages while the process is alive). Listeners only receive the payload; they do not control the banner.
 - `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 (`onMessage`, `onNotificationPress`) are no-ops.

package/README.ru.md

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

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

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

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

@@ -18,23 +18,20 @@ 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) -> Promise<Promise<Boolean>>)? = null
+  @Volatile private var onMessage: ((PushMessage) -> Unit)? = null
   @Volatile private var onNotificationPress: ((PushMessage) -> Unit)? = null
   @Volatile private var pendingPress: PushMessage? = null
   private val pendingMessages = CopyOnWriteArrayList<PushMessage>()
@@ -78,23 +75,12 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
     onDone(applyFirebaseConfig(context, config))
   }
 
-  fun setOnMessage(callback: (PushMessage) -> Promise<Promise<Boolean>>) {
+  fun setOnMessage(callback: (PushMessage) -> Unit) {
     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)
-          }
-        }
-      }
+      runOnMain { deliverMessage(message) }
     }
   }
 
@@ -145,69 +131,37 @@ internal object PushSignalCenter : Application.ActivityLifecycleCallbacks {
 
   fun emitMessage(remoteMessage: RemoteMessage) {
     val message = remoteMessage.toPushMessage()
-    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)
-    }
+    runOnMain { deliverMessage(message) }
   }
 
-  private fun resolveShouldShowBanner(
-    message: PushMessage,
-    onDone: (Boolean) -> Unit
-  ) {
+  private fun deliverMessage(message: PushMessage) {
     val callback = onMessage
     if (callback == null) {
-      onDone(false)
+      pendingMessages.add(message)
       return
     }
 
-    val delivered = AtomicBoolean(false)
-    val timeout = Runnable {
-      if (delivered.compareAndSet(false, true)) {
-        onDone(true)
-      }
+    try {
+      // Fire-and-forget: JS only needs the payload.
+      callback(message)
+    } catch (_: Throwable) {
+      // Ignore listener failures.
     }
-    mainHandler.postDelayed(timeout, FOREGROUND_TIMEOUT_MS)
 
-    val finish = { shouldShow: Boolean ->
-      if (delivered.compareAndSet(false, true)) {
-        mainHandler.removeCallbacks(timeout)
-        onDone(shouldShow)
-      }
+    val inForeground = startedActivityCount > 0 || currentActivity != null
+    if (
+      inForeground &&
+      (!message.title.isNullOrEmpty() || !message.body.isNullOrEmpty())
+    ) {
+      postForegroundNotification(message)
     }
+  }
 
-    try {
-      callback(message)
-        .then { inner ->
-          inner
-            .then { shouldShow -> finish(shouldShow) }
-            .catch { finish(true) }
-        }
-        .catch { finish(true) }
-    } catch (_: Throwable) {
-      finish(true)
+  private fun runOnMain(block: () -> Unit) {
+    if (Looper.myLooper() == Looper.getMainLooper()) {
+      block()
+    } else {
+      mainHandler.post(block)
     }
   }
 

package/ios/PushSignal.swift

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

package/ios/PushSignalCenter.swift

@@ -22,6 +22,7 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
 
   private let lock = NSLock()
   private var didInstall = false
+  private var didSwizzleAppDelegate = false
   private var didSwizzleNotificationCenter = false
   private var deviceToken: String?
   private var registrationError: Error?
@@ -33,7 +34,7 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
   private var recentMessageIds: [String: Date] = [:]
   private weak var forwardingDelegate: UNUserNotificationCenterDelegate?
 
-  var onMessage: ((PushMessage) -> Promise<Promise<Bool>>)? {
+  var onMessage: ((PushMessage) -> Void)? {
     didSet {
       flushPendingMessages()
     }
@@ -91,7 +92,7 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
   }
 
   func handleDeviceToken(_ deviceToken: Data) {
-    let token = deviceToken.map { String(format: "%02.2hhx", $0) }.joined()
+    let token = deviceToken.map { String(format: "%02x", $0) }.joined()
     finishRegistration(result: .success(token))
   }
 
@@ -104,19 +105,13 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     willPresent notification: UNNotification,
     withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
   ) {
-    let message = Self.message(from: notification)
-    Task {
-      let shouldShow = await self.deliverMessage(message)
-      let ours: UNNotificationPresentationOptions = shouldShow ? Self.foregroundPresentationOptions : []
-      await MainActor.run {
-        self.forwardWillPresent(
-          center,
-          notification: notification,
-          ourOptions: ours,
-          completionHandler: completionHandler
-        )
-      }
-    }
+    deliverMessage(Self.message(from: notification))
+    forwardWillPresent(
+      center,
+      notification: notification,
+      ourOptions: Self.foregroundPresentationOptions,
+      completionHandler: completionHandler
+    )
   }
 
   @objc func userNotificationCenter(
@@ -205,55 +200,26 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     return body()
   }
 
-  private func deliverMessage(_ message: PushMessage) async -> Bool {
+  private func deliverMessage(_ message: PushMessage) {
     guard shouldEmit(message) else {
-      return false
+      return
     }
 
     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
     }
 
-    return await invokeOnMessage(callback, message: message)
+    emitToJs(callback, message: message)
   }
 
-  private func invokeOnMessage(
-    _ callback: @escaping (PushMessage) -> Promise<Promise<Bool>>,
+  private func emitToJs(
+    _ callback: @escaping (PushMessage) -> Void,
     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)
-      }
+  ) {
+    DispatchQueue.main.async {
+      callback(message)
     }
   }
 
@@ -270,9 +236,7 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
       }
 
       for message in queued {
-        Task {
-          _ = await self.invokeOnMessage(callback, message: message)
-        }
+        self.emitToJs(callback, message: message)
       }
     }
   }
@@ -307,8 +271,10 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
     forwardingDelegate.userNotificationCenter?(
       center,
       willPresent: notification,
-      withCompletionHandler: { (forwarded: UNNotificationPresentationOptions) in
-        completionHandler(ourOptions.union(forwarded))
+      withCompletionHandler: { (forwarded: Int) in
+        // ObjC optional-protocol bridging exposes options as Int here.
+        let forwardedOptions = UNNotificationPresentationOptions(rawValue: UInt(forwarded))
+        completionHandler(ourOptions.union(forwardedOptions))
       }
     )
   }
@@ -474,9 +440,13 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
   }
 
   private func swizzleAppDelegate() {
+    guard !didSwizzleAppDelegate else {
+      return
+    }
     guard let appDelegate = UIApplication.shared.delegate else {
       return
     }
+    didSwizzleAppDelegate = true
 
     let target: AnyClass = type(of: appDelegate)
     let source: AnyClass = PushSignalAppDelegateHook.self
@@ -521,8 +491,18 @@ final class PushSignalCenter: NSObject, UNUserNotificationCenterDelegate {
 
     let replacementImp = method_getImplementation(replacementMethod)
     let types = method_getTypeEncoding(replacementMethod)
+    let superMethod = class_getSuperclass(target).flatMap { class_getInstanceMethod($0, original) }
 
+    // No implementation on this class yet — install ours and keep superclass under `replacement`.
     if class_addMethod(target, original, replacementImp, types) {
+      if let superMethod {
+        class_addMethod(
+          target,
+          replacement,
+          method_getImplementation(superMethod),
+          method_getTypeEncoding(superMethod)
+        )
+      }
       return
     }
 
@@ -543,17 +523,16 @@ private final class PushSignalAppDelegateHook: NSObject {
     didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data
   ) {
     PushSignalCenter.shared.handleDeviceToken(deviceToken)
-    let selector = #selector(
-      PushSignalAppDelegateHook.pushSignal_application(_:didRegisterForRemoteNotificationsWithDeviceToken:)
+    forwardToOriginal(
+      hooked: #selector(
+        UIApplicationDelegate.application(_:didRegisterForRemoteNotificationsWithDeviceToken:)
+      ),
+      original: #selector(
+        PushSignalAppDelegateHook.pushSignal_application(_:didRegisterForRemoteNotificationsWithDeviceToken:)
+      ),
+      application: application,
+      deviceToken: deviceToken
     )
-    guard responds(to: selector),
-          let method = class_getInstanceMethod(type(of: self), selector)
-    else {
-      return
-    }
-
-    typealias Fn = @convention(c) (Any, Selector, UIApplication, Data) -> Void
-    unsafeBitCast(method_getImplementation(method), to: Fn.self)(self, selector, application, deviceToken)
   }
 
   @objc func pushSignal_application(
@@ -561,17 +540,54 @@ private final class PushSignalAppDelegateHook: NSObject {
     didFailToRegisterForRemoteNotificationsWithError error: Error
   ) {
     PushSignalCenter.shared.handleRegistrationError(error)
-    let selector = #selector(
-      PushSignalAppDelegateHook.pushSignal_application(_:didFailToRegisterForRemoteNotificationsWithError:)
+    forwardToOriginal(
+      hooked: #selector(
+        UIApplicationDelegate.application(_:didFailToRegisterForRemoteNotificationsWithError:)
+      ),
+      original: #selector(
+        PushSignalAppDelegateHook.pushSignal_application(_:didFailToRegisterForRemoteNotificationsWithError:)
+      ),
+      application: application,
+      error: error as NSError
     )
-    guard responds(to: selector),
-          let method = class_getInstanceMethod(type(of: self), selector)
+  }
+
+  private func forwardToOriginal(
+    hooked: Selector,
+    original: Selector,
+    application: UIApplication,
+    deviceToken: Data
+  ) {
+    guard responds(to: original),
+          let cls = object_getClass(self),
+          let originalImp = class_getMethodImplementation(cls, original),
+          let hookedImp = class_getMethodImplementation(cls, hooked),
+          originalImp != hookedImp
+    else {
+      return
+    }
+
+    typealias Fn = @convention(c) (Any, Selector, UIApplication, Data) -> Void
+    unsafeBitCast(originalImp, to: Fn.self)(self, original, application, deviceToken)
+  }
+
+  private func forwardToOriginal(
+    hooked: Selector,
+    original: Selector,
+    application: UIApplication,
+    error: NSError
+  ) {
+    guard responds(to: original),
+          let cls = object_getClass(self),
+          let originalImp = class_getMethodImplementation(cls, original),
+          let hookedImp = class_getMethodImplementation(cls, hooked),
+          originalImp != hookedImp
     else {
       return
     }
 
     typealias Fn = @convention(c) (Any, Selector, UIApplication, NSError) -> Void
-    unsafeBitCast(method_getImplementation(method), to: Fn.self)(self, selector, application, error as NSError)
+    unsafeBitCast(originalImp, to: Fn.self)(self, original, application, error)
   }
 }
 

package/ios/PushSignalLaunchStore.m

@@ -1,6 +1,12 @@
 #import "PushSignalLaunchStore.h"
 #import <UIKit/UIKit.h>
 
+// Swift `@objc(PushSignalCenter)` — declared so messaging via `id` type-checks.
+@interface PushSignalCenter : NSObject
++ (void)installEarly;
++ (void)bootstrapWithLaunchOptions:(nullable NSDictionary *)launchOptions;
+@end
+
 static NSDictionary *sLaunchOptions;
 
 NSDictionary *PushSignalCopyLaunchOptions(void) {
@@ -10,12 +16,14 @@ NSDictionary *PushSignalCopyLaunchOptions(void) {
 @implementation PushSignalLaunchStore
 
 + (void)load {
+  // String form: `UIApplicationWillFinishLaunchingNotification` is not declared in
+  // every UIKit header set, but the system still posts this name.
   [[NSNotificationCenter defaultCenter]
-      addObserverForName:UIApplicationWillFinishLaunchingNotification
+      addObserverForName:@"UIApplicationWillFinishLaunchingNotification"
                   object:nil
                    queue:nil
               usingBlock:^(NSNotification *notification) {
-                Class center = NSClassFromString(@"PushSignalCenter");
+                id center = NSClassFromString(@"PushSignalCenter");
                 if ([center respondsToSelector:@selector(installEarly)]) {
                   [center installEarly];
                 }
@@ -27,7 +35,7 @@ NSDictionary *PushSignalCopyLaunchOptions(void) {
                    queue:nil
               usingBlock:^(NSNotification *notification) {
                 sLaunchOptions = [notification.userInfo copy];
-                Class center = NSClassFromString(@"PushSignalCenter");
+                id center = NSClassFromString(@"PushSignalCenter");
                 if ([center respondsToSelector:@selector(bootstrapWithLaunchOptions:)]) {
                   [center bootstrapWithLaunchOptions:sLaunchOptions];
                 }

package/lib/module/pushSignal.native.js

@@ -10,16 +10,14 @@ function bindNativeCallbacks() {
     return;
   }
   nativeCallbacksBound = true;
-  PushSignalHybridObject.setOnMessage(async message => {
-    const listeners = [...messageListeners];
-    const results = await Promise.all(listeners.map(async listener => {
+  PushSignalHybridObject.setOnMessage(message => {
+    for (const listener of [...messageListeners]) {
       try {
-        return await listener(message);
+        void listener(message);
       } catch {
-        return false;
+        // Ignore listener failures so one bad subscriber cannot break delivery.
       }
-    }));
-    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","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":[]}
+{"version":3,"names":["NitroModules","PushSignalHybridObject","createHybridObject","messageListeners","Set","pressListeners","nativeCallbacksBound","bindNativeCallbacks","setOnMessage","message","listener","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,CAAEC,OAAO,IAAK;IAC/C,KAAK,MAAMC,QAAQ,IAAI,CAAC,GAAGP,gBAAgB,CAAC,EAAE;MAC5C,IAAI;QACF,KAAKO,QAAQ,CAACD,OAAO,CAAC;MACxB,CAAC,CAAC,MAAM;QACN;MAAA;IAEJ;EACF,CAAC,CAAC;EAEFR,sBAAsB,CAACU,sBAAsB,CAAEF,OAAO,IAAK;IACzDJ,cAAc,CAACO,OAAO,CAAEF,QAAQ,IAAKA,QAAQ,CAACD,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,CAACN,QAA2B,EAAc;EACjEH,mBAAmB,CAAC,CAAC;EACrBJ,gBAAgB,CAACc,GAAG,CAACP,QAAQ,CAAC;EAC9B,OAAO,MAAM;IACXP,gBAAgB,CAACe,MAAM,CAACR,QAAQ,CAAC;EACnC,CAAC;AACH;AAEA,OAAO,SAASS,mBAAmBA,CACjCT,QAAwC,EAC5B;EACZH,mBAAmB,CAAC,CAAC;EACrBF,cAAc,CAACY,GAAG,CAACP,QAAQ,CAAC;EAC5B,OAAO,MAAM;IACXL,cAAc,CAACa,MAAM,CAACR,QAAQ,CAAC;EACjC,CAAC;AACH;AAEAH,mBAAmB,CAAC,CAAC","ignoreList":[]}

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

@@ -13,7 +13,7 @@ export interface PushMessage {
     body?: string;
     data: Record<string, string>;
 }
-export type OnMessageListener = (message: PushMessage) => boolean | void | Promise<boolean | void>;
+export type OnMessageListener = (message: PushMessage) => void | Promise<void>;
 export interface AndroidFirebaseConfig {
     project_id?: string;
     mobilesdk_app_id?: string;
@@ -26,7 +26,7 @@ export interface PushSignal extends HybridObject<{
 }> {
     initialize(config: AndroidFirebaseConfig): Promise<void>;
     getCredentials(): Promise<PushCredentials>;
-    setOnMessage(callback: (message: PushMessage) => Promise<boolean>): void;
+    setOnMessage(callback: (message: PushMessage) => void): 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,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"}
+{"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,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE1B,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"}

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;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"}
+{"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;AA+B5B,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++/JHybridPushSignalSpec.cpp

@@ -33,11 +33,10 @@ namespace margelo::nitro::pushsignal { struct PushMessage; }
 #include "JAndroidFirebaseConfig.hpp"
 #include "PushMessage.hpp"
 #include <functional>
-#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_bool_____PushMessage.hpp"
+#include "JFunc_void_PushMessage.hpp"
 #include <NitroModules/JNICallable.hpp>
 #include "JPushMessage.hpp"
 #include <unordered_map>
-#include "JFunc_void_PushMessage.hpp"
 
 namespace margelo::nitro::pushsignal {
 
@@ -103,9 +102,9 @@ namespace margelo::nitro::pushsignal {
       return __promise;
     }();
   }
-  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::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::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<std::shared_ptr<Promise<std::shared_ptr<Promise<bool>>>>(const PushMessage& /* message */)>& callback) override;
+    void setOnMessage(const std::function<void(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/HybridPushSignalSpec.kt

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

package/nitrogen/generated/android/pushsignalOnLoad.cpp

@@ -16,7 +16,6 @@
 #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>
 
@@ -43,7 +42,6 @@ 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