- Allow for non blocking token refresh on main app (blocking in other uses)

- Stop doing reresh straight after initial login

Author: andyfase

src/app.ts

@@ -82,8 +82,11 @@ export async function createApp(config: Config, bl: Bluelink) {
   // if its been at least MIN_API_REFRESH_TIME milliseconds
   const cachedStatus = bl.getCachedStatus()
   if (!cachedStatus || cachedStatus.status.lastStatusCheck < Date.now() + MIN_API_REFRESH_TIME) {
-    bl.getStatus(false, true).then(async (status) => {
-      updateStatus(status)
+    // non blocking refresh of Auth then status call
+    bl.refreshAuth().then(async () => {
+      bl.getStatus(false, true).then(async (status) => {
+        updateStatus(status)
+      })
     })
   }
 

src/index.ts

@@ -27,7 +27,8 @@ import { confirm, quickOptions } from './lib/scriptable-utils'
 
   // Init Bluelink - Deal with region exceptions if needed
   try {
-    bl = await initRegionalBluelink(blConfig)
+    // main app handles refreshing auth in non blocking way
+    bl = await initRegionalBluelink(blConfig, config.runsWithSiri || config.runsInWidget ? true : false)
   } catch (e) {
     const error = e instanceof Error ? e.message : e
     const errorMessage = `Error Initalizing Bluelink: ${error}`

src/lib/bluelink-regions/australia.ts

@@ -84,9 +84,9 @@ export class BluelinkAustralia extends Bluelink {
     this.europeccs2 = undefined
   }
 
-  static async init(config: Config, vin?: string, statusCheckInterval?: number) {
+  static async init(config: Config, refreshAuth: boolean, vin?: string, statusCheckInterval?: number) {
     const obj = new BluelinkAustralia(config, statusCheckInterval)
-    await obj.superInit(config)
+    await obj.superInit(config, refreshAuth)
     return obj
   }
 

src/lib/bluelink-regions/base.ts

@@ -178,18 +178,20 @@ export class Bluelink {
     this.logger = getBluelinkLogger()
   }
 
-  protected async superInit(config: Config, statusCheckInterval?: number) {
+  protected async superInit(config: Config, refreshAuth: boolean, statusCheckInterval?: number) {
     this.vin = this.config.vin
     this.statusCheckInterval = statusCheckInterval || DEFAULT_STATUS_CHECK_INTERVAL
 
+    // check for cache - if not this is first login
+    const existingCache = this.cacheExists()
     // loadCache will login user if the cache doesnt exist i.e first app use
     const cache = await this.loadCache()
     if (!cache) {
       this.loginFailure = true
       return
     }
     this.cache = cache
-    await this.refreshLogin()
+    if (existingCache && refreshAuth) await this.refreshLogin()
   }
 
   protected async refreshLogin(force?: boolean) {
@@ -322,6 +324,10 @@ export class Bluelink {
     }
   }
 
+  public async refreshAuth(force = false): Promise<void> {
+    return await this.refreshLogin(force)
+  }
+
   public async getStatus(forceUpdate: boolean, noCache: boolean, location: boolean = false): Promise<Status> {
     if (forceUpdate) {
       // getCar first then save then get remote status
@@ -439,6 +445,10 @@ export class Bluelink {
     Keychain.set(this.getCacheKey(true), JSON.stringify(this.cache))
   }
 
+  protected cacheExists(): boolean {
+    return Keychain.contains(this.getCacheKey())
+  }
+
   protected async loadCache(): Promise<Cache | undefined> {
     let cache: Cache | undefined = undefined
     if (Keychain.contains(this.getCacheKey())) {

src/lib/bluelink-regions/canada.ts

@@ -69,9 +69,9 @@ export class BluelinkCanada extends Bluelink {
     }
   }
 
-  static async init(config: Config, vin?: string, statusCheckInterval?: number) {
+  static async init(config: Config, refreshAuth: boolean, vin?: string, statusCheckInterval?: number) {
     const obj = new BluelinkCanada(config, statusCheckInterval)
-    await obj.superInit(config)
+    await obj.superInit(config, refreshAuth)
     return obj
   }
 

src/lib/bluelink-regions/europe.ts

@@ -89,9 +89,9 @@ export class BluelinkEurope extends Bluelink {
     this.europeccs2 = undefined
   }
 
-  static async init(config: Config, vin?: string, statusCheckInterval?: number) {
+  static async init(config: Config, refreshAuth: boolean, vin?: string, statusCheckInterval?: number) {
     const obj = new BluelinkEurope(config, statusCheckInterval)
-    await obj.superInit(config)
+    await obj.superInit(config, refreshAuth)
     return obj
   }
 

src/lib/bluelink-regions/india.ts

@@ -75,9 +75,9 @@ export class BluelinkIndia extends Bluelink {
     this.europeccs2 = undefined
   }
 
-  static async init(config: Config, vin?: string, statusCheckInterval?: number) {
+  static async init(config: Config, refreshAuth: boolean, vin?: string, statusCheckInterval?: number) {
     const obj = new BluelinkIndia(config, statusCheckInterval)
-    await obj.superInit(config)
+    await obj.superInit(config, refreshAuth)
     return obj
   }
 

src/lib/bluelink-regions/usa-kia.ts

@@ -43,9 +43,9 @@ export class BluelinkUSAKia extends Bluelink {
     this.authIdHeader = 'vinkey'
   }
 
-  static async init(config: Config, vin?: string, statusCheckInterval?: number) {
+  static async init(config: Config, refreshAuth: boolean, vin?: string, statusCheckInterval?: number) {
     const obj = new BluelinkUSAKia(config, statusCheckInterval)
-    await obj.superInit(config)
+    await obj.superInit(config, refreshAuth)
     return obj
   }
 

src/lib/bluelink-regions/usa.ts

@@ -48,9 +48,9 @@ export class BluelinkUSA extends Bluelink {
     this.authHeader = 'accessToken'
   }
 
-  static async init(config: Config, vin?: string, statusCheckInterval?: number) {
+  static async init(config: Config, refreshAuth: boolean, vin?: string, statusCheckInterval?: number) {
     const obj = new BluelinkUSA(config, statusCheckInterval)
-    await obj.superInit(config)
+    await obj.superInit(config, refreshAuth)
     return obj
   }
 

src/lib/bluelink.ts

@@ -13,7 +13,10 @@ const regionSupport = {
   genesis: ['canada', 'usa'],
 }
 
-export async function initRegionalBluelink(config: Config): Promise<BluelinkCanada | Bluelink | undefined> {
+export async function initRegionalBluelink(
+  config: Config,
+  refreshAuth = true,
+): Promise<BluelinkCanada | Bluelink | undefined> {
   for (const [manufacturer, regions] of Object.entries(regionSupport)) {
     if (config.manufacturer.toLowerCase() === manufacturer) {
       if (!regions.includes(config.auth.region)) {
@@ -24,15 +27,17 @@ export async function initRegionalBluelink(config: Config): Promise<BluelinkCana
 
   switch (config.auth.region) {
     case 'canada':
-      return await BluelinkCanada.init(config)
+      return await BluelinkCanada.init(config, refreshAuth)
     case 'usa':
-      return config.manufacturer === 'kia' ? await BluelinkUSAKia.init(config) : await BluelinkUSA.init(config)
+      return config.manufacturer === 'kia'
+        ? await BluelinkUSAKia.init(config, refreshAuth)
+        : await BluelinkUSA.init(config, refreshAuth)
     case 'europe':
-      return await BluelinkEurope.init(config)
+      return await BluelinkEurope.init(config, refreshAuth)
     case 'india':
-      return await BluelinkIndia.init(config)
+      return await BluelinkIndia.init(config, refreshAuth)
     case 'australia':
-      return await BluelinkAustralia.init(config)
+      return await BluelinkAustralia.init(config, refreshAuth)
     default:
       throw new Error(
         `Something went wrong determining bluelink region! Please raise an issue on GitHub with details of your vehicle and region.`,