@radhya/mach-push-react-native 0.1.2 → 0.1.4

package/ios/MachPush.swift

@@ -5,8 +5,13 @@ import UserNotifications
 
 @objc(MachPush)
 final class MachPush: RCTEventEmitter {
-  private var nativeTokenResolvers: [RCTPromiseResolveBlock] = []
-  private var nativeTokenRejecters: [RCTPromiseRejectBlock] = []
+  private struct PendingNativeTokenRequest {
+    let id: UUID
+    let resolve: RCTPromiseResolveBlock
+    let reject: RCTPromiseRejectBlock
+  }
+
+  private var nativeTokenRequests: [PendingNativeTokenRequest] = []
   private var hasEventListeners = false
 
   override init() {
@@ -108,11 +113,23 @@ final class MachPush: RCTEventEmitter {
       resolve(token)
       return
     }
-    nativeTokenResolvers.append(resolve)
-    nativeTokenRejecters.append(reject)
+    let request = PendingNativeTokenRequest(id: UUID(), resolve: resolve, reject: reject)
+    nativeTokenRequests.append(request)
     DispatchQueue.main.async {
       UIApplication.shared.registerForRemoteNotifications()
     }
+    DispatchQueue.main.asyncAfter(deadline: .now() + 20) { [weak self] in
+      guard let self else { return }
+      guard let index = self.nativeTokenRequests.firstIndex(where: { $0.id == request.id }) else {
+        return
+      }
+      let pending = self.nativeTokenRequests.remove(at: index)
+      pending.reject(
+        "MACH_PUSH_APNS_TOKEN_TIMEOUT",
+        "Timed out waiting for an APNs device token. Confirm the iOS build has the Push Notifications capability / aps-environment entitlement and that the app is installed on a physical device.",
+        nil
+      )
+    }
   }
 
   @objc(getDeviceInfo:rejecter:)
@@ -162,19 +179,17 @@ final class MachPush: RCTEventEmitter {
 
   @objc private func didRegisterToken(_ notification: Notification) {
     guard let token = notification.userInfo?["token"] as? String else { return }
-    let resolvers = nativeTokenResolvers
-    nativeTokenResolvers.removeAll()
-    nativeTokenRejecters.removeAll()
-    resolvers.forEach { $0(token) }
+    let requests = nativeTokenRequests
+    nativeTokenRequests.removeAll()
+    requests.forEach { $0.resolve(token) }
   }
 
   @objc private func didFailRegistration(_ notification: Notification) {
     let error = notification.userInfo?["error"] as? NSError
-    let rejecters = nativeTokenRejecters
-    nativeTokenResolvers.removeAll()
-    nativeTokenRejecters.removeAll()
-    rejecters.forEach {
-      $0(
+    let requests = nativeTokenRequests
+    nativeTokenRequests.removeAll()
+    requests.forEach {
+      $0.reject(
         "MACH_PUSH_REGISTRATION",
         error?.localizedDescription ?? "APNs registration failed.",
         error

package/ios/MachPushAppDelegateInterceptor.m

@@ -5,20 +5,75 @@
 NSString * const MachPushDidRegisterTokenNotification = @"MachPushDidRegisterTokenNotification";
 NSString * const MachPushDidFailRegistrationNotification = @"MachPushDidFailRegistrationNotification";
 
+static void MachPushPostDeviceToken(NSData *deviceToken) {
+  const unsigned char *bytes = deviceToken.bytes;
+  NSMutableString *token = [NSMutableString stringWithCapacity:deviceToken.length * 2];
+  for (NSUInteger index = 0; index < deviceToken.length; index++) {
+    [token appendFormat:@"%02x", bytes[index]];
+  }
+  [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"mach.push.nativeToken"];
+  [[NSNotificationCenter defaultCenter]
+    postNotificationName:MachPushDidRegisterTokenNotification
+    object:nil
+    userInfo:@{ @"token": token }];
+}
+
+static void MachPushPostRegistrationError(NSError *error) {
+  [[NSNotificationCenter defaultCenter]
+    postNotificationName:MachPushDidFailRegistrationNotification
+    object:nil
+    userInfo:@{ @"error": error }];
+}
+
 static BOOL MachPushSwizzle(Class cls, SEL original, SEL replacement) {
-  Method replacementMethod = class_getInstanceMethod(cls, replacement);
+  Method replacementMethod = class_getInstanceMethod([NSObject class], replacement);
   if (!replacementMethod) return NO;
   Method originalMethod = class_getInstanceMethod(cls, original);
   if (!originalMethod) {
     class_addMethod(cls, original, method_getImplementation(replacementMethod), method_getTypeEncoding(replacementMethod));
     return NO;
   }
-  method_exchangeImplementations(originalMethod, replacementMethod);
+
+  // Copy the original implementation onto the concrete app delegate class so
+  // `[self mach_application:...]` reliably reaches the app/Expo handler even
+  // when the original method is inherited from a Swift superclass.
+  class_addMethod(
+    cls,
+    replacement,
+    method_getImplementation(originalMethod),
+    method_getTypeEncoding(originalMethod)
+  );
+
+  Method concreteOriginal = class_getInstanceMethod(cls, original);
+  Method concreteReplacement = class_getInstanceMethod(cls, replacement);
+  if (!concreteOriginal || !concreteReplacement) return NO;
+  method_exchangeImplementations(concreteOriginal, concreteReplacement);
   return YES;
 }
 
 static BOOL MachPushHadRegisterHandler = NO;
 static BOOL MachPushHadFailureHandler = NO;
+static Class MachPushInstalledDelegateClass = Nil;
+
+static void MachPushInstallInterceptorIfNeeded(void) {
+  if (MachPushInstalledDelegateClass) return;
+
+  id<UIApplicationDelegate> delegate = UIApplication.sharedApplication.delegate;
+  Class appDelegateClass = delegate ? object_getClass(delegate) : NSClassFromString(@"AppDelegate");
+  if (!appDelegateClass) return;
+
+  MachPushHadRegisterHandler = MachPushSwizzle(
+    appDelegateClass,
+    @selector(application:didRegisterForRemoteNotificationsWithDeviceToken:),
+    @selector(mach_application:didRegisterForRemoteNotificationsWithDeviceToken:)
+  );
+  MachPushHadFailureHandler = MachPushSwizzle(
+    appDelegateClass,
+    @selector(application:didFailToRegisterForRemoteNotificationsWithError:),
+    @selector(mach_application:didFailToRegisterForRemoteNotificationsWithError:)
+  );
+  MachPushInstalledDelegateClass = appDelegateClass;
+}
 
 @interface NSObject (MachPushAppDelegateInterceptor)
 @end
@@ -27,33 +82,36 @@ static BOOL MachPushHadFailureHandler = NO;
 
 + (void)load {
   dispatch_async(dispatch_get_main_queue(), ^{
-    Class appDelegateClass = NSClassFromString(@"AppDelegate");
-    if (!appDelegateClass) return;
-    MachPushHadRegisterHandler = MachPushSwizzle(
-      appDelegateClass,
-      @selector(application:didRegisterForRemoteNotificationsWithDeviceToken:),
-      @selector(mach_application:didRegisterForRemoteNotificationsWithDeviceToken:)
-    );
-    MachPushHadFailureHandler = MachPushSwizzle(
-      appDelegateClass,
-      @selector(application:didFailToRegisterForRemoteNotificationsWithError:),
-      @selector(mach_application:didFailToRegisterForRemoteNotificationsWithError:)
-    );
+    MachPushInstallInterceptorIfNeeded();
+    [[NSNotificationCenter defaultCenter]
+      addObserverForName:UIApplicationDidFinishLaunchingNotification
+      object:nil
+      queue:[NSOperationQueue mainQueue]
+      usingBlock:^(__unused NSNotification *note) {
+        MachPushInstallInterceptorIfNeeded();
+      }];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+      MachPushInstallInterceptorIfNeeded();
+    });
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+      MachPushInstallInterceptorIfNeeded();
+    });
   });
 }
 
+- (void)application:(UIApplication *)application
+    didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+  MachPushPostDeviceToken(deviceToken);
+}
+
+- (void)application:(UIApplication *)application
+    didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
+  MachPushPostRegistrationError(error);
+}
+
 - (void)mach_application:(UIApplication *)application
     didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-  const unsigned char *bytes = deviceToken.bytes;
-  NSMutableString *token = [NSMutableString stringWithCapacity:deviceToken.length * 2];
-  for (NSUInteger index = 0; index < deviceToken.length; index++) {
-    [token appendFormat:@"%02x", bytes[index]];
-  }
-  [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"mach.push.nativeToken"];
-  [[NSNotificationCenter defaultCenter]
-    postNotificationName:MachPushDidRegisterTokenNotification
-    object:nil
-    userInfo:@{ @"token": token }];
+  MachPushPostDeviceToken(deviceToken);
   if (MachPushHadRegisterHandler) {
     [self mach_application:application didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
   }
@@ -61,10 +119,7 @@ static BOOL MachPushHadFailureHandler = NO;
 
 - (void)mach_application:(UIApplication *)application
     didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
-  [[NSNotificationCenter defaultCenter]
-    postNotificationName:MachPushDidFailRegistrationNotification
-    object:nil
-    userInfo:@{ @"error": error }];
+  MachPushPostRegistrationError(error);
   if (MachPushHadFailureHandler) {
     [self mach_application:application didFailToRegisterForRemoteNotificationsWithError:error];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radhya/mach-push-react-native",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "MACH Push for React Native and Expo development builds",
   "license": "MIT",
   "repository": {