@capacitor/background-runner 1.0.6-dev-20251126T155137.0 → 1.0.6-dev-20251209T171016.0

package/ios/Sources/CapacitorBackgroundRunner/CapacitorAPI/Notifications.swift

@@ -137,7 +137,7 @@ class CapacitorNotifications: NSObject, CapacitorNotificationsExports {
                     let content = UNMutableNotificationContent()
                     content.title = NSString.localizedUserNotificationString(forKey: notificationOption.title, arguments: nil)
                     content.body = NSString.localizedUserNotificationString(forKey: notificationOption.body, arguments: nil)
-                    content.userInfo = [:]
+                    content.userInfo = ["source": "capacitor-background-runner"]
 
                     if let extra = notificationOption.extra {
                         content.userInfo["cap_extra"] = extra

package/ios/Sources/CapacitorBackgroundRunner/CapacitorBackgroundRunner.swift

@@ -15,6 +15,7 @@ public class BackgroundRunnerPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "removeNotificationListeners", returnType: CAPPluginReturnPromise)
     ]
     private let impl = BackgroundRunner()
+    private weak var originalDelegate: UNUserNotificationCenterDelegate?
 
     override public func load() {
         NotificationCenter.default.addObserver(
@@ -197,6 +198,11 @@ public class BackgroundRunnerPlugin: CAPPlugin, CAPBridgedPlugin {
     @objc func registerNotificationCategories() {
         let notificationCenter = UNUserNotificationCenter.current()
 
+        // Capture the original delegate if it's not self
+        if notificationCenter.delegate !== self {
+            originalDelegate = notificationCenter.delegate
+        }
+
         // Set the plugin as the notification delegate
         notificationCenter.delegate = self
     }
@@ -208,30 +214,68 @@ extension BackgroundRunnerPlugin: UNUserNotificationCenterDelegate {
     public func userNotificationCenter(_ center: UNUserNotificationCenter,
                                        didReceive response: UNNotificationResponse,
                                        withCompletionHandler completionHandler: @escaping () -> Void) {
+        let userInfo = response.notification.request.content.userInfo
+
+        if isBackgroundRunnerNotification(userInfo) {
+            handleBackgroundRunnerNotification(response, completionHandler: completionHandler)
+        } else {
+            forwardToOriginalDelegate(center, didReceive: response, withCompletionHandler: completionHandler)
+        }
+    }
+
+    // This is needed to present notifications when the app is in the foreground
+    public func userNotificationCenter(_ center: UNUserNotificationCenter,
+                                       willPresent notification: UNNotification,
+                                       withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
+        let userInfo = notification.request.content.userInfo
+
+        if isBackgroundRunnerNotification(userInfo) {
+            handleBackgroundRunnerPresentation(completionHandler: completionHandler)
+        } else {
+            forwardToOriginalDelegate(center, willPresent: notification, withCompletionHandler: completionHandler)
+        }
+    }
+
+    // MARK: - Helper Methods
+
+    private func isBackgroundRunnerNotification(_ userInfo: [AnyHashable: Any]) -> Bool {
+        return (userInfo["source"] as? String) == "capacitor-background-runner"
+    }
+
+    private func handleBackgroundRunnerNotification(_ response: UNNotificationResponse, completionHandler: @escaping () -> Void) {
         let actionTypeId = response.notification.request.content.categoryIdentifier
         let notificationId = Int(response.notification.request.identifier) ?? -1
 
-        // Create event data
         let eventData: [String: Any] = [
             "actionTypeId": actionTypeId,
             "notificationId": notificationId
         ]
 
-        // Notify listeners with the action data - the 'true' parameter is for retaining the event
         notifyListeners("backgroundRunnerNotificationReceived", data: eventData, retainUntilConsumed: true)
-
         completionHandler()
     }
 
-    // This is needed to present notifications when the app is in the foreground
-    public func userNotificationCenter(_ center: UNUserNotificationCenter,
-                                       willPresent notification: UNNotification,
-                                       withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
-        // Show the notification even when the app is in foreground
+    private func forwardToOriginalDelegate(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
+        if let originalDelegate = originalDelegate, originalDelegate.responds(to: #selector(userNotificationCenter(_:didReceive:withCompletionHandler:))) {
+            originalDelegate.userNotificationCenter?(center, didReceive: response, withCompletionHandler: completionHandler)
+        } else {
+            completionHandler()
+        }
+    }
+
+    private func handleBackgroundRunnerPresentation(completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
         if #available(iOS 14.0, *) {
             completionHandler([.banner, .sound, .badge])
         } else {
             completionHandler([.alert, .sound, .badge])
         }
     }
+
+    private func forwardToOriginalDelegate(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
+        if let originalDelegate = originalDelegate, originalDelegate.responds(to: #selector(userNotificationCenter(_:willPresent:withCompletionHandler:))) {
+            originalDelegate.userNotificationCenter?(center, willPresent: notification, withCompletionHandler: completionHandler)
+        } else {
+            handleBackgroundRunnerPresentation(completionHandler: completionHandler)
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/background-runner",
-  "version": "1.0.6-dev-20251126T155137.0",
+  "version": "1.0.6-dev-20251209T171016.0",
   "description": "Capacitor Background Runner",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -83,5 +83,5 @@
       "src": "android"
     }
   },
-  "gitHead": "4cf2dd072a40a0717e9c28cbbcfbcc05b332b4de"
+  "gitHead": "3be5e99878ad8533a4f4bfbf0ee8bdacbd7f419a"
 }