temp save

Jicheng Lu · Jicheng Lu · commit a10ea02a28cf · 2025-11-11T17:33:22.000-06:00
diff --git a/src/lib/common/ProfileDropdown.svelte b/src/lib/common/ProfileDropdown.svelte
@@ -1,6 +1,6 @@
 <script>
 	import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from '@sveltestrap/sveltestrap';
-	import { resetLocalStorage } from '$lib/helpers/store';
+	import { resetStorage } from '$lib/helpers/store';
 	import { goto } from '$app/navigation';
 	import { browser } from '$app/environment';
 	import { userStore } from '$lib/helpers/store';
@@ -15,7 +15,7 @@
 
 	function logout() {
 		if (browser){	
-			resetLocalStorage(true);
+			resetStorage(true);
 		}
 
 		const chatFrame = document.getElementById(CHAT_FRAME_ID);
diff --git a/src/lib/helpers/http.js b/src/lib/helpers/http.js
@@ -1,17 +1,99 @@
 import axios from 'axios';
 import { getUserStore, globalErrorStore, loaderStore } from '$lib/helpers/store.js';
+import { renewToken } from '$lib/services/auth-service';
+
+// Refresh handling state
+let isRefreshing = false;
+
+/** @type {{config: import('axios').InternalAxiosRequestConfig, resolve: (value:any)=>void, reject: (reason?: any)=>void}[]} */
+const failedQueue = [];
+
+/** @type {{config: import('axios').InternalAxiosRequestConfig, resolve: (value:any)=>void, reject: (reason?: any)=>void}[]} */
+const pendingRequestQueue = [];
+
+/**
+ * Wrap renewToken into a Promise that resolves with the new access token string
+ * @param {string} token
+ * @returns {Promise<string>}
+ */
+function refreshAccessToken(token) {
+    return new Promise((resolve, reject) => {
+        renewToken(token, (newToken) => resolve(newToken), () => reject(new Error('Failed to refresh token')));
+    });
+}
+
+/**
+ * Retry queued requests sequentially with the provided token
+ * @param {string} newToken
+ * @returns {Promise<void>}
+ */
+function processQueueSequentially(newToken) {
+    let chain = Promise.resolve();
+    while (failedQueue.length) {
+        const item = failedQueue.shift();
+        if (!item) continue;
+        const { config, resolve, reject } = item;
+        // Ensure headers exists; Axios may use AxiosHeaders type
+        // @ts-ignore
+        config.headers = config.headers || {};
+        // @ts-ignore
+        config.headers.Authorization = `Bearer ${newToken}`;
+        chain = chain.then(() => axios(config).then(resolve).catch(reject));
+    }
+    return chain;
+}
 
 // Add a request interceptor to attach authentication tokens or headers
 axios.interceptors.request.use(
     (config) => {
-        // Add your authentication logic here
         const user = getUserStore();
         if (!skipLoader(config)) {
             loaderStore.set(true);
         }
-        // For example, attach an authentication token to the request headers
-        if (user.token)
+
+        // Proactive token refresh: if expired or a refresh is in progress,
+        // queue this request until a new token is available
+        if (isTokenExired() || isRefreshing) {
+            return new Promise((resolve, reject) => {
+                pendingRequestQueue.push({ config, resolve, reject });
+
+                if (!isRefreshing) {
+                    isRefreshing = true;
+                    refreshAccessToken(user?.token || '')
+                        .then((newToken) => {
+                            isRefreshing = false;
+                            // Release queued requests with the new token
+                            while (pendingRequestQueue.length) {
+                                const item = pendingRequestQueue.shift();
+                                if (!item) continue;
+                                const { config: cfg, resolve: res } = item;
+                                // @ts-ignore
+                                cfg.headers = cfg.headers || {};
+                                // @ts-ignore
+                                cfg.headers.Authorization = `Bearer ${newToken}`;
+                                res(cfg);
+                            }
+                        })
+                        .catch((err) => {
+                            isRefreshing = false;
+                            // Reject queued requests and redirect to login
+                            while (pendingRequestQueue.length) {
+                                const item = pendingRequestQueue.shift();
+                                if (item) item.reject(err);
+                            }
+                            redirectToLogin();
+                        });
+                }
+            });
+        }
+
+        // Attach current token if present
+        if (user.token) {
+            // @ts-ignore
+            config.headers = config.headers || {};
+            // @ts-ignore
             config.headers.Authorization = `Bearer ${user.token}`;
+        }
         return config;
     },
     (error) => {
@@ -25,23 +107,46 @@ axios.interceptors.response.use(
     (response) => {
         // If the request was successful, return the response
         loaderStore.set(false);
-        const user = getUserStore();
-        const isExpired = Date.now() / 1000 > user.expires;
-        if (isExpired || response?.status === 401) {
-            redirectToLogin();
-            return Promise.reject('user token expired!');
-        }
         return response;
     },
     (error) => {
         loaderStore.set(false);
-        const user = getUserStore();
-        
-        const isExpired = Date.now() / 1000 > user.expires;
-        if (isExpired || error?.response?.status === 401) {
-            redirectToLogin();
-            return Promise.reject(error);
-        } else if (!skipGlobalError(error.config)) {
+        const originalRequest = error?.config;
+
+        // If token expired or 401 returned, attempt a single token refresh and
+        // retry failed requests in sequence.
+        if ((error?.response?.status === 401 || isTokenExired()) && originalRequest && !originalRequest._retry) {
+            originalRequest._retry = true;
+
+            return new Promise((resolve, reject) => {
+                // Push the current request into the queue
+                failedQueue.push({ config: originalRequest, resolve, reject });
+
+                // Start refresh if not already in progress
+                if (!isRefreshing) {
+                    isRefreshing = true;
+                    const user = getUserStore();
+
+                    refreshAccessToken(user?.token || '')
+                        .then((newToken) => {
+                            isRefreshing = false;
+                            return processQueueSequentially(newToken);
+                        })
+                        .catch((err) => {
+                            isRefreshing = false;
+
+                            // Reject all queued requests
+                            while (failedQueue.length) {
+                                const item = failedQueue.shift();
+                                if (item) item.reject(err);
+                            }
+
+                            redirectToLogin();
+                            throw err;
+                        });
+                }
+            });
+        } else if (!skipGlobalError(originalRequest)) {
             globalErrorStore.set(true);
             setTimeout(() => {
                 globalErrorStore.set(false);
@@ -53,6 +158,10 @@ axios.interceptors.response.use(
     }
 );
 
+function isTokenExired() {
+    const user = getUserStore();
+    return Date.now() / 1000 > user.expires;
+}
 
 function redirectToLogin() {
     const curUrl = window.location.pathname + window.location.search;
@@ -155,7 +264,7 @@ function skipGlobalError(config) {
         new RegExp('http(s*)://(.*?)/conversation/(.*?)/update-message', 'g'),
         new RegExp('http(s*)://(.*?)/conversation/(.*?)/update-tags', 'g')
     ];
-    
+
     /** @type {RegExp[]} */
     const deleteRegexes = [
         new RegExp('http(s*)://(.*?)/knowledge/vector/(.*?)/delete-collection', 'g'),
@@ -201,7 +310,7 @@ export function replaceUrl(url, args) {
 
 /**
  * Replace new line as <br>
- * @param {string} text 
+ * @param {string} text
  * @returns string
  */
 export function replaceNewLine(text) {
@@ -210,7 +319,7 @@ export function replaceNewLine(text) {
 
 /**
  * Replace unnecessary markdown
- * @param {string} text 
+ * @param {string} text
  * @returns {string}
  */
 export function replaceMarkdown(text) {
diff --git a/src/lib/helpers/store.js b/src/lib/helpers/store.js
@@ -41,7 +41,7 @@ export const userStore = writable({ id: "", full_name: "", expires: 0, token: nu
 export function getUserStore() {
     if (browser) {
         // Access localStorage only if in the browser context
-        let json = localStorage.getItem(userKey);
+        let json = sessionStorage.getItem(userKey);
         if (json)
             return JSON.parse(json);
         else
@@ -54,7 +54,7 @@ export function getUserStore() {
 
 userStore.subscribe(value => {
     if (browser && value.token) {
-        localStorage.setItem(userKey, JSON.stringify(value));
+        sessionStorage.setItem(userKey, JSON.stringify(value));
     }
 });
 
@@ -219,13 +219,31 @@ const createKnowledgeBaseDocumentStore = () => {
 export const knowledgeBaseDocumentStore = createKnowledgeBaseDocumentStore();
 
 
-export function resetLocalStorage(resetUser = false) {
+export function resetStorage(resetUser = false) {
     conversationUserStateStore.resetAll();
     conversationUserMessageStore.reset();
     conversationUserAttachmentStore.reset();
-    localStorage.removeItem('conversation');
+    clearLocalStorage(['message']);
 
     if (resetUser) {
-        localStorage.removeItem('user');
+        sessionStorage.removeItem(userKey);
+    }
+}
+
+/** @param {string[]?} keyPrefixes */
+function clearLocalStorage(keyPrefixes = null) {
+    if (!keyPrefixes) {
+        localStorage.clear();
+        return;
+    }
+
+    for (let i = 0; i < localStorage.length; i++) {
+        const key = localStorage.key(i);
+        if (!key) continue;
+
+        const found = keyPrefixes.find(x => key.startsWith(x));
+        if (found) {
+            localStorage.removeItem(key);
+        }
     }
 }
diff --git a/src/lib/services/api-endpoints.js b/src/lib/services/api-endpoints.js
@@ -10,6 +10,7 @@ export const endpoints = {
 
     // user
     tokenUrl: `${host}/token`,
+    renewTokenUrl: `${host}/renew-token`,
     myInfoUrl: `${host}/user/me`,
     usersUrl: `${host}/users`,
     userDetailUrl: `${host}/user/{id}/details`,
diff --git a/src/lib/services/auth-service.js b/src/lib/services/auth-service.js
@@ -29,7 +29,7 @@ export async function getToken(email, password, onSucceed, onError) {
         if (!result) {
             return;
         }
-        let user = getUserStore();
+        const user = getUserStore();
         user.token = result.access_token;
         user.expires = result.expires;
         userStore.set(user);
@@ -40,6 +40,42 @@ export async function getToken(email, password, onSucceed, onError) {
     });
 }
 
+/**
+ * @param {string} token
+ * @param {((arg0: string) => void) | null} [onSucceed]
+ * @param {(() => void) | null} [onError]
+ */
+export async function renewToken(token, onSucceed = null, onError = null) {
+    const headers = {
+        Authorization: `Bearer ${token}`,
+    };
+
+    await fetch(endpoints.renewTokenUrl, {
+        method: 'POST',
+        headers: headers,
+    }).then(response => {
+        if (response.ok) {
+            return response.json();
+        } else {
+            console.log(response.statusText);
+            onError?.();
+            return false;
+        }
+    }).then(result => {
+        if (!result) {
+            return;
+        }
+        const user = getUserStore();
+        user.token = result.access_token;
+        user.expires = result.expires;
+        userStore.set(user);
+        onSucceed?.(result.access_token);
+    })
+    .catch(() => {
+        onError?.();
+    });
+}
+
 /**
  * Set token from exteranl
  * @param {string} token
diff --git a/src/routes/(authentication)/login/+page.svelte b/src/routes/(authentication)/login/+page.svelte
@@ -31,7 +31,7 @@
 		PUBLIC_AUTH_ENABLE_FIND_PWD,
 	} from '$env/static/public';
 	import { onMount } from 'svelte';
-	import { resetLocalStorage } from '$lib/helpers/store';
+	import { resetStorage } from '$lib/helpers/store';
 
 	let username = PUBLIC_ADMIN_USERNAME;
 	let password = PUBLIC_ADMIN_PASSWORD;
@@ -45,7 +45,7 @@
 		const userName = localStorage.getItem('user_name');
 		isRememberMe = userName !== null;
 		if(isRememberMe){
-			username = userName;
+			username = userName || '';
 		}
 	});
 	function handleRememberMe(){
@@ -56,6 +56,8 @@
 			localStorage.removeItem("user_name");
 		}
 	}
+
+	/** @param {any} e */
 	async function onSubmit(e) {
 		isSubmitting = true;
 		handleRememberMe();
@@ -66,7 +68,7 @@
 			status = 'success';
 			const redirectUrl = $page.url.searchParams.get('redirect');
 			isSubmitting = false;
-			resetLocalStorage();
+			resetStorage();
 			if (redirectUrl) {
 				window.location.href = decodeURIComponent(redirectUrl);
 			} else {
@@ -87,16 +89,16 @@
 	}
 
 	function onPasswordToggle() {
-		var x = document.getElementById('user-password');
+		const x = document.getElementById('user-password');
 		if (!x) return;
 
 		if (x.type === 'password') {
 			x.type = 'text';
-			var icon = document.getElementById('password-eye-icon');
+			const icon = document.getElementById('password-eye-icon');
 			icon.className = 'mdi mdi-eye-off-outline';
 		} else {
 			x.type = 'password';
-			var icon = document.getElementById('password-eye-icon');
+			const icon = document.getElementById('password-eye-icon');
 			icon.className = 'mdi mdi-eye-outline';
 		}
 	}
diff --git a/src/routes/(authentication)/register/+page.svelte b/src/routes/(authentication)/register/+page.svelte
@@ -32,7 +32,7 @@
 			const data = await response.json();
 
 			if (response.ok && data.message === 'success') {
-				localStorage.setItem('authUser', JSON.stringify(data));
+				sessionStorage.setItem('authUser', JSON.stringify(data));
 				isOpen = true;
 				msg = 'Registration success. Redirecting...';
 				status = 'success';
diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
