fix: Multiple small hardenings

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

Author: marcelklehr

src/lib/Account.ts

@@ -286,7 +286,7 @@ export default class Account {
             direction = ItemLocation.SERVER
             break
           default:
-            if (!cacheTree.children.length) {
+            if (!cacheTree.children?.length) {
               Logger.log('Using "merge default" strategy (no cache available)')
               strategyClass = MergeSyncProcess
             } else {
@@ -308,15 +308,16 @@ export default class Account {
         if (direction) {
           this.syncProcess.setDirection(direction)
         }
-        await this.syncProcess.sync()
       } else {
-        // if there is a pending continuation, we resume it
-
+        // if there is a pending continuation, we resume it (see construction above)
         Logger.log('Found existing persisted pending continuation. Resuming last sync')
+        // When resuming a continuation, the CachingTreeWrapper is usually not initialized yet, because the localTree is
+        // set from the persisted continuation
         await this.localCachingResource.setCacheTree(await this.localCachingResource.getBookmarksTree())
-        await this.syncProcess.sync()
       }
 
+      await this.syncProcess.sync()
+
       await this.setData({ scheduled: false, syncing: 1 })
 
       // update cache

src/lib/browser/BrowserTree.ts

@@ -97,7 +97,7 @@ export default class BrowserTree implements IResource<typeof ItemLocation.LOCAL>
       if (node.id === this.absoluteRoot.id) {
         isRoot = true
       }
-      if (node.children) {
+      if (Array.isArray(node.children)) {
         // seeded pseudo random number generator for separator IDs
         // We use this because we want IDs that are (largely) collision-free even
         // between folders and still consistent across browsers
@@ -138,7 +138,11 @@ export default class BrowserTree implements IResource<typeof ItemLocation.LOCAL>
         })
       }
     }
-    return recurse(tree) as Folder<typeof ItemLocation.LOCAL>
+    const processedTree = recurse(tree) as Folder<typeof ItemLocation.LOCAL>
+    if (!processedTree) {
+      throw new LocalFolderNotFoundError()
+    }
+    return processedTree
   }
 
   async createBookmark(bookmark:Bookmark<typeof ItemLocation.LOCAL>): Promise<string|number> {

src/lib/strategies/Default.ts

@@ -426,7 +426,7 @@ export default class SyncProcess {
     this.localTree.setHashSettings(this.hashSettings)
     this.server.setHashSettings(this.hashSettings)
 
-    if (!this.localTreeRoot) {
+    if (!this.localTreeRoot || typeof this.localTreeRoot.children === 'undefined') {
       Logger.log('Retrieving local tree')
       const localTreeRoot = await this.localTree.getBookmarksTree()
       Logger.log('Filtering out unaccepted local bookmarks')
@@ -525,21 +525,29 @@ export default class SyncProcess {
   }
 
   filterOutInvalidBookmarks(tree: Folder<TItemLocation>): void {
+    const invalidBookmarks = []
     tree.children = tree.children.filter(child => {
       if (child instanceof Bookmark) {
         // Chrome URLs cannot be added in firefox
         if (this.isFirefox && child.url.startsWith('chrome')) {
+          invalidBookmarks.push(child)
           return false
         }
         // Linkwarden supports bookmarks that have no URL eg. for directly uploaded files
         if (child.url === null) {
+          invalidBookmarks.push(child)
           return false
         }
       } else {
         this.filterOutInvalidBookmarks(child)
       }
       return true
     })
+    invalidBookmarks.length &&
+    Logger.log(
+      'Filtered out the following invalid bookmarks before syncing',
+      invalidBookmarks
+    )
   }
 
   async filterOutDuplicatesInTheSameFolder(tree: Folder<TItemLocation>): Promise<void> {

src/lib/strategies/Unidirectional.ts

@@ -33,6 +33,8 @@ export default class UnidirectionalSyncProcess extends DefaultStrategy {
 
       // Stage 2
       'revertReorders',
+
+      'direction'
     ]
   }