react-native-push-signal 0.1.4 → 0.1.7

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026 Anton Seagull
+Copyright (c) 2026 AntonSeagull
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

package/PushSignal.podspec

@@ -13,19 +13,9 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://antonseagull.com.git", :tag => "#{s.version}" }
 
-  s.source_files = [
-    "ios/**/*.{swift}",
-    "ios/**/*.{h,m,mm}",
-    "cpp/**/*.{hpp,cpp}",
-  ]
-  s.public_header_files = "ios/**/*.h"
+  s.source_files = "ios/**/*.{h,m,mm,cpp}"
+  s.private_header_files = "ios/**/*.h"
   s.frameworks = "UIKit", "UserNotifications"
 
-  s.dependency 'React-jsi'
-  s.dependency 'React-callinvoker'
-
-  load 'nitrogen/generated/ios/PushSignal+autolinking.rb'
-  add_nitrogen_files(s)
-
   install_modules_dependencies(s)
 end

package/README.md

@@ -7,11 +7,9 @@ Get device credentials for your server and listen for incoming notifications or
 ## Installation
 
 ```sh
-npm install react-native-push-signal react-native-nitro-modules
+npm install react-native-push-signal
 ```
 
-`react-native-nitro-modules` is required because this library uses [Nitro Modules](https://nitro.margelo.com/).
-
 ## Usage
 
 ```ts
@@ -44,10 +42,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 +112,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

@@ -7,11 +7,9 @@
 ## Установка
 
 ```sh
-npm install react-native-push-signal react-native-nitro-modules
+npm install react-native-push-signal
 ```
 
-`react-native-nitro-modules` обязателен: библиотека собрана на [Nitro Modules](https://nitro.margelo.com/).
-
 ## Использование
 
 ```ts
@@ -44,10 +42,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 +112,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/build.gradle

@@ -25,80 +25,20 @@ buildscript {
   }
 }
 
-def reactNativeArchitectures() {
-  def value = rootProject.getProperties().get("reactNativeArchitectures")
-  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
-apply from: '../nitrogen/generated/android/pushsignal+autolinking.gradle'
 
 apply plugin: "com.facebook.react"
 
 android {
-  namespace "com.margelo.nitro.pushsignal"
+  namespace "com.pushsignal"
 
   compileSdkVersion getExtOrDefault("compileSdkVersion")
 
   defaultConfig {
     minSdkVersion getExtOrDefault("minSdkVersion")
     consumerProguardFiles "consumer-rules.pro"
-
-    externalNativeBuild {
-      cmake {
-        cppFlags "-frtti -fexceptions -Wall -fstack-protector-all"
-        arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-        abiFilters (*reactNativeArchitectures())
-
-        buildTypes {
-          debug {
-            cppFlags "-O1 -g"
-          }
-          release {
-            cppFlags "-O2"
-          }
-        }
-      }
-    }
-  }
-
-  externalNativeBuild {
-    cmake {
-      path "CMakeLists.txt"
-    }
-  }
-
-  packaging {
-    resources {
-      excludes += [
-        "META-INF",
-        "META-INF/**"
-      ]
-    }
-
-    jniLibs {
-      excludes += [
-        "**/libc++_shared.so",
-        "**/libfbjni.so",
-        "**/libjsi.so",
-        "**/libfolly_json.so",
-        "**/libfolly_runtime.so",
-        "**/libglog.so",
-        "**/libhermes.so",
-        "**/libhermes-executor-debug.so",
-        "**/libhermes_executor.so",
-        "**/libreactnative.so",
-        "**/libreactnativejni.so",
-        "**/libturbomodulejsijni.so",
-        "**/libreact_nativemodule_core.so",
-        "**/libjscexecutor.so"
-      ]
-    }
-  }
-
-  buildFeatures {
-    prefab true
   }
 
   compileOptions {
@@ -109,7 +49,6 @@ android {
 
 dependencies {
   implementation "com.facebook.react:react-android"
-  implementation project(":react-native-nitro-modules")
   implementation "androidx.activity:activity-ktx:1.10.1"
   implementation "androidx.core:core-ktx:1.16.0"
   implementation "com.google.firebase:firebase-messaging:24.1.2"

package/android/consumer-rules.pro

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

package/android/src/main/AndroidManifest.xml

@@ -3,12 +3,12 @@
 
   <application>
     <provider
-      android:name="com.margelo.nitro.pushsignal.PushSignalInitProvider"
+      android:name="com.pushsignal.PushSignalInitProvider"
       android:authorities="${applicationId}.pushsignal.init"
       android:exported="false" />
 
     <service
-      android:name="com.margelo.nitro.pushsignal.PushSignalMessagingService"
+      android:name="com.pushsignal.PushSignalMessagingService"
       android:exported="false">
       <intent-filter>
         <action android:name="com.google.firebase.MESSAGING_EVENT" />

package/android/src/main/java/com/pushsignal/PushModels.kt

@@ -0,0 +1,15 @@
+package com.pushsignal
+
+data class PushMessage(
+  val id: String?,
+  val title: String?,
+  val body: String?,
+  val data: Map<String, String>,
+)
+
+data class AndroidFirebaseConfig(
+  val project_id: String?,
+  val mobilesdk_app_id: String?,
+  val current_key: String?,
+  val project_number: String?,
+)

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

@@ -1,4 +1,4 @@
-package com.margelo.nitro.pushsignal
+package com.pushsignal
 
 import android.app.Activity
 import android.app.Application
@@ -13,28 +13,25 @@ import android.os.Handler
 import android.os.Looper
 import androidx.activity.ComponentActivity
 import androidx.core.app.NotificationCompat
+import com.google.android.gms.tasks.Tasks
 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) -> 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,36 @@ 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 {
+      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/android/src/main/java/com/{margelo/nitro/pushsignal → pushsignal}/PushSignalInitProvider.kt

@@ -1,4 +1,4 @@
-package com.margelo.nitro.pushsignal
+package com.pushsignal
 
 import android.content.ContentProvider
 import android.content.ContentValues

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

@@ -1,4 +1,4 @@
-package com.margelo.nitro.pushsignal
+package com.pushsignal
 
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage

package/android/src/main/java/com/pushsignal/PushSignalModule.kt

@@ -0,0 +1,88 @@
+package com.pushsignal
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableMap
+import java.util.concurrent.Executors
+
+class PushSignalModule(reactContext: ReactApplicationContext) :
+  NativePushSignalSpec(reactContext) {
+
+  @Volatile
+  private var listening = false
+
+  override fun initialize(config: ReadableMap, promise: Promise) {
+    val firebaseConfig = AndroidFirebaseConfig(
+      project_id = config.getStringOrNull("project_id"),
+      mobilesdk_app_id = config.getStringOrNull("mobilesdk_app_id"),
+      current_key = config.getStringOrNull("current_key"),
+      project_number = config.getStringOrNull("project_number"),
+    )
+
+    PushSignalCenter.attach(reactApplicationContext)
+    PushSignalCenter.initialize(firebaseConfig) { error ->
+      if (error == null) {
+        promise.resolve(null)
+      } else {
+        promise.reject("E_INIT", error.message, error)
+      }
+    }
+  }
+
+  override fun getCredentials(promise: Promise) {
+    executor.execute {
+      try {
+        PushSignalCenter.attach(reactApplicationContext)
+        val token = PushSignalCenter.fetchToken()
+        val result = Arguments.createMap().apply {
+          putString("platform", "android_os")
+          putString("token", token)
+        }
+        promise.resolve(result)
+      } catch (error: Exception) {
+        promise.reject("E_CREDENTIALS", error.message, error)
+      }
+    }
+  }
+
+  override fun startListening() {
+    if (listening) {
+      return
+    }
+    listening = true
+
+    PushSignalCenter.setOnMessage { message ->
+      emitOnMessage(message.toWritableMap())
+    }
+    PushSignalCenter.setOnNotificationPress { message ->
+      emitOnNotificationPress(message.toWritableMap())
+    }
+  }
+
+  companion object {
+    const val NAME = NativePushSignalSpec.NAME
+    private val executor = Executors.newSingleThreadExecutor()
+  }
+}
+
+private fun ReadableMap.getStringOrNull(key: String): String? {
+  if (!hasKey(key) || isNull(key)) {
+    return null
+  }
+  return getString(key)
+}
+
+private fun PushMessage.toWritableMap(): WritableMap {
+  val map = Arguments.createMap()
+  id?.let { map.putString("id", it) }
+  title?.let { map.putString("title", it) }
+  body?.let { map.putString("body", it) }
+  val dataMap = Arguments.createMap()
+  data.forEach { (key, value) ->
+    dataMap.putString(key, value)
+  }
+  map.putMap("data", dataMap)
+  return map
+}

package/android/src/main/java/com/pushsignal/PushSignalPackage.kt

@@ -0,0 +1,30 @@
+package com.pushsignal
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class PushSignalPackage : BaseReactPackage() {
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return if (name == PushSignalModule.NAME) {
+      PushSignalModule(reactContext)
+    } else {
+      null
+    }
+  }
+
+  override fun getReactModuleInfoProvider() = ReactModuleInfoProvider {
+    mapOf(
+      PushSignalModule.NAME to ReactModuleInfo(
+        name = PushSignalModule.NAME,
+        className = PushSignalModule.NAME,
+        canOverrideExistingModule = false,
+        needsEagerInit = false,
+        isCxxModule = false,
+        isTurboModule = true
+      )
+    )
+  }
+}

package/ios/PushSignal.h

@@ -0,0 +1,4 @@
+#import <PushSignalSpec/PushSignalSpec.h>
+
+@interface PushSignal : NativePushSignalSpecBase <NativePushSignalSpec>
+@end

package/ios/PushSignal.mm

@@ -0,0 +1,57 @@
+#import "PushSignal.h"
+#import "PushSignalCenter.h"
+
+@implementation PushSignal {
+  BOOL _listening;
+}
+
+- (void)initialize:(NSDictionary *)config
+           resolve:(RCTPromiseResolveBlock)resolve
+            reject:(RCTPromiseRejectBlock)reject {
+  (void)config;
+  resolve(nil);
+}
+
+- (void)getCredentials:(RCTPromiseResolveBlock)resolve
+                reject:(RCTPromiseRejectBlock)reject {
+  [[PushSignalCenter shared] fetchCredentialsWithResolver:^(NSDictionary *credentials) {
+    resolve(credentials);
+  }
+                                                 rejecter:^(NSError *error) {
+                                                   reject(@"E_CREDENTIALS", error.localizedDescription, error);
+                                                 }];
+}
+
+- (void)startListening {
+  if (_listening) {
+    return;
+  }
+  _listening = YES;
+
+  __weak PushSignal *weakSelf = self;
+  [[PushSignalCenter shared] setOnMessage:^(NSDictionary *message) {
+    PushSignal *strongSelf = weakSelf;
+    if (strongSelf == nil) {
+      return;
+    }
+    [strongSelf emitOnMessage:message];
+  }];
+  [[PushSignalCenter shared] setOnNotificationPress:^(NSDictionary *message) {
+    PushSignal *strongSelf = weakSelf;
+    if (strongSelf == nil) {
+      return;
+    }
+    [strongSelf emitOnNotificationPress:message];
+  }];
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params {
+  return std::make_shared<facebook::react::NativePushSignalSpecJSI>(params);
+}
+
++ (NSString *)moduleName {
+  return @"PushSignal";
+}
+
+@end

package/ios/PushSignalCenter.h

@@ -0,0 +1,26 @@
+#import <Foundation/Foundation.h>
+#import <UserNotifications/UserNotifications.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PushSignalCenter : NSObject <UNUserNotificationCenterDelegate>
+
++ (instancetype)shared;
++ (void)installEarly;
++ (void)bootstrapWithLaunchOptions:(nullable NSDictionary *)launchOptions;
+
+- (void)install;
+- (void)rememberForwardingDelegate:(nullable id<UNUserNotificationCenterDelegate>)delegate;
+
+- (void)fetchCredentialsWithResolver:(void (^)(NSDictionary *credentials))resolve
+                            rejecter:(void (^)(NSError *error))reject;
+
+- (void)setOnMessage:(void (^)(NSDictionary *message))callback;
+- (void)setOnNotificationPress:(void (^)(NSDictionary *message))callback;
+
+- (void)handleDeviceToken:(NSData *)deviceToken;
+- (void)handleRegistrationError:(NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END