@neoskola/auto-play 0.2.6 → 0.2.8

package/ios/extensions/CarPlayTemplateExtensions.swift

@@ -19,7 +19,7 @@ extension CPTemplate {
         initTemplate(template: self, id: id)
     }
     @objc var id: String {
-        return (self.userInfo as? [String: Any])?["id"] as! String
+        return (self.userInfo as? [String: Any])?["id"] as? String ?? ""
     }
 }
 

package/ios/scenes/AutoPlayInterfaceController.swift

@@ -38,11 +38,13 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
     }
 
     var topTemplateId: String? {
-        return interfaceController.topTemplate?.id
+        let id = interfaceController.topTemplate?.id
+        return (id?.isEmpty == true) ? nil : id
     }
 
     var rootTemplateId: String? {
-        return interfaceController.rootTemplate.id
+        let id = interfaceController.rootTemplate.id
+        return id.isEmpty ? nil : id
     }
 
     func pushTemplate(
@@ -179,6 +181,7 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
         animated: Bool
     ) {
         let templateId = aTemplate.id
+        guard !templateId.isEmpty else { return }
 
         TemplateStore.getTemplate(templateId: templateId)?.onWillAppear(
             animated: animated
@@ -190,6 +193,7 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
         animated: Bool
     ) {
         let templateId = aTemplate.id
+        guard !templateId.isEmpty else { return }
 
         if rootTemplateId == templateId {
             // this makes sure we purge outdated CPSearchTemplate since that one can be popped on with a CarPlay native button we can not intercept
@@ -206,6 +210,7 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
         animated: Bool
     ) {
         let templateId = aTemplate.id
+        guard !templateId.isEmpty else { return }
 
         TemplateStore.getTemplate(templateId: templateId)?.onWillDisappear(
             animated: animated
@@ -217,6 +222,7 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
         animated: Bool
     ) {
         let templateId = aTemplate.id
+        guard !templateId.isEmpty else { return }
 
         TemplateStore.getTemplate(templateId: templateId)?.onDidDisappear(
             animated: animated

package/ios/templates/NowPlayingTemplate.swift

@@ -20,11 +20,17 @@ class NowPlayingTemplate: AutoPlayTemplate {
         template = CPNowPlayingTemplate.shared
         initTemplate(template: template, id: config.id)
 
-        setupNowPlayingButtons()
-        updateNowPlayingInfo()
-
-        if let image = config.image {
-            loadImageAsync(image: image)
+        // Constructor runs on the JS thread. Dispatch all CarPlay UI setup to main thread.
+        // CPNowPlayingTemplate.shared is Apple's singleton — must be modified on main thread.
+        // This also ensures MPNowPlayingInfoCenter and MPRemoteCommandCenter are configured
+        // even if push() is never called (CarPlay shows "Now Playing" bar automatically).
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+            self.setupNowPlayingButtons()
+            self.updateNowPlayingInfo()
+            if let image = config.image {
+                self.loadImageAsync(image: image)
+            }
         }
     }
 
@@ -123,6 +129,10 @@ class NowPlayingTemplate: AutoPlayTemplate {
     func invalidate() {
         setupNowPlayingButtons()
         updateNowPlayingInfo()
+
+        if loadedImage == nil, let image = config.image {
+            loadImageAsync(image: image)
+        }
     }
 
     func onWillAppear(animated: Bool) {

package/package.json

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