react-native-notify-kit 10.10.0 → 10.10.1

package/ios/NotifeeCore/NotifeeCore+UNUserNotificationCenter.m

@@ -17,6 +17,8 @@
 
 #import "NotifeeCore+UNUserNotificationCenter.h"
 
+#import <objc/runtime.h>
+
 #import "NotifeeCore.h"
 #import "NotifeeCoreDelegateHolder.h"
 #import "NotifeeCoreUtil.h"
@@ -29,7 +31,6 @@ typedef void (^NotifeeCoreVoidCompletionHandler)(void);
 @end
 
 @interface NotifeeCoreUNUserNotificationCenter ()
-- (void)refreshOriginalDelegateSelectorFlags;
 - (void)rechainUserNotificationCenterDelegate;
 @end
 
@@ -78,13 +79,85 @@ static NotifeeCoreVoidCompletionHandler NotifeeCoreOneShotVoidCompletionHandler(
   return [oneShotCompletionHandler copy];
 }
 
-@implementation NotifeeCoreUNUserNotificationCenter
+// Class/ISA pointers differ when two images contain this implementation. Use
+// runtime names, then message the trusted peer's accessor; never read its ivars.
+static BOOL NotifeeCoreIsDelegatePeer(id delegate) {
+  for (Class cls = object_getClass(delegate); cls != Nil; cls = class_getSuperclass(cls)) {
+    if (strcmp(class_getName(cls), "NotifeeCoreUNUserNotificationCenter") == 0) return YES;
+  }
+  return NO;
+}
+
+@protocol NotifeeCoreDelegateChain <NSObject>
+- (id<UNUserNotificationCenterDelegate>)originalDelegate;
+@end
+
+static BOOL NotifeeCoreDelegateChainIsUnsafe(id owner, id candidate) {
+  NSMutableArray *visited = [NSMutableArray new];
+  id cursor = candidate;
+  for (NSUInteger hops = 0; cursor != nil; hops++) {
+    if (cursor == owner || [visited indexOfObjectIdenticalTo:cursor] != NSNotFound) return YES;
+    if (!NotifeeCoreIsDelegatePeer(cursor)) return NO;  // Opaque SDK: contain only on reentry.
+    if (hops >= 32) return YES;                         // Bounded, fail closed.
+    [visited addObject:cursor];
+    cursor = [(id<NotifeeCoreDelegateChain>)cursor originalDelegate];
+  }
+  return NO;
+}
 
-struct {
-  unsigned int willPresentNotification : 1;
-  unsigned int didReceiveNotificationResponse : 1;
-  unsigned int openSettingsForNotification : 1;
-} originalUNCDelegateRespondsTo;
+// Foundation containers and a versioned string key share the synchronous call
+// context across binary images, without relying on a per-image registry/Class.
+// Identity includes selector, center and event, so nested distinct notifications
+// and later deliveries of the same object are independent. No state survives an
+// unwind; ordinary asynchronous downstream completions remain unrestricted.
+static void NotifeeCoreForward(id owner, id downstream, id center, id event, SEL selector,
+                               void (^invoke)(void), void (^fallback)(void)) {
+  NSString *key = @"app.notifee.UNUserNotificationCenter.forwarding.v1";
+  NSMutableDictionary *threadState = [NSThread currentThread].threadDictionary;
+  NSMutableArray *frames = threadState[key];
+  for (NSMutableDictionary *active in frames) {
+    if (active[@"owner"] == owner && active[@"center"] == (center ?: [NSNull null]) &&
+        active[@"event"] == (event ?: [NSNull null]) &&
+        [active[@"selector"] isEqualToString:NSStringFromSelector(selector)]) {
+      active[@"cycle"] = @YES;
+      // The outer invocation completes after the SDK returns, allowing an SDK
+      // to supply its own options before or after the recursive call unwinds.
+      return;
+    }
+  }
+  if (NotifeeCoreDelegateChainIsUnsafe(owner, downstream)) {
+    fallback();
+    return;
+  }
+  if (frames == nil) {
+    frames = [NSMutableArray new];
+    threadState[key] = frames;
+  }
+  NSMutableDictionary *frame = [@{
+    @"owner" : owner,
+    @"center" : center ?: [NSNull null],
+    @"event" : event ?: [NSNull null],
+    @"selector" : NSStringFromSelector(selector),
+    @"cycle" : @NO
+  } mutableCopy];
+  [frames addObject:frame];
+  @try {
+    invoke();
+    // Only a proven synchronous cycle triggers fallback. The caller passes a
+    // one-shot block, preserving any options already supplied by the downstream.
+    if ([frame[@"cycle"] boolValue]) fallback();
+  } @finally {
+    [frames removeObjectIdenticalTo:frame];
+    if (frames.count == 0) [threadState removeObjectForKey:key];
+  }
+}
+
+static UNNotificationPresentationOptions NotifeeCoreDefaultPresentationOptions(void) {
+  return UNNotificationPresentationOptionBanner | UNNotificationPresentationOptionSound |
+         UNNotificationPresentationOptionList | UNNotificationPresentationOptionBadge;
+}
+
+@implementation NotifeeCoreUNUserNotificationCenter
 
 + (instancetype)instance {
   static dispatch_once_t once;
@@ -103,36 +176,20 @@ struct {
   [self rechainUserNotificationCenterDelegate];
 }
 
-- (void)refreshOriginalDelegateSelectorFlags {
-  id<UNUserNotificationCenterDelegate> originalDelegate = self.originalDelegate;
-
-  originalUNCDelegateRespondsTo.openSettingsForNotification =
-      originalDelegate != nil &&
-      [originalDelegate respondsToSelector:@selector(userNotificationCenter:
-                                                openSettingsForNotification:)];
-  originalUNCDelegateRespondsTo.willPresentNotification =
-      originalDelegate != nil &&
-      [originalDelegate respondsToSelector:@selector
-                        (userNotificationCenter:willPresentNotification:withCompletionHandler:)];
-  originalUNCDelegateRespondsTo.didReceiveNotificationResponse =
-      originalDelegate != nil &&
-      [originalDelegate
-          respondsToSelector:@selector(userNotificationCenter:
-                                 didReceiveNotificationResponse:withCompletionHandler:)];
-}
-
 - (void)rechainUserNotificationCenterDelegate {
   @synchronized(self) {
     UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
     id<UNUserNotificationCenterDelegate> currentDelegate = center.delegate;
+    if (currentDelegate == self) return;
 
-    if (currentDelegate == self) {
-      [self refreshOriginalDelegateSelectorFlags];
+    // Leave an installed peer in charge. Replacing it loses its healthy leaf
+    // and permits independent singletons to adopt each other on activation.
+    // Preserve our existing downstream when a candidate is demonstrably unsafe.
+    if (NotifeeCoreIsDelegatePeer(currentDelegate) ||
+        NotifeeCoreDelegateChainIsUnsafe(self, currentDelegate))
       return;
-    }
 
     self.originalDelegate = currentDelegate;
-    [self refreshOriginalDelegateSelectorFlags];
     center.delegate = self;
   }
 }
@@ -188,6 +245,7 @@ struct {
        willPresentNotification:(UNNotification *)notification
          withCompletionHandler:
              (void (^)(UNNotificationPresentationOptions options))completionHandler {
+  id<UNUserNotificationCenterDelegate> downstream = self.originalDelegate;
   NSDictionary *notifeeNotification =
       notification.request.content.userInfo[kNotifeeUserInfoNotification];
   BOOL isRollingTimestampNotification =
@@ -244,24 +302,21 @@ struct {
       [self topUpRollingTimestampTriggersForLifecycleEvent:@"foreground delivery"];
     }
 
-  } else if (_originalDelegate != nil && originalUNCDelegateRespondsTo.willPresentNotification) {
-    NotifeeCorePresentationCompletionHandler oneShotCompletionHandler =
+  } else if ([downstream respondsToSelector:_cmd]) {
+    NotifeeCorePresentationCompletionHandler done =
         NotifeeCoreOneShotPresentationCompletionHandler(completionHandler);
-    [_originalDelegate userNotificationCenter:center
-                      willPresentNotification:notification
-                        withCompletionHandler:oneShotCompletionHandler];
+    NotifeeCoreForward(
+        self, downstream, center, notification, _cmd,
+        ^{
+          [downstream userNotificationCenter:center
+                     willPresentNotification:notification
+                       withCompletionHandler:done];
+        },
+        ^{
+          done(NotifeeCoreDefaultPresentationOptions());
+        });
   } else {
-    // No original delegate captured and the notification is not Notifee-owned.
-    // Returning UNNotificationPresentationOptionNone would silently drop the
-    // notification (no banner, no sound, no badge, no Notification Center entry),
-    // making remote pushes invisible to users in apps that don't install a
-    // competing UNUserNotificationCenterDelegate (e.g. apps without
-    // @react-native-firebase/messaging). Fall back to the platform default
-    // presentation options instead so the system shows the notification as it
-    // would if Notifee had not installed a delegate at all.
-    completionHandler(UNNotificationPresentationOptionBanner |
-                      UNNotificationPresentationOptionSound | UNNotificationPresentationOptionList |
-                      UNNotificationPresentationOptionBadge);
+    completionHandler(NotifeeCoreDefaultPresentationOptions());
   }
 }
 
@@ -279,34 +334,30 @@ struct {
 
   _notificationOpenedAppID = notifeeNotification[@"id"];
 
-  // handle notification outside of notifee
+  // External notifications prefer downstream handling in both flag states.
   if (notifeeNotification == nil) {
-    if (!self.shouldHandleRemoteNotifications) {
-      // Flag OFF: always forward to original delegate, never parse as Notifee
-      if (_originalDelegate != nil &&
-          originalUNCDelegateRespondsTo.didReceiveNotificationResponse) {
-        NotifeeCoreVoidCompletionHandler oneShotCompletionHandler =
-            NotifeeCoreOneShotVoidCompletionHandler(completionHandler);
-        [_originalDelegate userNotificationCenter:center
-                   didReceiveNotificationResponse:response
-                            withCompletionHandler:oneShotCompletionHandler];
-      } else {
-        completionHandler();
-      }
+    id<UNUserNotificationCenterDelegate> downstream = self.originalDelegate;
+    if ([downstream respondsToSelector:_cmd]) {
+      NotifeeCoreVoidCompletionHandler done =
+          NotifeeCoreOneShotVoidCompletionHandler(completionHandler);
+      NotifeeCoreForward(
+          self, downstream, center, response, _cmd,
+          ^{
+            [downstream userNotificationCenter:center
+                didReceiveNotificationResponse:response
+                         withCompletionHandler:done];
+          },
+          ^{
+            done();
+          });
       return;
     }
-    // Flag ON (default): existing behavior
-    if (_originalDelegate != nil && originalUNCDelegateRespondsTo.didReceiveNotificationResponse) {
-      NotifeeCoreVoidCompletionHandler oneShotCompletionHandler =
-          NotifeeCoreOneShotVoidCompletionHandler(completionHandler);
-      [_originalDelegate userNotificationCenter:center
-                 didReceiveNotificationResponse:response
-                          withCompletionHandler:oneShotCompletionHandler];
+    if (!self.shouldHandleRemoteNotifications) {
+      completionHandler();
       return;
-    } else {
-      notifeeNotification =
-          [NotifeeCoreUtil parseUNNotificationRequest:response.notification.request];
     }
+    notifeeNotification =
+        [NotifeeCoreUtil parseUNNotificationRequest:response.notification.request];
   }
 
   if (notifeeNotification != nil) {
@@ -375,11 +426,16 @@ struct {
 
 - (void)userNotificationCenter:(UNUserNotificationCenter *)center
     openSettingsForNotification:(nullable UNNotification *)notification {
-  if (_originalDelegate != nil && originalUNCDelegateRespondsTo.openSettingsForNotification) {
+  id<UNUserNotificationCenterDelegate> downstream = self.originalDelegate;
+  if ([downstream respondsToSelector:_cmd]) {
     if (@available(iOS 12.0, macOS 10.14, macCatalyst 13.0, *)) {
-      [_originalDelegate userNotificationCenter:center openSettingsForNotification:notification];
-    } else {
-      // Fallback on earlier versions
+      NotifeeCoreForward(self, downstream, center, notification, _cmd,
+                         ^{
+                           [downstream userNotificationCenter:center
+                                  openSettingsForNotification:notification];
+                         },
+                         ^{
+                         });
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-notify-kit",
-  "version": "10.10.0",
+  "version": "10.10.1",
   "author": "Marco Crupi",
   "description": "Maintained Notifee-compatible React Native notifications library for Android, iOS, FCM Mode, rich notifications, foreground services, and Expo CNG development builds.",
   "main": "dist/index.js",
@@ -26,13 +26,14 @@
   },
   "scripts": {
     "validate:all:ts": "tsc --project ./",
-    "build": "genversion --es6 --semi src/version.ts && tsc",
+    "build": "genversion --es6 --semi src/version.ts && tsc && yarn run build:nse-podfile",
+    "build:nse-podfile": "node ../../scripts/build-nse-podfile.cjs",
     "build:server": "tsc -p server/tsconfig.json",
     "build:clean": "rimraf android/build && rimraf ios/build && rimraf dist && rimraf server/dist",
     "build:watch": "tsc --watch",
     "test:server": "jest --config jest.config.server.js",
     "prepare": "yarn run build",
-    "prepack": "yarn run build:server && cd ../.. && bash build_ios_core.sh && bash scripts/verify-ios-core-generation.sh && bash scripts/prepack-cli.sh",
+    "prepack": "yarn run build:nse-podfile && yarn run build:server && cd ../.. && bash build_ios_core.sh && bash scripts/verify-ios-core-generation.sh && bash scripts/prepack-cli.sh",
     "postpack": "node ../../scripts/cli-artifacts.cjs postpack",
     "prepublishOnly": "cd ../.. && yarn run build:core",
     "format:android": "google-java-format --replace -i $(find . -type f -name \"*.java\" ! -path \"*/node_modules/*\" ! -path \"*/generated/*\")",

package/plugin/build/ios/withNotifyKitIosNseFiles.js

@@ -52,7 +52,7 @@ function writeNotifyKitIosNseFiles(
   writeFileIfMissingOrIdentical(
     path.join(targetDir, 'Info.plist'),
     renderNseInfoPlist({ targetName, ...versionOptions }),
-    contents => isGeneratedNseInfoPlist(contents, targetName),
+    contents => reconcileGeneratedNseInfoPlist(contents, targetName, versionOptions),
   );
   writeFileIfMissingOrIdentical(
     path.join(targetDir, `${targetName}.entitlements`),
@@ -72,29 +72,65 @@ function optionalString(value) {
   return typeof value === 'string' ? value : undefined;
 }
 
-function isGeneratedNseInfoPlist(contents, targetName) {
+// React Native's post_install (NewArchitectureHelper.set_RCTNewArchEnabled_in_info_plist)
+// appends this exact top-level entry to every target Info.plist, including the NSE.
+// Recognize only its canonical serialization immediately before the root </dict>, and
+// carry it over unchanged; NotifyKit never creates, removes or edits it.
+const RN_NEW_ARCH_ENABLED_ENTRY_PATTERN =
+  '(\\t<key>RCTNewArchEnabled</key>\\n\\t<(?:true|false)/>\\n)?';
+const ROOT_DICT_END = '</dict>\n</plist>\n';
+
+// Returns the contents to keep for a NotifyKit-generated Info.plist (refreshed version
+// fields plus any preserved tooling entry), or null when the file has consumer changes.
+function reconcileGeneratedNseInfoPlist(contents, targetName, versionOptions) {
+  const toolingEntry = matchGeneratedNseInfoPlist(contents, targetName);
+  if (toolingEntry === null) {
+    return null;
+  }
+
+  const generated = renderNseInfoPlist({ targetName, ...versionOptions });
+  if (!generated.endsWith(ROOT_DICT_END)) {
+    return null;
+  }
+
+  return generated.slice(0, -ROOT_DICT_END.length) + toolingEntry + ROOT_DICT_END;
+}
+
+// Returns the exact optional tooling entry ('' when absent), or null when the contents
+// are not the generated template.
+function matchGeneratedNseInfoPlist(contents, targetName) {
   const templateWithMarkers = renderNseInfoPlist({
     targetName,
     marketingVersion: MARKETING_VERSION_MARKER,
     currentProjectVersion: CURRENT_PROJECT_VERSION_MARKER,
   });
-  const escapedTemplate = escapeRegExp(templateWithMarkers)
+  if (!templateWithMarkers.endsWith(ROOT_DICT_END)) {
+    return null;
+  }
+
+  const escapedTemplateBody = escapeRegExp(templateWithMarkers.slice(0, -ROOT_DICT_END.length))
     .replace(MARKETING_VERSION_MARKER, '[^<]*')
     .replace(CURRENT_PROJECT_VERSION_MARKER, '[^<]*');
+  const match = new RegExp(
+    `^${escapedTemplateBody}${RN_NEW_ARCH_ENABLED_ENTRY_PATTERN}${escapeRegExp(ROOT_DICT_END)}$`,
+  ).exec(contents);
 
-  return new RegExp(`^${escapedTemplate}$`).test(contents);
+  return match ? (match[1] ?? '') : null;
 }
 
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
 
-function writeFileIfMissingOrIdentical(filePath, contents, canOverwrite) {
+function writeFileIfMissingOrIdentical(filePath, contents, reconcile) {
   if (fs.existsSync(filePath)) {
     const currentContents = fs.readFileSync(filePath, 'utf8');
     if (currentContents !== contents) {
-      if (canOverwrite?.(currentContents)) {
-        fs.writeFileSync(filePath, contents, 'utf8');
+      const reconciledContents = reconcile?.(currentContents) ?? null;
+      if (reconciledContents !== null) {
+        if (reconciledContents !== currentContents) {
+          fs.writeFileSync(filePath, reconciledContents, 'utf8');
+        }
         return;
       }