[native] fix: Properly serialize cache

to avoid JSON.stringify recursion error

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

src/lib/Account.ts

@@ -331,7 +331,7 @@ export default class Account {
       Logger.log('Storing cache')
       const cache = (await this.localCachingResource.getCacheTree()).clone(false)
       this.syncProcess.filterOutUnacceptedBookmarks(cache)
-      await this.storage.setCache(cache)
+      await this.storage.setCache(await cache.toJSONAsync())
 
       if (this.server.onSyncComplete) {
         Logger.log('Calling onSyncComplete')

src/lib/Tree.ts

@@ -169,6 +169,7 @@ export class Bookmark<L extends TItemLocation> {
     let obj = this
     while (obj instanceof Bookmark) {
       Object.entries(obj).forEach(([key, value]) => {
+        if (key === 'index') return
         if (!(key in result)) {
           result[key] = value
         }
@@ -186,6 +187,7 @@ export class Bookmark<L extends TItemLocation> {
     while (obj instanceof Bookmark) {
       await yieldToEventLoop()
       Object.entries(obj).forEach(([key, value]) => {
+        if (key === 'index') return
         if (!(key in result)) {
           result[key] = value
         }

src/lib/native/NativeAccountStorage.js

@@ -114,7 +114,7 @@ export default class NativeAccountStorage {
   async setCache(data) {
     await NativeAccountStorage.changeEntry(
       `bookmarks[${this.accountId}].cache`,
-      () => data
+      () => data.toJSON ? data.toJSON() : data
     )
   }
 

src/lib/native/NativeTree.ts

@@ -34,7 +34,7 @@ export default class NativeTree extends CachingAdapter implements BulkImportReso
   }
 
   async save():Promise<void> {
-    await Storage.set({key: `bookmarks[${this.accountId}].tree`, value: JSON.stringify(this.bookmarksCache.cloneWithLocation(true, ItemLocation.LOCAL))})
+    await Storage.set({key: `bookmarks[${this.accountId}].tree`, value: JSON.stringify(await this.bookmarksCache.cloneWithLocation(true, ItemLocation.LOCAL).toJSONAsync())})
     await Storage.set({key: `bookmarks[${this.accountId}].highestId`, value: this.highestId + ''})
   }