@neoskola/auto-play 0.3.15 → 0.3.17

package/ios/Types.swift

@@ -20,4 +20,5 @@ enum AutoPlayError: Error {
     case invalidTemplateType(String)
     case noUiWindow(String)
     case initReactRootViewFailed(String)
+    case pushFailed(String)
 }

package/ios/scenes/AutoPlayInterfaceController.swift

@@ -61,7 +61,11 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
                 return true
             }
 
-            return pushNowPlayingTemplateSafely(animated: animated)
+            let success = await pushNowPlayingTemplateSafely(animated: animated)
+            if !success {
+                throw AutoPlayError.pushFailed("CPNowPlayingTemplate push failed")
+            }
+            return true
         }
 
         return try await interfaceController.pushTemplate(
@@ -71,19 +75,26 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
     }
 
     /// Pushes CPNowPlayingTemplate using ObjC @try/@catch to prevent crash from NSException.
-    /// 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.push(
-                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
+    /// Uses a completion handler to confirm the push actually succeeded.
+    private func pushNowPlayingTemplateSafely(animated: Bool) async -> Bool {
+        return await withCheckedContinuation { continuation in
+            do {
+                try ObjCExceptionCatcher.push(
+                    CPNowPlayingTemplate.shared,
+                    on: self.interfaceController,
+                    animated: animated,
+                    completion: { success, error in
+                        if let error = error {
+                            print("[AutoPlay] CPNowPlayingTemplate push completion error: \(error.localizedDescription)")
+                        }
+                        print("[AutoPlay] CPNowPlayingTemplate push completion: success=\(success)")
+                        continuation.resume(returning: success)
+                    }
+                )
+            } catch {
+                print("[AutoPlay] CPNowPlayingTemplate push threw ObjC exception: \(error.localizedDescription)")
+                continuation.resume(returning: false)
+            }
         }
     }
 

package/ios/templates/NowPlayingTemplate.swift

@@ -38,16 +38,21 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
         // Set the config ID on the shared singleton so TemplateStore can find it
         initTemplate(template: CPNowPlayingTemplate.shared, id: config.id)
 
-        DispatchQueue.main.async { [weak self] in
-            guard let self = self else { return }
-            NowPlayingSessionManager.shared.ensureSessionActive()
-            self.setupRemoteCommandCenter()
-            self.updateNowPlayingInfo()
-            self.isSetupComplete = true
+        // Setup remote commands and now playing info synchronously
+        // so they're ready before CPNowPlayingTemplate.shared is pushed
+        NowPlayingSessionManager.shared.ensureSessionActive()
+        setupRemoteCommandCenter()
+        updateNowPlayingInfo()
 
-            if let image = config.image {
-                self.loadImageAsync(image: image)
-            }
+        // Set playbackState before push so CarPlay sees an active now-playing session
+        if config.isPlaying {
+            MPNowPlayingInfoCenter.default().playbackState = .playing
+        }
+
+        isSetupComplete = true
+
+        if let image = config.image {
+            loadImageAsync(image: image)
         }
     }
 

package/ios/utils/ObjCExceptionCatcher.h

@@ -13,4 +13,10 @@ onInterfaceController:(CPInterfaceController * _Nonnull)interfaceController
             animated:(BOOL)animated
                error:(NSError * _Nullable * _Nullable)error;
 
++ (BOOL)pushTemplate:(CPTemplate * _Nonnull)templateToPush
+onInterfaceController:(CPInterfaceController * _Nonnull)interfaceController
+            animated:(BOOL)animated
+          completion:(void (^ _Nullable)(BOOL success, NSError * _Nullable error))completion
+               error:(NSError * _Nullable * _Nullable)error;
+
 @end

package/ios/utils/ObjCExceptionCatcher.m

@@ -23,4 +23,26 @@ onInterfaceController:(CPInterfaceController *)interfaceController
     }
 }
 
++ (BOOL)pushTemplate:(CPTemplate *)templateToPush
+onInterfaceController:(CPInterfaceController *)interfaceController
+            animated:(BOOL)animated
+          completion:(void (^)(BOOL, NSError *))completion
+               error:(NSError **)error {
+    @try {
+        [interfaceController pushTemplate:templateToPush animated:animated completion:completion];
+        return YES;
+    } @catch (NSException *exception) {
+        NSLog(@"[ObjCExceptionCatcher] Caught exception during pushTemplate: %@ — %@", exception.name, exception.reason);
+        if (error) {
+            *error = [NSError errorWithDomain:@"ObjCExceptionCatcher"
+                                         code:0
+                                     userInfo:@{
+                NSLocalizedDescriptionKey: exception.reason ?: @"Unknown Objective-C exception",
+                @"ExceptionName": exception.name ?: @"Unknown"
+            }];
+        }
+        return NO;
+    }
+}
+
 @end

package/package.json

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