@iternio/react-native-auto-play 0.2.4 → 0.2.5-alpha

package/ios/hybrid/HybridAutoPlay.swift

@@ -147,7 +147,7 @@ class HybridAutoPlay: HybridAutoPlaySpec {
         -> NitroModules.Promise<Void>
     {
         return Promise.async {
-            return try await RootModule.withSceneAndInterfaceController {
+            try await RootModule.withSceneAndInterfaceController {
                 scene,
                 interfaceController in
 
@@ -196,7 +196,7 @@ class HybridAutoPlay: HybridAutoPlaySpec {
 
     func popTemplate(animate: Bool?) throws -> NitroModules.Promise<Void> {
         return Promise.async {
-            return try await RootModule.withInterfaceController {
+            try await RootModule.withInterfaceController {
                 interfaceController in
 
                 if try await interfaceController.dismissTemplate(
@@ -240,7 +240,7 @@ class HybridAutoPlay: HybridAutoPlaySpec {
         Void
     > {
         return Promise.async {
-            return try await RootModule.withInterfaceController {
+            try await RootModule.withInterfaceController {
                 interfaceController in
 
                 let _ = try await interfaceController.dismissTemplate(

package/ios/scenes/AutoPlayScene.swift

@@ -53,11 +53,12 @@ class AutoPlayScene: UIResponder {
     }
 
     func disconnect() {
-        SceneStore.removeScene(moduleName: moduleName)
-        isConnected = false
-        templateStore.disconnect()
         NitroSurface.stop(self.window?.rootViewController?.view)
         self.window = nil
+        isConnected = false
+
+        templateStore.disconnect()
+        SceneStore.removeScene(moduleName: moduleName)
     }
 
     func setState(state: VisibilityState) {

package/ios/utils/RootModule.swift

@@ -16,9 +16,7 @@ class RootModule {
                 moduleName: SceneStore.rootModuleName
             )
         else {
-            throw AutoPlayError.sceneNotFound(
-                "operation failed, \(SceneStore.rootModuleName) scene not found"
-            )
+            return
         }
 
         try action(scene)
@@ -71,15 +69,13 @@ class RootModule {
     static func withScene<T>(
         perform action:
             @escaping (AutoPlayScene) async throws -> T
-    ) async throws -> T {
+    ) async throws -> T? {
         guard
             let scene = SceneStore.getScene(
                 moduleName: SceneStore.rootModuleName
             )
         else {
-            throw AutoPlayError.sceneNotFound(
-                "operation failed, \(SceneStore.rootModuleName) scene not found"
-            )
+            return nil
         }
 
         return try await action(scene)
@@ -90,7 +86,7 @@ class RootModule {
         perform action:
             @escaping (AutoPlayScene, AutoPlayInterfaceController) async throws
             -> T
-    ) async throws -> T {
+    ) async throws -> T? {
         return try await withScene { scene in
             guard let interfaceController = scene.interfaceController else {
                 throw AutoPlayError.interfaceControllerNotFound(
@@ -106,7 +102,7 @@ class RootModule {
     static func withInterfaceController<T>(
         perform action:
             @escaping (AutoPlayInterfaceController) async throws -> T
-    ) async throws -> T {
+    ) async throws -> T? {
         try await withSceneAndInterfaceController { _, interfaceController in
             try await action(interfaceController)
         }

package/lib/templates/GridTemplate.js

@@ -24,6 +24,7 @@ export class GridTemplate extends Template {
         HybridGridTemplate.createGridTemplate(nitroConfig);
     }
     updateGrid(buttons) {
+        this.assertConnected();
         return HybridGridTemplate.updateGridTemplateButtons(this.id, NitroGridUtil.convert(this.template, buttons));
     }
 }

package/lib/templates/InformationTemplate.js

@@ -33,6 +33,7 @@ export class InformationTemplate extends Template {
         HybridInformationTemplate.createInformationTemplate(nitroConfig);
     }
     updateItems(items) {
+        this.assertConnected();
         const section = this.getSection(items);
         return HybridInformationTemplate.updateInformationTemplateSections(this.id, NitroSectionUtil.convert(this.template, section)?.at(0) ?? { items: [], type: 'default' });
     }

package/lib/templates/ListTemplate.js

@@ -24,6 +24,7 @@ export class ListTemplate extends Template {
         HybridListTemplate.createListTemplate(nitroConfig);
     }
     updateSections(sections) {
+        this.assertConnected();
         return HybridListTemplate.updateListTemplateSections(this.id, NitroSectionUtil.convert(this.template, sections));
     }
 }

package/lib/templates/MapTemplate.js

@@ -36,10 +36,12 @@ export class MapTemplate extends Template {
         HybridMapTemplate.createMapTemplate(nitroConfig);
     }
     setMapButtons(mapButtons) {
+        this.assertConnected();
         const buttons = NitroMapButton.convert(this.template, mapButtons);
         return HybridMapTemplate.setTemplateMapButtons(this.id, buttons);
     }
     setHeaderActions(headerActions) {
+        this.assertConnected();
         const nitroActions = NitroActionUtil.convert(this.template, headerActions);
         return HybridAutoPlay.setTemplateHeaderActions(this.id, nitroActions);
     }
@@ -49,12 +51,15 @@ export class MapTemplate extends Template {
      * @returns a callback to dismiss or update the navigation alert
      */
     showAlert(alert) {
+        this.assertConnected();
         return HybridMapTemplate.showNavigationAlert(this.id, NitroAlertUtil.convert(alert));
     }
     updateAlert(alertId, title, subtitle) {
+        this.assertConnected();
         HybridMapTemplate.updateNavigationAlert(this.id, alertId, title, subtitle);
     }
     dismissAlert(alertId) {
+        this.assertConnected();
         HybridMapTemplate.dismissNavigationAlert(this.id, alertId);
     }
     /**
@@ -63,6 +68,7 @@ export class MapTemplate extends Template {
      * @returns a callback to update the shown trip
      */
     showTripSelector({ trips, selectedTripId, textConfig, onTripSelected, onTripStarted, onBackPressed, mapButtons, }) {
+        this.assertConnected();
         if (trips.length === 0 ||
             trips.some((t) => t.routeChoices.length === 0 || t.routeChoices.some((r) => r.steps.length < 2))) {
             throw new Error('Invalid trips passed, either no trips or some trips routeChoice or steps are empty');
@@ -76,9 +82,11 @@ export class MapTemplate extends Template {
         return HybridMapTemplate.showTripSelector(this.id, trips, selectedTripId, textConfig, onTripSelected, onTripStarted, onBackPressed, buttons ?? []);
     }
     hideTripSelector() {
+        this.assertConnected();
         HybridMapTemplate.hideTripSelector(this.id);
     }
     updateVisibleTravelEstimate(visibleTravelEstimate) {
+        this.assertConnected();
         HybridMapTemplate.updateVisibleTravelEstimate(this.id, visibleTravelEstimate);
     }
     /**
@@ -86,6 +94,7 @@ export class MapTemplate extends Template {
      * @param steps all future steps, do not put in origin or passed steps
      */
     updateTravelEstimates(steps) {
+        this.assertConnected();
         HybridMapTemplate.updateTravelEstimates(this.id, steps);
     }
     /**
@@ -94,6 +103,7 @@ export class MapTemplate extends Template {
      * @namespace iOS will update travelEstimates only when passing in maneuvers with the same id
      */
     updateManeuvers(maneuvers) {
+        this.assertConnected();
         if (Array.isArray(maneuvers)) {
             const nitroManeuvers = maneuvers.reduce((acc, maneuver) => {
                 if (maneuver == null) {
@@ -117,9 +127,11 @@ export class MapTemplate extends Template {
      * or use this to start a navigation session without asking the user
      */
     startNavigation(trip) {
+        this.assertConnected();
         HybridMapTemplate.startNavigation(this.id, trip);
     }
     stopNavigation() {
+        this.assertConnected();
         HybridMapTemplate.stopNavigation(this.id);
     }
 }

package/lib/templates/MessageTemplate.d.ts

@@ -47,7 +47,9 @@ export type MessageTemplateConfig = Omit<NitroMessageTemplateConfig, 'headerActi
 export declare class MessageTemplate {
     private template;
     id: string;
+    isConnected: boolean;
     constructor(config: MessageTemplateConfig);
+    assertConnected(): void;
     /**
      * push this template on the stack and show it to the user
      */

package/lib/templates/MessageTemplate.js

@@ -14,7 +14,13 @@ const HybridMessageTemplate = NitroModules.createHybridObject('MessageTemplate')
 export class MessageTemplate {
     template = this;
     id = uuid.v4();
+    isConnected = HybridAutoPlay.isConnected();
     constructor(config) {
+        this.assertConnected();
+        const removeDisconnectListener = HybridAutoPlay.addListener('didDisconnect', () => {
+            this.isConnected = false;
+            removeDisconnectListener();
+        });
         const { headerActions, image, mapConfig, actions, ...rest } = config;
         const platformActions = Platform.OS === 'android'
             ? NitroActionUtil.convert(this.template, actions?.android)
@@ -34,10 +40,16 @@ export class MessageTemplate {
         };
         HybridMessageTemplate.createMessageTemplate(nitroConfig);
     }
+    assertConnected() {
+        if (!this.isConnected) {
+            throw new Error(`Template '${this.id}' used after disconnect!`);
+        }
+    }
     /**
      * push this template on the stack and show it to the user
      */
     push() {
+        this.assertConnected();
         return HybridAutoPlay.pushTemplate(this.id);
     }
 }

package/lib/templates/SearchTemplate.js

@@ -20,6 +20,7 @@ export class SearchTemplate extends Template {
         HybridSearchTemplate.createSearchTemplate(nitroConfig);
     }
     updateSearchResults(results) {
+        this.assertConnected();
         return HybridSearchTemplate.updateSearchResults(this.id, NitroSectionUtil.convert(this.template, results)?.at(0) ?? {
             items: [],
             type: 'default',

package/lib/templates/SignInTemplate.js

@@ -35,6 +35,7 @@ export class SignInTemplate extends Template {
      * @returns A promise that resolves when the template is updated.
      */
     updateTemplate(updatedConfig) {
+        this.assertConnected();
         const { headerActions, actions, ...rest } = updatedConfig;
         const nitroConfig = {
             ...rest,

package/lib/templates/Template.d.ts

@@ -60,7 +60,9 @@ export interface NitroBaseMapTemplateConfig extends TemplateConfig {
 }
 export declare class Template<TemplateConfigType, ActionsType> {
     id: string;
+    isConnected: boolean;
     constructor(config: TemplateConfig & TemplateConfigType);
+    assertConnected(): void;
     /**
      * set as root template on the stack
      */

package/lib/templates/Template.js

@@ -3,30 +3,45 @@ import { HybridAutoPlay } from '..';
 import { NitroActionUtil } from '../utils/NitroAction';
 export class Template {
     id;
+    isConnected = HybridAutoPlay.isConnected();
     constructor(config) {
+        this.assertConnected();
         // templates that render on a surface provide their own id, others use a auto generated one
         this.id =
             'id' in config && config.id != null && typeof config.id === 'string' ? config.id : uuid.v4();
+        const removeDisconnectListener = HybridAutoPlay.addListener('didDisconnect', () => {
+            this.isConnected = false;
+            removeDisconnectListener();
+        });
+    }
+    assertConnected() {
+        if (!this.isConnected) {
+            throw new Error(`Template '${this.id}' used after disconnect!`);
+        }
     }
     /**
      * set as root template on the stack
      */
     setRootTemplate() {
+        this.assertConnected();
         return HybridAutoPlay.setRootTemplate(this.id);
     }
     /**
      * push this template on the stack and show it to the user
      */
     push() {
+        this.assertConnected();
         return HybridAutoPlay.pushTemplate(this.id);
     }
     /**
      * remove all templates above this one from the stack
      */
     popTo() {
+        this.assertConnected();
         return HybridAutoPlay.popToTemplate(this.id);
     }
     setHeaderActions(headerActions) {
+        this.assertConnected();
         const nitroActions = NitroActionUtil.convert(this, headerActions);
         return HybridAutoPlay.setTemplateHeaderActions(this.id, nitroActions);
     }

package/package.json

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

package/src/templates/GridTemplate.ts

@@ -65,6 +65,8 @@ export class GridTemplate extends Template<GridTemplateConfig, HeaderActions<Gri
   }
 
   public updateGrid(buttons: Array<GridButton<GridTemplate>>) {
+    this.assertConnected();
+
     return HybridGridTemplate.updateGridTemplateButtons(
       this.id,
       NitroGridUtil.convert(this.template, buttons)

package/src/templates/InformationTemplate.ts

@@ -115,6 +115,8 @@ export class InformationTemplate extends Template<
   }
 
   public updateItems(items?: InformationItems) {
+    this.assertConnected();
+
     const section = this.getSection(items);
     return HybridInformationTemplate.updateInformationTemplateSections(
       this.id,

package/src/templates/ListTemplate.ts

@@ -122,6 +122,8 @@ export class ListTemplate extends Template<ListTemplateConfig, HeaderActions<Lis
   }
 
   public updateSections(sections?: Section<ListTemplate>) {
+    this.assertConnected();
+
     return HybridListTemplate.updateListTemplateSections(
       this.id,
       NitroSectionUtil.convert(this.template, sections)

package/src/templates/MapTemplate.ts

@@ -197,11 +197,15 @@ export class MapTemplate extends Template<MapTemplateConfig, MapTemplateConfig['
   }
 
   public setMapButtons(mapButtons: MapTemplateConfig['mapButtons']) {
+    this.assertConnected();
+
     const buttons = NitroMapButton.convert(this.template, mapButtons);
     return HybridMapTemplate.setTemplateMapButtons(this.id, buttons);
   }
 
   public override setHeaderActions(headerActions: MapTemplateConfig['headerActions']) {
+    this.assertConnected();
+
     const nitroActions = NitroActionUtil.convert(this.template, headerActions);
     return HybridAutoPlay.setTemplateHeaderActions(this.id, nitroActions);
   }
@@ -212,14 +216,20 @@ export class MapTemplate extends Template<MapTemplateConfig, MapTemplateConfig['
    * @returns a callback to dismiss or update the navigation alert
    */
   public showAlert(alert: NavigationAlert) {
+    this.assertConnected();
+
     return HybridMapTemplate.showNavigationAlert(this.id, NitroAlertUtil.convert(alert));
   }
 
   public updateAlert(alertId: number, title: AutoText, subtitle?: AutoText) {
+    this.assertConnected();
+
     HybridMapTemplate.updateNavigationAlert(this.id, alertId, title, subtitle);
   }
 
   public dismissAlert(alertId: number) {
+    this.assertConnected();
+
     HybridMapTemplate.dismissNavigationAlert(this.id, alertId);
   }
 
@@ -249,6 +259,8 @@ export class MapTemplate extends Template<MapTemplateConfig, MapTemplateConfig['
      */
     mapButtons?: MapTemplateConfig['mapButtons'];
   }): TripSelectorCallback {
+    this.assertConnected();
+
     if (
       trips.length === 0 ||
       trips.some(
@@ -285,10 +297,14 @@ export class MapTemplate extends Template<MapTemplateConfig, MapTemplateConfig['
   }
 
   public hideTripSelector() {
+    this.assertConnected();
+
     HybridMapTemplate.hideTripSelector(this.id);
   }
 
   public updateVisibleTravelEstimate(visibleTravelEstimate: VisibleTravelEstimate) {
+    this.assertConnected();
+
     HybridMapTemplate.updateVisibleTravelEstimate(this.id, visibleTravelEstimate);
   }
 
@@ -297,6 +313,8 @@ export class MapTemplate extends Template<MapTemplateConfig, MapTemplateConfig['
    * @param steps all future steps, do not put in origin or passed steps
    */
   public updateTravelEstimates(steps: Array<TripPoint>) {
+    this.assertConnected();
+
     HybridMapTemplate.updateTravelEstimates(this.id, steps);
   }
 
@@ -306,6 +324,8 @@ export class MapTemplate extends Template<MapTemplateConfig, MapTemplateConfig['
    * @namespace iOS will update travelEstimates only when passing in maneuvers with the same id
    */
   public updateManeuvers(maneuvers: AutoManeuver) {
+    this.assertConnected();
+
     if (Array.isArray(maneuvers)) {
       const nitroManeuvers = maneuvers.reduce((acc, maneuver) => {
         if (maneuver == null) {
@@ -334,10 +354,14 @@ export class MapTemplate extends Template<MapTemplateConfig, MapTemplateConfig['
    * or use this to start a navigation session without asking the user
    */
   public startNavigation(trip: TripConfig) {
+    this.assertConnected();
+
     HybridMapTemplate.startNavigation(this.id, trip);
   }
 
   public stopNavigation() {
+    this.assertConnected();
+
     HybridMapTemplate.stopNavigation(this.id);
   }
 }

package/src/templates/MessageTemplate.ts

@@ -74,8 +74,16 @@ export type MessageTemplateConfig = Omit<
 export class MessageTemplate {
   private template = this;
   public id = uuid.v4();
+  public isConnected = HybridAutoPlay.isConnected();
 
   constructor(config: MessageTemplateConfig) {
+    this.assertConnected();
+
+    const removeDisconnectListener = HybridAutoPlay.addListener('didDisconnect', () => {
+      this.isConnected = false;
+      removeDisconnectListener();
+    });
+
     const { headerActions, image, mapConfig, actions, ...rest } = config;
 
     const platformActions =
@@ -100,10 +108,18 @@ export class MessageTemplate {
     HybridMessageTemplate.createMessageTemplate(nitroConfig);
   }
 
+  public assertConnected() {
+    if (!this.isConnected) {
+      throw new Error(`Template '${this.id}' used after disconnect!`);
+    }
+  }
+
   /**
    * push this template on the stack and show it to the user
    */
   public push() {
+    this.assertConnected();
+
     return HybridAutoPlay.pushTemplate(this.id);
   }
 }

package/src/templates/SearchTemplate.ts

@@ -87,6 +87,8 @@ export class SearchTemplate extends Template<SearchTemplateConfig, HeaderActions
   }
 
   public updateSearchResults(results?: SingleSection<SearchTemplate>) {
+    this.assertConnected();
+
     return HybridSearchTemplate.updateSearchResults(
       this.id,
       NitroSectionUtil.convert(this.template, results)?.at(0) ?? {

package/src/templates/SignInTemplate.ts

@@ -97,6 +97,8 @@ export class SignInTemplate extends Template<
    * @returns A promise that resolves when the template is updated.
    */
   updateTemplate(updatedConfig: SignInTemplateUpdateConfig) {
+    this.assertConnected();
+
     const { headerActions, actions, ...rest } = updatedConfig;
     const nitroConfig: NitroSignInTemplateConfig & NitroTemplateConfig = {
       ...rest,

package/src/templates/Template.ts

@@ -74,17 +74,33 @@ export interface NitroBaseMapTemplateConfig extends TemplateConfig {
 
 export class Template<TemplateConfigType, ActionsType> {
   public id!: string;
+  public isConnected = HybridAutoPlay.isConnected();
 
   constructor(config: TemplateConfig & TemplateConfigType) {
+    this.assertConnected();
+
     // templates that render on a surface provide their own id, others use a auto generated one
     this.id =
       'id' in config && config.id != null && typeof config.id === 'string' ? config.id : uuid.v4();
+
+    const removeDisconnectListener = HybridAutoPlay.addListener('didDisconnect', () => {
+      this.isConnected = false;
+      removeDisconnectListener();
+    });
+  }
+
+  public assertConnected() {
+    if (!this.isConnected) {
+      throw new Error(`Template '${this.id}' used after disconnect!`);
+    }
   }
 
   /**
    * set as root template on the stack
    */
   public setRootTemplate() {
+    this.assertConnected();
+
     return HybridAutoPlay.setRootTemplate(this.id);
   }
 
@@ -92,6 +108,8 @@ export class Template<TemplateConfigType, ActionsType> {
    * push this template on the stack and show it to the user
    */
   public push() {
+    this.assertConnected();
+
     return HybridAutoPlay.pushTemplate(this.id);
   }
 
@@ -99,10 +117,14 @@ export class Template<TemplateConfigType, ActionsType> {
    * remove all templates above this one from the stack
    */
   public popTo() {
+    this.assertConnected();
+
     return HybridAutoPlay.popToTemplate(this.id);
   }
 
   public setHeaderActions<T>(headerActions?: ActionsType) {
+    this.assertConnected();
+
     const nitroActions = NitroActionUtil.convert(
       this as unknown as T,
       headerActions as HeaderActions<T>