@liujitcn/kratos-taro-app-system 0.0.59 → 0.0.61

package/package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "git@github.com:liujitcn/kratos-admin.git"
   },
-  "version": "0.0.59",
+  "version": "0.0.61",
   "type": "module",
   "files": [
     "dist",
@@ -38,8 +38,8 @@
     "@tarojs/components": "4.2.1",
     "@tarojs/taro": "4.2.1",
     "react": "18.3.1",
-    "@liujitcn/kratos-taro-app-core": "^0.0.59",
-    "@liujitcn/kratos-taro-app-ui": "^0.0.59"
+    "@liujitcn/kratos-taro-app-ui": "^0.0.61",
+    "@liujitcn/kratos-taro-app-core": "^0.0.61"
   },
   "scripts": {
     "build": "pnpm run build:entries && pnpm pack --pack-destination ../../../dist/npm",

package/src/api/base/v1/ai_message.ts

@@ -3,6 +3,7 @@ import {
   handleAuthExpired,
   http,
   requestBaseURL,
+  sourceClient,
 } from '@liujitcn/kratos-taro-app-core/utils/http'
 import { getLocaleRequestHeaders, t } from '@liujitcn/kratos-taro-app-core'
 import Taro from '@tarojs/taro'
@@ -76,7 +77,7 @@ export async function SendAiMessageStream(
   const headers: Record<string, string> = {
     Accept: 'text/event-stream',
     'Content-Type': 'application/json;charset=utf-8',
-    'source-client': 'miniapp',
+    'source-client': sourceClient,
     ...getLocaleRequestHeaders(),
   }
   if (accessToken) {
@@ -130,7 +131,7 @@ export function StreamAiMessageByChunkedRequest(
         header: {
           Accept: 'text/event-stream',
           'Content-Type': 'application/json;charset=utf-8',
-          'source-client': 'miniapp',
+          'source-client': sourceClient,
           ...getLocaleRequestHeaders(),
           ...(accessToken ? { Authorization: accessToken } : {}),
         },

package/src/notification.ts

@@ -1,6 +1,11 @@
+import { getLocaleRequestHeaders } from '@liujitcn/kratos-taro-app-core'
 import { setAppMenuBadge } from '@liujitcn/kratos-taro-app-core/navigation'
 import { getToken } from '@liujitcn/kratos-taro-app-core/utils/auth'
-import { getRequestAccessToken, requestBaseURL } from '@liujitcn/kratos-taro-app-core/utils/http'
+import {
+  getRequestAccessToken,
+  siteBaseURL,
+  sourceClient,
+} from '@liujitcn/kratos-taro-app-core/utils/http'
 import { defNotificationService } from './api/base/v1/notification'
 
 /** System 模块共享的站内信未读数。 */
@@ -71,9 +76,13 @@ function startNotificationSse(): () => void {
       try {
         const token = await getRequestAccessToken()
         if (!token || controller.signal.aborted) return
-        const sseBaseURL = requestBaseURL.replace(/\/api\/?$/, '') || window.location.origin
-        const response = await fetch(`${sseBaseURL}/events/base.notification`, {
-          headers: { Accept: 'text/event-stream', Authorization: token },
+        const response = await fetch(`${siteBaseURL}/events/base.notification`, {
+          headers: {
+            Accept: 'text/event-stream',
+            Authorization: token,
+            'source-client': sourceClient,
+            ...getLocaleRequestHeaders(),
+          },
           signal: controller.signal,
         })
         if (response.status === 401 || response.status === 403) return

package/src/views/pages/my/my.tsx

@@ -23,7 +23,7 @@ export default function MyPage() {
 
   useEffect(() => {
     void Taro.setNavigationBarTitle({ title: t('core.navigation.my') })
-  }, [locale, t])
+  }, [locale])
 
   const openAuthenticatedPage = (route: string) => {
     if (!ensureAuthenticated()) {

package/src/views/pagesMember/ai/index.tsx

@@ -190,6 +190,13 @@ export default function AiPage() {
 
   const isSessionSending = (sessionID: string) => Boolean(sessionID && sendingSessionMapRef.current[sessionID])
 
+  /** 等待指定会话的历史加载完成，避免发送消息与加载竞态。 */
+  const waitForMessagesLoaded = async (sessionID: string) => {
+    while (loadingSessionIDRef.current === sessionID) {
+      await new Promise((resolve) => setTimeout(resolve, 16))
+    }
+  }
+
   const scrollChatToBottom = () => {
     setChatBottomAnchor('')
     if (scrollTimer.current) clearTimeout(scrollTimer.current)
@@ -292,8 +299,12 @@ export default function AiPage() {
   const ensureActiveSession = async () => {
     if (activeSessionIDRef.current) return activeSessionIDRef.current
     if (sessionsRef.current.length > 0) {
-      setActiveSessionID(sessionsRef.current[0].id)
-      return sessionsRef.current[0].id
+      const sessionID = sessionsRef.current[0].id
+      setActiveSessionID(sessionID)
+      if (!messagesRef.current[sessionID]?.length) {
+        await loadMessages(sessionID)
+      }
+      return sessionID
     }
     const sessionID = await createRemoteSession()
     if (sessionID) {
@@ -309,10 +320,13 @@ export default function AiPage() {
     try {
       const response = await defAiSessionService.ListAiMessage({ session_id: sessionID })
       if (loadingSessionIDRef.current !== sessionID) return
-      updateSessionMessages(sessionID, normalizeMessageList(response.messages))
+      const loaded = normalizeMessageList(response.messages)
+      updateSessionMessages(sessionID, (current) => mergeWithLocalOnlyStreaming(current, loaded))
       if (activeSessionIDRef.current === sessionID) scrollChatToBottom()
     } catch (error) {
-      if (loadingSessionIDRef.current === sessionID) updateSessionMessages(sessionID, [])
+      if (loadingSessionIDRef.current === sessionID) {
+        updateSessionMessages(sessionID, (current) => mergeWithLocalOnlyStreaming(current, []))
+      }
       showError(error, t('system.ai.load_messages_failed'))
     } finally {
       if (loadingSessionIDRef.current === sessionID) setLoadingSessionID('')
@@ -325,8 +339,7 @@ export default function AiPage() {
     try {
       const response = await defAiSessionService.ListAiSession({ terminal: AI_TERMINAL })
       setSessions(normalizeSessionList(response.sessions))
-      const sessionID = await ensureActiveSession()
-      if (sessionID) await loadMessages(sessionID)
+      await ensureActiveSession()
     } catch (error) {
       showError(error, t('system.ai.load_sessions_failed'))
     } finally {
@@ -426,6 +439,8 @@ export default function AiPage() {
   const sendAiPayload = async (payload: { text: string; attachments: AiAttachment[] }) => {
     const sessionID = await ensureActiveSession()
     if (!sessionID || isSessionSending(sessionID)) return false
+    // 发送前等待进行中的历史加载结束，避免本地消息与历史加载竞态。
+    await waitForMessagesLoaded(sessionID)
     updateSessionMessages(sessionID, (current) =>
       sortMessages([...current, createLocalUserMessage(payload), createThinkingMessage({ sessionID })]),
     )
@@ -772,6 +787,18 @@ function normalizeMessageList(list?: AiMessage[] | null) {
   return sortMessages(list.filter(Boolean).flatMap((item) => [mapMessageItem(item, 'user'), mapMessageItem(item, 'ai')]))
 }
 
+/** 合并历史加载结果与仍在流式中的本地消息，避免加载覆盖进行中的对话。 */
+function mergeWithLocalOnlyStreaming(current: ChatMessageItem[], loaded: ChatMessageItem[]) {
+  const localStreaming = current.filter(
+    (item) => item.localOnly && item.status === AiMessageStatus.AI_MESSAGE_STATUS_GENERATING,
+  )
+  if (!localStreaming.length) return loaded
+  const messageMap = new Map<string, ChatMessageItem>()
+  for (const item of loaded) messageMap.set(item.key, item)
+  for (const item of localStreaming) messageMap.set(item.key, item)
+  return sortMessages(Array.from(messageMap.values()))
+}
+
 function hasSuccessfulAiMessages(list: ChatMessageItem[]) {
   return list.some((item) => item.status === AiMessageStatus.AI_MESSAGE_STATUS_SUCCESS)
 }

package/src/views/pagesMember/message/detail.tsx

@@ -46,7 +46,7 @@ export default function MessageDetailPage() {
     navigateAppView(detail.action_target, params)
   }
 
-  if (!detail) return <View className='empty'>{t('common.status.loading')}</View>
+  if (!detail) return <View className='empty'>{t('core.status.loading')}</View>
   return (
     <View className='detail-page'>
       <Text className='detail-title'>{detail.title}</Text>

package/src/views/pagesMember/message/index.tsx

@@ -1,6 +1,6 @@
 import { useDidShow } from '@tarojs/taro'
 import { Button, ScrollView, Text, View } from '@tarojs/components'
-import { useState } from 'react'
+import { useRef, useState } from 'react'
 import { navigateAppView, t } from '@liujitcn/kratos-taro-app-core'
 import { UniIcon } from '@liujitcn/kratos-taro-app-ui'
 import { defNotificationService } from '../../../api/base/v1/notification'
@@ -22,6 +22,9 @@ export default function MessageInboxPage() {
   const [categoryOptions, setCategoryOptions] = useState<
     NotificationCategory[]
   >([])
+  const requestSeqRef = useRef(0)
+  const loadingRef = useRef(false)
+  const finishedRef = useRef(false)
   const viewOptions = [
     { value: NotificationView.NOTIFICATION_VIEW_INBOX, key: 'system.notification.view.inbox' },
     { value: NotificationView.NOTIFICATION_VIEW_UNREAD, key: 'system.notification.view.unread' },
@@ -47,6 +50,9 @@ export default function MessageInboxPage() {
 
   /** 刷新站内信列表。 */
   async function refresh(view = selectedView, category = categoryId) {
+    const seq = ++requestSeqRef.current
+    loadingRef.current = true
+    finishedRef.current = false
     setItems([])
     setCursorId(0)
     setFinished(false)
@@ -60,17 +66,24 @@ export default function MessageInboxPage() {
         page_num: 1,
         page_size: 20,
       })
+      if (seq !== requestSeqRef.current) return
       setItems(result.notifications)
       setCursorId(result.next_cursor_id)
+      finishedRef.current = !result.has_more
       setFinished(!result.has_more)
     } finally {
-      setLoading(false)
+      if (seq === requestSeqRef.current) {
+        loadingRef.current = false
+        setLoading(false)
+      }
     }
   }
 
   /** 加载下一页。 */
   async function loadMore() {
-    if (loading || finished) return
+    if (loadingRef.current || finishedRef.current) return
+    const seq = requestSeqRef.current
+    loadingRef.current = true
     setLoading(true)
     try {
       const result = await defNotificationService.PageNotification({
@@ -81,12 +94,16 @@ export default function MessageInboxPage() {
         page_num: 1,
         page_size: 20,
       })
-      const next = [...items, ...result.notifications]
-      setItems(next)
+      if (seq !== requestSeqRef.current) return
+      setItems((current) => [...current, ...result.notifications])
       setCursorId(result.next_cursor_id)
+      finishedRef.current = !result.has_more
       setFinished(!result.has_more)
     } finally {
-      setLoading(false)
+      if (seq === requestSeqRef.current) {
+        loadingRef.current = false
+        setLoading(false)
+      }
     }
   }
 

package/src/views/pagesMember/profile/profile.tsx

@@ -10,7 +10,7 @@ import {
   View,
 } from '@tarojs/components'
 import Taro, { useLoad } from '@tarojs/taro'
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import defaultAvatar from '@liujitcn/kratos-taro-app-core/static/images/avatar.png'
 import navigatorBackground from '@liujitcn/kratos-taro-app-core/static/images/navigator_bg.png'
 import { defAuthService } from '@liujitcn/kratos-taro-app-core/api/system/app/v1/auth'
@@ -45,6 +45,8 @@ export default function ProfilePage() {
     avatar: '',
   })
   const [genderList, setGenderList] = useState<BaseDictForm_DictItem[]>([])
+  const submittingRef = useRef(false)
+  const navigateBackTimerRef = useRef<ReturnType<typeof setTimeout>>()
   const ensureAuthenticated = useUserStore((state) => state.ensureAuthenticated)
   const safeTop = Taro.getWindowInfo().safeArea?.top || 0
   const idTypeOptions = [
@@ -63,7 +65,13 @@ export default function ProfilePage() {
 
   useEffect(() => {
     void Taro.setNavigationBarTitle({ title: t('system.profile.title') })
-  }, [locale, t])
+  }, [locale])
+
+  useEffect(() => {
+    return () => {
+      if (navigateBackTimerRef.current) clearTimeout(navigateBackTimerRef.current)
+    }
+  }, [])
 
   const requireAuth = () => {
     if (ensureAuthenticated()) return true
@@ -122,6 +130,7 @@ export default function ProfilePage() {
   }
 
   const onSubmit = async () => {
+    if (submittingRef.current) return
     if (!requireAuth()) return
     if (userInfo.email && !EMAIL_PATTERN.test(userInfo.email)) {
       await Taro.showToast({ icon: 'none', title: t('system.profile.email_invalid') })
@@ -131,10 +140,16 @@ export default function ProfilePage() {
       await Taro.showToast({ icon: 'none', title: t('system.profile.id_code_invalid') })
       return
     }
-    await defAuthService.UpdateUserProfile({ user_profile: userInfo })
-    await useUserStore.getState().getUserProfile()
-    await Taro.showToast({ icon: 'success', title: t('system.profile.save_success') })
-    setTimeout(() => void Taro.navigateBack(), 400)
+    submittingRef.current = true
+    try {
+      await defAuthService.UpdateUserProfile({ user_profile: userInfo })
+      await useUserStore.getState().getUserProfile()
+      await Taro.showToast({ icon: 'success', title: t('system.profile.save_success') })
+      if (navigateBackTimerRef.current) clearTimeout(navigateBackTimerRef.current)
+      navigateBackTimerRef.current = setTimeout(() => void Taro.navigateBack(), 400)
+    } finally {
+      submittingRef.current = false
+    }
   }
 
   return (

package/src/views/pagesMember/settings/settings.tsx

@@ -36,7 +36,7 @@ export default function SettingsPage() {
 
   useEffect(() => {
     void Taro.setNavigationBarTitle({ title: t('system.settings.title') })
-  }, [locale, t])
+  }, [locale])
 
   const loadMfaStatus = async (force = false) => {
     if (!useUserStore.getState().isAuthenticated() || (mfaStatusLoading && !force)) return
@@ -109,6 +109,15 @@ export default function SettingsPage() {
     void loadMfaStatus()
   })
 
+  /** 登录态失效时请求层已弹窗引导重新登录，页面侧不再叠加失败提示。 */
+  const isAuthExpiredError = (error: unknown) => {
+    if (error && typeof error === 'object') {
+      const statusCode = (error as { statusCode?: number }).statusCode
+      if (statusCode === 401 || statusCode === 403) return true
+    }
+    return error instanceof Error && /auth (required|expired)/.test(error.message)
+  }
+
   const onLogout = async () => {
     if (logoutLoading) return
     const result = await Taro.showModal({
@@ -120,8 +129,10 @@ export default function SettingsPage() {
     try {
       await logout()
       await Taro.navigateBack()
-    } catch {
-      await Taro.showToast({ icon: 'none', title: t('system.settings.logout_failed') })
+    } catch (error) {
+      if (!isAuthExpiredError(error)) {
+        await Taro.showToast({ icon: 'none', title: t('system.settings.logout_failed') })
+      }
     } finally {
       setLogoutLoading(false)
     }