koishi-plugin-chat-patch 5.6.1 → 6.1.0

package/client/web/dist/index.html

@@ -11,7 +11,7 @@
         <link rel="stylesheet" href="./bcui/css/style.css">
         <link rel="stylesheet" href="./bcui/css/color-light.css">
         <link rel="stylesheet" href="./css/append-light.css">
-      <script type="module" crossorigin src="./assets/index-EJ2CcODr.js"></script>
+      <script type="module" crossorigin src="./assets/index-DOJoilEy.js"></script>
       <link rel="stylesheet" crossorigin href="./assets/index-X9hFOAza.css">
     </head>
 

package/client/web/src/assets/l10n/zh-CN.po

@@ -1047,9 +1047,6 @@ msgstr ""
 msgid "应用内通知和系统通知"
 msgstr ""
 
-msgid "成员设置"
-msgstr ""
-
 msgid "成员信息"
 msgstr ""
 

package/client/web/src/components/MsgBody.vue

@@ -103,17 +103,17 @@
                             class="msg-md" />
                         <img v-else-if="item.type == 'image' && item.file == 'marketface'"
                             :class=" imgStyle(data.message.length, Number(index), true) + ' msg-mface'"
-                            :src="item.url"
+                            :src="getImageUrl(item)"
                             :alt="item.summary"
                             @load="imageLoaded"
-                            @click="preImgClick(item.url || item.file)"
+                            @click="preImgClick(getImageUrl(item))"
                             @error="imgLoadFail">
                         <img v-else-if="item.type == 'mface'"
                             :class=" imgStyle(data.message.length, Number(index), true) + ' msg-mface'"
-                            :src="item.url"
+                            :src="getImageUrl(item)"
                             :alt="item.summary"
                             @load="imageLoaded"
-                            @click="preImgClick(item.url || item.file)"
+                            @click="preImgClick(getImageUrl(item))"
                             @error="imgLoadFail">
                         <template v-else-if="item.type == 'image'">
                             <div v-show="shouldShowImagePlaceholder(item, Number(index))"
@@ -121,21 +121,21 @@
                                 :class="imgStyle(data.message.length, Number(index), isFace(item)) + ' msg-img-placeholder'"
                                 @click="loadImage(item, Number(index), $event)">
                                 <font-awesome-icon
-                                    :icon="['fas', imageLoading(getImageKey(Number(index), item.url)) ? 'spinner' : 'image']"
-                                    :spin="imageLoading(getImageKey(Number(index), item.url))" />
+                                    :icon="['fas', imageLoading(getImageKey(Number(index), getImageUrl(item))) ? 'spinner' : 'image']"
+                                    :spin="imageLoading(getImageKey(Number(index), getImageUrl(item)))" />
                                 <span>
-                                    {{ imageLoading(getImageKey(Number(index), item.url)) ? $t('加载中') : $t('点击加载图片') }}
+                                    {{ imageLoading(getImageKey(Number(index), getImageUrl(item))) ? $t('加载中') : $t('点击加载图片') }}
                                 </span>
                             </div>
                             <img v-show="!shouldShowImagePlaceholder(item, Number(index))"
                                 :title="(!item.summary || item.summary == '') ? $t('预览图片') : item.summary"
                                 :alt="$t('图片')"
                                 :class=" imgStyle(data.message.length, Number(index), isFace(item))"
-                                :src="getImgSrc(item.url)"
+                                :src="getImgSrc(getImageUrl(item))"
                                 data-type="image"
                                 @load="imageLoaded"
                                 @error="imgLoadFail"
-                                @click="imgClick(item.url || item.file, $event)">
+                                @click="imgClick(getImageUrl(item), $event)">
                         </template>
                         <template v-else-if="item.type == 'face'">
                             <EmojiFace :emoji="Emoji.get(Number(item.id))" class="msg-face" />
@@ -173,7 +173,8 @@
                             <div v-if="data.fileView && Object.keys(data.fileView).length > 0"
                                 class="file-view">
                                 <img v-if="['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'].includes(data.fileView.ext)"
-                                    :src="getMediaSrc(data.fileView.url)">
+                                    :src="getMediaSrc(data.fileView.url)"
+                                    @click="preImgClick(getMediaSrc(data.fileView.url))">
                                 <video v-else-if="['mp4', 'avi', 'mkv', 'flv'].includes(data.fileView.ext)"
                                     playsinline controls muted
                                     autoplay>
@@ -570,11 +571,16 @@ async function loadCachedImages() {
     const selfId = authStore.loginInfo?.uin
     if (!selfId) return
     for (const seg of data.message) {
-        if (seg.type !== 'image' || !seg.url) continue
-        await loadCachedImage(seg.url)
+        const url = getImageUrl(seg)
+        if (seg.type !== 'image' || !url) continue
+        await loadCachedImage(url)
     }
 }
 
+function getImageUrl(item: { url?: string; file?: string }): string {
+    return String(item?.url || item?.file || '')
+}
+
 async function loadCachedImage(url: string) {
     if (resolvedImages.value[url]) return resolvedImages.value[url]
 
@@ -593,6 +599,7 @@ async function loadCachedImage(url: string) {
 }
 
 function getImgSrc(url: string): string {
+    if (!url) return ''
     if (url.startsWith('base64://')) {
         return `data:image/png;base64,${url.slice(9)}`
     }
@@ -617,11 +624,11 @@ function imageLoading(key: string) {
     return pendingImageLoads.value[key] === true
 }
 
-function shouldShowImagePlaceholder(item: { type: string, url: string }, index: number) {
+function shouldShowImagePlaceholder(item: { type: string, url?: string, file?: string }, index: number) {
     if (item.type !== 'image') return false
     if (settingsStore.sysConfig.opt_no_auto_load_image !== true) return false
 
-    return manualImageLoads.value[getImageKey(index, item.url)] !== true
+    return manualImageLoads.value[getImageKey(index, getImageUrl(item))] !== true
 }
 
 function getAtClass(who: number | string) {
@@ -717,8 +724,9 @@ function buildMessageImageList(): Img | undefined {
     const collect = (msg: any) => {
         if (!Array.isArray(msg?.message)) return
         for (const item of msg.message) {
-            if (item?.type === 'image' && item?.file !== 'marketface' && item?.url) {
-                urls.push(String(item.url))
+            if (item?.type === 'image' && item?.file !== 'marketface') {
+                const url = getImageUrl(item)
+                if (url) urls.push(url)
             }
         }
     }
@@ -729,15 +737,16 @@ function buildMessageImageList(): Img | undefined {
     return Img.fromList([...new Set(urls)])
 }
 
-async function loadImage(item: { url: string }, index: number, _event?: MouseEvent) {
+async function loadImage(item: { url?: string; file?: string }, index: number, _event?: MouseEvent) {
     if (props.selecting) return
-    const key = getImageKey(index, item.url)
+    const url = getImageUrl(item)
+    const key = getImageKey(index, url)
     if (manualImageLoads.value[key] || pendingImageLoads.value[key]) return
 
     pendingImageLoads.value[key] = true
     try {
         if (data._from_local_db) {
-            await loadCachedImage(item.url)
+            await loadCachedImage(url)
         }
         manualImageLoads.value[key] = true
     } finally {
@@ -1252,7 +1261,7 @@ async function openMerge(event?: MouseEvent) {
                 imgList.push({
                     index: index,
                     message_id: item.message_id,
-                    img_url: msg.url,
+                    img_url: msg.url || msg.file,
                 })
                 index++
             }

package/client/web/src/function/connect.ts

@@ -6,7 +6,6 @@ import {
   botKey,
   connectBackend,
   getActiveBot,
-  getBlockedPlatforms,
   getBootstrap,
   getLogins,
   request,
@@ -38,6 +37,7 @@ import type { ConnectionHistoryItem, LoginCacheElem } from './elements/system'
 import type { UserFriendElem, UserGroupElem } from './elements/information'
 
 const HISTORY_KEY = 'chat-patch:connection-history'
+const CLIENT_MESSAGE_CACHE_LIMIT = 500
 const logger = new Logger()
 const unsupportedMethods = new Set<string>()
 
@@ -45,14 +45,6 @@ function encodeKeyPart(value: string): string {
   return encodeURIComponent(value)
 }
 
-function isBlockedPlatform(platform: string): boolean {
-  return getBlockedPlatforms().some((item) => {
-    return item.exactMatch
-      ? platform === item.platformName
-      : platform.includes(item.platformName)
-  })
-}
-
 function getChannelKind(value: unknown): 'group' | 'direct' | 'unknown' {
   if (typeof value === 'number') {
     if (value === 0) return 'group'
@@ -730,6 +722,9 @@ function recordBotMessage(platform: string, selfId: string, msg: Record<string,
   const messageId = String(msg.message_id ?? '')
   if (messageId && !messages.some((item) => String(item.message_id) === messageId)) {
     messages.push(msg)
+    if (messages.length > CLIENT_MESSAGE_CACHE_LIMIT) {
+      messages.splice(0, messages.length - CLIENT_MESSAGE_CACHE_LIMIT)
+    }
     chatStore.sessionMessageCache.set(cacheKey, messages)
   }
   const currentShowId = String(chatStore.chatInfo.show.id ?? '')
@@ -900,7 +895,6 @@ export function restoreBotStateFromMessageCache(platform: string, selfId: string
 }
 
 function onSatoriEvent(event: SatoriEvent) {
-  if (isBlockedPlatform(event.platform)) return
   const oneBot = satoriEventToOneBot(event.body, String(event.platform || ''))
   if (oneBot) {
     oneBot._rawSatori = {
@@ -949,7 +943,6 @@ export function flushPendingBotEvents(platform: string, selfId: string) {
   if (!events?.length) return
   pendingBotEvents.delete(key)
   for (const event of events) {
-    if (isBlockedPlatform(event.platform)) continue
     const oneBot = satoriEventToOneBot(event.body, String(event.platform || ''))
     if (oneBot) {
       oneBot._rawSatori = {
@@ -978,7 +971,7 @@ function onSatoriReady(logins: Array<{ platform: string; selfId: string; name: s
   login.creating = false
   login.status = true
   const authStore = useAuthStore()
-  const visibleLogins = logins.filter((item) => !isBlockedPlatform(item.platform))
+  const visibleLogins = logins
   for (const item of visibleLogins) {
     if (!item.platform || !item.selfId) continue
     identityInfoCache.set(identityCacheKey('user', item.platform, item.selfId, item.selfId), {
@@ -1310,6 +1303,8 @@ export interface SaveSelfMessagePayload {
   forwardId?: string
   forwardContent?: unknown[]
   sentAt?: number
+  timestamp?: number
+  timestampMs?: number
   source?: 'webui' | 'bot' | 'plugin'
   kind?: string
 }
@@ -1337,6 +1332,8 @@ function selfMessageToOneBot(record: unknown): Record<string, unknown> | null {
   const selfId = getString(obj.selfId)
   const channelId = getString(obj.channelId)
   const sentAt = Number(obj.sentAt ?? Date.now())
+  const timestamp = Number(obj.timestamp) || Math.floor(sentAt / 1000)
+  const timestampMs = Number(obj.timestampMs ?? sentAt)
   const messageId = getString(obj.messageId)
   const localId = getString(obj.id) || `self-${sentAt}`
   // 只按记录里的显式 channelType 判断，不根据频道 ID 前缀推断
@@ -1406,10 +1403,11 @@ function selfMessageToOneBot(record: unknown): Record<string, unknown> | null {
     channel_id: channelId,
     guild_id: guildId || undefined,
     target_id: selfId,
-    time: Math.floor(sentAt / 1000) || Math.floor(Date.now() / 1000),
-    local_time: sentAt,
-    timestamp_ms: sentAt,
-    time_ms: sentAt,
+    timestamp,
+    time: timestamp,
+    local_time: timestampMs,
+    timestamp_ms: timestampMs,
+    time_ms: timestampMs,
     sender: {
       user_id: selfId,
       nickname: getString(login?.name) || selfId,
@@ -1476,8 +1474,9 @@ export async function loadChatHistoryFromCache(params: {
     const raw = getObject(recordObj.raw)
     const msg = satoriEventToOneBot(raw, params.platform)
     if (!msg || !msg.message_id) continue
-    const localTime = Number(recordObj.receivedAt ?? recordObj.timestampMs ?? recordObj.timestamp ?? 0)
-    if (localTime) {
+    const rawTime = Number(recordObj.timestampMs ?? recordObj.timestamp ?? recordObj.receivedAt ?? 0)
+    const localTime = rawTime > 1e12 ? rawTime : rawTime * 1000
+    if (localTime > 0) {
       msg.local_time = localTime
       msg.timestamp_ms = localTime
       msg.time_ms = localTime

package/client/web/src/function/msg.ts

@@ -1039,6 +1039,8 @@ const msgFunctions = {
                     message: Array.isArray(sentItem?.message) ? sentItem.message : [],
                     source: 'webui',
                     sentAt: Number(sentItem?.local_time ?? sentItem?.timestamp_ms ?? Date.now()),
+                    timestamp: Number(sentItem?.time) || Math.floor(Date.now() / 1000),
+                    timestampMs: Number(sentItem?.local_time ?? sentItem?.timestamp_ms ?? Date.now()),
                     kind: String(sentItem?.message?.[0]?.type ?? 'text'),
                 })
             }

package/client/web/src/function/satori-model.ts

@@ -456,6 +456,7 @@ export function satoriEventToOneBot(
     self_id: selfId,
     platform,
     sn: getNumber(event.sn),
+    timestamp: Math.floor(normalizeTimestampMs(event.timestamp) / 1000),
     timestamp_ms: getNumber(event.timestamp) ? normalizeTimestampMs(event.timestamp) : 0,
     time: Math.floor(normalizeTimestampMs(event.timestamp) / 1000),
     message_seq: getNumber(event.sn),
@@ -733,6 +734,7 @@ function messageListFromResponse(data: unknown): unknown[] {
     return {
       message_id: getString(message.id),
       sn: getNumber(message.sn),
+      timestamp: Math.floor(normalizeTimestampMs(message.timestamp) / 1000),
       timestamp_ms: getNumber(message.timestamp) ? normalizeTimestampMs(message.timestamp) : 0,
       time: Math.floor(normalizeTimestampMs(message.timestamp) / 1000),
       message_seq: getNumber(message.sn) || getNumber(message.seq),

package/client/web/src/function/satori.ts

@@ -57,17 +57,6 @@ function getObject(value: unknown): Record<string, unknown> {
   return typeof value === 'object' && value !== null ? value as Record<string, unknown> : {}
 }
 
-function isBlockedPlatform(
-  platform: string,
-  blockedPlatforms: SatoriBootstrap['blockedPlatforms'],
-): boolean {
-  return (blockedPlatforms ?? []).some((item) => {
-    return item.exactMatch
-      ? platform === item.platformName
-      : platform.includes(item.platformName)
-  })
-}
-
 async function parseJsonResponse(response: Response): Promise<unknown> {
   const text = await response.text()
   if (!response.ok) {
@@ -299,6 +288,7 @@ export function connect(
   let reconnectTimer = 0
   let retry = 0
   let disposed = false
+  let lastPongAt = 0
 
   const handleMessage = (event: MessageEvent) => {
     if (getString(event.data.source) === 'chat-patch-response') {
@@ -325,6 +315,7 @@ export function connect(
       socket = new WebSocket(wsUrl())
       socket.addEventListener('open', () => {
         retry = 0
+        lastPongAt = Date.now()
         socket?.send(JSON.stringify({
           op: 3,
           body: {
@@ -333,6 +324,10 @@ export function connect(
           },
         }))
         pingTimer = window.setInterval(() => {
+          if (Date.now() - lastPongAt > 30000) {
+            socket?.close()
+            return
+          }
           socket?.send(JSON.stringify({ op: 1, body: {} }))
         }, 10000)
         onStatus(true)
@@ -344,6 +339,7 @@ export function connect(
           const op = Number(raw.op)
           const body = getObject(raw.body)
           if (op === 4) {
+            lastPongAt = Date.now()
             const loginList = Array.isArray(body.logins) ? body.logins : []
             const seen = new Set<string>()
             const nextLogins: SatoriLogin[] = []
@@ -353,7 +349,7 @@ export function connect(
               const platform = getString(login.platform) || getString(user.platform)
               const selfId = getString(user.id) || getString(login.selfId)
               const key = [platform, selfId].map((value) => encodeURIComponent(value)).join(':')
-              if (!platform || !selfId || seen.has(key) || isBlockedPlatform(platform, bootstrap?.blockedPlatforms ?? [])) continue
+              if (!platform || !selfId || seen.has(key)) continue
               seen.add(key)
               nextLogins.push({
                 platform: getString(login.platform) || getString(user.platform),
@@ -371,8 +367,18 @@ export function connect(
             onReady(logins)
             return
           }
+          if (op === 1) {
+            lastPongAt = Date.now()
+            socket?.send(JSON.stringify({ op: 2, body: {} }))
+            return
+          }
+          if (op === 2) {
+            lastPongAt = Date.now()
+            return
+          }
           if (op === 5) return
           if (op === 0) {
+            lastPongAt = Date.now()
             sequence = Number(getObject(body).sn ?? sequence)
             localStorage.setItem('chat-patch:sn', String(sequence))
             onEvent({

package/client/web/src/function/utils/appUtil.ts

@@ -53,6 +53,13 @@ function encodeKeyPart(value: unknown): string {
     return encodeURIComponent(String(value ?? ''))
 }
 
+const HISTORY_INITIAL_LIMIT = 100
+let historyRequestId = 0
+
+function chatTargetKey(type: unknown, id: unknown, channelId: unknown): string {
+    return `${String(type ?? '')}:${String(id ?? '')}:${String(channelId ?? '')}`
+}
+
 /**
  * 滚动到目标消息（不自动加载）
  * @param seqName DOM 名（chat-xx）
@@ -113,14 +120,26 @@ export async function loadHistory(info: BaseChatInfoElem) {
     const chatStore = useChatStore()
     const settingsStore = useSettingsStore()
     const uiStore = useUIStore()
+    const requestId = ++historyRequestId
+    const targetKey = chatTargetKey(info.type, info.id, info.channel_id)
+    const isStale = () => {
+        return requestId !== historyRequestId
+            || targetKey !== chatTargetKey(
+                chatStore.chatInfo.show.type,
+                chatStore.chatInfo.show.id,
+                chatStore.chatInfo.show.channel_id,
+            )
+    }
     uiStore.nowGetHistory = false
     uiStore.historyBeforeTime = undefined
+    uiStore.canLoadHistory = true
+    uiStore.loadHistoryFail = false
     chatStore.messageList = []
     const channelId = String(info.channel_id ?? info.id ?? '')
     const cacheKey = [authStore.loginInfo.platform, authStore.loginInfo.uin, channelId].map(encodeKeyPart).join(':')
-    const cachedMessages = chatStore.sessionMessageCache.get(cacheKey)
-    if (cachedMessages?.length) {
-        chatStore.messageList = [...cachedMessages]
+    const sessionCached = chatStore.sessionMessageCache.get(cacheKey)
+    if (sessionCached?.length && !isStale()) {
+        chatStore.messageList = [...sessionCached]
     }
     // 本地有数据时立即显示，同时仍发网络请求以获取最新消息（避免遗漏）
     if (
@@ -132,17 +151,19 @@ export async function loadHistory(info: BaseChatInfoElem) {
             channelId,
             20,
         )
-        if (localMsgs.length > 0) {
+        if (localMsgs.length > 0 && !isStale()) {
             chatStore.messageList = localMsgs
         }
     }
+    if (isStale()) return
     try {
         const cachedMessages = await loadChatHistoryFromCache({
             platform: String(authStore.loginInfo.platform ?? ''),
             selfId: String(authStore.loginInfo.uin ?? ''),
             channelId,
-            limit: 500,
+            limit: HISTORY_INITIAL_LIMIT,
         })
+        if (isStale()) return
         if (cachedMessages.length > 0) {
             const mergedMap = new Map<string, any>()
             for (const msg of chatStore.messageList) {
@@ -167,7 +188,7 @@ export async function loadHistory(info: BaseChatInfoElem) {
                 }
                 return 0
             })
-            chatStore.messageList = merged.slice(-500)
+            chatStore.messageList = merged.slice(-HISTORY_INITIAL_LIMIT)
         }
     } catch (error) {
         logger.error(error as Error, '[LocalHistory] 加载聊天记录缓存失败')

package/client/web/src/function/utils/msgUtil.ts

@@ -518,13 +518,24 @@ function getBase64Source(item: any): string {
     return ''
 }
 
-function isBase64Source(source: string): boolean {
-    return source.startsWith('base64://') || source.startsWith('data:')
-}
-
-export function getLocalMediaUrl(value: string): string {
-    if (!value) return value
-    const isLocalPath = value.startsWith('file:') ||
+function isBase64Source(source: string): boolean {
+    return source.startsWith('base64://') || source.startsWith('data:')
+}
+
+function toPreviewImageSrc(item: any): string {
+    const source = String(item?.url ?? item?.file ?? '')
+    if (source.startsWith('base64://')) {
+        return `data:image/png;base64,${source.slice(9)}`
+    }
+    if (source.startsWith('data:') || source.startsWith('http:') || source.startsWith('https:')) {
+        return source
+    }
+    return getLocalMediaUrl(source)
+}
+
+export function getLocalMediaUrl(value: string): string {
+    if (!value) return value
+    const isLocalPath = value.startsWith('file:') ||
         /^[a-z]:[\\/]/i.test(value) ||
         value.startsWith('\\\\')
     if (!isLocalPath) return value
@@ -637,20 +648,15 @@ export async function sendMsgRaw(
         const preShowMsg = typeof msg === 'string'
             ? parsePreviewMarkup(msg)
             : JSON.parse(JSON.stringify(msg));
-        preShowMsg.forEach((item: any) => {
-            // 对 base64 图片做特殊处理
-            if (item.type == 'image') {
-                if (item.file.startsWith('base64://')) {
-                    const b64Str = (item.file as string).substring(9)
-                    item.url = 'data:image/png;base64,' + b64Str
-                } else {
-                    item.url = item.file
-                }
-            }
-            if (item.type == 'record' && item.file.startsWith('base64://')) {
-                const b64Str = (item.file as string).substring(9)
-                item.url = 'data:audio/webm;base64,' + b64Str
-            }
+        preShowMsg.forEach((item: any) => {
+            // 对 base64 图片做特殊处理
+            if (item.type == 'image') {
+                item.url = toPreviewImageSrc(item)
+            }
+            if (item.type == 'record' && String(item?.file ?? '').startsWith('base64://')) {
+                const b64Str = (item.file as string).substring(9)
+                item.url = 'data:audio/webm;base64,' + b64Str
+            }
         })
         const showMsg = {
             revoke: true,