fix(Account): Use async lock for loading accounts

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

src/lib/Account.ts

@@ -38,6 +38,7 @@ AdapterFactory.register('fake', async() => (await import('./adapters/Fake')).def
 const LOCK_TIMEOUT = 1000 * 60 * 60 * 2
 
 const dataLock = new AsyncLock()
+const accountLock = new AsyncLock()
 
 export default class Account {
   static cache = {}
@@ -56,13 +57,15 @@ export default class Account {
   }
 
   static async get(id:string):Promise<Account> {
-    if (this.cache[id]) {
-      await this.cache[id].updateFromStorage()
-      return this.cache[id]
-    }
-    const account = await (await this.getAccountClass()).get(id)
-    this.cache[id] = account
-    return account
+    return accountLock.acquire(id, async() => {
+      if (this.cache[id]) {
+        await this.cache[id].updateFromStorage()
+        return this.cache[id]
+      }
+      const account = await (await this.getAccountClass()).get(id)
+      this.cache[id] = account
+      return account
+    })
   }
 
   static async create(data: IAccountData):Promise<Account> {

src/lib/native/NativeAccount.ts

@@ -29,7 +29,7 @@ export default class NativeAccount extends Account {
     return new NativeAccount(id, storage, await AdapterFactory.factory(data), tree)
   }
 
-  static async create(data: IAccountData):Promise<Account> {
+  static async create(data: IAccountData): Promise<Account> {
     const id = '' + Date.now() + Math.random()
     const adapter = await AdapterFactory.factory(data)
     const storage = new NativeAccountStorage(id)
@@ -44,7 +44,7 @@ export default class NativeAccount extends Account {
     return new NativeAccount(id, storage, adapter, tree)
   }
 
-  async init():Promise<void> {
+  async init(): Promise<void> {
     console.log('initializing account ' + this.id)
     await this.storage.initMappings()
     await this.storage.initCache()
@@ -53,80 +53,123 @@ export default class NativeAccount extends Account {
     this.localTree = nativeTree
   }
 
-  async isInitialized():Promise<boolean> {
+  async isInitialized(): Promise<boolean> {
     try {
-      return Boolean(NativeAccountStorage.getEntry(`bookmarks[${this.storage.accountId}].mappings`))
+      return Boolean(
+        NativeAccountStorage.getEntry(
+          `bookmarks[${this.storage.accountId}].mappings`
+        )
+      )
     } catch (e) {
       console.log('Apparently not initialized, because:', e)
       return false
     }
   }
 
-  async updateFromStorage():Promise<void> {
+  async updateFromStorage(): Promise<void> {
     // empty
   }
 
-  static async stringifyError(er:any):Promise<string> {
+  static async stringifyError(er: any): Promise<string> {
     if (er instanceof UnknownFolderItemOrderError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.item])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.item,
+      ])
     }
     if (er instanceof MissingItemOrderError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.item])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.item,
+      ])
     }
     if (er instanceof HttpError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.status, er.method, er.statusMessage])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.status,
+        er.method,
+        er.statusMessage,
+      ])
     }
     if (er instanceof ParseResponseError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0')) + '\n' + er.response
+      return (
+        i18n.getMessage('Error' + String(er.code).padStart(3, '0')) +
+        '\n' +
+        er.response
+      )
     }
     if (er instanceof InconsistentBookmarksExistenceError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.folder, er.bookmark])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.folder,
+        er.bookmark,
+      ])
     }
     if (er instanceof LockFileError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.status, er.lockFile])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.status,
+        er.lockFile,
+      ])
     }
     if (er instanceof ServersideDeletionFailsafeError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.percent])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.percent,
+      ])
     }
     if (er instanceof ServersideAdditionFailsafeError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.percent])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.percent,
+      ])
     }
     if (er instanceof ClientsideDeletionFailsafeError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.percent])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.percent,
+      ])
     }
     if (er instanceof ClientsideAdditionFailsafeError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.percent])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.percent,
+      ])
     }
     if (er instanceof CreateBookmarkError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.bookmark.inspect()])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.bookmark.inspect(),
+      ])
     }
     if (er instanceof UpdateBookmarkError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.bookmark.inspect()])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.bookmark.inspect(),
+      ])
     }
     if (er instanceof GitPushError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.errorMessage])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.errorMessage,
+      ])
     }
     if (er instanceof UnexpectedFolderPathError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.originalPath, er.newPath])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.originalPath,
+        er.newPath,
+      ])
     }
     if (er instanceof InvalidUrlError) {
-      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.url])
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [
+        er.url,
+      ])
     }
     if (er instanceof FloccusError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'))
     }
     if (er.list) {
-      return (await Promise.all(er.list
-        .map((e) => {
-          Logger.log(e)
-          return this.stringifyError(e)
-        })))
-        .join('\n')
+      return (
+        await Promise.all(
+          er.list.map((e) => {
+            Logger.log(e)
+            return this.stringifyError(e)
+          })
+        )
+      ).join('\n')
     }
     return er.message
   }
 
-  static async getAllAccounts():Promise<Account[]> {
+  static async getAllAccounts(): Promise<Account[]> {
     return Promise.all(
       (await NativeAccountStorage.getAllAccounts()).map((accountId) =>
         Account.get(accountId)