fix(Git): catch errors from git.push operations

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

Author: marcelklehr

_locales/en/messages.json

@@ -128,6 +128,9 @@
   "Error043": {
     "message": "E043: Failsafe: The current sync run would increase your bookmarks count by {0}%. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway."
   },
+  "Error044": {
+    "message": "E044: Git push operation failed: {0}"
+  },
   "LabelWebdavurl": {
     "message": "WebDAV URL"
   },

src/errors/Error.ts

@@ -368,4 +368,15 @@ export class AdditionFailsafeError extends FloccusError {
     this.percent = percent
     Object.setPrototypeOf(this, AdditionFailsafeError.prototype)
   }
+}
+
+export class GitPushError extends FloccusError {
+  public errorMessage: string
+
+  constructor(errorMessage:string) {
+    super(`E044: Git push operation failed: ${errorMessage}`)
+    this.code = 44
+    this.errorMessage = errorMessage
+    Object.setPrototypeOf(this, AdditionFailsafeError.prototype)
+  }
 }

src/lib/adapters/Git.ts

@@ -9,7 +9,7 @@ import http from 'isomorphic-git/http/web'
 import FS from '@isomorphic-git/lightning-fs'
 import Html from '../serializers/Html'
 import {
-  FileUnreadableError,
+  FileUnreadableError, GitPushError,
   MissingPermissionsError,
   ResourceLockedError,
   SlashError
@@ -133,7 +133,7 @@ export default class GitAdapter extends CachingAdapter {
           await git.renameBranch({ fs: this.fs, dir: this.dir, ref: this.server.branch, oldref: currentBranch })
         }
         Logger.log('(git) push')
-        await git.push({
+        const result = await git.push({
           fs: this.fs,
           http,
           dir: this.dir,
@@ -142,6 +142,9 @@ export default class GitAdapter extends CachingAdapter {
           remote: 'origin',
           onAuth: () => this.onAuth()
         })
+        if (result.error) {
+          throw new GitPushError(result.error)
+        }
       } else {
         throw e
       }
@@ -203,19 +206,23 @@ export default class GitAdapter extends CachingAdapter {
       })
       try {
         Logger.log('(git) push')
-        await git.push({
+        const result = await git.push({
           fs: this.fs,
           http,
           dir: this.dir,
           remote: 'origin',
           force: true,
           onAuth: () => this.onAuth()
         })
+        if (result.error) {
+          throw new GitPushError(result.error)
+        }
       } catch (e) {
         if (e.code && e.code === git.Errors.PushRejectedError.code) {
           await this.freeLock() // Only clears the locks set in the current adapter instance
           throw new ResourceLockedError
         }
+        throw e
       }
     } else {
       Logger.log('No changes to the server version necessary')
@@ -244,7 +251,10 @@ export default class GitAdapter extends CachingAdapter {
       Logger.log('(git) tag ' + tag)
       await git.tag({ fs: this.fs, dir: this.dir, ref: tag })
       Logger.log('(git) push tag ' + tag)
-      await git.push({ fs: this.fs, http, dir: this.dir, ref: tag, onAuth: () => this.onAuth() })
+      const result = await git.push({ fs: this.fs, http, dir: this.dir, ref: tag, onAuth: () => this.onAuth() })
+      if (result.error) {
+        throw new GitPushError(result.error)
+      }
       this.locked.push(tag)
     })()
     await this.lockingPromise
@@ -265,6 +275,7 @@ export default class GitAdapter extends CachingAdapter {
     try {
       for (const tag of this.locked) {
         Logger.log('(git) push: delete tag ' + tag)
+        // Ignoring result.error
         await git.push({ fs: this.fs, http, dir: this.dir, ref: tag, delete: true, onAuth: () => this.onAuth() })
       }
       this.locked = []
@@ -281,6 +292,7 @@ export default class GitAdapter extends CachingAdapter {
     const tags = await git.listTags({ fs, dir: this.dir })
     const lockTags = tags.filter(tag => tag.startsWith('floccus-lock-'))
     for (const tag of lockTags) {
+      // ignoring result.error
       await git.push({ fs, http, dir: this.dir, ref: tag, delete: true, onAuth: () => this.onAuth() })
     }
   }
@@ -359,7 +371,7 @@ export default class GitAdapter extends CachingAdapter {
     if (currentBranch && currentBranch !== this.server.branch) {
       await git.renameBranch({ fs, dir: this.dir, ref: this.server.branch, oldref: currentBranch })
     }
-    await git.push({
+    const result = await git.push({
       fs,
       http,
       dir: this.dir,
@@ -369,6 +381,9 @@ export default class GitAdapter extends CachingAdapter {
       force: true,
       onAuth: () => this.onAuth()
     })
+    if (result.error) {
+      throw new GitPushError(result.error)
+    }
     await git.fetch({
       http,
       fs,

src/lib/browser/BrowserAccount.ts

@@ -6,7 +6,7 @@ import Account from '../Account'
 import {
   AdditionFailsafeError,
   CreateBookmarkError,
-  DeletionFailsafeError, FloccusError,
+  DeletionFailsafeError, FloccusError, GitPushError,
   HttpError,
   InconsistentBookmarksExistenceError, LockFileError,
   MissingItemOrderError,
@@ -119,6 +119,9 @@ export default class BrowserAccount extends Account {
     if (er instanceof UpdateBookmarkError) {
       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])
+    }
     if (er instanceof FloccusError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'))
     }

src/lib/native/NativeAccount.ts

@@ -6,7 +6,7 @@ import { IAccountData } from '../interfaces/AccountStorage'
 import {
   AdditionFailsafeError,
   CreateBookmarkError,
-  DeletionFailsafeError, FloccusError,
+  DeletionFailsafeError, FloccusError, GitPushError,
   HttpError,
   InconsistentBookmarksExistenceError, LockFileError,
   MissingItemOrderError,
@@ -97,6 +97,9 @@ export default class NativeAccount extends Account {
     if (er instanceof UpdateBookmarkError) {
       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])
+    }
     if (er instanceof FloccusError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'))
     }