@iternio/react-native-auto-play 0.1.0 → 0.1.1

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/VirtualRenderer.kt

@@ -43,6 +43,10 @@ class VirtualRenderer(
     private val isCluster: Boolean = false
 ) {
     private lateinit var uiManager: FabricUIManager
+    private fun isUiManagerInitialized(): Boolean {
+        return ::uiManager.isInitialized
+    }
+
     private lateinit var display: Display
     private lateinit var reactContext: ReactContext
 
@@ -51,6 +55,9 @@ class VirtualRenderer(
     private var reactSurfaceId: Int? = null
 
     private lateinit var reactRootView: ReactRootView
+    private fun isReactRootViewInitialized(): Boolean {
+        return ::reactRootView.isInitialized
+    }
 
     private var height: Int = 0
     private var width: Int = 0
@@ -270,7 +277,7 @@ class VirtualRenderer(
         val reactNativeScale = virtualScreenDensity / mainScreenDensity * BuildConfig.SCALE_FACTOR
 
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            if (!this::uiManager.isInitialized) {
+            if (!isUiManagerInitialized()) {
                 // this makes sure we have all required instances
                 // no matter if the app is launched on the phone or AA first
                 return
@@ -299,7 +306,7 @@ class VirtualRenderer(
 
             var splashScreenView: View? = null
 
-            if (!this@VirtualRenderer::reactRootView.isInitialized) {
+            if (!isReactRootViewInitialized()) {
                 splashScreenView =
                     if (isCluster) getClusterSplashScreen(context, height, width) else null
 
@@ -470,11 +477,15 @@ class VirtualRenderer(
             val renderer = virtualRenderer[moduleId]
 
             if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-                renderer?.reactSurfaceId?.let {
-                    renderer.uiManager.stopSurface(it)
+                if (renderer?.isUiManagerInitialized() == true) {
+                    renderer.reactSurfaceId?.let {
+                        renderer.uiManager.stopSurface(it)
+                    }
                 }
             } else {
-                renderer?.reactRootView?.unmountReactApplication()
+                if (renderer?.isReactRootViewInitialized() == true) {
+                    renderer.reactRootView.unmountReactApplication()
+                }
             }
 
             virtualRenderer.remove(moduleId)

package/ios/Types.swift

@@ -18,4 +18,6 @@ enum AutoPlayError: Error {
     case propertyNotFoundError(String)
     case unsupportedVersion(String)
     case invalidTemplateType(String)
+    case noUiWindow(String)
+    case initReactRootViewFailed(String)
 }

package/ios/hybrid/HybridAutoPlay.swift

@@ -131,8 +131,8 @@ class HybridAutoPlay: HybridAutoPlaySpec {
                 let carPlayTemplate = template.getTemplate()
                 
                 if carPlayTemplate is CPMapTemplate {
-                    await MainActor.run {
-                        scene.initRootView()
+                    try await MainActor.run {
+                        try scene.initRootView()
                     }
                 }
 

package/ios/hybrid/HybridCarPlayDashboard.swift

@@ -30,9 +30,13 @@ class HybridCarPlayDashboard: HybridCarPlayDashboardSpec {
         }
     }
 
-    func initRootView() throws {
-        let scene = try SceneStore.getDashboardScene()
-        scene?.initRootView()
+    func initRootView() throws -> Promise<Void> {
+        return Promise.async {
+            guard let scene = try SceneStore.getDashboardScene() else { return }
+            try await MainActor.run {
+                try scene.initRootView()
+            }
+        }
     }
 
     func setButtons(buttons: [NitroCarPlayDashboardButton]) throws -> Promise<

package/ios/hybrid/HybridCluster.swift

@@ -60,7 +60,7 @@ class HybridCluster: HybridClusterSpec {
                     let scene = try SceneStore.getClusterScene(
                         clusterId: clusterId
                     )
-                    scene?.initRootView()
+                    try scene?.initRootView()
                 }
             } else {
                 throw AutoPlayError.unsupportedVersion(

package/ios/scenes/AutoPlayScene.swift

@@ -9,7 +9,7 @@ import CarPlay
 
 class AutoPlayScene: UIResponder {
     var initialProperties: [String: Any] = [:]
-    var moduleName: String?
+    let moduleName: String
     var window: UIWindow?
     var isConnected = false
     var interfaceController: AutoPlayInterfaceController?
@@ -17,7 +17,11 @@ class AutoPlayScene: UIResponder {
     var traitCollection = UIScreen.main.traitCollection
     var safeAreaInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
 
-    override init() {}
+    override init() {
+        fatalError(
+            "init() should never be called - use init(moduleName: String) instead"
+        )
+    }
 
     init(moduleName: String) {
         self.moduleName = moduleName
@@ -46,43 +50,37 @@ class AutoPlayScene: UIResponder {
         self.window = nil
         isConnected = false
 
-        guard let moduleName = self.moduleName else {
-            return
-        }
-
         SceneStore.removeScene(moduleName: moduleName)
     }
 
     func setState(state: VisibilityState) {
-        guard let moduleName = self.moduleName else {
-            return
-        }
-
         SceneStore.setState(moduleName: moduleName, state: state)
     }
 
-    func initRootView() {
-        DispatchQueue.main.async {
-            guard let window = self.window else {
-                return
-            }
-            guard let moduleName = self.moduleName else {
-                return
-            }
-
-            guard
-                let rootView = ViewUtils.getRootView(
-                    moduleName: moduleName,
-                    initialProps: self.initialProperties
-                )
-            else { return }
-
-            window.rootViewController = AutoPlaySceneViewController(
-                view: rootView,
-                moduleName: moduleName
+    @MainActor
+    func initRootView() throws {
+        guard let window = self.window else {
+            throw AutoPlayError.noUiWindow(
+                "window nil for module: \(moduleName)"
             )
-            window.makeKeyAndVisible()
         }
+        
+        guard
+            let rootView = ViewUtils.getRootView(
+                moduleName: moduleName,
+                initialProps: self.initialProperties
+            )
+        else {
+            throw AutoPlayError.initReactRootViewFailed(
+                "could not create react root view for module: \(moduleName)"
+            )
+        }
+
+        window.rootViewController = AutoPlaySceneViewController(
+            view: rootView,
+            moduleName: moduleName
+        )
+        window.makeKeyAndVisible()
     }
 
     open func traitCollectionDidChange(traitCollection: UITraitCollection) {
@@ -93,7 +91,7 @@ class AutoPlayScene: UIResponder {
     open func safeAreaInsetsDidChange(safeAreaInsets: UIEdgeInsets) {
         self.safeAreaInsets = safeAreaInsets
         HybridAutoPlay.emitSafeAreaInsets(
-            moduleName: moduleName!,
+            moduleName: moduleName,
             safeAreaInsets: safeAreaInsets
         )
     }

package/lib/specs/CarPlayDashboard.nitro.d.ts

@@ -16,7 +16,7 @@ export interface CarPlayDashboard extends HybridObject<{
 }> {
     addListener(eventType: EventName, callback: () => void): CleanupCallback;
     setButtons(buttons: Array<NitroCarPlayDashboardButton>): Promise<void>;
-    initRootView(): void;
+    initRootView(): Promise<void>;
     addListenerColorScheme(callback: (payload: ColorScheme) => void): CleanupCallback;
 }
 export {};

package/nitrogen/generated/ios/ReactNativeAutoPlay-Swift-Cxx-Bridge.hpp

@@ -613,15 +613,6 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay::bridge::swift {
   using std__weak_ptr_HybridCarPlayDashboardSpec_ = std::weak_ptr<HybridCarPlayDashboardSpec>;
   inline std__weak_ptr_HybridCarPlayDashboardSpec_ weakify_std__shared_ptr_HybridCarPlayDashboardSpec_(const std::shared_ptr<HybridCarPlayDashboardSpec>& strong) noexcept { return strong; }
   
-  // pragma MARK: Result<void>
-  using Result_void_ = Result<void>;
-  inline Result_void_ create_Result_void_() noexcept {
-    return Result<void>::withValue();
-  }
-  inline Result_void_ create_Result_void_(const std::exception_ptr& error) noexcept {
-    return Result<void>::withError(error);
-  }
-  
   // pragma MARK: std::function<void(const std::string& /* clusterId */)>
   /**
    * Specialized version of `std::function<void(const std::string&)>`.
@@ -759,6 +750,15 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay::bridge::swift {
   using std__weak_ptr_HybridClusterSpec_ = std::weak_ptr<HybridClusterSpec>;
   inline std__weak_ptr_HybridClusterSpec_ weakify_std__shared_ptr_HybridClusterSpec_(const std::shared_ptr<HybridClusterSpec>& strong) noexcept { return strong; }
   
+  // pragma MARK: Result<void>
+  using Result_void_ = Result<void>;
+  inline Result_void_ create_Result_void_() noexcept {
+    return Result<void>::withValue();
+  }
+  inline Result_void_ create_Result_void_(const std::exception_ptr& error) noexcept {
+    return Result<void>::withError(error);
+  }
+  
   // pragma MARK: std::function<void(std::optional<bool> /* animated */)>
   /**
    * Specialized version of `std::function<void(std::optional<bool>)>`.

package/nitrogen/generated/ios/c++/HybridCarPlayDashboardSpecSwift.hpp

@@ -98,11 +98,13 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
       auto __value = std::move(__result.value());
       return __value;
     }
-    inline void initRootView() override {
+    inline std::shared_ptr<Promise<void>> initRootView() override {
       auto __result = _swiftPart.initRootView();
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());
       }
+      auto __value = std::move(__result.value());
+      return __value;
     }
     inline std::function<void()> addListenerColorScheme(const std::function<void(ColorScheme /* payload */)>& callback) override {
       auto __result = _swiftPart.addListenerColorScheme(callback);

package/nitrogen/generated/ios/swift/HybridCarPlayDashboardSpec.swift

@@ -17,7 +17,7 @@ public protocol HybridCarPlayDashboardSpec_protocol: HybridObject {
   // Methods
   func addListener(eventType: EventName, callback: @escaping () -> Void) throws -> () -> Void
   func setButtons(buttons: [NitroCarPlayDashboardButton]) throws -> Promise<Void>
-  func initRootView() throws -> Void
+  func initRootView() throws -> Promise<Void>
   func addListenerColorScheme(callback: @escaping (_ payload: ColorScheme) -> Void) throws -> () -> Void
 }
 

package/nitrogen/generated/ios/swift/HybridCarPlayDashboardSpec_cxx.swift

@@ -158,13 +158,21 @@ open class HybridCarPlayDashboardSpec_cxx {
   }
   
   @inline(__always)
-  public final func initRootView() -> bridge.Result_void_ {
+  public final func initRootView() -> bridge.Result_std__shared_ptr_Promise_void___ {
     do {
-      try self.__implementation.initRootView()
-      return bridge.create_Result_void_()
+      let __result = try self.__implementation.initRootView()
+      let __resultCpp = { () -> bridge.std__shared_ptr_Promise_void__ in
+        let __promise = bridge.create_std__shared_ptr_Promise_void__()
+        let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_void__(__promise)
+        __result
+          .then({ __result in __promiseHolder.resolve() })
+          .catch({ __error in __promiseHolder.reject(__error.toCpp()) })
+        return __promise
+      }()
+      return bridge.create_Result_std__shared_ptr_Promise_void___(__resultCpp)
     } catch (let __error) {
       let __exceptionPtr = __error.toCpp()
-      return bridge.create_Result_void_(__exceptionPtr)
+      return bridge.create_Result_std__shared_ptr_Promise_void___(__exceptionPtr)
     }
   }
   

package/nitrogen/generated/shared/c++/HybridCarPlayDashboardSpec.hpp

@@ -60,7 +60,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
       // Methods
       virtual std::function<void()> addListener(EventName eventType, const std::function<void()>& callback) = 0;
       virtual std::shared_ptr<Promise<void>> setButtons(const std::vector<NitroCarPlayDashboardButton>& buttons) = 0;
-      virtual void initRootView() = 0;
+      virtual std::shared_ptr<Promise<void>> initRootView() = 0;
       virtual std::function<void()> addListenerColorScheme(const std::function<void(ColorScheme /* payload */)>& callback) = 0;
 
     protected:

package/package.json

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

package/src/specs/CarPlayDashboard.nitro.ts

@@ -17,6 +17,6 @@ interface NitroCarPlayDashboardButton extends BaseCarPlayDashboardButton {
 export interface CarPlayDashboard extends HybridObject<{ ios: 'swift' }> {
   addListener(eventType: EventName, callback: () => void): CleanupCallback;
   setButtons(buttons: Array<NitroCarPlayDashboardButton>): Promise<void>;
-  initRootView(): void;
+  initRootView(): Promise<void>;
   addListenerColorScheme(callback: (payload: ColorScheme) => void): CleanupCallback;
 }