fix: harden cold storage sync ordering

Author: SameDesu123

src/ts/drive/drive.ts

@@ -299,8 +299,6 @@ async function loadDrive(ACCESS_TOKEN:string, mode: 'backup'|'sync'):Promise<voi
         }
 
         const db:Database = mode === 'backup' ? await getDbFromList() : JSON.parse(Buffer.from(await getFileData(ACCESS_TOKEN, dbs[0][0].id)).toString('utf-8'))
-        lastSaved = Date.now()
-        localStorage.setItem('risu_lastsaved', `${lastSaved}`)
         const coldStorageRestoreFailures = await restoreColdStorageFromDrive(ACCESS_TOKEN, files, db, mode)
         if(coldStorageRestoreFailures.length > 0){
             alertError(`${mode === 'sync' ? 'Sync' : 'Backup restore'} failed. ${coldStorageRestoreFailures.length} cold storage item(s) could not be restored.`)
@@ -361,6 +359,8 @@ async function loadDrive(ACCESS_TOKEN:string, mode: 'backup'|'sync'):Promise<voi
 
         if(isTauri){
             await writeFile('database/database.bin', dbData, {baseDir: BaseDirectory.AppData})
+            lastSaved = Date.now()
+            localStorage.setItem('risu_lastsaved', `${lastSaved}`)
             relaunch()
             alertStore.set({
                 type: "wait",
@@ -369,6 +369,8 @@ async function loadDrive(ACCESS_TOKEN:string, mode: 'backup'|'sync'):Promise<voi
         }
         else{
             await forageStorage.setItem('database/database.bin', dbData)
+            lastSaved = Date.now()
+            localStorage.setItem('risu_lastsaved', `${lastSaved}`)
             location.search = ''
             alertStore.set({
                 type: "wait",

src/ts/storage/autoStorage.ts

@@ -38,15 +38,15 @@ export class AutoStorage{
     }
 
     async checkAccountSync(){
-        let db = getDatabase()
+        let db = getDatabase({ snapshot: true })
         if(this.isAccount){
             return true
         }
         if(localStorage.getItem('dosync') === 'avoid'){
             return false
         }
         if((localStorage.getItem('dosync') === 'sync' || db?.account?.useSync) && (localStorage.getItem('accountst') !== 'able')){
-            const keys = await this.realStorage.keys()
+            const keys = (await this.realStorage.keys()).filter((key) => key !== 'database/database.bin')
             let i = 0;
             const accountStorage = new AccountStorage()
 
@@ -78,26 +78,16 @@ export class AutoStorage{
                 return false
             }
 
-            let replaced:{[key:string]:string} = {}
-            
-            for(const key of keys){
-                alertStore.set({
-                    type: "wait",
-                    msg: `Migrating your data...(${i}/${keys.length})`
-                })
-                const rkey = await accountStorage.setItem(key,await this.realStorage.getItem(key))
-                if(rkey !== key){
-                    replaced[key] = rkey
-                }
-                i += 1
-            }
-
             const {
                 collectColdStorageBackupPayloads,
                 setAccountColdStorageItem
             } = await import("../process/coldstorage.svelte")
             const coldStoragePayloads = await collectColdStorageBackupPayloads(db)
-            const failedColdKeys:string[] = [...coldStoragePayloads.missingKeys]
+            if(coldStoragePayloads.missingKeys.length > 0){
+                alertError(`Failed to migrate ${coldStoragePayloads.missingKeys.length} cold storage item(s) to account sync.`)
+                return false
+            }
+            const failedColdKeys:string[] = []
             for(let coldIndex = 0; coldIndex < coldStoragePayloads.payloads.length; coldIndex++){
                 const payload = coldStoragePayloads.payloads[coldIndex]
                 alertStore.set({
@@ -113,6 +103,24 @@ export class AutoStorage{
                 return false
             }
 
+            let replaced:{[key:string]:string} = {}
+            try {
+                for(const key of keys){
+                    alertStore.set({
+                        type: "wait",
+                        msg: `Migrating your data...(${i}/${keys.length})`
+                    })
+                    const rkey = await accountStorage.setItem(key,await this.realStorage.getItem(key))
+                    if(rkey !== key){
+                        replaced[key] = rkey
+                    }
+                    i += 1
+                }
+            } catch (error) {
+                alertError(error)
+                return false
+            }
+
             const dba = replaceDbResources(db, replaced)
             const comp = encodeRisuSaveLegacy(dba, 'compression')
             //try decoding