Reapply "fix(CachingTreeWrapper): Reload cache tree after update failure"

This reverts commit 3df9edf.

Author: marcelklehr

src/lib/CachingTreeWrapper.ts

@@ -2,6 +2,7 @@ import { CachingResource, ICapabilities, IHashSettings, OrderFolderResource } fr
 import { Bookmark, Folder, ItemLocation } from './Tree'
 import CacheTree from './CacheTree'
 import Ordering from './interfaces/Ordering'
+import Logger from './Logger'
 
 export default class CachingTreeWrapper implements OrderFolderResource<typeof ItemLocation.LOCAL>, CachingResource<typeof ItemLocation.LOCAL> {
   private innerTree: OrderFolderResource<typeof ItemLocation.LOCAL>
@@ -63,7 +64,15 @@ export default class CachingTreeWrapper implements OrderFolderResource<typeof It
 
   async updateFolder(folder:Folder<typeof ItemLocation.LOCAL>): Promise<void> {
     await this.innerTree.updateFolder(folder)
-    await this.cacheTree.updateFolder(folder.copy(false))
+    try {
+      await this.cacheTree.updateFolder(folder.copy(false))
+    } catch (error) {
+      Logger.log('CachingTreeWrapper: reloading cache tree after updateFolder mismatch', {
+        folder,
+        error,
+      })
+      this.cacheTree.setTree((await this.innerTree.getBookmarksTree()).copy())
+    }
   }
 
   async removeFolder(folder:Folder<typeof ItemLocation.LOCAL>): Promise<void> {