fix: //version

Zephyruso · Dec 23, 2024 · 50a269d · 50a269d
1 parent 573f11f
commit 50a269d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -9,17 +9,7 @@ import ReconnectingWebSocket from 'reconnectingwebsocket'
 import { computed, nextTick, ref, watch } from 'vue'
 
 axios.interceptors.request.use((config) => {
-  config.baseURL =
-    activeBackend.value?.protocol +
-    '://' +
-    activeBackend.value?.host +
-    ':' +
-    activeBackend.value?.port
-
-  if (activeBackend.value?.secondaryPath) {
-    config.baseURL += activeBackend.value?.secondaryPath
-  }
-
+  config.baseURL = getUrlFromBackend(activeBackend.value!)
   config.headers['Authorization'] = 'Bearer ' + activeBackend.value?.password
   return config
 })
@@ -162,7 +152,7 @@ export const queryDNSAPI = (params: { name: string; type: string }) => {
 
 const createWebSocket = <T>(url: string, searchParams?: Record<string, string>) => {
   const backend = activeBackend.value!
-  const resurl = new URL(`${getUrlFromBackend(backend)}${url}`)
+  const resurl = new URL(`${getUrlFromBackend(backend)}/${url}`)
 
   resurl.searchParams.append('token', backend?.password || '')
 
@@ -210,7 +200,7 @@ export const isBackendAvailable = async (backend: Backend, timeout: number = 500
   const timeoutId = setTimeout(() => controller.abort(), timeout)
 
   try {
-    const res = await fetch(`${getUrlFromBackend(backend)}version`, {
+    const res = await fetch(`${getUrlFromBackend(backend)}/version`, {
       method: 'GET',
       headers: {
         Authorization: `Bearer ${backend.password}`,

diff --git a/src/helper/index.ts b/src/helper/index.ts
@@ -157,5 +157,5 @@ export const importSettings = () => {
 }
 
 export const getUrlFromBackend = (end: Omit<Backend, 'uuid'>) => {
-  return `${end.protocol}://${end.host}:${end.port}${end.secondaryPath || '/'}`
+  return `${end.protocol}://${end.host}:${end.port}${end.secondaryPath || ''}`
 }
diff --git a/src/views/HomePage.vue b/src/views/HomePage.vue
@@ -202,7 +202,11 @@ const documentVisible = useDocumentVisibility()
 watch(
   documentVisible,
   async () => {
-    if (!activeBackend.value || backendList.value.length === 0 || !documentVisible.value) {
+    if (
+      !activeBackend.value ||
+      backendList.value.length === 0 ||
+      documentVisible.value !== 'visible'
+    ) {
       return
     }
     try {