@neoskola/auto-play 0.2.14 → 0.2.16

package/ios/scenes/AutoPlayInterfaceController.swift

@@ -61,7 +61,7 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
                 return true
             }
 
-            return await pushNowPlayingTemplateSafely(animated: animated)
+            return pushNowPlayingTemplateSafely(animated: animated)
         }
 
         return try await interfaceController.pushTemplate(
@@ -71,24 +71,19 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
     }
 
     /// Pushes CPNowPlayingTemplate using ObjC @try/@catch to prevent crash from NSException.
-    private func pushNowPlayingTemplateSafely(animated: Bool) async -> Bool {
-        return await withCheckedContinuation { continuation in
-            do {
-                try ObjCExceptionCatcher.execute {
-                    self.interfaceController.pushTemplate(
-                        CPNowPlayingTemplate.shared,
-                        animated: animated
-                    ) { success, error in
-                        if let error = error {
-                            print("[AutoPlay] CPNowPlayingTemplate push completion error: \(error)")
-                        }
-                        continuation.resume(returning: success)
-                    }
-                }
-            } catch {
-                print("[AutoPlay] CPNowPlayingTemplate push threw ObjC exception: \(error.localizedDescription)")
-                continuation.resume(returning: false)
-            }
+    /// The push call is made entirely in Objective-C so NSExceptions never propagate through Swift frames.
+    private func pushNowPlayingTemplateSafely(animated: Bool) -> Bool {
+        do {
+            try ObjCExceptionCatcher.pushTemplate(
+                CPNowPlayingTemplate.shared,
+                on: self.interfaceController,
+                animated: animated
+            )
+            print("[AutoPlay] CPNowPlayingTemplate pushed successfully")
+            return true
+        } catch {
+            print("[AutoPlay] CPNowPlayingTemplate push threw ObjC exception: \(error.localizedDescription)")
+            return false
         }
     }
 

package/ios/utils/ObjCExceptionCatcher.h

@@ -1,12 +1,16 @@
 #import <Foundation/Foundation.h>
+#import <CarPlay/CarPlay.h>
 
-/// Provides Objective-C @try/@catch exception handling for Swift code.
-/// Swift's try/catch cannot catch Objective-C NSExceptions, which causes
-/// crashes when Apple frameworks throw them (e.g., CPInterfaceController.pushTemplate
-/// with CPNowPlayingTemplate). This wrapper makes those exceptions catchable.
+/// Provides Objective-C @try/@catch exception handling for CarPlay template pushes.
+/// Swift's try/catch cannot catch Objective-C NSExceptions. When pushTemplate is called
+/// from a Swift closure, the NSException propagates through Swift stack frames and crashes.
+/// This helper performs the pushTemplate call entirely in Objective-C so @try/@catch works.
+API_AVAILABLE(ios(14.0))
 @interface ObjCExceptionCatcher : NSObject
 
-+ (BOOL)executeBlock:(void(NS_NOESCAPE ^_Nonnull)(void))block
++ (BOOL)pushTemplate:(CPTemplate * _Nonnull)templateToPush
+onInterfaceController:(CPInterfaceController * _Nonnull)interfaceController
+            animated:(BOOL)animated
                error:(NSError * _Nullable * _Nullable)error;
 
 @end

package/ios/utils/ObjCExceptionCatcher.m

@@ -2,12 +2,15 @@
 
 @implementation ObjCExceptionCatcher
 
-+ (BOOL)executeBlock:(void(NS_NOESCAPE ^)(void))block error:(NSError **)error {
++ (BOOL)pushTemplate:(CPTemplate *)templateToPush
+onInterfaceController:(CPInterfaceController *)interfaceController
+            animated:(BOOL)animated
+               error:(NSError **)error {
     @try {
-        block();
+        [interfaceController pushTemplate:templateToPush animated:animated completion:nil];
         return YES;
     } @catch (NSException *exception) {
-        NSLog(@"[ObjCExceptionCatcher] Caught exception: %@ — %@", exception.name, exception.reason);
+        NSLog(@"[ObjCExceptionCatcher] Caught exception during pushTemplate: %@ — %@", exception.name, exception.reason);
         if (error) {
             *error = [NSError errorWithDomain:@"ObjCExceptionCatcher"
                                          code:0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neoskola/auto-play",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",