react-native-notify-kit 10.0.0 → 10.2.0

package/dist/validators/validateIOSCategory.js

@@ -86,10 +86,10 @@ export default function validateIOSCategory(category) {
         if (!isArray(category.intentIdentifiers)) {
             throw new Error("'category.intentIdentifiers' expected an array value.");
         }
-        const identifiers = Object.values(IOSIntentIdentifier);
+        const identifiers = Object.values(IOSIntentIdentifier).filter((identifier) => typeof identifier === 'number');
         for (let i = 0; i < category.intentIdentifiers.length; i++) {
             const intentIdentifier = category.intentIdentifiers[i];
-            if (!identifiers.includes(intentIdentifier)) {
+            if (typeof intentIdentifier !== 'number' || !identifiers.includes(intentIdentifier)) {
                 throw new Error(`'category.intentIdentifiers' unexpected intentIdentifier "${intentIdentifier}" at array index "${i}".`);
             }
         }

package/dist/validators/validateIOSCategory.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateIOSCategory.js","sourceRoot":"","sources":["../../src/validators/validateIOSCategory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validateIOSCategory.js","sourceRoot":"","sources":["../../src/validators/validateIOSCategory.ts"],"names":[],"mappings":"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"}

package/dist/validators/validateTrigger.js

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016-present Invertase Limited
  */
-import { objectHasProperty, isNumber, isObject, isValidEnum, isUndefined, isBoolean, } from '../utils';
+import { objectHasProperty, isNumber, isObject, isValidEnum, isUndefined, isBoolean, isAndroid, } from '../utils';
 import { TimeUnit, RepeatFrequency, TriggerType, AlarmType, } from '../types/Trigger';
 const MINIMUM_INTERVAL = 15;
 function isMinimumInterval(interval, timeUnit) {
@@ -30,10 +30,26 @@ export default function validateTrigger(trigger) {
             throw new Error('Unknown trigger type');
     }
 }
+// Smallest plausible epoch-ms value for a future trigger. 1e12 ms ≈ Sep 2001;
+// anything smaller is almost certainly the wrong unit (seconds-since-epoch,
+// or a Date.getDate() day-of-month). We intercept the three common shapes
+// and emit targeted hints — see upstream invertase/notifee#872 for the
+// year-after-year UX pattern this guards against.
+const MIN_PLAUSIBLE_EPOCH_MS = 1e12;
+const MIN_PLAUSIBLE_EPOCH_SECONDS = 1e9;
 function validateTimestampTrigger(trigger) {
     if (!isNumber(trigger.timestamp)) {
         throw new Error("'trigger.timestamp' expected a number value.");
     }
+    if (trigger.timestamp < MIN_PLAUSIBLE_EPOCH_MS) {
+        if (trigger.timestamp >= 1 && trigger.timestamp <= 31) {
+            throw new Error(`'trigger.timestamp' looks like a day-of-month (${trigger.timestamp}). Did you mean \`date.getTime()\` instead of \`date.getDate()\`?`);
+        }
+        if (trigger.timestamp >= MIN_PLAUSIBLE_EPOCH_SECONDS) {
+            throw new Error(`'trigger.timestamp' looks like seconds since epoch (${trigger.timestamp}). Notifee expects milliseconds — multiply by 1000, or use \`Date.now()\` / \`date.getTime()\`.`);
+        }
+        throw new Error(`'trigger.timestamp' (${trigger.timestamp}) is too small to be a valid epoch millisecond value. Use \`Date.now()\` or \`someDate.getTime()\`.`);
+    }
     const now = Date.now();
     if (trigger.timestamp <= now) {
         throw new Error("'trigger.timestamp' date must be in the future.");
@@ -49,6 +65,26 @@ function validateTimestampTrigger(trigger) {
         }
         out.repeatFrequency = trigger.repeatFrequency;
     }
+    const hasRepeatFrequency = objectHasProperty(trigger, 'repeatFrequency') && !isUndefined(trigger.repeatFrequency);
+    const isRepeating = hasRepeatFrequency && trigger.repeatFrequency !== RepeatFrequency.NONE;
+    if (objectHasProperty(trigger, 'repeatInterval') && !isUndefined(trigger.repeatInterval)) {
+        if (!hasRepeatFrequency) {
+            throw new Error("'trigger.repeatInterval' requires a repeatFrequency value.");
+        }
+        if (trigger.repeatFrequency === RepeatFrequency.NONE) {
+            throw new Error("'trigger.repeatInterval' requires a repeating repeatFrequency value.");
+        }
+        if (!isNumber(trigger.repeatInterval) ||
+            !Number.isFinite(trigger.repeatInterval) ||
+            !Number.isInteger(trigger.repeatInterval) ||
+            trigger.repeatInterval <= 0) {
+            throw new Error("'trigger.repeatInterval' expected a positive integer value.");
+        }
+        out.repeatInterval = trigger.repeatInterval;
+    }
+    else if (isRepeating) {
+        out.repeatInterval = 1;
+    }
     if (objectHasProperty(trigger, 'alarmManager') && !isUndefined(trigger.alarmManager)) {
         if (isBoolean(trigger.alarmManager)) {
             if (trigger.alarmManager) {
@@ -69,6 +105,11 @@ function validateTimestampTrigger(trigger) {
         // Default to AlarmManager for reliable delivery when app is killed
         out.alarmManager = validateTimestampAlarmManager();
     }
+    if (isAndroid &&
+        trigger.alarmManager === false &&
+        out.repeatFrequency === RepeatFrequency.MONTHLY) {
+        throw new Error("'trigger.repeatFrequency' MONTHLY is not supported when 'trigger.alarmManager' is false.");
+    }
     return out;
 }
 function validateTimestampAlarmManager(alarmManager) {

package/dist/validators/validateTrigger.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateTrigger.js","sourceRoot":"","sources":["../../src/validators/validateTrigger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validateTrigger.js","sourceRoot":"","sources":["../../src/validators/validateTrigger.ts"],"names":[],"mappings":"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"}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "10.0.0";
+export declare const version = "10.2.0";

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '10.0.0';
+export const version = '10.2.0';
 //# sourceMappingURL=version.js.map

package/ios/NotifeeCore/NotifeeCore+NSNotificationCenter.m

@@ -18,6 +18,11 @@
 #import <UIKit/UIKit.h>
 #import "NotifeeCore+NSNotificationCenter.h"
 #import "NotifeeCore+UNUserNotificationCenter.h"
+#import "NotifeeCore.h"
+
+@interface NotifeeCore (RollingTimestampTopUp)
++ (void)topUpRollingTimestampTriggersWithCompletion:(void (^)(NSError *error))completion;
+@end
 
 @implementation NotifeeCoreNSNotificationCenter
 
@@ -42,6 +47,11 @@
            selector:@selector(application_onDidFinishLaunchingNotification:)
                name:UIApplicationDidFinishLaunchingNotification
              object:nil];
+    [[NSNotificationCenter defaultCenter]
+        addObserver:strongSelf
+           selector:@selector(application_didBecomeActiveNotification:)
+               name:UIApplicationDidBecomeActiveNotification
+             object:nil];
     [[NSNotificationCenter defaultCenter]
         addObserver:strongSelf
            selector:@selector(messaging_didReceiveRemoteNotification:)
@@ -58,21 +68,21 @@
 #pragma mark Application Notifications
 
 - (void)application_onDidFinishLaunchingNotification:(nonnull NSNotification *)notification {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  // UIApplicationLaunchOptionsLocalNotificationKey is deprecated since iOS 10.
-  // On modern iOS, initial notification is delivered via didReceiveNotificationResponse:
-  // which sets _initialNotification and _notificationOpenedAppID directly.
-  // This legacy path only works for UILocalNotification (pre-iOS 10).
-  UILocalNotification *launchNotification =
-      (UILocalNotification *)notification.userInfo[UIApplicationLaunchOptionsLocalNotificationKey];
-  [[NotifeeCoreUNUserNotificationCenter instance]
-      onDidFinishLaunchingNotification:launchNotification.userInfo];
+  [[NotifeeCoreUNUserNotificationCenter instance] markInitialNotificationGathered];
   [[NotifeeCoreUNUserNotificationCenter instance] getInitialNotification];
 
   [[NotifeeCoreUNUserNotificationCenter instance] observe];
 }
 
+- (void)application_didBecomeActiveNotification:(nonnull NSNotification *)notification {
+  [NotifeeCore topUpRollingTimestampTriggersWithCompletion:^(NSError *error) {
+    if (error != nil) {
+      NSLog(@"NotifeeCore: Failed to top up rolling timestamp triggers after app became active: %@",
+            error);
+    }
+  }];
+}
+
 - (void)messaging_didReceiveRemoteNotification:(nonnull NSNotification *)notification {
   // Intentionally empty: remote notifications are handled via
   // UNUserNotificationCenterDelegate (willPresentNotification:,

package/ios/NotifeeCore/NotifeeCore+UNUserNotificationCenter.h

@@ -30,7 +30,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property(strong, nullable) NSDictionary *initialNotification;
 @property bool initialNotificationGathered;
 @property(nullable) notifeeMethodNSDictionaryBlock initialNotificationBlock;
-@property NSString *initialNoticationID;
 @property NSString *notificationOpenedAppID;
 
 + (_Nonnull instancetype)instance;
@@ -39,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (nullable NSDictionary *)getInitialNotification;
 
-- (void)onDidFinishLaunchingNotification:(NSDictionary *)notification;
+- (void)markInitialNotificationGathered;
 
 @end
 

package/ios/NotifeeCore/NotifeeCore+UNUserNotificationCenter.m

@@ -17,9 +17,14 @@
 
 #import "NotifeeCore+UNUserNotificationCenter.h"
 
+#import "NotifeeCore.h"
 #import "NotifeeCoreDelegateHolder.h"
 #import "NotifeeCoreUtil.h"
 
+@interface NotifeeCore (RollingTimestampTopUp)
++ (void)topUpRollingTimestampTriggersWithCompletion:(void (^)(NSError *error))completion;
+@end
+
 @implementation NotifeeCoreUNUserNotificationCenter
 
 struct {
@@ -63,12 +68,7 @@ struct {
   });
 }
 
-- (void)onDidFinishLaunchingNotification:(nonnull NSDictionary *)notifUserInfo {
-  if (notifUserInfo != nil) {
-    NSDictionary *notifeeNotification = notifUserInfo[kNotifeeUserInfoNotification];
-    _initialNoticationID = notifeeNotification[@"id"];
-  }
-
+- (void)markInitialNotificationGathered {
   _initialNotificationGathered = YES;
 }
 
@@ -89,6 +89,24 @@ struct {
   return nil;
 }
 
+- (BOOL)isRollingTimestampNotificationRequest:(UNNotificationRequest *)request {
+  if ([NotifeeCoreUtil isRollingInternalNotificationId:request.identifier]) {
+    return YES;
+  }
+
+  NSDictionary *trigger = request.content.userInfo[kNotifeeUserInfoTrigger];
+  return [NotifeeCoreUtil isRollingTimestampTrigger:trigger];
+}
+
+- (void)topUpRollingTimestampTriggersForLifecycleEvent:(NSString *)eventName {
+  [NotifeeCore topUpRollingTimestampTriggersWithCompletion:^(NSError *error) {
+    if (error != nil) {
+      NSLog(@"NotifeeCore: Failed to top up rolling timestamp triggers after %@: %@", eventName,
+            error);
+    }
+  }];
+}
+
 #pragma mark - UNUserNotificationCenter Delegate Methods
 
 // The method will be called on the delegate only if the application is in the
@@ -103,6 +121,8 @@ struct {
              (void (^)(UNNotificationPresentationOptions options))completionHandler {
   NSDictionary *notifeeNotification =
       notification.request.content.userInfo[kNotifeeUserInfoNotification];
+  BOOL isRollingTimestampNotification =
+      [self isRollingTimestampNotificationRequest:notification.request];
 
   // we only care about notifications created through notifee
   if (notifeeNotification != nil) {
@@ -127,25 +147,16 @@ struct {
     // if list or banner is true, ignore alert property
     if (banner || list) {
       if (banner) {
-        if (@available(iOS 14, *)) {
-          presentationOptions |= UNNotificationPresentationOptionBanner;
-        } else {
-          // for iOS 13 we need to set alert
-          presentationOptions |= UNNotificationPresentationOptionAlert;
-        }
+        presentationOptions |= UNNotificationPresentationOptionBanner;
       }
 
       if (list) {
-        if (@available(iOS 14, *)) {
-          presentationOptions |= UNNotificationPresentationOptionList;
-        } else {
-          // for iOS 13 we need to set alert
-          presentationOptions |= UNNotificationPresentationOptionAlert;
-        }
+        presentationOptions |= UNNotificationPresentationOptionList;
       }
     } else if (alert) {
       // TODO: remove alert once it has been fully removed from the notifee API
-      presentationOptions |= UNNotificationPresentationOptionAlert;
+      presentationOptions |=
+          UNNotificationPresentationOptionBanner | UNNotificationPresentationOptionList;
     }
 
     // Emit DELIVERED for every Notifee-owned notification presented in foreground.
@@ -160,6 +171,9 @@ struct {
     }];
 
     completionHandler(presentationOptions);
+    if (isRollingTimestampNotification) {
+      [self topUpRollingTimestampTriggersForLifecycleEvent:@"foreground delivery"];
+    }
 
   } else if (_originalDelegate != nil && originalUNCDelegateRespondsTo.willPresentNotification) {
     [_originalDelegate userNotificationCenter:center
@@ -174,15 +188,9 @@ struct {
     // @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.
-    if (@available(iOS 14.0, *)) {
-      completionHandler(
-          UNNotificationPresentationOptionBanner | UNNotificationPresentationOptionSound |
-          UNNotificationPresentationOptionList | UNNotificationPresentationOptionBadge);
-    } else {
-      completionHandler(UNNotificationPresentationOptionAlert |
-                        UNNotificationPresentationOptionSound |
-                        UNNotificationPresentationOptionBadge);
-    }
+    completionHandler(UNNotificationPresentationOptionBanner |
+                      UNNotificationPresentationOptionSound | UNNotificationPresentationOptionList |
+                      UNNotificationPresentationOptionBadge);
   }
 }
 
@@ -195,6 +203,8 @@ struct {
              withCompletionHandler:(void (^)(void))completionHandler {
   NSDictionary *notifeeNotification =
       response.notification.request.content.userInfo[kNotifeeUserInfoNotification];
+  BOOL isRollingTimestampNotification =
+      [self isRollingTimestampNotificationRequest:response.notification.request];
 
   _notificationOpenedAppID = notifeeNotification[@"id"];
 
@@ -234,6 +244,9 @@ struct {
         }
       }];
       completionHandler();
+      if (isRollingTimestampNotification) {
+        [self topUpRollingTimestampTriggersForLifecycleEvent:@"notification response"];
+      }
       return;
     }
 
@@ -272,16 +285,12 @@ struct {
     // store notification for getInitialNotification
     _initialNotification = [eventDetail copy];
 
-    // post PRESS/ACTION_PRESS event
-    // Set is initial notification to true
-    if (_notificationOpenedAppID != nil && _initialNoticationID != nil &&
-        [_initialNoticationID isEqualToString:_notificationOpenedAppID]) {
-      eventDetail[@"initialNotification"] = @1;
-    }
-
     [[NotifeeCoreDelegateHolder instance] didReceiveNotifeeCoreEvent:event];
 
     completionHandler();
+    if (isRollingTimestampNotification) {
+      [self topUpRollingTimestampTriggersForLifecycleEvent:@"notification response"];
+    }
   } else {
     // Defensive: parseUNNotificationRequest: currently never returns nil,
     // but if it did, the completionHandler contract must still be honored.