fix: Resume sync with reset cache after MappingFailure

see #2096

Signed-off-by: Marcel Klehr <[email protected]>

Author: marcelklehr

src/errors/Error.ts

@@ -411,4 +411,15 @@ export class XbelParseError extends FloccusError {
     this.code = 47
     Object.setPrototypeOf(this, XbelParseError.prototype)
   }
+}
+
+export class MappingFailureError extends FloccusError {
+  public id: string
+
+  constructor(id: string) {
+    super(`E048: Failed to map ID: ${id}`)
+    this.id = id
+    this.code = 48
+    Object.setPrototypeOf(this, MappingFailureError.prototype)
+  }
 }

src/lib/Account.ts

@@ -337,6 +337,19 @@ export default class Account {
     } catch (e) {
       console.log(e)
       const message = await Account.stringifyError(e)
+
+      // Catch MappingFailureError and gracefully resume with reset cache
+      if (matchAllErrors(e, e => e.code === 48)) {
+        Logger.log('Caught MappingFailureError: Gracefully resuming with reset cache')
+        await this.init()
+        await this.storage.setCurrentContinuation(null)
+        this.syncProcess = null
+        this.localCachingResource = null
+        await this.setData({ syncing: false })
+        this.syncing = false
+        return this.sync(strategy, forceSync)
+      }
+
       console.error('Syncing failed with', message)
       Logger.log('Syncing failed with', message)
       setContext('accountData', {
@@ -432,5 +445,5 @@ export default class Account {
 }
 
 function matchAllErrors(e, fn:(e)=>boolean) {
-  return fn(e) && e.list && e.list.every(e => matchAllErrors(e, fn))
+  return fn(e) && (e.list ? e.list.every(e => matchAllErrors(e, fn)) : true)
 }

src/lib/Diff.ts

@@ -3,6 +3,7 @@ import Mappings, { MappingSnapshot } from './Mappings'
 import Ordering from './interfaces/Ordering'
 import batchingToposort from 'batching-toposort'
 import Logger from './Logger'
+import { MappingFailureError } from '../errors/Error'
 
 export const ActionType = {
   CREATE: 'CREATE',
@@ -255,7 +256,7 @@ export default class Diff<L1 extends TItemLocation, L2 extends TItemLocation, A
               diff.commit(action)
               Logger.log('Failed to map parentId of action ' + diff.inspect())
               Logger.log(JSON.stringify(mappingsSnapshot, null,'\t'))
-              throw new Error('Failed to map parentId to ' + targetLocation + ': ' + action.payload.parentId)
+              throw new MappingFailureError(action.payload.parentId.toString())
             }
           }
         }