[fix] file sync login

src/ts/storage/accountStorage.ts

@@ -2,42 +2,53 @@ import { get } from "svelte/store"
 import { DataBase } from "./database"
 import { hubURL } from "../characterCards"
 import localforage from "localforage"
+import { alertLogin } from "../alert"
 
 export class AccountStorage{
     auth:string
     usingSync:boolean
 
     async setItem(key:string, value:Uint8Array) {
-        await this.checkAuth()
-        const da = await fetch(hubURL + '/api/account/write', {
-            method: "POST",
-            body: value,
-            headers: {
-                'content-type': 'application/json',
-                'x-risu-key': key,
-                'x-risu-auth': this.auth ?? sessionStorage.getItem("fallbackRisuToken")
-            }
-        })
+        this.checkAuth()
+        let da:Response
+        while((!da) || da.status === 403){
+            da = await fetch(hubURL + '/api/account/write', {
+                method: "POST",
+                body: value,
+                headers: {
+                    'content-type': 'application/json',
+                    'x-risu-key': key,
+                    'x-risu-auth': this.auth
+                }
+            })
+            localStorage.setItem("fallbackRisuToken",await alertLogin())
+            this.checkAuth()
+        }
         if(da.status < 200 || da.status >= 300){
             throw await da.text()
         }
         return await da.text()
     }
     async getItem(key:string):Promise<Buffer> {
-        await this.checkAuth()
+        this.checkAuth()
         if(key.startsWith('assets/')){
             const k:ArrayBuffer = await localforage.getItem(key)
             if(k){
                 return Buffer.from(k)
             }
         }
-        const da = await fetch(hubURL + '/api/account/read', {
-            method: "GET",
-            headers: {
-                'x-risu-key': key,
-                'x-risu-auth': this.auth ?? sessionStorage.getItem("fallbackRisuToken")
-            }
-        })
+        let da:Response
+        while((!da) || da.status === 403){
+            da = await fetch(hubURL + '/api/account/read', {
+                method: "GET",
+                headers: {
+                    'x-risu-key': key,
+                    'x-risu-auth': this.auth
+                }
+            })
+            localStorage.setItem("fallbackRisuToken",await alertLogin())
+            this.checkAuth()
+        }
         if(da.status < 200 || da.status >= 300){
             throw await da.text()
         }
@@ -57,16 +68,12 @@ export class AccountStorage{
         throw "Error: You remove data in account. report this to dev if you found this."
     }
 
-    private async checkAuth(){
+    private checkAuth(){
         const db = get(DataBase)
         this.auth = db?.account?.token
         if(!this.auth){
-            db.account = {
-                id: "",
-                token: sessionStorage.getItem("fallbackRisuToken"),
-                useSync: true,
-                data: {}
-            }
+            db.account = JSON.parse(localStorage.getItem("fallbackRisuToken"))
+            this.auth = db?.account?.token
         }
     }
 

src/ts/storage/autoStorage.ts

@@ -38,6 +38,9 @@ export class AutoStorage{
 
     async checkAccountSync(){
         let db = get(DataBase)
+        if(this.isAccount){
+            return true
+        }
         if(db.account?.useSync && (localStorage.getItem('accountst') !== 'able')){
             getUnpargeables(db)
             console.log("migrating")
@@ -68,11 +71,13 @@ export class AutoStorage{
             })
 
             localStorage.setItem('accountst', 'able')
-            sessionStorage.setItem('fallbackRisuToken',db.account?.token)
+            localStorage.setItem('fallbackRisuToken',JSON.stringify(db.account))
+            this.isAccount = true
             return true
         }
         else if(localStorage.getItem('accountst') === 'able'){
             this.realStorage = new AccountStorage()
+            this.isAccount = true
         }
         return false
     }
@@ -81,6 +86,7 @@ export class AutoStorage{
         if(!this.realStorage){
             if(localStorage.getItem('accountst') === 'able'){
                 this.realStorage = new AccountStorage()
+                this.isAccount = true
                 return
             }
             if(isNodeServer){

src/ts/storage/globalApi.ts

@@ -86,6 +86,10 @@ export async function getFileSrc(loc:string) {
         return convertFileSrc(loc)
     }
     try {
+
+        if(forageStorage.isAccount){
+            return hubURL + `/rs/` + loc
+        }
         if(usingSw){
             const encoded = Buffer.from(loc,'utf-8').toString('hex')
             let ind = fileCache.origin.indexOf(loc)