From 285477455752af8c828ef0467b3ab7b42dbafd19 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Fri, 8 May 2026 09:50:31 +0200
Subject: [PATCH 01/11] feat(Adapters): Add item context to HTTP errors

and always log response body when HTTP status >= 400

see #2158

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
---
 src/errors/Error.ts                    |   8 +-
 src/lib/adapters/Karakeep.ts           | 115 ++++++++++++++-----------
 src/lib/adapters/Linkwarden.ts         |  44 +++++++---
 src/lib/adapters/NextcloudBookmarks.ts |  57 +++++++++---
 4 files changed, 146 insertions(+), 78 deletions(-)

diff --git a/src/errors/Error.ts b/src/errors/Error.ts
index 017d6970c1..bbb16f0041 100644
--- a/src/errors/Error.ts
+++ b/src/errors/Error.ts
@@ -1,4 +1,4 @@
-import { Bookmark, TItemLocation } from '../lib/Tree'
+import { Bookmark, TItem, TItemLocation } from '../lib/Tree'
 import { statusCodes } from '../lib/statusCodes'
 
 export class FloccusError extends Error {
@@ -160,14 +160,16 @@ export class HttpError extends TransientError {
   public status: number
   public method: string
   public statusMessage: string
+  public item: TItem<TItemLocation>|undefined|null
 
-  constructor(status: number, method: string) {
+  constructor(status: number, method: string, item?: TItem<TItemLocation>) {
     super(
-      `E019: HTTP status ${status}. Failed ${method} request (${statusCodes[status]}). Check your server configuration and log.`
+      `E019: HTTP status ${status}. Failed ${method} request (${statusCodes[status]})` + (item ? ` for item ${item.inspect()}` : '') + `. Check your server configuration and log.`
     )
     this.status = status
     this.method = method
     this.statusMessage = statusCodes[status]
+    this.item = item
     Object.setPrototypeOf(this, HttpError.prototype)
   }
 }
diff --git a/src/lib/adapters/Karakeep.ts b/src/lib/adapters/Karakeep.ts
index 95d319d943..4f66001fa1 100644
--- a/src/lib/adapters/Karakeep.ts
+++ b/src/lib/adapters/Karakeep.ts
@@ -1,5 +1,5 @@
 import Adapter from '../interfaces/Adapter'
-import { Bookmark, Folder, ItemLocation } from '../Tree'
+import { Bookmark, Folder, ItemLocation, TItem, TItemLocation } from '../Tree'
 import PQueue from 'p-queue'
 import { ICapabilities, IHashSettings, IResource } from '../interfaces/Resource'
 import Logger from '../Logger'
@@ -118,12 +118,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
     }
   }
 
-  async createBookmark(bookmark: {
-    id: string | number
-    url: string
-    title: string
-    parentId: string | number
-  }): Promise<string | number> {
+  async createBookmark(bookmark: Bookmark<TItemLocation>): Promise<string | number> {
     Logger.log('(karakeep)CREATE', { bookmark })
     const response = await this.sendRequest(
       'POST',
@@ -133,7 +128,9 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
         type: 'link',
         url: bookmark.url,
         title: bookmark.title,
-      }
+      },
+      false,
+      bookmark
     )
     if (response.alreadyExists) {
       await this.sendRequest(
@@ -142,7 +139,9 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
         'application/json',
         {
           title: bookmark.title,
-        }
+        },
+        false,
+        bookmark
       )
     }
     await this.sendRequest(
@@ -150,17 +149,13 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       `/api/v1/lists/${bookmark.parentId}/bookmarks/${response.id}`,
       'application/json',
       undefined,
-      /* returnRawResponse */ true
+      true,
+      bookmark
     )
     return `${response.id};${bookmark.parentId}`
   }
 
-  async updateBookmark(bookmark: {
-    id: string | number
-    url: string
-    title: string
-    parentId: string | number
-  }): Promise<void> {
+  async updateBookmark(bookmark: Bookmark<TItemLocation>): Promise<void> {
     Logger.log('(karakeep)UPDATE', { bookmark })
     const [id, oldParentId] = this.parseBookmarkId(bookmark.id)
     await this.sendRequest(
@@ -170,7 +165,9 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       {
         url: bookmark.url,
         title: bookmark.title,
-      }
+      },
+      false,
+      bookmark
     )
 
     if (oldParentId !== bookmark.parentId) {
@@ -180,24 +177,23 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
           `/api/v1/lists/${oldParentId}/bookmarks/${id}`,
           'application/json',
           undefined,
-          /* returnRawResponse */ true
+          true,
+          bookmark
         ),
         this.sendRequest(
           'PUT',
           `/api/v1/lists/${bookmark.parentId}/bookmarks/${id}`,
           'application/json',
           undefined,
-          /* returnRawResponse */ true
+          true,
+          bookmark
         ),
       ])
     }
     bookmark.id = `${id};${bookmark.parentId}`
   }
 
-  async removeBookmark(bookmark: {
-    id: string | number
-    parentId: string | number
-  }): Promise<void> {
+  async removeBookmark(bookmark: Bookmark<TItemLocation>): Promise<void> {
     Logger.log('(karakeep)DELETE', { bookmark })
 
     const [id, parentId] = this.parseBookmarkId(bookmark.id)
@@ -208,7 +204,8 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       `/api/v1/lists/${parentId}/bookmarks/${id}`,
       'application/json',
       undefined,
-      /* returnRawResponse */ true
+      true,
+      bookmark
     )
 
     // If the bookmark is not in any list, delete it from the server
@@ -219,16 +216,13 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
         `/api/v1/bookmarks/${id}`,
         'application/json',
         undefined,
-        /* returnRawResponse */ true
+        true,
+        bookmark
       )
     }
   }
 
-  async createFolder(folder: {
-    id: string | number
-    title?: string
-    parentId: string | number
-  }): Promise<string | number> {
+  async createFolder(folder: Folder<TItemLocation>): Promise<string | number> {
     Logger.log('(karakeep)CREATEFOLDER', { folder })
     const response = await this.sendRequest(
       'POST',
@@ -239,16 +233,14 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
         icon: '📔',
         type: 'manual',
         parentId: folder.parentId,
-      }
+      },
+      false,
+      folder
     )
     return response.id
   }
 
-  async updateFolder(folder: {
-    id: string | number
-    title?: string
-    parentId: string | number
-  }): Promise<void> {
+  async updateFolder(folder: Folder<TItemLocation>): Promise<void> {
     Logger.log('(karakeep)UPDATEFOLDER', { folder })
     await this.sendRequest(
       'PATCH',
@@ -257,14 +249,16 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       {
         name: folder.title,
         parentId: folder.parentId,
-      }
+      },
+      false,
+      folder
     )
   }
 
   /**
    * Removes the list from karakeep, but also all its content recursively
    */
-  async removeFolder(folder: { id: string | number }): Promise<void> {
+  async removeFolder(folder: Folder<TItemLocation>): Promise<void> {
     Logger.log('(karakeep)DELETEFOLDER', { folder })
 
     const deleteListContent = async() => {
@@ -276,17 +270,25 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
           'GET',
           `/api/v1/lists/${folder.id}/bookmarks?includeContent=false&${
             nextCursor ? 'cursor=' + nextCursor : ''
-          }`
+          }`,
+          undefined,
+          undefined,
+          false,
+          folder
         )
         nextCursor = response.nextCursor
         bookmarkIds.push(...response.bookmarks.map((b) => b.id))
       } while (nextCursor !== null)
       await Promise.all(
         bookmarkIds.map((id) =>
-          this.removeBookmark({
+          // create a dummy bookmark
+          this.removeBookmark(new Bookmark({
             id: `${id};${folder.id}`,
             parentId: folder.id,
-          })
+            url: '',
+            title: '',
+            location: ItemLocation.SERVER
+          }))
         )
       )
     }
@@ -300,9 +302,13 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
 
       await Promise.all(
         childrenListIds.map((listId) =>
-          this.removeFolder({
+          // create dummy folder
+          this.removeFolder(new Folder({
             id: listId,
-          })
+            parentId: folder.id,
+            title: '',
+            location: ItemLocation.SERVER,
+          }))
         )
       )
     }
@@ -315,7 +321,8 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       `/api/v1/lists/${folder.id}`,
       'application/json',
       undefined,
-      /* returnRawResponse */ true
+      true,
+      folder
     )
   }
 
@@ -428,7 +435,8 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
     relUrl: string,
     type: string = null,
     body: any = null,
-    returnRawResponse = false
+    returnRawResponse = false,
+    item: TItem<TItemLocation> = null
   ): Promise<any> {
     const url = this.server.url + relUrl
     let res
@@ -447,7 +455,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
     Logger.log(`QUEUING ${verb} ${url}`)
 
     if (!IS_BROWSER) {
-      return this.sendRequestNative(verb, url, type, body, returnRawResponse)
+      return this.sendRequestNative(verb, url, type, body, returnRawResponse, item)
     }
 
     try {
@@ -495,7 +503,11 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       throw new AuthenticationError()
     }
     if (res.status === 503 || res.status >= 400) {
-      throw new HttpError(res.status, verb)
+      Logger.log(
+        `${verb} ${url}: Server responded with ${res.status}: ` +
+          (await res.text()).substring(0, 250)
+      )
+      throw new HttpError(res.status, verb, item)
     }
     let json
     try {
@@ -512,7 +524,8 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
     url: string,
     type: string,
     body: any,
-    returnRawResponse: boolean
+    returnRawResponse: boolean,
+    item: TItem<TItemLocation> = null
   ) {
     let res
     let timedOut = false
@@ -561,7 +574,11 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       throw new AuthenticationError()
     }
     if (res.status === 503 || res.status >= 400) {
-      throw new HttpError(res.status, verb)
+      Logger.log(
+        `${verb} ${url}: Server responded with ${res.status}: ` +
+          res.data.substring(0, 250)
+      )
+      throw new HttpError(res.status, verb, item)
     }
     const json = res.data
 
diff --git a/src/lib/adapters/Linkwarden.ts b/src/lib/adapters/Linkwarden.ts
index acf1efe0ee..6b00c5ca04 100644
--- a/src/lib/adapters/Linkwarden.ts
+++ b/src/lib/adapters/Linkwarden.ts
@@ -1,5 +1,5 @@
 import Adapter from '../interfaces/Adapter'
-import { Bookmark, Folder, ItemLocation } from '../Tree'
+import { Bookmark, Folder, ItemLocation, TItem, TItemLocation } from '../Tree'
 import PQueue from 'p-queue'
 import { ICapabilities, IHashSettings, IResource } from '../interfaces/Resource'
 import Logger from '../Logger'
@@ -118,7 +118,10 @@ export default class LinkwardenAdapter implements Adapter, IResource<typeof Item
         collection: {
           id: bookmark.parentId,
         },
-      })
+      },
+      false,
+      bookmark,
+    )
     return response.id
   }
 
@@ -138,12 +141,15 @@ export default class LinkwardenAdapter implements Adapter, IResource<typeof Item
           name: collection.name,
           ownerId: collection.ownerId,
         },
-      })
+      },
+      false,
+      bookmark,
+    )
   }
 
   async removeBookmark(bookmark: Bookmark<typeof ItemLocation.SERVER>): Promise<void> {
     Logger.log('(linkwarden)DELETE', {bookmark})
-    await this.sendRequest('DELETE', `/api/v1/links/${bookmark.id}`)
+    await this.sendRequest('DELETE', `/api/v1/links/${bookmark.id}`, undefined, undefined, false, bookmark)
   }
 
   async createFolder(folder: Folder<typeof ItemLocation.SERVER>): Promise<string | number> {
@@ -154,7 +160,10 @@ export default class LinkwardenAdapter implements Adapter, IResource<typeof Item
       {
         name: folder.title,
         parentId: folder.parentId,
-      })
+      },
+      false,
+      folder
+    )
     return response.id
   }
 
@@ -168,7 +177,10 @@ export default class LinkwardenAdapter implements Adapter, IResource<typeof Item
         ...collection,
         name: folder.title,
         parentId: folder.parentId,
-      })
+      },
+      false,
+      folder,
+    )
   }
 
   async removeFolder(folder: Folder<typeof ItemLocation.SERVER>): Promise<void> {
@@ -178,7 +190,7 @@ export default class LinkwardenAdapter implements Adapter, IResource<typeof Item
     do {
       try {
         count++
-        await this.sendRequest('DELETE', `/api/v1/collections/${folder.id}`)
+        await this.sendRequest('DELETE', `/api/v1/collections/${folder.id}`, undefined, undefined, false, folder)
         success = true
       } catch (e) {
         if (e instanceof HttpError && e.status === 401) {
@@ -241,7 +253,7 @@ export default class LinkwardenAdapter implements Adapter, IResource<typeof Item
     return true
   }
 
-  async sendRequest(verb:string, relUrl:string, type:string = null, body:any = null, returnRawResponse = false):Promise<any> {
+  async sendRequest(verb:string, relUrl:string, type:string = null, body:any = null, returnRawResponse = false, item: TItem<TItemLocation> = null):Promise<any> {
     const url = this.server.url + relUrl
     let res
     let timedOut = false
@@ -259,7 +271,7 @@ export default class LinkwardenAdapter implements Adapter, IResource<typeof Item
     Logger.log(`QUEUING ${verb} ${url}`)
 
     if (!IS_BROWSER) {
-      return this.sendRequestNative(verb, url, type, body, returnRawResponse)
+      return this.sendRequestNative(verb, url, type, body, returnRawResponse, item)
     }
 
     try {
@@ -305,7 +317,11 @@ export default class LinkwardenAdapter implements Adapter, IResource<typeof Item
       throw new AuthenticationError()
     }
     if (res.status === 503 || res.status >= 400) {
-      throw new HttpError(res.status, verb)
+      Logger.log(
+        `${verb} ${url}: Server responded with ${res.status}: ` +
+          (await res.text()).substring(0, 250)
+      )
+      throw new HttpError(res.status, verb, item)
     }
     let json
     try {
@@ -317,7 +333,7 @@ export default class LinkwardenAdapter implements Adapter, IResource<typeof Item
     return json
   }
 
-  private async sendRequestNative(verb: string, url: string, type: string, body: any, returnRawResponse: boolean) {
+  private async sendRequestNative(verb: string, url: string, type: string, body: any, returnRawResponse: boolean, item: TItem<TItemLocation> = null) {
     let res
     let timedOut = false
     try {
@@ -363,7 +379,11 @@ export default class LinkwardenAdapter implements Adapter, IResource<typeof Item
       throw new AuthenticationError()
     }
     if (res.status === 503 || res.status >= 400) {
-      throw new HttpError(res.status, verb)
+      Logger.log(
+        `${verb} ${url}: Server responded with ${res.status}: ` +
+          (await res.text()).substring(0, 250)
+      )
+      throw new HttpError(res.status, verb, item)
     }
     const json = res.data
 
diff --git a/src/lib/adapters/NextcloudBookmarks.ts b/src/lib/adapters/NextcloudBookmarks.ts
index bf942c5ab5..61f9b22138 100644
--- a/src/lib/adapters/NextcloudBookmarks.ts
+++ b/src/lib/adapters/NextcloudBookmarks.ts
@@ -3,7 +3,7 @@ import { CapacitorHttp as Http } from '@capacitor/core'
 import Adapter from '../interfaces/Adapter'
 import HtmlSerializer from '../serializers/Html'
 import Logger from '../Logger'
-import { Bookmark, Folder, ItemLocation, TItem } from '../Tree'
+import { Bookmark, Folder, ItemLocation, TItem, TItemLocation } from '../Tree'
 import { Base64 } from 'js-base64'
 import AsyncLock from 'async-lock'
 import * as Parallel from 'async-parallel'
@@ -430,7 +430,10 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
       'POST',
       'index.php/apps/bookmarks/public/rest/v2/folder',
       'application/json',
-      body
+      body,
+      undefined,
+      undefined,
+      folder,
     )
     if (typeof json.item !== 'object') {
       throw new UnexpectedServerResponseError()
@@ -475,7 +478,10 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
         'POST',
         `index.php/apps/bookmarks/public/rest/v2/folder/${parentId}/import`,
         'multipart/form-data',
-        body
+        body,
+        undefined,
+        undefined,
+        folder
       )
     })
 
@@ -528,7 +534,10 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
       'PUT',
       `index.php/apps/bookmarks/public/rest/v2/folder/${id}`,
       'application/json',
-      body
+      body,
+      undefined,
+      undefined,
+      folder
     )
     const oldParentFolder = this.tree.findFolder(oldFolder.parentId)
     if (!oldParentFolder) {
@@ -573,7 +582,12 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
     }
     await this.sendRequest(
       'DELETE',
-      `index.php/apps/bookmarks/public/rest/v2/folder/${id}`
+      `index.php/apps/bookmarks/public/rest/v2/folder/${id}`,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      folder,
     )
     const parent = this.tree.findFolder(oldFolder.parentId)
     if (parent) {
@@ -679,7 +693,10 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
             'POST',
             'index.php/apps/bookmarks/public/rest/v2/bookmark',
             'application/json',
-            body
+            body,
+            undefined,
+            undefined,
+            bm
           )
         } catch (e) {
           if (e instanceof HttpError) {
@@ -740,7 +757,10 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
           'PUT',
           `index.php/apps/bookmarks/public/rest/v2/bookmark/${upstreamId}`,
           'application/json',
-          body
+          body,
+          undefined,
+          undefined,
+          newBm,
         )
       } catch (e) {
         if (e instanceof HttpError) {
@@ -780,7 +800,12 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
       try {
         await this.sendRequest(
           'DELETE',
-          `index.php/apps/bookmarks/public/rest/v2/folder/${parentId}/bookmarks/${upstreamId}`
+          `index.php/apps/bookmarks/public/rest/v2/folder/${parentId}/bookmarks/${upstreamId}`,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          bookmark,
         )
         // remove bookmark from the cached list
         const list = await this.getBookmarksList()
@@ -851,7 +876,7 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
     return json.ocs.data
   }
 
-  async sendRequest(verb:string, relUrl:string, type:string = null, originalBody:any = null, returnRawResponse = false, headers = {}):Promise<any> {
+  async sendRequest(verb:string, relUrl:string, type:string = null, originalBody:any = null, returnRawResponse = false, headers = {}, item: TItem<TItemLocation> = null):Promise<any> {
     const url = this.normalizeServerURL(this.server.url) + relUrl
     let res
     let timedOut = false
@@ -870,7 +895,7 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
     Logger.log(`QUEUING ${verb} ${url}`)
 
     if (!IS_BROWSER) {
-      return this.sendRequestNative(verb, url, type, body, returnRawResponse, headers)
+      return this.sendRequestNative(verb, url, type, body, returnRawResponse, headers, item)
     }
 
     const authString = !this.ticket || this.ticketTimestamp + 60 * 60 * 1000 < Date.now()
@@ -920,7 +945,7 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
     if ((res.status === 401 || res.status === 403 || res.status === 404) && authString.startsWith('Bearer')) {
       this.ticket = null
       this.ticketTimestamp = 0
-      return this.sendRequest(verb, relUrl, type, originalBody, returnRawResponse, headers)
+      return this.sendRequest(verb, relUrl, type, originalBody, returnRawResponse, headers, item)
     }
 
     if (returnRawResponse) {
@@ -932,7 +957,7 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
     }
     if (res.status === 503 || res.status >= 400) {
       Logger.log(`${verb} ${url}: Server responded with ${res.status}: ` + (await res.text()).substring(0, 250))
-      throw new HttpError(res.status, verb)
+      throw new HttpError(res.status, verb, item)
     }
     let json
     try {
@@ -992,7 +1017,7 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
     return res.status === 200
   }
 
-  private async sendRequestNative(verb: string, url: string, type: string, body: any, returnRawResponse: boolean, headers = {}) {
+  private async sendRequestNative(verb: string, url: string, type: string, body: any, returnRawResponse: boolean, headers = {}, item: TItem<TItemLocation> = null) {
     let res
     let timedOut = false
     const authString = !this.ticket || this.ticketTimestamp + 60 * 60 * 1000 < Date.now()
@@ -1037,7 +1062,7 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
     if ((res.status === 401 || res.status === 403 || res.status === 404) && authString.startsWith('Bearer')) {
       this.ticket = null
       this.ticketTimestamp = 0
-      return this.sendRequestNative(verb, url, type, body, returnRawResponse, headers)
+      return this.sendRequestNative(verb, url, type, body, returnRawResponse, headers, item)
     }
 
     if (returnRawResponse) {
@@ -1052,6 +1077,10 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
       throw new AuthenticationError()
     }
     if (res.status === 503 || res.status >= 400) {
+      Logger.log(
+        `${verb} ${url}: Server responded with ${res.status}: ` +
+          res.data.substring(0, 250)
+      )
       throw new HttpError(res.status, verb)
     }
     const json = res.data

From c25bb90954aafed3c1b0fdfeeb447519aaa44072 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Fri, 8 May 2026 09:51:08 +0200
Subject: [PATCH 02/11] fix: Run lint:fix

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
---
 src/ui/views/native/Home.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ui/views/native/Home.vue b/src/ui/views/native/Home.vue
index 668ae360bc..a83362a993 100644
--- a/src/ui/views/native/Home.vue
+++ b/src/ui/views/native/Home.vue
@@ -1,13 +1,14 @@
 <template>
-  <v-alert v-if="!isBrowserSupported" type="error">
+  <v-alert
+    v-if="!isBrowserSupported"
+    type="error">
     {{ 'This browser or WebView is not supported' }}
   </v-alert>
   <v-progress-circular
     v-else
     indeterminate
     color="blue darken-1"
-    class="ma-auto"
-  />
+    class="ma-auto" />
 </template>
 
 <script>

From deff58d48ebd7ebbfd281f2684298687be5f6964 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Fri, 8 May 2026 12:27:33 +0200
Subject: [PATCH 03/11] fix: copy pasta

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
---
 src/lib/adapters/Karakeep.ts           | 9 ++++++++-
 src/lib/adapters/Linkwarden.ts         | 9 ++++++++-
 src/lib/adapters/NextcloudBookmarks.ts | 8 +++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/lib/adapters/Karakeep.ts b/src/lib/adapters/Karakeep.ts
index 4f66001fa1..9d1b67ec9f 100644
--- a/src/lib/adapters/Karakeep.ts
+++ b/src/lib/adapters/Karakeep.ts
@@ -574,9 +574,16 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       throw new AuthenticationError()
     }
     if (res.status === 503 || res.status >= 400) {
+      let responseData: string
+      try {
+        responseData =
+          typeof res.data === 'string' ? res.data : JSON.stringify(res.data)
+      } catch (e) {
+        responseData = String(res.data)
+      }
       Logger.log(
         `${verb} ${url}: Server responded with ${res.status}: ` +
-          res.data.substring(0, 250)
+          responseData.substring(0, 250)
       )
       throw new HttpError(res.status, verb, item)
     }
diff --git a/src/lib/adapters/Linkwarden.ts b/src/lib/adapters/Linkwarden.ts
index 6b00c5ca04..99a99e7990 100644
--- a/src/lib/adapters/Linkwarden.ts
+++ b/src/lib/adapters/Linkwarden.ts
@@ -379,9 +379,16 @@ export default class LinkwardenAdapter implements Adapter, IResource<typeof Item
       throw new AuthenticationError()
     }
     if (res.status === 503 || res.status >= 400) {
+      let responseData: string
+      try {
+        responseData =
+          typeof res.data === 'string' ? res.data : JSON.stringify(res.data)
+      } catch (e) {
+        responseData = String(res.data)
+      }
       Logger.log(
         `${verb} ${url}: Server responded with ${res.status}: ` +
-          (await res.text()).substring(0, 250)
+          responseData.substring(0, 250)
       )
       throw new HttpError(res.status, verb, item)
     }
diff --git a/src/lib/adapters/NextcloudBookmarks.ts b/src/lib/adapters/NextcloudBookmarks.ts
index 61f9b22138..0f5aa387dc 100644
--- a/src/lib/adapters/NextcloudBookmarks.ts
+++ b/src/lib/adapters/NextcloudBookmarks.ts
@@ -1077,9 +1077,15 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
       throw new AuthenticationError()
     }
     if (res.status === 503 || res.status >= 400) {
+      let responseData: string
+      try {
+        responseData = typeof res.data === 'string' ? res.data : JSON.stringify(res.data)
+      } catch (e) {
+        responseData = String(res.data)
+      }
       Logger.log(
         `${verb} ${url}: Server responded with ${res.status}: ` +
-          res.data.substring(0, 250)
+          responseData.substring(0, 250)
       )
       throw new HttpError(res.status, verb)
     }

From e8ad6841523ed6ca091558fd23ccb6ca00176523 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Fri, 8 May 2026 12:31:26 +0200
Subject: [PATCH 04/11] fix: minor fixes

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
---
 src/errors/Error.ts                    | 8 +++++++-
 src/lib/adapters/NextcloudBookmarks.ts | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/errors/Error.ts b/src/errors/Error.ts
index bbb16f0041..19040fee45 100644
--- a/src/errors/Error.ts
+++ b/src/errors/Error.ts
@@ -164,7 +164,13 @@ export class HttpError extends TransientError {
 
   constructor(status: number, method: string, item?: TItem<TItemLocation>) {
     super(
-      `E019: HTTP status ${status}. Failed ${method} request (${statusCodes[status]})` + (item ? ` for item ${item.inspect()}` : '') + `. Check your server configuration and log.`
+      `E019: HTTP status ${status}. Failed ${method} request (${statusCodes[status]})` +
+        (item
+          ? ` for item #${item.id}[${item.title}]${'url' in item ? `(${item.url})` : ''} parentId: ${
+            item.parentId
+          }`
+          : '') +
+        `. Check your server configuration and log.`
     )
     this.status = status
     this.method = method
diff --git a/src/lib/adapters/NextcloudBookmarks.ts b/src/lib/adapters/NextcloudBookmarks.ts
index 0f5aa387dc..c1d5259568 100644
--- a/src/lib/adapters/NextcloudBookmarks.ts
+++ b/src/lib/adapters/NextcloudBookmarks.ts
@@ -1087,7 +1087,7 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
         `${verb} ${url}: Server responded with ${res.status}: ` +
           responseData.substring(0, 250)
       )
-      throw new HttpError(res.status, verb)
+      throw new HttpError(res.status, verb, item)
     }
     const json = res.data
     if (json.status !== 'success') {

From 359c618c8376b2e87b01bc9483f9ac1a8cfa65f5 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Sun, 10 May 2026 11:01:07 +0200
Subject: [PATCH 05/11] fix(Karakeep): Do not use returnRawResponse if the
 response is not used

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
---
 src/lib/adapters/Karakeep.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/adapters/Karakeep.ts b/src/lib/adapters/Karakeep.ts
index 9d1b67ec9f..6f53f4f427 100644
--- a/src/lib/adapters/Karakeep.ts
+++ b/src/lib/adapters/Karakeep.ts
@@ -149,7 +149,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       `/api/v1/lists/${bookmark.parentId}/bookmarks/${response.id}`,
       'application/json',
       undefined,
-      true,
+      false,
       bookmark
     )
     return `${response.id};${bookmark.parentId}`
@@ -177,7 +177,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
           `/api/v1/lists/${oldParentId}/bookmarks/${id}`,
           'application/json',
           undefined,
-          true,
+          false,
           bookmark
         ),
         this.sendRequest(
@@ -185,7 +185,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
           `/api/v1/lists/${bookmark.parentId}/bookmarks/${id}`,
           'application/json',
           undefined,
-          true,
+          false,
           bookmark
         ),
       ])
@@ -204,7 +204,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       `/api/v1/lists/${parentId}/bookmarks/${id}`,
       'application/json',
       undefined,
-      true,
+      false,
       bookmark
     )
 
@@ -216,7 +216,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
         `/api/v1/bookmarks/${id}`,
         'application/json',
         undefined,
-        true,
+        false,
         bookmark
       )
     }
@@ -321,7 +321,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       `/api/v1/lists/${folder.id}`,
       'application/json',
       undefined,
-      true,
+      false,
       folder
     )
   }

From 9001d681c71aa8154a89917e9a4484f70dc1b84f Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Sun, 10 May 2026 11:02:56 +0200
Subject: [PATCH 06/11] fix(Error): Improve error message for HttpError

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
---
 src/errors/Error.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/errors/Error.ts b/src/errors/Error.ts
index 19040fee45..a19afbe26b 100644
--- a/src/errors/Error.ts
+++ b/src/errors/Error.ts
@@ -166,9 +166,9 @@ export class HttpError extends TransientError {
     super(
       `E019: HTTP status ${status}. Failed ${method} request (${statusCodes[status]})` +
         (item
-          ? ` for item #${item.id}[${item.title}]${'url' in item ? `(${item.url})` : ''} parentId: ${
-            item.parentId
-          }`
+          ? ` for item #${item.id}[${item.title.substring(0, 100)}]${
+            'url' in item ? `(${item.url.substring(0, 100)})` : ''
+          } parentId: ${item.parentId}`
           : '') +
         `. Check your server configuration and log.`
     )

From 991681259bd1ac8800969d1d05c2bed5c465b17f Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Sun, 10 May 2026 11:04:43 +0200
Subject: [PATCH 07/11] fix(Karakeep): Avoid passing invalid URL to dummy
 bookmark

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
---
 src/lib/adapters/Karakeep.ts | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/lib/adapters/Karakeep.ts b/src/lib/adapters/Karakeep.ts
index 6f53f4f427..b2fb59b13b 100644
--- a/src/lib/adapters/Karakeep.ts
+++ b/src/lib/adapters/Karakeep.ts
@@ -282,13 +282,15 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       await Promise.all(
         bookmarkIds.map((id) =>
           // create a dummy bookmark
-          this.removeBookmark(new Bookmark({
-            id: `${id};${folder.id}`,
-            parentId: folder.id,
-            url: '',
-            title: '',
-            location: ItemLocation.SERVER
-          }))
+          this.removeBookmark(
+            new Bookmark({
+              id: `${id};${folder.id}`,
+              parentId: folder.id,
+              url: 'about:blank',
+              title: '',
+              location: ItemLocation.SERVER,
+            })
+          )
         )
       )
     }

From 1b8ce5dbbc94d140a2c7ccacfc358d97fe71f1bf Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Sun, 10 May 2026 12:36:44 +0200
Subject: [PATCH 08/11] Revert "fix(Karakeep): Do not use returnRawResponse if
 the response is not used"

This reverts commit 359c618c8376b2e87b01bc9483f9ac1a8cfa65f5.
---
 src/lib/adapters/Karakeep.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/adapters/Karakeep.ts b/src/lib/adapters/Karakeep.ts
index b2fb59b13b..e9cd4a680e 100644
--- a/src/lib/adapters/Karakeep.ts
+++ b/src/lib/adapters/Karakeep.ts
@@ -149,7 +149,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       `/api/v1/lists/${bookmark.parentId}/bookmarks/${response.id}`,
       'application/json',
       undefined,
-      false,
+      true,
       bookmark
     )
     return `${response.id};${bookmark.parentId}`
@@ -177,7 +177,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
           `/api/v1/lists/${oldParentId}/bookmarks/${id}`,
           'application/json',
           undefined,
-          false,
+          true,
           bookmark
         ),
         this.sendRequest(
@@ -185,7 +185,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
           `/api/v1/lists/${bookmark.parentId}/bookmarks/${id}`,
           'application/json',
           undefined,
-          false,
+          true,
           bookmark
         ),
       ])
@@ -204,7 +204,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       `/api/v1/lists/${parentId}/bookmarks/${id}`,
       'application/json',
       undefined,
-      false,
+      true,
       bookmark
     )
 
@@ -216,7 +216,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
         `/api/v1/bookmarks/${id}`,
         'application/json',
         undefined,
-        false,
+        true,
         bookmark
       )
     }
@@ -323,7 +323,7 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       `/api/v1/lists/${folder.id}`,
       'application/json',
       undefined,
-      false,
+      true,
       folder
     )
   }

From 090ab43041d4517fd59b33b0770ee7d6147e7e34 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Sun, 10 May 2026 12:38:21 +0200
Subject: [PATCH 09/11] fix(Karakeep): Make returnRawResponse=true still check
 response status code

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
---
 src/lib/adapters/Karakeep.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lib/adapters/Karakeep.ts b/src/lib/adapters/Karakeep.ts
index e9cd4a680e..54aaa8a33c 100644
--- a/src/lib/adapters/Karakeep.ts
+++ b/src/lib/adapters/Karakeep.ts
@@ -497,10 +497,6 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       throw new RedirectError()
     }
 
-    if (returnRawResponse) {
-      return res
-    }
-
     if (res.status === 403) {
       throw new AuthenticationError()
     }
@@ -511,6 +507,11 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
       )
       throw new HttpError(res.status, verb, item)
     }
+
+    if (returnRawResponse) {
+      return res
+    }
+
     let json
     try {
       json = await res.json()

From 3a481481519f684ba460c533f9199f3f4a59dd20 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Sun, 10 May 2026 13:23:36 +0200
Subject: [PATCH 10/11] fix(Linkwarden|Karakeep): Fix item removal

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
---
 src/lib/adapters/Karakeep.ts   | 62 ++++++++++++++++++++++------------
 src/lib/adapters/Linkwarden.ts | 11 +++++-
 2 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/src/lib/adapters/Karakeep.ts b/src/lib/adapters/Karakeep.ts
index 54aaa8a33c..da07380ad8 100644
--- a/src/lib/adapters/Karakeep.ts
+++ b/src/lib/adapters/Karakeep.ts
@@ -198,27 +198,36 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
 
     const [id, parentId] = this.parseBookmarkId(bookmark.id)
 
-    // Remove the bookmark from the list
-    await this.sendRequest(
-      'DELETE',
-      `/api/v1/lists/${parentId}/bookmarks/${id}`,
-      'application/json',
-      undefined,
-      true,
-      bookmark
-    )
-
-    // If the bookmark is not in any list, delete it from the server
-    const bookmarkLists = await this.getListsOfBookmark(id)
-    if (bookmarkLists.size === 0) {
+    try {
+      // Remove the bookmark from the list
       await this.sendRequest(
         'DELETE',
-        `/api/v1/bookmarks/${id}`,
+        `/api/v1/lists/${parentId}/bookmarks/${id}`,
         'application/json',
         undefined,
         true,
         bookmark
       )
+
+      // If the bookmark is not in any list, delete it from the server
+      const bookmarkLists = await this.getListsOfBookmark(id)
+      if (bookmarkLists.size === 0) {
+        await this.sendRequest(
+          'DELETE',
+          `/api/v1/bookmarks/${id}`,
+          'application/json',
+          undefined,
+          true,
+          bookmark
+        )
+      }
+    } catch (e) {
+      if (e instanceof HttpError) {
+        if (e.status === 404) {
+          return
+        }
+      }
+      throw e
     }
   }
 
@@ -318,14 +327,23 @@ export default class KarakeepAdapter implements Adapter, IResource<typeof ItemLo
     await Promise.all([deleteListContent(), deleteListFolders()])
 
     // Delete the list itself "after" deleting all its content in case any failure occurs in the previous steps
-    await this.sendRequest(
-      'DELETE',
-      `/api/v1/lists/${folder.id}`,
-      'application/json',
-      undefined,
-      true,
-      folder
-    )
+    try {
+      await this.sendRequest(
+        'DELETE',
+        `/api/v1/lists/${folder.id}`,
+        'application/json',
+        undefined,
+        true,
+        folder
+      )
+    } catch (e) {
+      if (e instanceof HttpError) {
+        if (e.status === 404) {
+          return
+        }
+      }
+      throw e
+    }
   }
 
   async getBookmarksTree(
diff --git a/src/lib/adapters/Linkwarden.ts b/src/lib/adapters/Linkwarden.ts
index 99a99e7990..10df41c473 100644
--- a/src/lib/adapters/Linkwarden.ts
+++ b/src/lib/adapters/Linkwarden.ts
@@ -149,7 +149,16 @@ export default class LinkwardenAdapter implements Adapter, IResource<typeof Item
 
   async removeBookmark(bookmark: Bookmark<typeof ItemLocation.SERVER>): Promise<void> {
     Logger.log('(linkwarden)DELETE', {bookmark})
-    await this.sendRequest('DELETE', `/api/v1/links/${bookmark.id}`, undefined, undefined, false, bookmark)
+    try {
+      await this.sendRequest('DELETE', `/api/v1/links/${bookmark.id}`, undefined, undefined, false, bookmark)
+    } catch (e) {
+      if (e instanceof HttpError) {
+        if (e.status === 404) {
+          return
+        }
+      }
+      throw e
+    }
   }
 
   async createFolder(folder: Folder<typeof ItemLocation.SERVER>): Promise<string | number> {

From 5b470f4b022ee6dd3cb77b70770874c19f6502e2 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Sun, 10 May 2026 14:29:19 +0200
Subject: [PATCH 11/11] tests: Dump logs after test failure if we're in CI

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
---
 src/test/test.js | 95 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 72 insertions(+), 23 deletions(-)

diff --git a/src/test/test.js b/src/test/test.js
index 20230f488d..e5e7f3ea5d 100644
--- a/src/test/test.js
+++ b/src/test/test.js
@@ -16,6 +16,7 @@ import {
   ClientsideDeletionFailsafeError,
   ServersideAdditionFailsafeError, ServersideDeletionFailsafeError
 } from '../errors/Error'
+import Logger from '../lib/Logger'
 
 chai.use(chaiAsPromised)
 const expect = chai.expect
@@ -72,7 +73,7 @@ describe('Floccus', function() {
   this.slow(20000) // 20s is slow
 
   const params = (new URL(window.location.href)).searchParams
-  let SERVER, CREDENTIALS, ACCOUNTS, APP_VERSION, SEED, BROWSER, RANDOM_MANIPULATION_ITERATIONS, TEST_URL
+  let SERVER, CREDENTIALS, ACCOUNTS, APP_VERSION, SEED, BROWSER, RANDOM_MANIPULATION_ITERATIONS, TEST_URL, IS_CI
   SERVER =
     params.get('server') ||
     'http://localhost'
@@ -83,6 +84,7 @@ describe('Floccus', function() {
   }
   APP_VERSION = params.get('app_version') || 'stable'
   BROWSER = params.get('browser') || 'firefox'
+  IS_CI = params.get('ci') === 'true'
 
   SEED = (new URL(window.location.href)).searchParams.get('seed') || Math.random() + ''
   console.log('RANDOMNESS SEED', SEED)
@@ -90,6 +92,17 @@ describe('Floccus', function() {
 
   RANDOM_MANIPULATION_ITERATIONS = 35
 
+  Logger.persist = () => Promise.resolve()
+  let DUMP_LOGS = function(currentTest) {
+    // Dump logs if test failed
+    if (IS_CI && currentTest && currentTest.isFailed()) {
+      for (const log of Logger.messages) {
+        console.log(log)
+      }
+      Logger.messages = []
+    }
+  }
+
   ACCOUNTS = [
     FakeAdapter.getDefaultValues(),
     {
@@ -282,6 +295,7 @@ describe('Floccus', function() {
             }
           })
           afterEach('clean up account', async function() {
+            DUMP_LOGS(this.currentTest)
             if (!account) return
             try {
               await browser.bookmarks.removeTree(account.getData().localRoot)
@@ -294,8 +308,8 @@ describe('Floccus', function() {
               await account.setData({ serverRoot: null })
               account.lockTimeout = 0
               const tree = await getAllBookmarks(account)
-              await withSyncConnection(account, async() => {
-                await AsyncParallel.each(tree.children, async child => {
+              await withSyncConnection(account, async () => {
+                await AsyncParallel.each(tree.children, async (child) => {
                   if (child instanceof Folder) {
                     await account.server.removeFolder(child)
                   } else {
@@ -313,11 +327,16 @@ describe('Floccus', function() {
                 await account.server.deleteFile(file.id)
               }
               if (files.length > 1) {
-                throw new Error('Google Drive sync left more than one file behind')
+                throw new Error(
+                  'Google Drive sync left more than one file behind'
+                )
               }
             }
             if (ACCOUNT_DATA.type === 'dropbox') {
-              const fileList = await account.server.listFiles(ACCOUNT_DATA.bookmark_file, 100)
+              const fileList = await account.server.listFiles(
+                ACCOUNT_DATA.bookmark_file,
+                100
+              )
               const files = fileList.matches
               for (const file of files) {
                 await account.server.deleteFile(file.metadata.metadata.id)
@@ -3991,16 +4010,17 @@ describe('Floccus', function() {
             }
           })
           afterEach('clean up accounts', async function() {
+            DUMP_LOGS(this.currentTest)
             if (ACCOUNT_DATA.type === 'git') {
               await account1.server.clearServer()
             } else if (ACCOUNT_DATA.type !== 'fake') {
               await account1.setData({
-                serverRoot: null
+                serverRoot: null,
               })
               account1.lockTimeout = 0
-              await withSyncConnection(account1, async() => {
+              await withSyncConnection(account1, async () => {
                 const tree = await account1.server.getBookmarksTree(true)
-                await AsyncParallel.each(tree.children, async child => {
+                await AsyncParallel.each(tree.children, async (child) => {
                   if (child instanceof Folder) {
                     await account1.server.removeFolder(child)
                   } else {
@@ -4010,17 +4030,24 @@ describe('Floccus', function() {
               })
             }
             if (ACCOUNT_DATA.type === 'google-drive') {
-              const fileList = await account1.server.listFiles('name = ' + "'" + ACCOUNT_DATA.bookmark_file + "'")
+              const fileList = await account1.server.listFiles(
+                'name = ' + "'" + ACCOUNT_DATA.bookmark_file + "'"
+              )
               const files = fileList.files
               for (const file of files) {
                 await account1.server.deleteFile(file.id)
               }
               if (files.length > 1) {
-                throw new Error('Google Drive sync left more than one file behind')
+                throw new Error(
+                  'Google Drive sync left more than one file behind'
+                )
               }
             }
             if (ACCOUNT_DATA.type === 'dropbox') {
-              const fileList = await account1.server.listFiles(ACCOUNT_DATA.bookmark_file, 100)
+              const fileList = await account1.server.listFiles(
+                ACCOUNT_DATA.bookmark_file,
+                100
+              )
               const files = fileList.matches
               for (const file of files) {
                 await account1.server.deleteFile(file.metadata.metadata.id)
@@ -5644,13 +5671,22 @@ describe('Floccus', function() {
             }
           })
           afterEach('clean up account', async function() {
+            DUMP_LOGS(this.currentTest)
             if (!account) return
             try {
               await awaitTabsUpdated()
               const tabs = await browser.tabs.query({
-                windowType: 'normal' // no devtools or panels or popups
+                windowType: 'normal', // no devtools or panels or popups
               })
-              await browser.tabs.remove(tabs.filter(tab => !tab.url.startsWith('chrome') && !tab.url.startsWith('moz')).map(tab => tab.id))
+              await browser.tabs.remove(
+                tabs
+                  .filter(
+                    (tab) =>
+                      !tab.url.startsWith('chrome') &&
+                      !tab.url.startsWith('moz')
+                  )
+                  .map((tab) => tab.id)
+              )
             } catch (e) {
               console.error(e)
             }
@@ -5661,8 +5697,8 @@ describe('Floccus', function() {
               await account.setData({ serverRoot: null })
               account.lockTimeout = 0
               const tree = await getAllBookmarks(account)
-              await withSyncConnection(account, async() => {
-                await AsyncParallel.each(tree.children, async child => {
+              await withSyncConnection(account, async () => {
+                await AsyncParallel.each(tree.children, async (child) => {
                   if (child instanceof Folder) {
                     await account.server.removeFolder(child)
                   } else {
@@ -5672,17 +5708,24 @@ describe('Floccus', function() {
               })
             }
             if (ACCOUNT_DATA.type === 'google-drive') {
-              const fileList = await account.server.listFiles('name = ' + "'" + ACCOUNT_DATA.bookmark_file + "'")
+              const fileList = await account.server.listFiles(
+                'name = ' + "'" + ACCOUNT_DATA.bookmark_file + "'"
+              )
               const files = fileList.files
               for (const file of files) {
                 await account.server.deleteFile(file.id)
               }
               if (files.length > 1) {
-                throw new Error('Google Drive sync left more than one file behind')
+                throw new Error(
+                  'Google Drive sync left more than one file behind'
+                )
               }
             }
             if (ACCOUNT_DATA.type === 'dropbox') {
-              const fileList = await account.server.listFiles(ACCOUNT_DATA.bookmark_file, 100)
+              const fileList = await account.server.listFiles(
+                ACCOUNT_DATA.bookmark_file,
+                100
+              )
               const files = fileList.matches
               for (const file of files) {
                 await account.server.deleteFile(file.metadata.metadata.id)
@@ -6046,6 +6089,7 @@ describe('Floccus', function() {
             }
           })
           afterEach('clean up account', async function() {
+            DUMP_LOGS(this.currentTest)
             if (!account) return
             try {
               await awaitTabsUpdated()
@@ -7139,16 +7183,17 @@ describe('Floccus', function() {
         afterEach('clean up accounts', async function() {
           RUN_INTERRUPTS = false
           stopInterrupts()
+          DUMP_LOGS(this.currentTest)
           if (ACCOUNT_DATA.type === 'git') {
             await account1.server.clearServer()
           } else if (ACCOUNT_DATA.type !== 'fake') {
             await account1.setData({
-              serverRoot: null
+              serverRoot: null,
             })
             account1.lockTimeout = 0
             const tree = await getAllBookmarks(account1)
-            await withSyncConnection(account1, async() => {
-              await AsyncParallel.each(tree.children, async child => {
+            await withSyncConnection(account1, async () => {
+              await AsyncParallel.each(tree.children, async (child) => {
                 if (child instanceof Folder) {
                   await account1.server.removeFolder(child)
                 } else {
@@ -7158,13 +7203,17 @@ describe('Floccus', function() {
             })
           }
           if (ACCOUNT_DATA.type === 'google-drive') {
-            const fileList = await account1.server.listFiles('name = ' + "'" + ACCOUNT_DATA.bookmark_file + "'")
+            const fileList = await account1.server.listFiles(
+              'name = ' + "'" + ACCOUNT_DATA.bookmark_file + "'"
+            )
             const files = fileList.files
             for (const file of files) {
               await account1.server.deleteFile(file.id)
             }
             if (files.length > 1) {
-              throw new Error('Google Drive sync left more than one file behind')
+              throw new Error(
+                'Google Drive sync left more than one file behind'
+              )
             }
           }
           if (ACCOUNT_DATA.type === 'dropbox') {