From 89849ec3d5bd00bd34fb3bcfc52bc04310b81fc3 Mon Sep 17 00:00:00 2001
From: zAlweNy26 <zdanymc@gmail.com>
Date: Mon, 8 Jul 2024 18:53:17 +0200
Subject: [PATCH] fix race condition

---
 src/App.vue                | 11 ++++++++++-
 src/api.ts                 |  1 +
 src/main.ts                | 10 ++++------
 src/stores/useMemory.ts    |  6 +++++-
 src/stores/useMessages.ts  |  2 +-
 src/stores/usePlugins.ts   |  4 ++--
 src/stores/useSettings.ts  | 13 +------------
 src/views/SettingsView.vue | 12 +++++++++---
 8 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a0585da..f50403d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,4 +1,13 @@
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import { useSettings } from '@stores/useSettings'
+import { updateCredential } from './api'
+
+const { cookie } = storeToRefs(useSettings())
+
+onBeforeMount(() => {
+	updateCredential(cookie.value)
+})
+</script>
 
 <template>
 	<div
diff --git a/src/api.ts b/src/api.ts
index 62af49c..7fa8ec8 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -18,6 +18,7 @@ export const apiClient = new CatClient({
 	port: getPort(),
 	secure: window.location.protocol === 'https:',
 	timeout: 15000,
+	instant: false,
 	ws: {
 		retries: 3,
 		delay: 3000,
diff --git a/src/main.ts b/src/main.ts
index 82be935..647d455 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,19 +3,17 @@ import { createPinia } from 'pinia'
 import { defineRule } from 'vee-validate'
 import { all as AllRules } from '@vee-validate/rules'
 import vLock from '@/directives/vLock'
-
-Object.keys(AllRules).forEach(rule => {
-	defineRule(rule, AllRules[rule])
-})
-
 import App from '@/App.vue'
 import router from '@/router'
-
 import 'unfonts.css'
 import 'animate.css'
 import '@assets/main.css'
 import { cloneDeep } from 'lodash'
 
+Object.keys(AllRules).forEach(rule => {
+	defineRule(rule, AllRules[rule])
+})
+
 const app = createApp(App)
 
 const pinia = createPinia()
diff --git a/src/stores/useMemory.ts b/src/stores/useMemory.ts
index 015fbaf..e3b390d 100644
--- a/src/stores/useMemory.ts
+++ b/src/stores/useMemory.ts
@@ -9,7 +9,11 @@ export const useMemory = defineStore('memory', () => {
 		data: [],
 	})
 
-	const { state: collections, isLoading, execute: fetchCollections } = useAsyncState(MemoryService.getCollections, undefined)
+	const {
+		state: collections,
+		isLoading,
+		execute: fetchCollections,
+	} = useAsyncState(MemoryService.getCollections, undefined, { resetOnExecute: false })
 
 	watchEffect(() => {
 		currentState.loading = isLoading.value
diff --git a/src/stores/useMessages.ts b/src/stores/useMessages.ts
index 1a8a00c..05365d7 100644
--- a/src/stores/useMessages.ts
+++ b/src/stores/useMessages.ts
@@ -36,7 +36,7 @@ export const useMessages = defineStore('messages', () => {
 		],
 	})
 
-	const { state: history } = useAsyncState(MemoryService.getConversation, [])
+	const { state: history } = useAsyncState(MemoryService.getConversation, [], { resetOnExecute: false })
 
 	watchEffect(() => {
 		history.value.forEach(({ who, message, why, when }) => {
diff --git a/src/stores/usePlugins.ts b/src/stores/usePlugins.ts
index 78a8b20..c2f3a39 100644
--- a/src/stores/usePlugins.ts
+++ b/src/stores/usePlugins.ts
@@ -13,8 +13,8 @@ export const usePlugins = defineStore('plugins', () => {
 		},
 	})
 
-	const { state: plugins, isLoading, execute: fetchPlugins } = useAsyncState(PluginService.getPlugins, undefined)
-	const { state: settings, execute: fetchSettings } = useAsyncState(PluginService.getPluginsSettings, undefined)
+	const { state: plugins, isLoading, execute: fetchPlugins } = useAsyncState(PluginService.getPlugins, undefined, { resetOnExecute: false })
+	const { state: settings, execute: fetchSettings } = useAsyncState(PluginService.getPluginsSettings, undefined, { resetOnExecute: false })
 
 	const { showNotification, sendNotificationFromJSON } = useNotifications()
 
diff --git a/src/stores/useSettings.ts b/src/stores/useSettings.ts
index 615a740..a6e8e93 100644
--- a/src/stores/useSettings.ts
+++ b/src/stores/useSettings.ts
@@ -1,7 +1,6 @@
-import { apiClient, tryRequest } from '@/api'
 import { useJwt } from '@vueuse/integrations/useJwt'
 import { useCookies } from '@vueuse/integrations/useCookies'
-import type { Status, AuthPermission, AuthResource } from 'ccat-api'
+import type { AuthPermission, AuthResource } from 'ccat-api'
 import type { JwtPayload } from 'jwt-decode'
 
 interface Filter {
@@ -49,22 +48,12 @@ export const useSettings = defineStore('settings', () => {
 		},
 	})
 
-	const getStatus = async () => {
-		const result = await tryRequest(apiClient.api?.status.home(), 'Getting Cheshire Cat status', 'Unable to fetch Cheshire Cat status')
-		return result.data ?? result.message
-	}
-
-	const { state: cat, execute } = useAsyncState(getStatus, {} as Status)
-
 	return {
 		isDark,
 		pluginsFilters,
 		toggleDark,
-		cat,
 		cookie,
 		jwt,
-		getStatus,
-		refreshStatus: execute,
 	}
 })
 
diff --git a/src/views/SettingsView.vue b/src/views/SettingsView.vue
index 2488720..67226bc 100644
--- a/src/views/SettingsView.vue
+++ b/src/views/SettingsView.vue
@@ -1,8 +1,14 @@
 <script setup lang="ts">
+import { apiClient, tryRequest } from '@/api'
 import SidePanel from '@components/SidePanel.vue'
-import { useSettings } from '@stores/useSettings'
+import type { Status } from 'ccat-api'
 
-const { cat } = storeToRefs(useSettings())
+const getStatus = async () => {
+	const result = await tryRequest(apiClient.api?.status.home(), 'Getting Cheshire Cat status', 'Unable to fetch Cheshire Cat status')
+	return result.data
+}
+
+const { state: cat } = useAsyncState(getStatus, {} as Status, { resetOnExecute: false })
 
 const panelTitles = {
 	embedder: 'Configure the Embedder',
@@ -24,7 +30,7 @@ const openSidePanel = (title: keyof typeof panelTitles) => {
 			<p class="text-lg font-bold">
 				Cheshire Cat AI - Version
 				<span class="text-primary">
-					{{ typeof cat == 'string' ? 'unknown' : cat.version }}
+					{{ cat ? cat.version : 'unknown' }}
 				</span>
 			</p>
 		</div>