feat: open ui callback and timeout

Author: kermanx

frontend/src/App.vue

@@ -17,7 +17,7 @@ import 'vue-sonner/style.css'
 
 const { t } = useI18n()
 const authStore = useAuthStore()
-const { replace, currentRoute } = useRouter()
+const { currentRoute } = useRouter()
 const themeStore = useThemeStore()
 const serviceStore = useServiceStore()
 
@@ -31,7 +31,7 @@ onMounted(async () => {
 
   authState.value = await authStore.checkAuth()
   isCheckingAuth.value = false
-  setTimeout(() => replace(currentRoute.value.path), 100)
+  setTimeout(() => currentRoute.value.query = {}, 100)
   Clarity.init('sx60zbxtfz')
 })
 
@@ -40,6 +40,18 @@ watch(() => serviceStore.serverConnected, async (connected) => {
     authState.value = await authStore.checkAuth()
   }
 })
+
+async function onUIOpened() {
+  const params = new URLSearchParams(window.location.search)
+  const session = params.get('session')
+  if (!session)
+    return
+  await serviceStore.fetch('ui/opened', {
+    method: 'POST',
+    body: JSON.stringify({ session }),
+  })
+}
+onUIOpened()
 </script>
 
 <template>

frontend/src/components/SiliconFlowConfigDialog.vue

@@ -1,18 +1,30 @@
 <script setup lang="ts">
+import { VisuallyHidden } from 'reka-ui'
+import { useI18n } from 'vue-i18n'
 import SiliconFlowCard from '@/components/SiliconFlowCard.vue'
-import { Dialog, DialogContent } from '@/components/ui/dialog'
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog'
 
 const emit = defineEmits<{
   configured: [provider: string]
 }>()
 
 const open = defineModel<boolean>('open')
+
+const { t } = useI18n()
 </script>
 
 <template>
   <Dialog v-model:open="open">
     <DialogContent class="sm:max-w-lg p-0 border-none">
-      <SiliconFlowCard show-title @configured="(provider) => emit('configured', provider)" />
+      <VisuallyHidden>
+        <DialogHeader>
+          <DialogTitle>{{ t('providers.siliconFlow') }}</DialogTitle>
+          <DialogDescription>
+            {{ t('providers.siliconFlowDescription') }}
+          </DialogDescription>
+        </DialogHeader>
+      </VisuallyHidden>
+      <SiliconFlowCard show-title @configured="(provider) => { open = false; emit('configured', provider) }" />
     </DialogContent>
   </Dialog>
 </template>

frontend/src/locales/zh-CN.json

@@ -177,7 +177,7 @@
       "manualConfigSuccess": "手动配置提供商保存成功",
       "manualConfigError": "手动配置提供商保存失败"
     },
-    "manualConfigSuccess": "配置成果"
+    "manualConfigSuccess": "配置成功"
   },
   "siliconFlow": {
     "loggedIn": "已登录",

frontend/src/stores/service.ts

@@ -7,6 +7,9 @@ import { useAuthStore } from '@/stores/auth'
 export const useServiceStore = defineStore('service', () => {
   const authStore = useAuthStore()
 
+  const params = new URLSearchParams(window.location.search)
+  const token = ref<string | null>(params.get('token') || null)
+
   const serverConnected = ref(true)
   const servicePort = ref<number | null>(null)
   const serviceHost = computed(() => {
@@ -23,8 +26,11 @@ export const useServiceStore = defineStore('service', () => {
   })
   let requireFindService = true
 
-  const params = new URLSearchParams(window.location.search)
-  const token = ref<string | null>(params.get('token') || null)
+  const givenServerPort = Number.parseInt(params.get('port') || '')
+  if (givenServerPort > 0 && givenServerPort < 65535) {
+    servicePort.value = givenServerPort
+    requireFindService = false
+  }
 
   const initialLoad = new Promise<void>((resolve) => {
     useIntervalFn(

frontend/src/views/AppManagement.vue

@@ -93,7 +93,7 @@ onMounted(() => {
               </p>
             </div>
             <div :class="{ 'opacity-0 pointer-events-none select-none': !app.granted }" class="mt-4 transition-opacity duration-300">
-              <ProviderSelector v-model="app.provider" compact @update:model-value="appStore.toggleAppAuthorization(app.id, true, app.provider)" />
+              <ProviderSelector v-model="app.provider" compact @update:model-value="app.granted && appStore.toggleAppAuthorization(app.id, app.granted, app.provider)" />
             </div>
           </CardContent>
         </Card>

sdk/node/src/index.ts

@@ -143,7 +143,7 @@ export async function requestUniTokenOpenAI(options: UniTokenOptions): Promise<U
   const abortController = new AbortController()
   setTimeout(() => {
     abortController.abort()
-  }, 10000) // 10 seconds timeout
+  }, 100000) // 100 seconds timeout
 
   const response = await fetch(`${serverUrl}app/register`, {
     method: 'POST',

service/logic/open.go

@@ -1,13 +1,21 @@
 package logic
 
 import (
+	"fmt"
 	"net/url"
+	"strconv"
+	"time"
 
 	"uni-token-service/constants"
 	"uni-token-service/logic/open_browser"
 	"uni-token-service/store"
+
+	"github.com/google/uuid"
 )
 
+var openingUI = make(map[string](chan struct{}))
+var ServerPort = -1
+
 func OpenUI(params url.Values, auth bool) error {
 	if auth {
 		allUsers, err := store.Users.List()
@@ -30,5 +38,32 @@ func OpenUI(params url.Values, auth bool) error {
 		params.Set("token", token)
 	}
 
-	return openBrowser.OpenBrowser(constants.GetUserName(), constants.GetAppBaseUrl()+"?"+params.Encode())
+	sessionId := uuid.New().String()
+	params.Set("session", sessionId)
+	params.Set("port", strconv.Itoa(ServerPort))
+
+	err := openBrowser.OpenBrowser(constants.GetUserName(), constants.GetAppBaseUrl()+"?"+params.Encode())
+	if err != nil {
+		return err
+	}
+
+	channel := make(chan struct{})
+	openingUI[sessionId] = channel
+	defer delete(openingUI, sessionId)
+
+	select {
+	case <-channel:
+		return nil
+	case <-time.After(5 * time.Second):
+		return fmt.Errorf("failed to open UI: timeout")
+	}
+}
+
+func OnUIOpened(sessionId string) {
+	channel, ok := openingUI[sessionId]
+	if !ok {
+		return
+	}
+	channel <- struct{}{}
+	close(channel)
 }

service/server/action.go

@@ -12,7 +12,8 @@ import (
 
 func SetupActionAPI(router *gin.Engine) {
 	router.GET("/", handleCheck)
-	router.GET("/open", handleOpenUrl)
+	router.GET("/ui/open", handleOpenUI)
+	router.POST("/ui/opened", handleUIOpened)
 }
 
 func handleCheck(c *gin.Context) {
@@ -22,11 +23,24 @@ func handleCheck(c *gin.Context) {
 	})
 }
 
-func handleOpenUrl(c *gin.Context) {
+func handleOpenUI(c *gin.Context) {
 	err := logic.OpenUI(url.Values{}, true)
 
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to open UI"})
 		return
 	}
 }
+
+func handleUIOpened(c *gin.Context) {
+	var req struct {
+		Session string `json:"session"`
+	}
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request"})
+		return
+	}
+
+	logic.OnUIOpened(req.Session)
+	c.Status(http.StatusOK)
+}

service/server/server.go

@@ -42,6 +42,7 @@ func SetupAPIServer() (int, error) {
 
 	// Get a random available port
 	port := getPort()
+	logic.ServerPort = port
 
 	// Start server in a goroutine
 	go func() {