react-native-notify-kit 10.8.1 → 10.9.0

package/android/src/test/java/app/notifee/core/ForegroundServiceTest.java

@@ -119,7 +119,7 @@ public class ForegroundServiceTest {
 
   @Test
   @Config(
-      sdk = {34, 35},
+      sdk = {34, 35, 37},
       shadows = SliceAShadowService.class)
   public void sliceA_demotionPrecedesDestructiveRetirementAndEventWork() throws Exception {
     ForegroundService service = sliceAService(ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
@@ -221,7 +221,9 @@ public class ForegroundServiceTest {
   }
 
   @Test
-  @Config(sdk = 35, shadows = SliceAShadowService.class)
+  @Config(
+      sdk = {35, 37},
+      shadows = SliceAShadowService.class)
   public void sliceA_reservedUnknownAndAcceptedUndeliveredStartsRemainHeld() throws Exception {
     ForegroundService service = sliceAService(ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
     RecordingServiceContext context = useRecordingContext();
@@ -338,7 +340,9 @@ public class ForegroundServiceTest {
   }
 
   @Test
-  @Config(sdk = 35, shadows = SliceAShadowService.class)
+  @Config(
+      sdk = {35, 37},
+      shadows = SliceAShadowService.class)
   public void sliceA_demotionThrowPreservesEvidenceAndPrimaryEvenWhenStopThrows() throws Exception {
     ForegroundService service = sliceAService(ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
     Object runner = issue81Field(service, "mRunnerToken");
@@ -1047,7 +1051,8 @@ public class ForegroundServiceTest {
     }
 
     @Implementation
-    protected void startForeground(int id, Notification notification, int foregroundServiceType) {
+    protected void startForeground(int id, Notification notification, int foregroundServiceType)
+        throws Exception {
       if (promotionFailure != null) throw promotionFailure;
       promotions++;
       foreground = true;
@@ -1272,7 +1277,9 @@ public class ForegroundServiceTest {
   }
 
   @Test
-  @Config(sdk = 35, shadows = Issue81ShadowService.class)
+  @Config(
+      sdk = {35, 37},
+      shadows = Issue81ShadowService.class)
   public void issue82_pendingB_definiteRejectionReevaluatesRecovery_unknownDoesNot()
       throws Exception {
     for (RuntimeException reply :
@@ -1824,7 +1831,7 @@ public class ForegroundServiceTest {
 
   @Test
   @Config(
-      sdk = {31, 33, 34, 35},
+      sdk = {31, 33, 34, 35, 37},
       shadows = Issue81ShadowService.class)
   public void issue81_retryFreshDenied_recoversWithoutClaimingPromotion() throws Exception {
     issue81AssertFreshRecovery(Service.START_FLAG_RETRY);
@@ -2030,7 +2037,9 @@ public class ForegroundServiceTest {
   }
 
   @Test
-  @Config(sdk = 33, shadows = Issue81ShadowService.class)
+  @Config(
+      sdk = {33, 37},
+      shadows = Issue81ShadowService.class)
   public void issue81_deniedA_withQueuedStop_promotesBBeforeStopping() throws Exception {
     RecordingServiceContext context = useRecordingContext();
     ForegroundService service = issue81Service();
@@ -2371,7 +2380,7 @@ public class ForegroundServiceTest {
 
   @Test
   @Config(
-      sdk = {31, 34},
+      sdk = {31, 34, 37},
       shadows = Issue81ShadowService.class)
   public void issue81_deferredRecovery_lateSecurityRejection_stops() throws Exception {
     issue81AssertLateRejection(new SecurityException("B rejected"));
@@ -3105,7 +3114,7 @@ public class ForegroundServiceTest {
     }
 
     @Implementation
-    protected void startForeground(int id, Notification notification) {
+    protected void startForeground(int id, Notification notification) throws Exception {
       if (!forwardingTyped) {
         recordPromotion(id, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE);
       }
@@ -3113,7 +3122,7 @@ public class ForegroundServiceTest {
     }
 
     @Implementation
-    protected void startForeground(int id, Notification notification, int type) {
+    protected void startForeground(int id, Notification notification, int type) throws Exception {
       recordPromotion(id, notification, type);
       // ShadowService's typed overload delegates to the two-argument shadow. Record only the
       // actual platform invocation so the witness cannot count that delegation as a second call.
@@ -4180,7 +4189,7 @@ public class ForegroundServiceTest {
   @Implements(Service.class)
   public static class DenyOldNotificationShadowService extends ShadowService {
     @Implementation
-    protected void startForeground(int id, Notification notification) {
+    protected void startForeground(int id, Notification notification) throws Exception {
       if ("B".equals(notification.extras.getString(Notification.EXTRA_TITLE))) {
         throw new ForegroundServiceStartNotAllowedException("real old START denied");
       }
@@ -5274,7 +5283,7 @@ public class ForegroundServiceTest {
   @Implements(Service.class)
   public static class RejectBStartForegroundShadowService extends ShadowService {
     @Implementation
-    protected void startForeground(int id, Notification notification) {
+    protected void startForeground(int id, Notification notification) throws Exception {
       if ("B".equals(notification.extras.getString(Notification.EXTRA_TITLE))) {
         throw new SecurityException("posting B rejected");
       }
@@ -5282,7 +5291,8 @@ public class ForegroundServiceTest {
     }
 
     @Implementation
-    protected void startForeground(int id, Notification notification, int foregroundServiceType) {
+    protected void startForeground(int id, Notification notification, int foregroundServiceType)
+        throws Exception {
       if ("B".equals(notification.extras.getString(Notification.EXTRA_TITLE))) {
         throw new SecurityException("posting B rejected");
       }

package/android/src/test/java/app/notifee/core/ShadowServiceCompatibilityTest.java

@@ -0,0 +1,170 @@
+package app.notifee.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ServiceInfo;
+import android.os.Build;
+import android.os.IBinder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowService;
+
+/** Exercises the real Robolectric superclass calls, including its checked exception contract. */
+@RunWith(RobolectricTestRunner.class)
+public class ShadowServiceCompatibilityTest {
+  public static class TestService extends Service {
+    @Override
+    public IBinder onBind(Intent intent) {
+      return null;
+    }
+  }
+
+  @Test
+  @Config(
+      sdk = {29, 35, 36, 37},
+      shadows = ForegroundServiceTest.SliceAShadowService.class)
+  public void sliceA_typedForwardingPreservesFailures() {
+    ForegroundServiceTest.SliceAShadowService.reset();
+    assertForwarding(ForegroundServiceTest.SliceAShadowService.class, true);
+  }
+
+  @Test
+  @Config(
+      sdk = {24, 35, 36, 37},
+      shadows = ForegroundServiceTest.Issue81ShadowService.class)
+  public void issue81_untypedForwardingPreservesFailures() {
+    resetIssue81();
+    assertForwarding(ForegroundServiceTest.Issue81ShadowService.class, false);
+  }
+
+  @Test
+  @Config(
+      sdk = {29, 35, 36, 37},
+      shadows = ForegroundServiceTest.Issue81ShadowService.class)
+  public void issue81_typedForwardingResetsDelegationAfterFailure() {
+    resetIssue81();
+    TestService service = assertForwarding(ForegroundServiceTest.Issue81ShadowService.class, true);
+    // One record for each outer typed call, including failed attempts, without double counting.
+    assertEquals(4, ForegroundServiceTest.Issue81ShadowService.promotions.size());
+    service.startForeground(101, notification());
+    assertEquals(5, ForegroundServiceTest.Issue81ShadowService.promotions.size());
+    assertEquals(
+        Integer.valueOf(101), ForegroundServiceTest.Issue81ShadowService.promotions.get(4));
+  }
+
+  @Test
+  @Config(
+      sdk = {24, 35, 36, 37},
+      shadows = ForegroundServiceTest.DenyOldNotificationShadowService.class)
+  public void denyOld_untypedForwardingPreservesFailures() {
+    assertForwarding(ForegroundServiceTest.DenyOldNotificationShadowService.class, false);
+  }
+
+  @Test
+  @Config(
+      sdk = {24, 35, 36, 37},
+      shadows = ForegroundServiceTest.RejectBStartForegroundShadowService.class)
+  public void rejectB_untypedForwardingPreservesFailures() {
+    assertForwarding(ForegroundServiceTest.RejectBStartForegroundShadowService.class, false);
+  }
+
+  @Test
+  @Config(
+      sdk = {29, 35, 36, 37},
+      shadows = ForegroundServiceTest.RejectBStartForegroundShadowService.class)
+  public void rejectB_typedForwardingPreservesFailures() {
+    assertForwarding(ForegroundServiceTest.RejectBStartForegroundShadowService.class, true);
+  }
+
+  private static void resetIssue81() {
+    ForegroundServiceTest.Issue81ShadowService.failure = null;
+    ForegroundServiceTest.Issue81ShadowService.beforePromotion = null;
+    ForegroundServiceTest.Issue81ShadowService.rejectTitle = null;
+    ForegroundServiceTest.Issue81ShadowService.promotions.clear();
+    ForegroundServiceTest.Issue81ShadowService.types.clear();
+    ForegroundServiceTest.Issue81ShadowService.order.clear();
+  }
+
+  private static Notification notification() {
+    Context context = RuntimeEnvironment.getApplication();
+    if (Build.VERSION.SDK_INT >= 26) {
+      context
+          .getSystemService(NotificationManager.class)
+          .createNotificationChannel(
+              new NotificationChannel("compat", "compat", NotificationManager.IMPORTANCE_LOW));
+      return new Notification.Builder(context, "compat").setContentTitle("A").build();
+    }
+    return new Notification.Builder(context).setContentTitle("A").build();
+  }
+
+  private static TestService assertForwarding(
+      Class<? extends ShadowService> expected, boolean typed) {
+    assertEquals(RuntimeEnvironment.getApiLevel(), Build.VERSION.SDK_INT);
+    System.out.println(
+        "Shadow compatibility: sdk="
+            + RuntimeEnvironment.getApiLevel()
+            + " java="
+            + System.getProperty("java.specification.version"));
+    TestService service = Robolectric.buildService(TestService.class).create().get();
+    ShadowService shadow = org.robolectric.Shadows.shadowOf(service);
+    assertSame(expected, shadow.getClass());
+    Notification notification = notification();
+    Runnable promote =
+        () -> {
+          if (typed) {
+            service.startForeground(
+                100, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
+          } else {
+            service.startForeground(100, notification);
+          }
+        };
+    promote.run();
+    assertSame(notification, shadow.getLastForegroundNotification());
+    assertEquals(100, shadow.getLastForegroundNotificationId());
+    assertTrue((notification.flags & Notification.FLAG_FOREGROUND_SERVICE) != 0);
+    if (typed)
+      assertEquals(
+          ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC, service.getForegroundServiceType());
+    // Both a platform-style runtime failure and the newly declared checked failure must escape.
+    for (Exception failure :
+        new Exception[] {new SecurityException("denied"), new Exception("checked")}) {
+      Notification rejected = notification();
+      shadow.setThrowInStartForeground(failure);
+      assertSame(
+          failure,
+          assertThrows(
+              Exception.class,
+              () -> {
+                if (typed) {
+                  service.startForeground(
+                      200, rejected, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
+                } else {
+                  service.startForeground(200, rejected);
+                }
+              }));
+      assertSame(notification, shadow.getLastForegroundNotification());
+      assertEquals(100, shadow.getLastForegroundNotificationId());
+      assertEquals(0, rejected.flags & Notification.FLAG_FOREGROUND_SERVICE);
+    }
+    shadow.setThrowInStartForeground(null);
+    promote.run();
+    assertSame(notification, shadow.getLastForegroundNotification());
+    if (typed)
+      assertEquals(
+          ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC, service.getForegroundServiceType());
+    return service;
+  }
+}

package/android/src/test/resources/robolectric.properties

@@ -0,0 +1,4 @@
+# Robolectric 4.14's no-manifest fallback was API 21; 4.17 supports API 23+.
+# Run unconfigured tests at the library's supported minimum, independently of compileSdk.
+# Explicit @Config SDKs (including API 36/37 on JDK 21) still take precedence.
+sdk=24

package/cli/dist/cli.js

@@ -84,4 +84,3 @@ program
     logger.error(err.message ?? String(err));
     process.exit(2);
 });
-//# sourceMappingURL=cli.js.map

package/cli/dist/commands/initNse.js

@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initNse = initNse;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const xcode_1 = __importDefault(require("xcode"));
+const xcode_1 = __importDefault(require("../lib/xcode"));
 const detectProject_1 = require("../lib/detectProject");
 const initNseCore_1 = require("../lib/initNseCore");
 const writeTemplates_1 = require("../lib/writeTemplates");
@@ -208,4 +208,3 @@ function checkPbxprojTarget(pbxprojPath, targetName) {
     }
     return false;
 }
-//# sourceMappingURL=initNse.js.map

package/cli/dist/lib/detectProject.js

@@ -40,7 +40,7 @@ exports.deriveBundleId = void 0;
 exports.detectIosProject = detectIosProject;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const xcode_1 = __importDefault(require("xcode"));
+const xcode_1 = __importDefault(require("./xcode"));
 var initNseCore_1 = require("./initNseCore");
 Object.defineProperty(exports, "deriveBundleId", { enumerable: true, get: function () { return initNseCore_1.deriveNseBundleIdentifier; } });
 /**
@@ -124,4 +124,3 @@ function readParentTarget(pbxprojPath) {
     }
     return { bundleId, targetName };
 }
-//# sourceMappingURL=detectProject.js.map

package/cli/dist/lib/initNseCore.js

@@ -194,4 +194,3 @@ function expandKnownBundleIdVariables(bundleId, parentTargetName) {
 function toRfc1034Identifier(value) {
     return value.replace(/[^A-Za-z0-9.-]/g, '-');
 }
-//# sourceMappingURL=initNseCore.js.map

package/cli/dist/lib/logger.js

@@ -21,4 +21,3 @@ const info = (msg) => {
     console.log(chalk_1.default.cyan('ℹ') + ' ' + msg);
 };
 exports.info = info;
-//# sourceMappingURL=logger.js.map

package/cli/dist/lib/patchPodfile.js

@@ -239,4 +239,3 @@ function hasUncommentedTarget(content, targetName) {
 function escapeRegex(s) {
     return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
-//# sourceMappingURL=patchPodfile.js.map

package/cli/dist/lib/patchXcodeProject.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Xcode project patching via xcode@3.x.
+ * Xcode project patching via the stable vendored xcode@3.0.1 compatibility layer.
  *
  * xcode@3.x has three known bugs that this module works around. See inline
  * comments tagged "xcode@3.x bug" for details. Do NOT remove these
@@ -53,7 +53,7 @@ exports.patchXcodeProject = patchXcodeProject;
 exports.patchXcodeProjectForNotifyKitNse = patchXcodeProjectForNotifyKitNse;
 const crypto = __importStar(require("crypto"));
 const fs = __importStar(require("fs"));
-const xcode_1 = __importDefault(require("xcode"));
+const xcode_1 = __importDefault(require("./xcode"));
 /**
  * Adds an NSE target to the .pbxproj file via the xcode library.
  * Idempotent: if a target with the given name already exists, returns false.
@@ -102,6 +102,10 @@ function patchXcodeProjectForNotifyKitNse(proj, options) {
     proj.addSourceFile(`${targetName}/NotificationService.swift`, {
         target: targetUuid,
     }, group.uuid);
+    // The stable writer serializes undefined JS values as the bare word
+    // "undefined". addSourceFile also creates an unset explicitFileType;
+    // omit it on our new reference, preserving every existing reference.
+    fixSourceFileReference(proj, `${targetName}/NotificationService.swift`);
     // xcode@3.x bug: addTargetDependency() adds the dependency to an internal
     // cache but does not serialize it to the project hash, so writeSync()
     // emits a pbxproj with no dependency entry. CocoaPods' host-target
@@ -199,6 +203,22 @@ function fixProductFileReference(proj, targetName) {
         }
     }
 }
+function fixSourceFileReference(proj, sourcePath) {
+    const fileRefs = proj.hash.project.objects.PBXFileReference;
+    if (!fileRefs)
+        return;
+    for (const value of Object.values(fileRefs)) {
+        if (!value || typeof value !== 'object')
+            continue;
+        const ref = value;
+        if (String(ref.path ?? '').replace(/^"|"$/g, '') !== sourcePath)
+            continue;
+        for (const key of Object.keys(ref)) {
+            if (ref[key] === undefined)
+                delete ref[key];
+        }
+    }
+}
 function genUuid() {
     return crypto.randomBytes(12).toString('hex').toUpperCase().slice(0, 24);
 }
@@ -264,4 +284,3 @@ function stripRnfbInfoPlistInputPath(proj, hostUuid) {
         }
     }
 }
-//# sourceMappingURL=patchXcodeProject.js.map

package/cli/dist/lib/writeTemplates.js

@@ -70,4 +70,3 @@ function writeTemplates(opts) {
     }
     return written;
 }
-//# sourceMappingURL=writeTemplates.js.map

package/cli/dist/lib/xcode.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// Keeping this relative path works in both src/lib and the compiled dist/lib.
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const xcode = require('../../vendor/xcode');
+exports.default = xcode;

package/cli/dist/templates/NotificationService.swift.tmpl

@@ -1,32 +1,100 @@
+import Foundation
 import UserNotifications
 import RNNotifeeCore
 
+private func nseLog(_ message: String) {
+  NSLog("[NotifyKitNSE] %@", message)
+}
+
+private func requestedAttachmentURLs(from userInfo: [AnyHashable: Any]) -> [String] {
+  guard let serializedOptions = userInfo["notifee_options"] as? String,
+        let data = serializedOptions.data(using: .utf8),
+        let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+        let ios = json["ios"] as? [String: Any],
+        let attachments = ios["attachments"] as? [[String: Any]] else {
+    return []
+  }
+
+  return attachments.compactMap { attachment in
+    attachment["url"] as? String
+  }
+}
+
 class NotificationService: UNNotificationServiceExtension {
   var contentHandler: ((UNNotificationContent) -> Void)?
   var bestAttemptContent: UNMutableNotificationContent?
+  private let deliveryLock = NSLock()
+  private var didDeliver = false
 
   override func didReceive(
     _ request: UNNotificationRequest,
     withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void
   ) {
+    let mutableContent = request.content.mutableCopy() as? UNMutableNotificationContent
+
+    deliveryLock.lock()
+    didDeliver = false
     self.contentHandler = contentHandler
-    self.bestAttemptContent = request.content.mutableCopy() as? UNMutableNotificationContent
+    self.bestAttemptContent = mutableContent
+    deliveryLock.unlock()
+
+    let requestedAttachmentUrls = requestedAttachmentURLs(from: request.content.userInfo)
 
-    guard let bestAttemptContent = bestAttemptContent else {
-      contentHandler(request.content)
+    nseLog(
+      "didReceive id=\(request.identifier) title=\(request.content.title) " +
+        "hasNotifeeOptions=\(request.content.userInfo["notifee_options"] != nil) " +
+        "requestedAttachments=\(requestedAttachmentUrls.count) " +
+        "urls=\(requestedAttachmentUrls.joined(separator: ","))"
+    )
+
+    guard let bestAttemptContent = mutableContent else {
+      nseLog("mutableCopy failed for id=\(request.identifier); delivering original content")
+      deliverOnce(request.content)
       return
     }
 
     NotifeeExtensionHelper.populateNotificationContent(
       request,
       with: bestAttemptContent,
-      withContentHandler: contentHandler
+      withContentHandler: { [weak self] content in
+        let deliveredAttachmentIds = content.attachments.map(\.identifier).joined(separator: ",")
+        nseLog(
+          "contentHandler id=\(request.identifier) title=\(content.title) " +
+            "deliveredAttachments=\(content.attachments.count) " +
+            "identifiers=\(deliveredAttachmentIds)"
+        )
+        self?.deliverOnce(content)
+      }
     )
   }
 
+  private func deliverOnce(_ content: UNNotificationContent) {
+    var handler: ((UNNotificationContent) -> Void)?
+
+    deliveryLock.lock()
+    if !didDeliver {
+      didDeliver = true
+      handler = contentHandler
+      contentHandler = nil
+      bestAttemptContent = nil
+    }
+    deliveryLock.unlock()
+
+    handler?(content)
+  }
+
   override func serviceExtensionTimeWillExpire() {
-    if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent {
-      contentHandler(bestAttemptContent)
+    deliveryLock.lock()
+    let content = bestAttemptContent
+    deliveryLock.unlock()
+
+    if let bestAttemptContent = content {
+      nseLog(
+        "serviceExtensionTimeWillExpire id=\(bestAttemptContent.userInfo["gcm.message_id"] ?? "n/a") " +
+          "title=\(bestAttemptContent.title) " +
+          "deliveredAttachments=\(bestAttemptContent.attachments.count)"
+      )
+      deliverOnce(bestAttemptContent)
     }
   }
 }

package/cli/package.json

@@ -0,0 +1 @@
+{"version":"10.9.0"}

package/cli/vendor/xcode/AUTHORS

@@ -0,0 +1,6 @@
+Andrew Lunny (@alunny)
+Anis Kadri (@imhotep)
+Mike Reinstein (@mreinstein)
+Filip Maj (@filmaj)
+Brett Rudd (@goya)
+Bob Easterday (@bobeast)