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

package/dist/index.mjs

@@ -3,9 +3,14 @@ import { registerUserStoreExtension } from "@liujitcn/kratos-uni-app-core/stores
 
 // src/notification.ts
 import { ref } from "vue";
+import { getLocaleRequestHeaders } from "@liujitcn/kratos-uni-app-core";
 import { setAppMenuBadge } from "@liujitcn/kratos-uni-app-core/navigation";
 import { hasValidToken } from "@liujitcn/kratos-uni-app-core/utils/auth";
-import { getRequestAccessToken, requestBaseURL } from "@liujitcn/kratos-uni-app-core/utils/http";
+import {
+  getRequestAccessToken,
+  siteBaseURL,
+  sourceClient
+} from "@liujitcn/kratos-uni-app-core/utils/http";
 
 // src/api/base/v1/notification.ts
 import { http } from "@liujitcn/kratos-uni-app-core/utils/http";
@@ -172,9 +177,13 @@ function startNotificationSse() {
         const token = await getRequestAccessToken("optional");
         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)
@@ -730,5 +739,6 @@ var src_default = systemModule;
 export {
   src_default as default,
   pauseNotificationPolling,
-  resumeNotificationPolling
+  resumeNotificationPolling,
+  startNotificationPolling
 };

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",
@@ -35,7 +35,7 @@
     "@dcloudio/uni-app": "3.0.0-5010520260709002",
     "@dcloudio/uni-ui": "^1.4.28",
     "vue": "^3.4.21",
-    "@liujitcn/kratos-uni-app-core": "^0.0.59"
+    "@liujitcn/kratos-uni-app-core": "^0.0.61"
   },
   "devDependencies": {
     "esbuild": "^0.20.2",

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

@@ -3,6 +3,7 @@ import {
   handleAuthExpired,
   http,
   requestBaseURL,
+  sourceClient,
 } from '@liujitcn/kratos-uni-app-core/utils/http'
 import type { ListAiMessageRequest, ListAiMessageResponse } from '../../../rpc/base/v1/ai_session'
 import type {
@@ -74,7 +75,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) {
@@ -128,7 +129,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/index.ts

@@ -14,6 +14,6 @@ registerUserStoreExtension({
   onSilentLogout: stopNotificationPolling,
 })
 
-export { pauseNotificationPolling, resumeNotificationPolling }
+export { pauseNotificationPolling, resumeNotificationPolling, startNotificationPolling }
 
 export default systemModule

package/src/notification.ts

@@ -1,7 +1,12 @@
 import { ref } from 'vue'
+import { getLocaleRequestHeaders } from '@liujitcn/kratos-uni-app-core'
 import { setAppMenuBadge } from '@liujitcn/kratos-uni-app-core/navigation'
 import { hasValidToken } from '@liujitcn/kratos-uni-app-core/utils/auth'
-import { getRequestAccessToken, requestBaseURL } from '@liujitcn/kratos-uni-app-core/utils/http'
+import {
+  getRequestAccessToken,
+  siteBaseURL,
+  sourceClient,
+} from '@liujitcn/kratos-uni-app-core/utils/http'
 import { defNotificationService } from './api/base/v1/notification'
 
 /** System 模块共享的站内信未读数。 */
@@ -70,9 +75,13 @@ function startNotificationSse(): () => void {
       try {
         const token = await getRequestAccessToken('optional')
         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/pagesMember/ai/index.vue

@@ -484,6 +484,8 @@ async function sendAiPayload(payload: { text: string; attachments: AiAttachment[
   if (!sessionID || isSessionSending(sessionID)) {
     return false
   }
+  // 发送前等待进行中的历史加载结束，避免本地消息与历史加载竞态。
+  await waitForMessagesLoaded(sessionID)
 
   const localUserMessage = createLocalUserMessage(payload)
   const thinkingMessage = createThinkingMessage({ sessionID })
@@ -798,10 +800,7 @@ async function ensureSessionsLoaded() {
       terminal: AI_TERMINAL,
     })
     sessions.value = 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 {
@@ -814,8 +813,12 @@ async function ensureActiveSession() {
     return activeSessionID.value
   }
   if (sessions.value.length > 0) {
-    activeSessionID.value = sessions.value[0].id
-    return activeSessionID.value
+    const sessionID = sessions.value[0].id
+    activeSessionID.value = sessionID
+    if (!messages.value[sessionID]?.length) {
+      await loadMessages(sessionID)
+    }
+    return sessionID
   }
   const sessionID = await createRemoteSession()
   if (sessionID) {
@@ -849,13 +852,14 @@ async function loadMessages(sessionID: string) {
     if (loadingSessionID.value !== sessionID) {
       return
     }
-    messages.value[sessionID] = normalizeMessageList(response.messages)
+    const loaded = normalizeMessageList(response.messages)
+    messages.value[sessionID] = mergeWithLocalOnlyStreaming(messages.value[sessionID] ?? [], loaded)
     if (activeSessionID.value === sessionID) {
       scrollChatToBottom()
     }
   } catch (error) {
     if (loadingSessionID.value === sessionID) {
-      messages.value[sessionID] = []
+      messages.value[sessionID] = mergeWithLocalOnlyStreaming(messages.value[sessionID] ?? [], [])
     }
     showError(error, t('system.ai.load_messages_failed'))
   } finally {
@@ -865,6 +869,31 @@ async function loadMessages(sessionID: string) {
   }
 }
 
+/** 合并历史加载结果与仍在流式中的本地消息，避免加载覆盖进行中的对话。 */
+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()))
+}
+
+/** 等待指定会话的历史加载完成，避免发送消息与加载竞态。 */
+async function waitForMessagesLoaded(sessionID: string) {
+  while (loadingSessionID.value === sessionID) {
+    await new Promise((resolve) => setTimeout(resolve, 16))
+  }
+}
+
 function normalizeSession(session?: Partial<AiSession> | null): AiSession {
   return {
     id: String(session?.id ?? ''),

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

@@ -74,7 +74,7 @@ function openAction() {
       {{ t('common.action.view') }}
     </button>
   </view>
-  <view v-else class="empty">{{ t('common.status.loading') }}</view>
+  <view v-else class="empty">{{ t('core.status.loading') }}</view>
 </template>
 
 <style scoped lang="scss">

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

@@ -15,6 +15,7 @@ const finished = ref(false)
 const selectedView = ref(NotificationView.NOTIFICATION_VIEW_INBOX)
 const categoryId = ref<number>()
 const categoryOptions = ref<NotificationCategory[]>([])
+let requestSeq = 0
 const viewOptions = [
   { value: NotificationView.NOTIFICATION_VIEW_INBOX, key: 'system.notification.view.inbox' },
   { value: NotificationView.NOTIFICATION_VIEW_UNREAD, key: 'system.notification.view.unread' },
@@ -35,9 +36,12 @@ async function loadCategories() {
 
 /** 刷新站内信列表。 */
 async function refresh() {
+  requestSeq++
   cursorId.value = 0
   finished.value = false
   items.value = []
+  // 先重置 loading，再发起新请求，避免清空列表后 loadMore 因旧 loading 直接返回。
+  loading.value = false
   await loadMore()
 }
 
@@ -81,6 +85,7 @@ async function deleteItem(item: Notification) {
 /** 加载下一页站内信。 */
 async function loadMore() {
   if (loading.value || finished.value) return
+  const seq = requestSeq
   loading.value = true
   try {
     const result = await defNotificationService.PageNotification({
@@ -91,11 +96,12 @@ async function loadMore() {
       page_num: 1,
       page_size: 20,
     })
+    if (seq !== requestSeq) return
     items.value.push(...result.notifications)
     finished.value = !result.has_more
     cursorId.value = result.next_cursor_id
   } finally {
-    loading.value = false
+    if (seq === requestSeq) loading.value = false
   }
 }
 

package/src/views/pagesMember/profile/profile.vue

@@ -3,7 +3,7 @@ import { defAuthService } from '@liujitcn/kratos-uni-app-core/api/system/app/v1/
 import { useUserStore } from '@liujitcn/kratos-uni-app-core/stores'
 import type { UserProfileForm } from '@liujitcn/kratos-uni-app-core/rpc/system/app/v1/auth'
 import { onLoad } from '@dcloudio/uni-app'
-import { computed, ref } from 'vue'
+import { computed, onBeforeUnmount, ref } from 'vue'
 import type { BaseDictForm_DictItem } from '@liujitcn/kratos-uni-app-core/rpc/system/app/v1/base_dict'
 import { BaseUserIDType } from '@liujitcn/kratos-uni-app-core/rpc/system/common/v1/common'
 import { defBaseDictService } from '@liujitcn/kratos-uni-app-core/api/system/app/v1/base_dict'
@@ -21,6 +21,13 @@ const { t } = useI18n()
 const { safeAreaInsets } = uni.getSystemInfoSync()
 
 const imgMaxSize = ref(1024 * 1024)
+const submitting = ref(false)
+let navigateBackTimer: ReturnType<typeof setTimeout> | undefined
+
+onBeforeUnmount(() => {
+  if (navigateBackTimer) clearTimeout(navigateBackTimer)
+  navigateBackTimer = undefined
+})
 
 // 获取个人信息，修改个人信息需提供初始值
 const userInfo = ref({} as UserProfileForm)
@@ -196,6 +203,7 @@ const onGetPhoneNumber: UniHelper.ButtonOnGetphonenumber = async (e) => {
 
 // 点击保存提交表单
 const onSubmit = async () => {
+  if (submitting.value) return
   if (!userStore.ensureAuthenticated()) {
     navigateToLogin()
     return
@@ -210,25 +218,32 @@ const onSubmit = async () => {
     return
   }
 
-  const { nick_name, gender, email, id_type, id_code } = userInfo.value
-  await defAuthService.UpdateUserProfile({
-    user_profile: {
-      nick_name: nick_name,
-      gender: gender,
-      avatar: userInfo.value.avatar,
-      phone: userInfo.value.phone,
-      user_name: userInfo.value.user_name,
-      email,
-      id_type,
-      id_code,
-    },
-  })
-  // 更新Store昵称
-  syncUserStoreProfile(userInfo.value)
-  await uni.showToast({ icon: 'success', title: t('system.profile.save_success') })
-  setTimeout(() => {
-    uni.navigateBack()
-  }, 400)
+  submitting.value = true
+  try {
+    const { nick_name, gender, email, id_type, id_code } = userInfo.value
+    await defAuthService.UpdateUserProfile({
+      user_profile: {
+        nick_name: nick_name,
+        gender: gender,
+        avatar: userInfo.value.avatar,
+        phone: userInfo.value.phone,
+        user_name: userInfo.value.user_name,
+        email,
+        id_type,
+        id_code,
+      },
+    })
+    // 更新Store昵称
+    syncUserStoreProfile(userInfo.value)
+    await uni.showToast({ icon: 'success', title: t('system.profile.save_success') })
+    if (navigateBackTimer) clearTimeout(navigateBackTimer)
+    navigateBackTimer = setTimeout(() => {
+      navigateBackTimer = undefined
+      uni.navigateBack()
+    }, 400)
+  } finally {
+    submitting.value = false
+  }
 }
 </script>