fix: Fix interrupt tests with NextcloudBookmarks

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

Author: marcelklehr

src/lib/adapters/NextcloudBookmarks.ts

@@ -67,8 +67,6 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
   private bookmarkLock: AsyncLock
   private list: Bookmark<typeof ItemLocation.SERVER>[]
   private tree: Folder<typeof ItemLocation.SERVER>
-  private abortController: AbortController
-  private abortSignal: AbortSignal
   private canceled = false
   private cancelCallback: () => void = null
   private lockingInterval: any
@@ -85,8 +83,6 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
     this.server = server
     this.fetchQueue = new PQueue({ concurrency: 12 })
     this.bookmarkLock = new AsyncLock()
-    this.abortController = new AbortController()
-    this.abortSignal = this.abortController.signal
   }
 
   static getDefaultValues(): NextcloudBookmarksConfig {
@@ -158,9 +154,6 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
     this.capabilities = await this.getNextcloudCapabilities()
     await this.checkFeatureJavascriptLinks()
 
-    this.abortController = new AbortController()
-    this.abortSignal = this.abortController.signal
-
     if (this.lockingInterval) {
       clearInterval(this.lockingInterval)
     }
@@ -172,7 +165,12 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
     } else if (!this.locked) {
       throw new ResourceLockedError()
     }
-    this.lockingInterval = setInterval(() => !this.ended && this.acquireLock(), LOCK_INTERVAL)
+    this.lockingInterval = setInterval(() => {
+      if (!this.ended) {
+        this.acquireLock()
+          .catch(() => { /* pass */ })
+      }
+    }, LOCK_INTERVAL)
   }
 
   async onSyncComplete(): Promise<void> {
@@ -190,7 +188,6 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
   cancel() {
     this.canceled = true
     this.fetchQueue.clear()
-    this.abortController.abort()
     this.cancelCallback && this.cancelCallback()
   }
 
@@ -851,6 +848,9 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
       ? 'Basic ' + Base64.encode(this.server.username + ':' + this.server.password)
       : 'Bearer ' + this.ticket
 
+    const abortController = new AbortController()
+    const abortSignal = abortController.signal
+
     try {
       res = await this.fetchQueue.add(() => {
         Logger.log(`FETCHING ${verb} ${url}`)
@@ -863,13 +863,14 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
               Authorization: authString,
               ...headers
             },
-            signal: this.abortSignal,
+            signal: abortSignal,
             ...(body && !['get', 'head'].includes(verb.toLowerCase()) && { body }),
           }),
           new Promise((resolve, reject) =>
             setTimeout(() => {
               timedOut = true
               reject(new RequestTimeoutError())
+              abortController.abort()
             }, TIMEOUT)
           ),
         ])

src/test/test.js

@@ -6909,14 +6909,19 @@ describe('Floccus', function() {
     describe(`${stringifyAccountData(ACCOUNT_DATA)} benchmark ${ACCOUNT_DATA.serverRoot ? 'subfolder' : 'root'}`, function() {
       context('with two clients', function() {
         this.timeout(120 * 60000) // timeout after 2h
+        const BENCHMARK_SIZE = 1000
         let account1, account2, RUN_INTERRUPTS = false
         let timeouts = []
         let i = 0
         let timer = null
         const setInterrupt = () => {
           if (!timeouts.length) {
             timeouts = new Array(1000).fill(0).map((_, index) =>
-              ACCOUNT_DATA.type === 'nextcloud-bookmarks' ? random.int(50000, 150000) : random.int(200, Math.round(4000 + (20000 - 4000) * (index % 20) / 20))
+              ACCOUNT_DATA.type === 'nextcloud-bookmarks'
+                // Produce random numbers of timeouts between 30s and increasing numbers between 30s and 180s (increasing for streches of 20, then going back to 30s)
+                ? random.int(30000, Math.round(30000 + (180000 - 30000) * (index % 20) / 20))
+                // Produce random numbers of timeouts between 4s and increasing numbers between 4s and 20s (increasing for streches of 20, then going back to 4s)
+                : random.int(200, Math.round(4000 + (20000 - 4000) * (index % 20) / 20))
             )
           }
           const timeout = timeouts[(i++) % 1000]
@@ -7060,7 +7065,7 @@ describe('Floccus', function() {
             }
           }
 
-          await createTree(localRoot, 0, 1000)
+          await createTree(localRoot, 0, BENCHMARK_SIZE)
 
           const tree1Initial = await account1.localTree.getBookmarksTree(true)
           await account1.sync()
@@ -7211,7 +7216,7 @@ describe('Floccus', function() {
             }
           }
 
-          await createTree(localRoot, 0, 1000)
+          await createTree(localRoot, 0, BENCHMARK_SIZE)
 
           let tree1Initial = await account1.localTree.getBookmarksTree(true)
           await account1.sync()
@@ -7442,7 +7447,7 @@ describe('Floccus', function() {
             }
           }
 
-          await createTree(localRoot, 0, 1000)
+          await createTree(localRoot, 0, BENCHMARK_SIZE)
 
           let tree1Initial = await account1.localTree.getBookmarksTree(true)
           await account1.sync()
@@ -7684,7 +7689,7 @@ describe('Floccus', function() {
             }
           }
 
-          await createTree(localRoot, 0, 1000)
+          await createTree(localRoot, 0, BENCHMARK_SIZE)
 
           let tree1Initial = await account1.localTree.getBookmarksTree(true)
           await account1.sync()
@@ -7922,7 +7927,7 @@ describe('Floccus', function() {
             }
           }
 
-          await createTree(localRoot, 0, 1000)
+          await createTree(localRoot, 0, BENCHMARK_SIZE)
 
           let tree1Initial = await account1.localTree.getBookmarksTree(true)
           await syncAccountWithInterrupts(account1)
@@ -8179,7 +8184,7 @@ describe('Floccus', function() {
             }
           }
 
-          await createTree(localRoot, 0, 1000)
+          await createTree(localRoot, 0, BENCHMARK_SIZE)
 
           let tree1Initial = await account1.localTree.getBookmarksTree(true)
           await account1.sync()
@@ -8423,7 +8428,7 @@ describe('Floccus', function() {
             }
           }
 
-          await createTree(localRoot, 0, 1000)
+          await createTree(localRoot, 0, BENCHMARK_SIZE)
 
           let tree1Initial = await account1.localTree.getBookmarksTree(true)
           await account1.sync()