@react-native-firebase/messaging 21.8.0 → 21.10.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [21.10.0](https://github.com/invertase/react-native-firebase/compare/v21.9.0...v21.10.0) (2025-02-11)
+
+### Features
+
+- **messaging, ios:** background completion handler from JS ([#8128](https://github.com/invertase/react-native-firebase/issues/8128)) ([f00fa8d](https://github.com/invertase/react-native-firebase/commit/f00fa8d26071c33b30a3d0a155e19a90a221a828))
+
+## [21.9.0](https://github.com/invertase/react-native-firebase/compare/v21.8.0...v21.9.0) (2025-02-11)
+
+**Note:** Version bump only for package @react-native-firebase/messaging
+
 ## [21.8.0](https://github.com/invertase/react-native-firebase/compare/v21.7.4...v21.8.0) (2025-02-10)
 
 ### Bug Fixes

package/ios/RNFBMessaging/RNFBMessaging+AppDelegate.h

@@ -27,6 +27,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property _Nullable RCTPromiseResolveBlock registerPromiseResolver;
 @property(nonatomic, strong) NSCondition *conditionBackgroundMessageHandlerSet;
 @property(nonatomic) BOOL backgroundMessageHandlerSet;
+@property(nonatomic, copy) void (^completionHandler)(UIBackgroundFetchResult);
+@property(nonatomic, assign) UIBackgroundTaskIdentifier backgroundTaskId;
 
 + (_Nonnull instancetype)sharedInstance;
 

package/ios/RNFBMessaging/RNFBMessaging+AppDelegate.m

@@ -156,30 +156,34 @@
     DLog(@"didReceiveRemoteNotification gcm.message_id was present %@", userInfo);
 
     if ([UIApplication sharedApplication].applicationState == UIApplicationStateBackground) {
+      // Store the completion handler to call later when the JS code finishes
+      RNFBMessagingAppDelegate *sharedInstance = [RNFBMessagingAppDelegate sharedInstance];
+      sharedInstance.completionHandler = completionHandler;
+
       // If app is in background state, register background task to guarantee async queues aren't
       // frozen.
-      UIBackgroundTaskIdentifier __block backgroundTaskId =
-          [application beginBackgroundTaskWithExpirationHandler:^{
-            if (backgroundTaskId != UIBackgroundTaskInvalid) {
-              [application endBackgroundTask:backgroundTaskId];
-              backgroundTaskId = UIBackgroundTaskInvalid;
-            }
-          }];
-      // TODO add support in a later version for calling completion handler directly from JS when
-      // user JS code complete
+      sharedInstance.backgroundTaskId = [application beginBackgroundTaskWithExpirationHandler:^{
+        if (sharedInstance.backgroundTaskId != UIBackgroundTaskInvalid) {
+          [application endBackgroundTask:sharedInstance.backgroundTaskId];
+          sharedInstance.backgroundTaskId = UIBackgroundTaskInvalid;
+        }
+      }];
+
       dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(25 * NSEC_PER_SEC)),
                      dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-                       completionHandler(UIBackgroundFetchResultNewData);
+                       if (sharedInstance.completionHandler) {
+                         sharedInstance.completionHandler(UIBackgroundFetchResultNewData);
+                         sharedInstance.completionHandler = nil;
+                       }
 
                        // Stop background task after the longest timeout, async queue is okay to
                        // freeze again after handling period
-                       if (backgroundTaskId != UIBackgroundTaskInvalid) {
-                         [application endBackgroundTask:backgroundTaskId];
-                         backgroundTaskId = UIBackgroundTaskInvalid;
+                       if (sharedInstance.backgroundTaskId != UIBackgroundTaskInvalid) {
+                         [application endBackgroundTask:sharedInstance.backgroundTaskId];
+                         sharedInstance.backgroundTaskId = UIBackgroundTaskInvalid;
                        }
                      });
 
-      RNFBMessagingAppDelegate *sharedInstance = [RNFBMessagingAppDelegate sharedInstance];
       [sharedInstance.conditionBackgroundMessageHandlerSet lock];
       @try {
         DLog(@"didReceiveRemoteNotification sharedInstance.backgroundMessageHandlerSet = %@",
@@ -242,4 +246,4 @@
   }
 }
 
-@end
+@end

package/ios/RNFBMessaging/RNFBMessagingModule.m

@@ -219,6 +219,20 @@ RCT_EXPORT_METHOD(getIsHeadless : (RCTPromiseResolveBlock)resolve : (RCTPromiseR
   return resolve(@([RCTConvert BOOL:@(notifCenter.isHeadless)]));
 }
 
+RCT_EXPORT_METHOD(completeNotificationProcessing) {
+  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+    RNFBMessagingAppDelegate *appDelegate = [RNFBMessagingAppDelegate sharedInstance];
+    if (appDelegate.completionHandler) {
+      appDelegate.completionHandler(UIBackgroundFetchResultNewData);
+      appDelegate.completionHandler = nil;
+    }
+    if (appDelegate.backgroundTaskId != UIBackgroundTaskInvalid) {
+      [[UIApplication sharedApplication] endBackgroundTask:appDelegate.backgroundTaskId];
+      appDelegate.backgroundTaskId = UIBackgroundTaskInvalid;
+    }
+  });
+}
+
 RCT_EXPORT_METHOD(requestPermission
                   : (NSDictionary *)permissions
                   : (RCTPromiseResolveBlock)resolve

package/lib/index.js

@@ -98,7 +98,13 @@ class FirebaseMessagingModule extends FirebaseModule {
           return Promise.resolve();
         }
 
-        return backgroundMessageHandler(remoteMessage);
+        // Ensure the handler is a promise
+        const handlerPromise = Promise.resolve(backgroundMessageHandler(remoteMessage));
+        handlerPromise.finally(() => {
+          this.native.completeNotificationProcessing();
+        });
+
+        return handlerPromise;
       });
 
       this.emitter.addListener('messaging_settings_for_notification_opened', remoteMessage => {

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '21.8.0';
+module.exports = '21.10.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/messaging",
-  "version": "21.8.0",
+  "version": "21.10.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - React Native Firebase provides native integration of Firebase Cloud Messaging (FCM) for both Android & iOS. FCM is a cost free service, allowing for server-device and device-device communication. The React Native Firebase Messaging module provides a simple JavaScript API to interact with FCM.",
   "main": "lib/index.js",
@@ -24,11 +24,11 @@
     "messaging"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "21.8.0",
+    "@react-native-firebase/app": "21.10.0",
     "expo": ">=47.0.0"
   },
   "devDependencies": {
-    "expo": "^52.0.30"
+    "expo": "^52.0.32"
   },
   "peerDependenciesMeta": {
     "expo": {
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "14ebd5c2d2e0f284397c331f909e533c47f2ec62"
+  "gitHead": "3fd30c09b2eb7d60a6ac7f6f906673a12b7bc1a7"
 }