Merge pull request #2109 from floccusaddon/fix/more-mapping-errors

fix: Implement GC for mappings

Author: marcelklehr

src/lib/Account.ts

@@ -312,6 +312,10 @@ export default class Account {
       }
 
       if (mappings) {
+        // Remove superfluous items from mappings
+        // as we don't remove items immediately anymore, due to possible interrupts
+        await mappings.gc(cache)
+        // store mappings
         await mappings.persist()
       }
 

src/lib/Mappings.ts

@@ -1,4 +1,4 @@
-import { TItem, TItemLocation, TItemType } from './Tree'
+import { Folder, ItemLocation, ItemType, TItem, TItemLocation, TItemType } from './Tree'
 
 type InternalItemTypeMapping = { LocalToServer: Record<string, string>, ServerToLocal: Record<string, string> }
 
@@ -33,6 +33,20 @@ export default class Mappings {
     }
   }
 
+  async gc(tree: Folder<typeof ItemLocation.LOCAL>) {
+    const index = tree.createIndex()
+    for (const localId in this.bookmarks.LocalToServer) {
+      if (!(localId in index[ItemType.BOOKMARK])) {
+        await this.removeBookmark({localId})
+      }
+    }
+    for (const localId in this.folders.LocalToServer) {
+      if (!(localId in index[ItemType.FOLDER])) {
+        await this.removeFolder({localId})
+      }
+    }
+  }
+
   async addFolder({ localId, remoteId }: { localId?:string|number, remoteId?:string|number }):Promise<void> {
     Mappings.add(this.folders, { localId, remoteId })
   }

src/lib/strategies/Default.ts

@@ -1381,11 +1381,7 @@ export default class SyncProcess {
     } else {
       localId = item.id
     }
-    if (item.type === 'folder') {
-      await this.mappings.removeFolder({ localId, remoteId })
-    } else {
-      await this.mappings.removeBookmark({ localId, remoteId })
-    }
+    // We don't remove from mappings immediately anymore, but wait for GC
   }
 
   async loadChildren(