Mutations that we can't apply should not fail the synchronization

alineacms · Nov 17, 2023 · cacae05 · cacae05
1 parent e10a3f3
commit cacae05
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/backend/Database.ts b/src/backend/Database.ts
@@ -102,8 +102,15 @@ export class Database implements Syncable {
     return this.store.transaction(async tx => {
       const reHash = []
       for (const mutation of mutations) {
-        const updateRows = await this.applyMutation(tx, mutation)
-        if (updateRows) reHash.push(updateRows)
+        try {
+          const updateRows = await this.applyMutation(tx, mutation)
+          if (updateRows) reHash.push(updateRows)
+        } catch (error) {
+          console.error(error)
+          console.warn(
+            `> could not apply mutation\n${JSON.stringify(mutation)}`
+          )
+        }
       }
       await Database.index(tx)
       const changed = (

diff --git a/src/backend/Handler.ts b/src/backend/Handler.ts
@@ -111,12 +111,17 @@ export class Handler {
     const {pending, db} = this.options
     const meta = await db.meta()
     if (!pending) return meta
-    const toApply = await pending.pendingSince(
-      meta.commitHash,
-      this.previewAuth()
-    )
-    if (!toApply) return meta
-    await db.applyMutations(toApply.mutations, toApply.toCommitHash)
+    try {
+      const toApply = await pending.pendingSince(
+        meta.commitHash,
+        this.previewAuth()
+      )
+      if (!toApply) return meta
+      await db.applyMutations(toApply.mutations, toApply.toCommitHash)
+    } catch (error) {
+      console.error(error)
+      console.warn('> could not sync pending mutations')
+    }
     return db.meta()
   }
 }